Fix part of #5025: App and OS Deprecation Milestone 3 - Add New Deprecation Dialog Fragments

app/src/main/AndroidManifest.xml

@@ -92,6 +92,18 @@
       android:name=".app.notice.testing.GeneralAvailabilityUpgradeNoticeDialogFragmentTestActivity"
       android:label="@string/test_activity_label"
       android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.ForcedAppDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.OptionalAppDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.OsDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.onboarding.OnboardingActivity"
       android:label="@string/onboarding_activity_title"

app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt

@@ -31,7 +31,10 @@ import org.oppia.android.app.mydownloads.MyDownloadsFragment
 import org.oppia.android.app.mydownloads.UpdatesTabFragment
 import org.oppia.android.app.notice.AutomaticAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.BetaNoticeDialogFragment
+import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragment
+import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
+import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
 import org.oppia.android.app.onboarding.OnboardingFragment
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment
 import org.oppia.android.app.options.AppLanguageFragment
@@ -113,7 +116,10 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(appVersionFragment: AppVersionFragment)
   fun inject(audioFragment: AudioFragment)
   fun inject(audioLanguageFragment: AudioLanguageFragment)
-  fun inject(autoAppDeprecationNoticeDialogFragment: AutomaticAppDeprecationNoticeDialogFragment)
+  fun inject(
+    automaticAppDeprecationNoticeDialogFragment:
+      AutomaticAppDeprecationNoticeDialogFragment
+  )
   fun inject(betaNoticeDialogFragment: BetaNoticeDialogFragment)
   fun inject(cellularAudioDialogFragment: CellularAudioDialogFragment)
   fun inject(completedStoryListFragment: CompletedStoryListFragment)
@@ -127,6 +133,7 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(explorationTestActivityTestFragment: ExplorationTestActivityPresenter.TestFragment)
   fun inject(faqListFragment: FAQListFragment)
   fun inject(forceNetworkTypeFragment: ForceNetworkTypeFragment)
+  fun inject(forcedAppDeprecationNoticeDialogFragment: ForcedAppDeprecationNoticeDialogFragment)
   fun inject(fragment: GeneralAvailabilityUpgradeNoticeDialogFragment)
   fun inject(helpFragment: HelpFragment)
   fun inject(hintsAndSolutionDialogFragment: HintsAndSolutionDialogFragment)
@@ -146,7 +153,9 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(navigationDrawerFragment: NavigationDrawerFragment)
   fun inject(onboardingFragment: OnboardingFragment)
   fun inject(ongoingTopicListFragment: OngoingTopicListFragment)
+  fun inject(optionalAppDeprecationNoticeDialogFragment: OptionalAppDeprecationNoticeDialogFragment)
   fun inject(optionFragment: OptionsFragment)
+  fun inject(osDeprecationNoticeDialogFragment: OsDeprecationNoticeDialogFragment)
   fun inject(policiesFragment: PoliciesFragment)
   fun inject(profileAndDeviceIdFragment: ProfileAndDeviceIdFragment)
   fun inject(profileChooserFragment: ProfileChooserFragment)

app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt

@@ -0,0 +1,9 @@
+package org.oppia.android.app.notice
+
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+
+/** Listener for when an option on any deprecation dialog is clicked. */
+interface DeprecationNoticeActionListener {
+  /** Called when a dialog button is clicked. */
+  fun onActionButtonClicked(noticeType: DeprecationNoticeActionType)
+}

app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragment.kt

@@ -0,0 +1,29 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/** Dialog fragment that informs the user of an app deprecation. */
+class ForcedAppDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [ForcedAppDeprecationNoticeDialogFragment]. */
+    fun newInstance(): ForcedAppDeprecationNoticeDialogFragment {
+      return ForcedAppDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var presenter: ForcedAppDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return presenter.handleOnCreateDialog()
+  }
+}

app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt

@@ -0,0 +1,47 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an app deprecation dialog to the user. */
+class ForcedAppDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the forced app deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.forced_app_update_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.forced_app_update_dialog_message,
+          appName
+        )
+      )
+      .setPositiveButton(R.string.forced_app_update_dialog_update_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.UPDATE
+        )
+      }
+      .setNegativeButton(R.string.forced_app_update_dialog_close_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.CLOSE
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}

app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragment.kt

@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/** Dialog fragment that informs the user that a new app version is available for download. */
+class OptionalAppDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [OptionalAppDeprecationNoticeDialogFragment]. */
+    fun newInstance(): OptionalAppDeprecationNoticeDialogFragment {
+      return OptionalAppDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var optionalAppDeprecationNoticeDialogFragmentPresenter:
+    OptionalAppDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return optionalAppDeprecationNoticeDialogFragmentPresenter.handleOnCreateDialog()
+  }
+}

app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt

@@ -0,0 +1,47 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an optional update dialog to the user. */
+class OptionalAppDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the optional app deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.optional_app_update_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.optional_app_update_dialog_message,
+          appName
+        )
+      )
+      .setPositiveButton(R.string.optional_app_update_dialog_update_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.UPDATE
+        )
+      }
+      .setNegativeButton(R.string.optional_app_update_dialog_dismiss_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.DISMISS
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}

app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragment.kt

@@ -0,0 +1,33 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/**
+ * Dialog fragment that informs the user that their phone OS is no longer supported by Oppia and
+ * they will no longer be able to update their app to the latest version.
+ */
+class OsDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [OsDeprecationNoticeDialogFragment]. */
+    fun newInstance(): OsDeprecationNoticeDialogFragment {
+      return OsDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var osDeprecationNoticeDialogFragmentPresenter:
+    OsDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return osDeprecationNoticeDialogFragmentPresenter.handleOnCreateDialog()
+  }
+}

app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt

@@ -0,0 +1,42 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an OS deprecation dialog to the user. */
+class OsDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the OS deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.os_deprecation_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.os_deprecation_dialog_message,
+          appName
+        )
+      )
+      .setNegativeButton(R.string.os_deprecation_dialog_dismiss_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.DISMISS
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}

app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel

@@ -18,6 +18,19 @@ kt_android_library(
     ],
 )
 
+kt_android_library(
+    name = "forced_app_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
 kt_android_library(
     name = "general_availability_upgrade_notice_dialog_fragment_test_activity",
     testonly = True,
@@ -31,4 +44,30 @@ kt_android_library(
     ],
 )
 
+kt_android_library(
+    name = "optional_app_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
+kt_android_library(
+    name = "os_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "OsDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
 dagger_rules()

app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt

@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice.testing
+
+import android.os.Bundle
+import org.oppia.android.app.notice.DeprecationNoticeActionListener
+import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.testing.activity.TestActivity
+
+/** [TestActivity] for setting up a test environment for testing the beta notice dialog. */
+class ForcedAppDeprecationNoticeDialogFragmentTestActivity :
+  TestActivity(),
+  DeprecationNoticeActionListener {
+  /**
+   * [DeprecationNoticeActionListener] that must be initialized by the test, and is presumed to be a
+   * Mockito mock (though this is not, strictly speaking, required).
+   *
+   * This listener will be used as the callback for the dialog in response to UI operations.
+   */
+  lateinit var mockCallbackListener: DeprecationNoticeActionListener
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    ForcedAppDeprecationNoticeDialogFragment.newInstance()
+      .showNow(supportFragmentManager, "forced_app_deprecation_dialog")
+  }
+
+  override fun onActionButtonClicked(noticeType: DeprecationNoticeActionType) {
+    mockCallbackListener.onActionButtonClicked(noticeType)
+  }
+}