Merge branch 'develop' into remove-zero-quantity

app/BUILD.bazel

@@ -660,6 +660,7 @@ 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",

app/src/main/java/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.setUpDrawer(
+    navigationDrawerFragment.initializeDrawer(
       binding.administratorControlsActivityDrawerLayout,
       toolbar, /* menuItemId= */ 0
     )

app/src/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 android.widget.EditText
+import androidx.appcompat.widget.AppCompatEditText
 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 EditText class for fraction input interaction view. */
+/** The custom [AppCompatEditText] class for fraction input interaction view. */
 class FractionInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : AppCompatEditText(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()) setTypeface(typeface, Typeface.ITALIC)
+    if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
     setSingleLine(false)
   }
 }

app/src/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 android.widget.EditText
+import androidx.appcompat.widget.AppCompatEditText
 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 [EditText] class for math expression interactions interaction view.
+ * The custom [AppCompatEditText] 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
-) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : AppCompatEditText(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()) setTypeface(typeface, Typeface.ITALIC)
+    if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
     setSingleLine(false)
   }
 }

app/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 android.widget.EditText
+import androidx.appcompat.widget.AppCompatEditText
 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 EditText class for numeric input interaction view. */
+/** The custom [AppCompatEditText] class for numeric input interaction view. */
 class NumericInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : AppCompatEditText(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()) setTypeface(typeface, Typeface.ITALIC)
+    if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
     setSingleLine(false)
   }
 }

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 android.widget.EditText
+import androidx.appcompat.widget.AppCompatEditText
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.utility.KeyboardHelper
 
-/** The custom EditText class for ratio input interaction view. */
+/** The custom [AppCompatEditText] class for ratio input interaction view. */
 class RatioInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : AppCompatEditText(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()) setTypeface(typeface, Typeface.ITALIC)
+    if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
     setSingleLine(false)
   }
 }

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 android.widget.EditText
+import androidx.appcompat.widget.AppCompatEditText
 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 EditText class for text input interaction view. */
+/** The custom [AppCompatEditText] class for text input interaction view. */
 class TextInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
+) : AppCompatEditText(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()) setTypeface(typeface, Typeface.ITALIC)
-    setSingleLine(false)
+    if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
+    isSingleLine = false
   }
 }

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.setUpDrawer(
+    navigationDrawerFragment.initializeDrawer(
       binding.developerOptionsActivityDrawerLayout,
       toolbar, menuItemId = -1
     )

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt

@@ -33,8 +33,8 @@ class NavigationDrawerFragment :
     return navigationDrawerFragmentPresenter.handleCreateView(inflater, container)
   }
 
-  fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
-    navigationDrawerFragmentPresenter.setUpDrawer(drawerLayout, toolbar, menuItemId)
+  fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
+    navigationDrawerFragmentPresenter.initializeDrawer(drawerLayout, toolbar, menuItemId)
   }
 
   override fun routeToProfileProgress(profileId: Int) {

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt

@@ -62,13 +62,17 @@ 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)
@@ -366,11 +370,17 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
     }
   }
 
+  fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
+    this.drawerLayout = drawerLayout
+    this.toolbar = toolbar
+    this.menuItemId = 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.
    */
-  fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
+  private 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)
@@ -407,7 +417,6 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
             true
         }
       }
-      this.drawerLayout = drawerLayout
       drawerToggle = object : ActionBarDrawerToggle(
         fragment.activity,
         drawerLayout,
@@ -446,7 +455,6 @@ 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,

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.setUpDrawer(
+    navigationDrawerFragment.initializeDrawer(
       activity.findViewById<View>(R.id.help_activity_drawer_layout) as DrawerLayout,
       toolbar, R.id.nav_help
     )

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!!.setUpDrawer(
+    navigationDrawerFragment!!.initializeDrawer(
       activity.findViewById<View>(R.id.home_activity_drawer_layout) as DrawerLayout,
       toolbar, R.id.nav_home
     )

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!!.setUpDrawer(
+    navigationDrawerFragment!!.initializeDrawer(
       activity.findViewById<View>(R.id.options_activity_drawer_layout) as DrawerLayout,
       toolbar, R.id.nav_options
     )

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>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
       android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
       android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
       android:layout_width="@dimen/navigation_drawer_width"

app/src/main/res/layout-sw600dp/help_activity.xml

@@ -102,7 +102,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
   </LinearLayout>
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
     android:id="@+id/help_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
     android:layout_width="wrap_content"

app/src/main/res/layout-sw600dp/option_activity.xml

@@ -85,7 +85,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
   </LinearLayout>
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
     android:id="@+id/options_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
     android:layout_width="wrap_content"

app/src/main/res/layout/administrator_controls_activity.xml

@@ -28,7 +28,7 @@
         android:layout_height="match_parent" />
     </LinearLayout>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
       android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
       android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
       android:layout_width="wrap_content"

app/src/main/res/layout/developer_options_activity.xml

@@ -39,7 +39,7 @@
       </FrameLayout>
     </LinearLayout>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
       android:id="@+id/developer_options_activity_fragment_navigation_drawer"
       android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
       android:layout_width="wrap_content"

app/src/main/res/layout/help_activity.xml

@@ -38,7 +38,7 @@
     </FrameLayout>
   </LinearLayout>
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
     android:id="@+id/help_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
     android:layout_width="wrap_content"

app/src/main/res/layout/home_activity.xml

@@ -33,7 +33,7 @@
       android:layout_weight="1" />
   </LinearLayout>
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
     android:id="@+id/home_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
     android:layout_width="wrap_content"

app/src/main/res/layout/option_activity.xml

@@ -36,7 +36,7 @@
     </FrameLayout>
   </LinearLayout>
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
     android:id="@+id/options_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
     android:layout_width="wrap_content"

app/src/main/res/values-pt-rBR/strings.xml

@@ -185,28 +185,28 @@
   <string name="correct">Correto!</string>
   <string name="topic_prefix">Tópico: %s</string>
   <plurals name="chapter_count" fuzzy="true">
-    <item quantity="one">1 Capítulo\n    </item>
-    <item quantity="other">\n      %s Capítulos\n    </item>
+    <item quantity="one">%s Capítulo</item>
+    <item quantity="other">%s Capítulos</item>
   </plurals>
   <plurals name="story_count" fuzzy="true">
-    <item quantity="one">1 História\n    </item>
-    <item quantity="other">\n      %s Histórias\n    </item>
+    <item quantity="one">%s História</item>
+    <item quantity="other">%s Histórias</item>
   </plurals>
   <plurals name="story_total_chapters">
     <item quantity="one">%s de %s Capítulo Concluído</item>
     <item quantity="other">%s de %s Capítulos Concluídos</item>
   </plurals>
   <plurals name="lesson_count" fuzzy="true">
-    <item quantity="one">1 Lição\n    </item>
-    <item quantity="other">\n      %s Lições\n    </item>
+    <item quantity="one">%s Lição</item>
+    <item quantity="other">%s Lições</item>
   </plurals>
   <plurals name="completed_story_count" fuzzy="true">
-    <item quantity="one">1 história concluída</item>
+    <item quantity="one">%s história concluída</item>
     <item quantity="zero">%s Histórias concluídas</item>
     <item quantity="other">%s Histórias concluídas</item>
   </plurals>
   <plurals name="ongoing_topic_count" fuzzy="true">
-    <item quantity="one">1 Tópico em andamento</item>
+    <item quantity="one">%s Tópico em andamento</item>
     <item quantity="zero">%s Tópicos em andamento</item>
     <item quantity="other">%s Tópicos em andamento</item>
   </plurals>

testing/BUILD.bazel

@@ -43,6 +43,7 @@ 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",