Update release 0.12 branch to include #5285 and #5287 (#5288)

## Explanation This fixes #5284 for the upcoming 0.12 release by cherry-picking #5285 and #5287 into the release branch. Both cherry-picks happened cleanly, so the review is expected to be straightforward. ## Essential Checklist - [ ] ~The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)~ - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only See corresponding cherry-picks and original PRs for references on what reverted behavior is being checked in within this PR. --------- Co-authored-by: Adhiambo Peres <[email protected]>
oppia · Dec 23, 2023 · 01f4111 · 01f4111
1 parent 74f4baf
commit 01f4111
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 133 deletions.
diff --git a/app/BUILD.bazel b/app/BUILD.bazel
@@ -660,7 +660,6 @@ kt_android_library(
  "//third_party:androidx_core_core-ktx",
  "//third_party:androidx_databinding_databinding-common",
  "//third_party:androidx_databinding_databinding-runtime",
- "//third_party:androidx_fragment_fragment",
  "//third_party:circularimageview_circular_image_view",
  "//utility/src/main/java/org/oppia/android/util/accessibility",
  "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser",

diff --git a/...ava/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt b/...ava/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
@@ -96,7 +96,7 @@ class AdministratorControlsActivityPresenter @Inject constructor(
  .findFragmentById(
  R.id.administrator_controls_activity_fragment_navigation_drawer
  ) as NavigationDrawerFragment
- navigationDrawerFragment.initializeDrawer(
+ navigationDrawerFragment.setUpDrawer(
  binding.administratorControlsActivityDrawerLayout,
  toolbar, /* menuItemId= */ 0
  )

diff --git a/...rc/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt b/...rc/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt
@@ -8,7 +8,7 @@ import android.view.KeyEvent.ACTION_UP
 import android.view.KeyEvent.KEYCODE_BACK
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.widget.AppCompatEditText
+import android.widget.EditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
 import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
@@ -22,12 +22,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
 
 // TODO(#4135): Add a dedicated test suite for this class.
 
-/** The custom [AppCompatEditText] class for fraction input interaction view. */
+/** The custom EditText class for fraction input interaction view. */
 class FractionInputInteractionView @JvmOverloads constructor(
  context: Context,
  attrs: AttributeSet? = null,
  defStyle: Int = android.R.attr.editTextStyle
-) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
  private var hintText: CharSequence = ""
  private val stateKeyboardButtonListener: StateKeyboardButtonListener
 
@@ -71,7 +71,7 @@ class FractionInputInteractionView @JvmOverloads constructor(
 
  private fun restoreHint() {
  hint = hintText
- if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
+ if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
  setSingleLine(false)
  }
 }
diff --git a/.../main/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsView.kt b/.../main/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsView.kt
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.widget.AppCompatEditText
+import android.widget.EditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
 import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
@@ -19,7 +19,7 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
 // maxLength="200".
 
 /**
- * The custom [AppCompatEditText] class for math expression interactions interaction view.
+ * The custom [EditText] class for math expression interactions interaction view.
  *
  * Note that the hint should be set via [setPlaceholder] to ensure that it's properly initialized if
  * using databinding, otherwise setting the hint through android:hint should work fine.
@@ -28,7 +28,7 @@ class MathExpressionInteractionsView @JvmOverloads constructor(
  context: Context,
  attrs: AttributeSet? = null,
  defStyle: Int = android.R.attr.editTextStyle
-) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
  private var hintText: CharSequence = ""
  private val stateKeyboardButtonListener: StateKeyboardButtonListener
 
@@ -84,7 +84,7 @@ class MathExpressionInteractionsView @JvmOverloads constructor(
 
  private fun restoreHint() {
  hint = hintText
- if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
+ if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
  setSingleLine(false)
  }
 }
diff --git a/...src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt b/...src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt
@@ -8,7 +8,7 @@ import android.view.KeyEvent.ACTION_UP
 import android.view.KeyEvent.KEYCODE_BACK
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.widget.AppCompatEditText
+import android.widget.EditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
 import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
@@ -20,12 +20,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
 // background="@drawable/edit_text_background"
 // maxLength="200".
 
-/** The custom [AppCompatEditText] class for numeric input interaction view. */
+/** The custom EditText class for numeric input interaction view. */
 class NumericInputInteractionView @JvmOverloads constructor(
  context: Context,
  attrs: AttributeSet? = null,
  defStyle: Int = android.R.attr.editTextStyle
-) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
  private val stateKeyboardButtonListener: StateKeyboardButtonListener
  private var hintText: CharSequence = ""
 
@@ -69,7 +69,7 @@ class NumericInputInteractionView @JvmOverloads constructor(
 
  private fun restoreHint() {
  hint = hintText
- if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
+ if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
  setSingleLine(false)
  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt
@@ -6,16 +6,16 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.widget.AppCompatEditText
+import android.widget.EditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper
 
-/** The custom [AppCompatEditText] class for ratio input interaction view. */
+/** The custom EditText class for ratio input interaction view. */
 class RatioInputInteractionView @JvmOverloads constructor(
  context: Context,
  attrs: AttributeSet? = null,
  defStyle: Int = android.R.attr.editTextStyle
-) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
  private var hintText: CharSequence = ""
  private val stateKeyboardButtonListener: StateKeyboardButtonListener
 
@@ -59,7 +59,7 @@ class RatioInputInteractionView @JvmOverloads constructor(
 
  private fun restoreHint() {
  hint = hintText
- if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
+ if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
  setSingleLine(false)
  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.widget.AppCompatEditText
+import android.widget.EditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
 import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
@@ -17,12 +17,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
 // background="@drawable/edit_text_background"
 // maxLength="200".
 
-/** The custom [AppCompatEditText] class for text input interaction view. */
+/** The custom EditText class for text input interaction view. */
 class TextInputInteractionView @JvmOverloads constructor(
  context: Context,
  attrs: AttributeSet? = null,
  defStyle: Int = android.R.attr.editTextStyle
-) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
  private var hintText: CharSequence = ""
  private val stateKeyboardButtonListener: StateKeyboardButtonListener
 
@@ -66,7 +66,7 @@ class TextInputInteractionView @JvmOverloads constructor(
 
  private fun restoreHint() {
  hint = hintText
- if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
- isSingleLine = false
+ if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
+ setSingleLine(false)
  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityPresenter.kt
@@ -41,7 +41,7 @@ class DeveloperOptionsActivityPresenter @Inject constructor(
  .findFragmentById(
  R.id.developer_options_activity_fragment_navigation_drawer
  ) as NavigationDrawerFragment
- navigationDrawerFragment.initializeDrawer(
+ navigationDrawerFragment.setUpDrawer(
  binding.developerOptionsActivityDrawerLayout,
  toolbar, menuItemId = -1
  )

diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt
@@ -33,8 +33,8 @@ class NavigationDrawerFragment :
  return navigationDrawerFragmentPresenter.handleCreateView(inflater, container)
  }
 
- fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
- navigationDrawerFragmentPresenter.initializeDrawer(drawerLayout, toolbar, menuItemId)
+ fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
+ navigationDrawerFragmentPresenter.setUpDrawer(drawerLayout, toolbar, menuItemId)
  }
 
  override fun routeToProfileProgress(profileId: Int) {

diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
@@ -62,17 +62,13 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  private lateinit var drawerLayout: DrawerLayout
  private lateinit var binding: DrawerFragmentBinding
  private lateinit var profileId: ProfileId
- private lateinit var toolbar: Toolbar
  private var previousMenuItemId: Int? = null
  private var internalProfileId: Int = -1
- private var menuItemId: Int = 0
 
  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
  binding = DrawerFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
  binding.fragmentDrawerNavView.setNavigationItemSelectedListener(this)
 
- setUpDrawer(drawerLayout, toolbar, menuItemId)
-
  fragment.setHasOptionsMenu(true)
 
  internalProfileId = activity.intent.getIntExtra(NAVIGATION_PROFILE_ID_ARGUMENT_KEY, -1)
@@ -370,32 +366,11 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  }
  }
 
- fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
- this.drawerLayout = drawerLayout
- this.toolbar = toolbar
- this.menuItemId = menuItemId
-
- /**
- * [setUpDrawer] is called directly if binding is already initialized.
- * Otherwise, [setUpDrawer] is called from [handleCreateView].
- *
- * Note: [binding] is already initialized when [initializeDrawer] is called via [onRestart]
- * and [handleCreateView] will not be called in that case.
- */
- if (this::binding.isInitialized) {
- setUpDrawer(
- this.drawerLayout,
- this.toolbar,
- this.menuItemId
- )
- }
- }
-
  /**
  * Initializes the navigation drawer for the specified [DrawerLayout] and [Toolbar], which the host activity is
  * expected to provide. The [menuItemId] corresponds to the menu ID of the current activity, for navigation purposes.
  */
- private fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
+ fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
  previousMenuItemId = if (activity is TopicActivity) null else menuItemId
  if (menuItemId != 0 && menuItemId != -1) {
  getFooterViewModel().isAdministratorControlsSelected.set(false)
@@ -432,6 +407,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  true
  }
  }
+ this.drawerLayout = drawerLayout
  drawerToggle = object : ActionBarDrawerToggle(
  fragment.activity,
  drawerLayout,
@@ -470,6 +446,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  // For showing navigation drawer in DeveloperOptionsActivity
  else if (menuItemId == -1) getFooterViewModel().isDeveloperOptionsSelected.set(true)
  uncheckAllMenuItemsWhenAdministratorControlsOrDeveloperOptionsIsSelected()
+ this.drawerLayout = drawerLayout
  drawerToggle = object : ActionBarDrawerToggle(
  fragment.activity,
  drawerLayout,

diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
@@ -192,7 +192,7 @@ class HelpActivityPresenter @Inject constructor(
  .findFragmentById(
  R.id.help_activity_fragment_navigation_drawer
  ) as NavigationDrawerFragment
- navigationDrawerFragment.initializeDrawer(
+ navigationDrawerFragment.setUpDrawer(
  activity.findViewById<View>(R.id.help_activity_drawer_layout) as DrawerLayout,
  toolbar, R.id.nav_help
  )

diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt
@@ -49,7 +49,7 @@ class HomeActivityPresenter @Inject constructor(private val activity: AppCompatA
  navigationDrawerFragment = activity
  .supportFragmentManager
  .findFragmentById(R.id.home_activity_fragment_navigation_drawer) as NavigationDrawerFragment
- navigationDrawerFragment!!.initializeDrawer(
+ navigationDrawerFragment!!.setUpDrawer(
  activity.findViewById<View>(R.id.home_activity_drawer_layout) as DrawerLayout,
  toolbar, R.id.nav_home
  )

diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt
@@ -72,7 +72,7 @@ class OptionsActivityPresenter @Inject constructor(
  .findFragmentById(
  R.id.options_activity_fragment_navigation_drawer
  ) as NavigationDrawerFragment
- navigationDrawerFragment!!.initializeDrawer(
+ navigationDrawerFragment!!.setUpDrawer(
  activity.findViewById<View>(R.id.options_activity_drawer_layout) as DrawerLayout,
  toolbar, R.id.nav_options
  )

diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
@@ -98,7 +98,7 @@
  app:layout_constraintTop_toBottomOf="@id/administrator_controls_activity_toolbar" />
  </androidx.constraintlayout.widget.ConstraintLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="@dimen/navigation_drawer_width"

diff --git a/app/src/main/res/layout-sw600dp/help_activity.xml b/app/src/main/res/layout-sw600dp/help_activity.xml
@@ -102,7 +102,7 @@
  </androidx.constraintlayout.widget.ConstraintLayout>
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/help_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout-sw600dp/option_activity.xml b/app/src/main/res/layout-sw600dp/option_activity.xml
@@ -85,7 +85,7 @@
  </androidx.constraintlayout.widget.ConstraintLayout>
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/options_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/administrator_controls_activity.xml b/app/src/main/res/layout/administrator_controls_activity.xml
@@ -28,7 +28,7 @@
  android:layout_height="match_parent" />
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/developer_options_activity.xml b/app/src/main/res/layout/developer_options_activity.xml
@@ -39,7 +39,7 @@
  </FrameLayout>
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/developer_options_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/help_activity.xml b/app/src/main/res/layout/help_activity.xml
@@ -38,7 +38,7 @@
  </FrameLayout>
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/help_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/home_activity.xml b/app/src/main/res/layout/home_activity.xml
@@ -33,7 +33,7 @@
  android:layout_weight="1" />
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/home_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/option_activity.xml b/app/src/main/res/layout/option_activity.xml
@@ -36,7 +36,7 @@
  </FrameLayout>
  </LinearLayout>
 
- <androidx.fragment.app.FragmentContainerView
+ <fragment
  android:id="@+id/options_activity_fragment_navigation_drawer"
  android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
  android:layout_width="wrap_content"

diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
@@ -43,7 +43,6 @@ kt_android_library(
  "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
  "//testing/src/main/java/org/oppia/android/testing/time:fake_oppia_clock",
  "//third_party:androidx_core_core-ktx",
- "//third_party:androidx_fragment_fragment",
  "//third_party:androidx_lifecycle_lifecycle-livedata-ktx",
  "//third_party:androidx_test_espresso_espresso-accessibility",
  "//third_party:androidx_test_espresso_espresso-contrib",