Fixes part of #4120, part of #1051: Fix a lot of build-time warnings

app/BUILD.bazel

@@ -694,7 +694,6 @@ kt_android_library(
         "//app/src/main/java/org/oppia/android/app/utility/math:math_expression_accessibility_util",
         "//app/src/main/java/org/oppia/android/app/viewmodel:observable_array_list",
         "//app/src/main/java/org/oppia/android/app/viewmodel:observable_view_model",
-        "//app/src/main/java/org/oppia/android/app/viewmodel:view_model_provider",
         "//domain",
         "//domain/src/main/java/org/oppia/android/domain/audio:audio_player_controller",
         "//domain/src/main/java/org/oppia/android/domain/clipboard:clipboard_controller",

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt

@@ -138,6 +138,7 @@ class AdministratorControlsActivity :
     if (fragment is ProfileEditFragment) {
       administratorControlsActivityPresenter.handleOnBackPressed()
     } else {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       super.onBackPressed()
     }
   }

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt

@@ -3,7 +3,6 @@ package org.oppia.android.app.administratorcontrols
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
@@ -62,14 +61,11 @@ class AdministratorControlsActivityPresenter @Inject constructor(
     if (isMultipane) {
       val adminControlsActivity = activity as AdministratorControlsActivity
       when (lastLoadedFragment) {
-        PROFILE_LIST_FRAGMENT -> (activity as AdministratorControlsActivity).loadProfileList()
-        APP_VERSION_FRAGMENT -> (activity as AdministratorControlsActivity).loadAppVersion()
+        PROFILE_LIST_FRAGMENT -> activity.loadProfileList()
+        APP_VERSION_FRAGMENT -> activity.loadAppVersion()
         PROFILE_EDIT_FRAGMENT -> selectedProfileId.let { profileId ->
           if (extraControlsTitle != null) {
-            (activity as AdministratorControlsActivity).loadProfileEdit(
-              profileId = profileId,
-              profileName = extraControlsTitle
-            )
+            activity.loadProfileEdit(profileId = profileId, profileName = extraControlsTitle)
             if (isProfileDeletionDialogVisible && profileId != 0) {
               val fragment = activity.supportFragmentManager.findFragmentById(
                 R.id.administrator_controls_fragment_multipane_placeholder
@@ -88,7 +84,7 @@ class AdministratorControlsActivityPresenter @Inject constructor(
 
   /** Sets up the navigation drawer. */
   private fun setUpNavigationDrawer() {
-    val toolbar = binding.administratorControlsActivityToolbar as Toolbar
+    val toolbar = binding.administratorControlsActivityToolbar
     activity.setSupportActionBar(toolbar)
     activity.supportActionBar!!.setDisplayShowHomeEnabled(true)
     navigationDrawerFragment = activity
@@ -206,9 +202,9 @@ class AdministratorControlsActivityPresenter @Inject constructor(
       outState.putString(SELECTED_CONTROLS_TITLE_SAVED_KEY, titleTextView.text.toString())
     }
     outState.putString(LAST_LOADED_FRAGMENT_EXTRA_KEY, lastLoadedFragment)
-    isProfileDeletionDialogVisible?.let {
+    isProfileDeletionDialogVisible.let {
       outState.putBoolean(IS_PROFILE_DELETION_DIALOG_VISIBLE_KEY, it)
     }
-    selectedProfileId?.let { outState.putInt(SELECTED_PROFILE_ID_SAVED_KEY, it) }
+    selectedProfileId.let { outState.putInt(SELECTED_PROFILE_ID_SAVED_KEY, it) }
   }
 }

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt

@@ -23,6 +23,7 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt

@@ -5,15 +5,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import org.oppia.android.app.fragment.FragmentScope
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.AppVersionFragmentBinding
 import javax.inject.Inject
 
 /** The presenter for [AppVersionFragment]. */
 @FragmentScope
 class AppVersionFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<AppVersionViewModel>
+  private val appVersionViewModel: AppVersionViewModel
 ) {
   private lateinit var binding: AppVersionFragmentBinding
 
@@ -26,12 +25,8 @@ class AppVersionFragmentPresenter @Inject constructor(
     )
     binding.let {
       it.lifecycleOwner = fragment
-      it.viewModel = getAppVersionViewModel()
+      it.viewModel = appVersionViewModel
     }
     return binding.root
   }
-
-  private fun getAppVersionViewModel(): AppVersionViewModel {
-    return viewModelProvider.getForFragment(fragment, AppVersionViewModel::class.java)
-  }
 }

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt

@@ -28,6 +28,7 @@ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt

@@ -8,7 +8,6 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import org.oppia.android.R
 import org.oppia.android.app.recyclerview.BindableAdapter
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.CompletedStoryItemBinding
 import org.oppia.android.databinding.CompletedStoryListFragmentBinding
 import javax.inject.Inject
@@ -17,7 +16,7 @@ import javax.inject.Inject
 class CompletedStoryListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<CompletedStoryListViewModel>,
+  private val viewModel: CompletedStoryListViewModel,
   private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
 
@@ -29,7 +28,6 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
     container: ViewGroup?,
     internalProfileId: Int
   ): View? {
-    val viewModel = getCompletedStoryListViewModel()
     viewModel.setProfileId(internalProfileId)
 
     binding = CompletedStoryListFragmentBinding
@@ -61,8 +59,4 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
       )
       .build()
   }
-
-  private fun getCompletedStoryListViewModel(): CompletedStoryListViewModel {
-    return viewModelProvider.getForFragment(fragment, CompletedStoryListViewModel::class.java)
-  }
 }

app/src/main/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdapters.java

@@ -12,7 +12,7 @@
  */
 public final class AppCompatCheckBoxBindingAdapters {
   /** Sets the button tint for the specified checkbox, via data-binding. */
-  @BindingAdapter("app:buttonTint")
+  @BindingAdapter("buttonTint")
   public static void setButtonTint(@NonNull AppCompatCheckBox checkBox, @ColorInt int colorRgb) {
     CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(colorRgb));
   }

app/src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java

@@ -18,7 +18,7 @@ public final class CircularProgressIndicatorAdapters {
    * @param progress the numerical progress to set on the indicator (which will be displayed based
    *     on the indicator's customized minimum and maximum progress values)
    */
-  @BindingAdapter("app:animatedProgress")
+  @BindingAdapter("animatedProgress")
   public static void setAnimatedProgress(CircularProgressIndicator indicator, int progress) {
     if (progress > 0) {
       indicator.setProgressCompat(progress, /* animated = */ true);

app/src/main/java/org/oppia/android/app/databinding/ConstraintLayoutAdapters.java

@@ -10,7 +10,7 @@
 public final class ConstraintLayoutAdapters {
 
   /** Binding adapter for setting a layout_constraintEnd_toEndOf to a view. */
-  @BindingAdapter("app:layout_constraintEnd_toEndOf")
+  @BindingAdapter("layout_constraintEnd_toEndOf")
   public static void setConstraintEndToEndOf(@NonNull View view, int constraintToId) {
     ConstraintLayout constraintLayout = (ConstraintLayout) view.getParent();
     ConstraintSet constraintSet = new ConstraintSet();
@@ -20,7 +20,7 @@ public static void setConstraintEndToEndOf(@NonNull View view, int constraintToI
   }
 
   /** Binding adapter for setting layout_constraintHorizontal_bias to a view. */
-  @BindingAdapter("app:layout_constraintHorizontal_bias")
+  @BindingAdapter("layout_constraintHorizontal_bias")
   public static void setHorizontalBias(@NonNull View view, float value) {
     ConstraintLayout constraintLayout = (ConstraintLayout) view.getParent();
     ConstraintSet constraintSet = new ConstraintSet();

app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java

@@ -20,7 +20,7 @@ public static void setBackgroundColor(@NonNull View view, @ColorInt int colorRgb
   }
 
   /** Used to set a rounded-rect background drawable with a data-bound color. */
-  @BindingAdapter("app:roundedRectDrawableWithColor")
+  @BindingAdapter("roundedRectDrawableWithColor")
   public static void setBackgroundDrawable(@NonNull View view, @ColorInt int colorRgb) {
     view.setBackgroundResource(R.drawable.rounded_rect_background);
     // The input color needs to have alpha channel prepended to it.
@@ -29,7 +29,7 @@ public static void setBackgroundDrawable(@NonNull View view, @ColorInt int color
   }
 
   /** Used to set a top rounded-rect background drawable with a data-bound color. */
-  @BindingAdapter("app:topRoundedRectDrawableWithColor")
+  @BindingAdapter("topRoundedRectDrawableWithColor")
   public static void setTopBackgroundDrawable(@NonNull View view, @ColorInt int colorRgb) {
     view.setBackgroundResource(R.drawable.top_rounded_rect_background);
     // The input color needs to have alpha channel prepended to it.

app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java

@@ -9,7 +9,7 @@
 public final class EditTextBindingAdapters {
 
   /** Binding adapter for setting a [TextWatcher] as a change listener for an [EditText]. */
-  @BindingAdapter("app:textChangedListener")
+  @BindingAdapter("textChangedListener")
   public static void bindTextWatcher(@NonNull EditText editText, TextWatcher textWatcher) {
     editText.addTextChangedListener(textWatcher);
   }

app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java

@@ -9,7 +9,7 @@
 public final class GuidelineBindingAdapters {
 
   /** Binding adapter for setting the `guidePercent` for a [Guideline]. */
-  @BindingAdapter("app:layout_constraintGuide_percent")
+  @BindingAdapter("layout_constraintGuide_percent")
   public static void setGuidelinePercentage(@NonNull Guideline guideline, float percentage) {
     ConstraintLayout.LayoutParams params =
         (ConstraintLayout.LayoutParams) guideline.getLayoutParams();
@@ -18,7 +18,7 @@ public static void setGuidelinePercentage(@NonNull Guideline guideline, float pe
   }
 
   /** Binding adapter for setting the `guideEnd` for a [Guideline]. */
-  @BindingAdapter("app:layout_constraintGuide_end")
+  @BindingAdapter("layout_constraintGuide_end")
   public static void setConstraintGuidelineEnd(@NonNull Guideline guideline, float guideEndPx) {
     ConstraintLayout.LayoutParams params =
         (ConstraintLayout.LayoutParams) guideline.getLayoutParams();

app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java

@@ -17,15 +17,15 @@
 
 /** Holds all custom binding adapters that bind to [ImageView]. */
 public final class ImageViewBindingAdapters {
-  @BindingAdapter("app:srcCompat")
+  @BindingAdapter("srcCompat")
   public static void setImageDrawableCompat(
       @NonNull ImageView imageView,
       @DrawableRes int drawableResourceId
   ) {
     imageView.setImageResource(drawableResourceId);
   }
 
-  @BindingAdapter("app:srcCompat")
+  @BindingAdapter("srcCompat")
   public static void setImageDrawableCompat(
       @NonNull ImageView imageView,
       Drawable drawable
@@ -40,7 +40,7 @@ public static void setImageDrawableCompat(
    * @param imageView view where the profile avatar will be loaded into
    * @param profileAvatar represents either a colorId or local image uri
    */
-  @BindingAdapter("profile:src")
+  @BindingAdapter("profileImageSource")
   public static void setProfileImage(ImageView imageView, ProfileAvatar profileAvatar) {
     if (profileAvatar != null) {
       if (profileAvatar.getAvatarTypeCase() == ProfileAvatar.AvatarTypeCase.AVATAR_COLOR_RGB) {
@@ -86,7 +86,7 @@ public boolean onResourceReady(
    * <p/>
    * Reference: https://stackoverflow.com/a/35809319/3689782.
    */
-  @BindingAdapter("playState:image")
+  @BindingAdapter("playStateImage")
   public static void setPlayStateDrawable(
       @NonNull ImageView imageView,
       ChapterPlayState chapterPlayState

app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java

@@ -10,7 +10,7 @@
 public final class MarginBindingAdapters {
 
   /** Sets the start margin for a view, accounting for RTL scenarios. */
-  @BindingAdapter("app:layoutMarginStart")
+  @BindingAdapter("layoutMarginStart")
   public static void setLayoutMarginStart(@NonNull View view, float marginStart) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
@@ -20,7 +20,7 @@ public static void setLayoutMarginStart(@NonNull View view, float marginStart) {
   }
 
   /** Sets the end margin for a view, accounting for RTL scenarios. */
-  @BindingAdapter("app:layoutMarginEnd")
+  @BindingAdapter("layoutMarginEnd")
   public static void setLayoutMarginEnd(@NonNull View view, float marginEnd) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
@@ -30,7 +30,7 @@ public static void setLayoutMarginEnd(@NonNull View view, float marginEnd) {
   }
 
   /** Used to set a margin-top for views. */
-  @BindingAdapter("app:layoutMarginTop")
+  @BindingAdapter("layoutMarginTop")
   public static void setLayoutMarginTop(@NonNull View view, float marginTop) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
@@ -41,7 +41,7 @@ public static void setLayoutMarginTop(@NonNull View view, float marginTop) {
   }
 
   /** Used to set a margin-bottom for views. */
-  @BindingAdapter("app:layoutMarginBottom")
+  @BindingAdapter("layoutMarginBottom")
   public static void setLayoutMarginBottom(@NonNull View view, float marginBottom) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
@@ -52,7 +52,7 @@ public static void setLayoutMarginBottom(@NonNull View view, float marginBottom)
   }
 
   /** Used to set a margin for views. */
-  @BindingAdapter("app:layoutMargin")
+  @BindingAdapter("layoutMargin")
   public static void setLayoutMargin(@NonNull View view, float margin) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();

app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java

@@ -14,11 +14,11 @@ public final class StateAssemblerMarginBindingAdapters {
   /** Used to set a margin for exploration split-view. */
   @BindingAdapter(
       value = {
-          "app:explorationSplitViewMarginApplicable",
-          "app:explorationSplitViewMarginStart",
-          "app:explorationSplitViewMarginTop",
-          "app:explorationSplitViewMarginEnd",
-          "app:explorationSplitViewMarginBottom",
+          "explorationSplitViewMarginApplicable",
+          "explorationSplitViewMarginStart",
+          "explorationSplitViewMarginTop",
+          "explorationSplitViewMarginEnd",
+          "explorationSplitViewMarginBottom",
       },
       requireAll = false
   )
@@ -36,11 +36,11 @@ public static void setExplorationSplitViewMargin(
   /** Used to set a margin for exploration view. */
   @BindingAdapter(
       value = {
-          "app:explorationViewMarginApplicable",
-          "app:explorationViewMarginStart",
-          "app:explorationViewMarginTop",
-          "app:explorationViewMarginEnd",
-          "app:explorationViewMarginBottom",
+          "explorationViewMarginApplicable",
+          "explorationViewMarginStart",
+          "explorationViewMarginTop",
+          "explorationViewMarginEnd",
+          "explorationViewMarginBottom",
       },
       requireAll = false
   )
@@ -58,11 +58,11 @@ public static void setExplorationViewMargin(
   /** Used to set a margin for question view. */
   @BindingAdapter(
       value = {
-          "app:questionViewMarginApplicable",
-          "app:questionViewMarginStart",
-          "app:questionViewMarginTop",
-          "app:questionViewMarginEnd",
-          "app:questionViewMarginBottom",
+          "questionViewMarginApplicable",
+          "questionViewMarginStart",
+          "questionViewMarginTop",
+          "questionViewMarginEnd",
+          "questionViewMarginBottom",
       },
       requireAll = false
   )
@@ -80,11 +80,11 @@ public static void setQuestionViewMargin(
   /** Used to set a margin for question split-view. */
   @BindingAdapter(
       value = {
-          "app:questionSplitViewMarginApplicable",
-          "app:questionSplitViewMarginStart",
-          "app:questionSplitViewMarginTop",
-          "app:questionSplitViewMarginEnd",
-          "app:questionSplitViewMarginBottom",
+          "questionSplitViewMarginApplicable",
+          "questionSplitViewMarginStart",
+          "questionSplitViewMarginTop",
+          "questionSplitViewMarginEnd",
+          "questionSplitViewMarginBottom",
       },
       requireAll = false
   )