Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix part of #2003: Replacing space_32dp #2121

Merged
merged 6 commits into from
Nov 21, 2020
Merged

Fix part of #2003: Replacing space_32dp #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fce4b83
Fix part of #2003: Replacing space_32dp
Arjupta Nov 16, 2020
6ea9288
Resolving conflicts
Arjupta Nov 17, 2020
17ade99
Resloving conflicts
Arjupta Nov 17, 2020
670fe25
Overiding dimensions
Arjupta Nov 18, 2020
e0984c7
Overiding dimension and resolving conflicts
Arjupta Nov 18, 2020
5e2d6bd
Resolving conflicts with space_128dp
Arjupta Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/res/layout-land/content_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
app:explorationViewPaddingTop="@{@dimen/space_16dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_16dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand All @@ -52,7 +52,7 @@
app:questionViewMarginBottom="@{@dimen/space_16dp}"
app:questionViewMarginEnd="@{@dimen/content_item_question_view_margin_end}"
app:questionViewMarginStart="@{@dimen/content_item_question_view_margin_start}"
app:questionViewMarginTop="@{@dimen/space_32dp}"
app:questionViewMarginTop="@{@dimen/content_item_question_view_margin_top}"
app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}"
app:questionViewPaddingBottom="@{@dimen/space_0dp}"
app:questionViewPaddingEnd="@{@dimen/space_0dp}"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout-land/drag_drop_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
android:padding="0dp"
app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.splitView}"
app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.splitView}"
app:explorationViewMarginBottom="@{@dimen/space_0dp}"
Expand All @@ -36,8 +36,8 @@
app:explorationViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.splitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.splitView}"
app:questionViewMarginBottom="@{@dimen/space_0dp}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/feedback_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
app:explorationViewPaddingTop="@{@dimen/space_16dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/feedback_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/submitted_answer_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
app:explorationViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/submitted_answer_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/submitted_answer_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}"
app:questionViewMarginBottom="@{@dimen/space_0dp}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-land/content_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
app:explorationViewPaddingTop="@{@dimen/space_16dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
android:padding="0dp"
app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.splitView}"
app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.splitView}"
app:explorationViewMarginBottom="@{@dimen/space_0dp}"
Expand All @@ -36,8 +36,8 @@
app:explorationViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.splitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.splitView}"
app:questionViewMarginBottom="@{@dimen/space_0dp}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-land/feedback_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_40dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginTop="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/feedback_item_question_split_view_margin_top}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:orientation="vertical"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}">
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_margin_start_profile_not_added}">

<TextView
android:id="@+id/add_profile_text"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/white"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />

<TextView
Expand All @@ -76,7 +76,7 @@
android:textSize="16sp"
android:textStyle="italic"
android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_4dp}"
profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />

Expand All @@ -93,7 +93,7 @@
android:textSize="16sp"
android:textStyle="italic"
android:visibility="@{viewModel.profile.isAdmin &amp;&amp; hasProfileEverBeenAddedValue ? View.VISIBLE : View.GONE}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />
</LinearLayout>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-port/content_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
app:explorationViewPaddingTop="@{@dimen/space_16dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
android:padding="0dp"
app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
app:explorationViewMarginBottom="@{@dimen/space_0dp}"
Expand All @@ -36,8 +36,8 @@
app:explorationViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
app:questionViewMarginBottom="@{@dimen/space_0dp}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-port/feedback_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
app:explorationViewPaddingTop="@{@dimen/space_16dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/feedback_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:orientation="vertical"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}">
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_margin_start_profile_not_added}">

<TextView
android:id="@+id/add_profile_text"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/white"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />

<TextView
Expand Down Expand Up @@ -93,7 +93,7 @@
android:textSize="16sp"
android:textStyle="italic"
android:visibility="@{viewModel.profile.isAdmin &amp;&amp; hasProfileEverBeenAddedValue ? View.VISIBLE : View.GONE}"
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}" />
app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}" />
</LinearLayout>

<View
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-sw600dp-port/state_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="top"
app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/state_fragment_non_split_view_margin_end}"
app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/state_fragment_non_split_view_margin_start}"
app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_end : @dimen/state_fragment_non_split_view_margin_end}"
app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_start : @dimen/state_fragment_non_split_view_margin_start}"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/content_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
app:explorationViewPaddingTop="@{@dimen/space_12dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_12dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
Expand All @@ -50,8 +50,8 @@
app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
app:questionViewMarginBottom="@{@dimen/space_12dp}"
app:questionViewMarginEnd="@{@dimen/space_32dp}"
app:questionViewMarginStart="@{@dimen/space_32dp}"
app:questionViewMarginEnd="@{@dimen/content_item_question_view_margin_end}"
app:questionViewMarginStart="@{@dimen/content_item_question_view_margin_start}"
app:questionViewMarginTop="@{@dimen/content_item_question_view_margin_top}"
app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
app:questionViewPaddingBottom="@{@dimen/space_0dp}"
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/res/layout/drag_drop_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}"
app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
app:explorationSplitViewMarginTop="@{@dimen/space_32dp}"
app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
app:explorationSplitViewMarginTop="@{@dimen/drag_drop_item_exploration_split_view_margin_top}"
app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
app:explorationViewMarginBottom="@{@dimen/space_0dp}"
app:explorationViewMarginEnd="@{@dimen/space_24dp}"
app:explorationViewMarginStart="@{@dimen/space_40dp}"
app:explorationViewMarginTop="@{@dimen/space_24dp}"
app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
app:questionViewMarginBottom="@{@dimen/space_0dp}"
app:questionViewMarginEnd="@{@dimen/space_32dp}"
app:questionViewMarginStart="@{@dimen/space_32dp}"
app:questionViewMarginEnd="@{@dimen/drag_drop_item_question_view_margin_end}"
app:questionViewMarginStart="@{@dimen/drag_drop_item_question_view_margin_start}"
app:questionViewMarginTop="@{@dimen/space_24dp}">

<TextView
Expand Down
Loading