Fix #3551 option_audio_language.xml into single xml file (#4220)

* Good * Done * Amend
oppia · Mar 2, 2022 · dd02432 · dd02432
1 parent 4ccd35a
commit dd02432
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 109 deletions.
diff --git a/app/src/main/res/layout-land/option_audio_language.xml b/app/src/main/res/layout-land/option_audio_language.xml
diff --git a/app/src/main/res/layout-sw600dp/option_audio_language.xml b/app/src/main/res/layout-sw600dp/option_audio_language.xml
diff --git a/app/src/main/res/layout/option_audio_language.xml b/app/src/main/res/layout/option_audio_language.xml
@@ -3,6 +3,9 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
+    <variable
+      name="commonViewModel"
+      type="org.oppia.android.app.options.OptionControlsViewModel" />
 
     <variable
       name="viewModel"
@@ -13,12 +16,12 @@
     android:id="@+id/audio_laguage_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/general_item_background_border"
+    android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex ? @drawable/general_item_background_border_cyan : @drawable/general_item_background_border}"
     android:minHeight="48dp"
     android:onClick="@{(v) -> viewModel.onAudioLanguageClicked()}"
-    android:paddingStart="16dp"
+    android:paddingStart="@dimen/option_audio_language_padding_start"
     android:paddingTop="20dp"
-    android:paddingEnd="16dp"
+    android:paddingEnd="@dimen/option_audio_language_padding_end"
     android:paddingBottom="20dp">
 
     <TextView

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -447,4 +447,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">36dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">36dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">0dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">36dp</dimen>
+  <dimen name="option_audio_language_padding_end">36dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -439,4 +439,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -438,4 +438,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -648,4 +648,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>