Merge multiple versions of audio_language_fragment.xml (oppia#3997)

* AudioLanguageActivity: Add AppBar into audio_language_activity.xml and set click listeners in AudioLanguageActivityPresenter * AudioLanguageFragment: Remove references to audio_language_toolbar from xml and Presenter * AudioLanguageFragment: Remove redundant audio_language_fragment files and use resolution specific dimens.xml to separate dimensions * AudioLanguageActivity: Migrate to data binding * AudioLanguageActivity: Reformat imports to fix KtLint's warnings * AudioLanguageFragmentPresenter: Refactor imports to fix KtLint's warnings * audio_language_activity.xml: Add newline at end to fix warning * audio_language_activity.xml: Remove unwanted extra lines * AudioLanguageActivityPresenter: Use DataBindingUtil instead of binding.inflate function
kritigupta45 · Dec 31, 2021 · abe00c8 · abe00c8
1 parent 6c54f39
commit abe00c8
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 110 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivityPresenter.kt
@@ -1,8 +1,11 @@
 package org.oppia.android.app.options
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.databinding.AudioLanguageActivityBinding
 import javax.inject.Inject
 
 /** The presenter for [AudioLanguageActivity]. */
@@ -12,7 +15,18 @@ class AudioLanguageActivityPresenter @Inject constructor(private val activity: A
  private lateinit var prefSummaryValue: String
 
  fun handleOnCreate(prefKey: String, prefValue: String) {
- activity.setContentView(R.layout.audio_language_activity)
+ val binding: AudioLanguageActivityBinding = DataBindingUtil.setContentView(
+ activity,
+ R.layout.audio_language_activity,
+ )
+ val toolbar = binding.audioLanguageToolbar
+ toolbar.setNavigationOnClickListener {
+ val intent = Intent().apply {
+ putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, prefSummaryValue)
+ }
+ (activity as AudioLanguageActivity).setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent)
+ activity.finish()
+ }
  setLanguageSelected(prefValue)
  if (getAudioLanguageFragment() == null) {
  val audioLanguageFragment = AudioLanguageFragment.newInstance(prefKey, prefValue)

diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt
@@ -1,6 +1,5 @@
 package org.oppia.android.app.options
 
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,14 +33,6 @@ class AudioLanguageFragmentPresenter @Inject constructor(
  adapter = createRecyclerViewAdapter()
  }
 
- binding.audioLanguageToolbar?.setNavigationOnClickListener {
- val message = languageSelectionViewModel.selectedLanguage.value
- val intent = Intent()
- intent.putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, message)
- (fragment.activity as AudioLanguageActivity).setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent)
- (fragment.activity as AudioLanguageActivity).finish()
- }
-
  return binding.root
  }
 

diff --git a/app/src/main/res/layout-land/audio_language_fragment.xml b/app/src/main/res/layout-land/audio_language_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp/audio_language_fragment.xml b/app/src/main/res/layout-sw600dp/audio_language_fragment.xml
@@ -28,7 +28,7 @@
  android:background="@color/general_navigation_background"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingBottom="132dp"
+ android:paddingBottom="@dimen/audio_language_recycler_view_padding_bottom"
  android:scrollbars="none"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/audio_language_activity.xml b/app/src/main/res/layout/audio_language_activity.xml
@@ -1,5 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
- android:id="@+id/audio_language_fragment_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+<layout xmlns:android="http:https://schemas.android.com/apk/res/android"
+ xmlns:app="http:https://schemas.android.com/apk/res-auto">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/reading_list_app_bar_layout"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/audio_language_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:fontFamily="sans-serif"
+ android:minHeight="?attr/actionBarSize"
+ app:navigationContentDescription="@string/navigate_up"
+ app:navigationIcon="?attr/homeAsUpIndicator"
+ app:title="@string/audio_language_activity_title"
+ app:titleTextAppearance="@style/ToolbarTextAppearance"
+ app:titleTextColor="@color/white" />
+ </com.google.android.material.appbar.AppBarLayout>
+
+ <FrameLayout
+ android:id="@+id/audio_language_fragment_container"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/audio_language_fragment.xml b/app/src/main/res/layout/audio_language_fragment.xml
@@ -13,36 +13,13 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent">
 
- <com.google.android.material.appbar.AppBarLayout
- android:id="@+id/reading_list_app_bar_layout"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/audio_language_toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:fontFamily="sans-serif"
- android:minHeight="?attr/actionBarSize"
- app:navigationContentDescription="@string/navigate_up"
- app:navigationIcon="?attr/homeAsUpIndicator"
- app:title="@string/audio_language_activity_title"
- app:titleTextAppearance="@style/ToolbarTextAppearance"
- app:titleTextColor="@color/white" />
- </com.google.android.material.appbar.AppBarLayout>
-
  <FrameLayout
  android:layout_width="0dp"
  android:layout_height="0dp"
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout">
+ app:layout_constraintTop_toTopOf="parent">
 
  <androidx.recyclerview.widget.RecyclerView
  android:id="@+id/audio_language_recycler_view"
@@ -51,7 +28,7 @@
  android:background="@color/general_navigation_background"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingBottom="132dp"
+ android:paddingBottom="@dimen/audio_language_recycler_view_padding_bottom"
  android:scrollbars="none"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -390,4 +390,7 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">72dp</dimen>
 
+ <!-- AudioLanguageFragment -->
+ <dimen name="audio_language_recycler_view_padding_bottom">96dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -396,4 +396,7 @@
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">96dp</dimen>
 
+ <!-- AudioLanguageFragment -->
+ <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -398,4 +398,7 @@
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">120dp</dimen>
 
+ <!-- AudioLanguageFragment -->
+ <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -588,4 +588,7 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">32dp</dimen>
 
+ <!-- AudioLanguageFragment -->
+ <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
+
 </resources>