From 76c542fd29edc119bb10e18e308475c224a6e85e Mon Sep 17 00:00:00 2001 From: veena14cs Date: Sun, 20 Jun 2021 16:54:43 +0530 Subject: [PATCH 1/7] Update selection_interaction_item.xml --- .../res/layout/selection_interaction_item.xml | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/app/src/main/res/layout/selection_interaction_item.xml b/app/src/main/res/layout/selection_interaction_item.xml index fa6345d7efa..5ce91496f31 100644 --- a/app/src/main/res/layout/selection_interaction_item.xml +++ b/app/src/main/res/layout/selection_interaction_item.xml @@ -13,44 +13,51 @@ type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + app:layoutMarginTop="@{viewModel.hasConversationView ? @dimen/interaction_item_exploration_view_margin_top : @dimen/interaction_item_question_view_margin_top}"> - - - - + android:background="@{viewModel.hasConversationView ? @drawable/rounded_rect_grey_border_white_background : @drawable/rounded_rect_white_background}" + android:descendantFocusability="beforeDescendants" + android:focusableInTouchMode="true" + android:orientation="vertical" + android:paddingStart="@dimen/selection_interaction_item_padding_start" + android:paddingTop="12dp" + android:paddingEnd="@dimen/selection_interaction_item_padding_end" + android:paddingBottom="12dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + From 1eaa7940dd4d13c100a5a00941560a0fd60238de Mon Sep 17 00:00:00 2001 From: veena14cs Date: Sun, 20 Jun 2021 20:25:04 +0530 Subject: [PATCH 2/7] Update selection_interaction_item.xml --- .../res/layout/selection_interaction_item.xml | 73 +++++++++---------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/app/src/main/res/layout/selection_interaction_item.xml b/app/src/main/res/layout/selection_interaction_item.xml index 5ce91496f31..fa6345d7efa 100644 --- a/app/src/main/res/layout/selection_interaction_item.xml +++ b/app/src/main/res/layout/selection_interaction_item.xml @@ -13,51 +13,44 @@ type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + app:layoutMarginTop="@{viewModel.hasConversationView ? @dimen/interaction_item_exploration_view_margin_top : @dimen/interaction_item_question_view_margin_top}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + - - - - - - + android:divider="@android:color/transparent" + app:allOptionsItemInputType="@{viewModel.getSelectionItemInputType()}" + app:data="@{viewModel.choiceItems}" + app:entityId="@{viewModel.entityId}" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + From fa0171821c4c150b4bef2a29945cda406b7f0c07 Mon Sep 17 00:00:00 2001 From: veena14cs Date: Thu, 24 Jun 2021 16:11:22 +0530 Subject: [PATCH 3/7] Update return_to_topic_button_item.xml --- app/src/main/res/layout/return_to_topic_button_item.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/return_to_topic_button_item.xml b/app/src/main/res/layout/return_to_topic_button_item.xml index 5d5bdb72027..9ae1d4f79c0 100644 --- a/app/src/main/res/layout/return_to_topic_button_item.xml +++ b/app/src/main/res/layout/return_to_topic_button_item.xml @@ -14,9 +14,8 @@ Date: Thu, 24 Jun 2021 16:28:58 +0530 Subject: [PATCH 4/7] Update return_to_topic_button_item.xml --- app/src/main/res/layout/return_to_topic_button_item.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/return_to_topic_button_item.xml b/app/src/main/res/layout/return_to_topic_button_item.xml index 9ae1d4f79c0..5d5bdb72027 100644 --- a/app/src/main/res/layout/return_to_topic_button_item.xml +++ b/app/src/main/res/layout/return_to_topic_button_item.xml @@ -14,8 +14,9 @@ Date: Sat, 18 Sep 2021 14:58:33 -0700 Subject: [PATCH 5/7] Update image_region_selection_interaction_item.xml --- .../main/res/layout/image_region_selection_interaction_item.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/image_region_selection_interaction_item.xml b/app/src/main/res/layout/image_region_selection_interaction_item.xml index 375835975b7..82a28abdd2c 100644 --- a/app/src/main/res/layout/image_region_selection_interaction_item.xml +++ b/app/src/main/res/layout/image_region_selection_interaction_item.xml @@ -22,6 +22,7 @@ android:paddingTop="12dp" android:paddingEnd="16dp" android:paddingBottom="12dp" + android:layoutDirection="ltr" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.splitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/interaction_item_split_view_margin_end}" From ea98dd1e59484959d7b096132a38d43beae335bc Mon Sep 17 00:00:00 2001 From: Veena Date: Sat, 18 Sep 2021 16:44:22 -0700 Subject: [PATCH 6/7] Update image_region_selection_interaction_item.xml --- .../main/res/layout/image_region_selection_interaction_item.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/image_region_selection_interaction_item.xml b/app/src/main/res/layout/image_region_selection_interaction_item.xml index 82a28abdd2c..375835975b7 100644 --- a/app/src/main/res/layout/image_region_selection_interaction_item.xml +++ b/app/src/main/res/layout/image_region_selection_interaction_item.xml @@ -22,7 +22,6 @@ android:paddingTop="12dp" android:paddingEnd="16dp" android:paddingBottom="12dp" - android:layoutDirection="ltr" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.splitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/interaction_item_split_view_margin_end}" From 9ee7214ed6981f2ee7d520945bcbfb250e348335 Mon Sep 17 00:00:00 2001 From: Veena Date: Sat, 3 Sep 2022 16:23:36 +0530 Subject: [PATCH 7/7] Update ListItemLeadingMarginSpanTest.kt --- .../org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/src/{sharedTest => test}/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt (100%) diff --git a/app/src/sharedTest/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt similarity index 100% rename from app/src/sharedTest/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt rename to app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt