Status bar color fix for pre-lollipop versions oppia#1042

prathameshbhalekar · May 18, 2020 · 344d228 · 344d228
1 parent 5b5c6f9
commit 344d228
Show file tree

Hide file tree

Showing 26 changed files with 131 additions and 47 deletions.
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragmentPresenter.kt
@@ -253,13 +253,13 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
         override fun onDrawerOpened(drawerView: View) {
           super.onDrawerOpened(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
-          StatusBarColor.statusBarColorUpdate(R.color.slideDrawerOpenStatusBar, activity, false)
+          StatusBarColor.statusBarColorUpdate(R.color.slideDrawerOpenStatusBar, activity,binding.statusBarBackground, false)
         }
 
         override fun onDrawerClosed(drawerView: View) {
           super.onDrawerClosed(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
-          StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity, false)
+          StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity,binding.statusBarBackground, false)
         }
       }
       drawerLayout.setDrawerListener(drawerToggle)
@@ -279,13 +279,13 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
         override fun onDrawerOpened(drawerView: View) {
           super.onDrawerOpened(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
-          StatusBarColor.statusBarColorUpdate(R.color.slideDrawerOpenStatusBar, activity, false)
+          StatusBarColor.statusBarColorUpdate(R.color.slideDrawerOpenStatusBar, activity,binding.statusBarBackground, false)
         }
 
         override fun onDrawerClosed(drawerView: View) {
           super.onDrawerClosed(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
-          StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity, false)
+          StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity,binding.statusBarBackground, false)
         }
       }
       drawerLayout.setDrawerListener(drawerToggle)

diff --git a/app/src/main/java/org/oppia/app/home/topiclist/TopicListAdapter.kt b/app/src/main/java/org/oppia/app/home/topiclist/TopicListAdapter.kt
@@ -151,7 +151,7 @@ class TopicListAdapter(
        */
       val snapHelper = StartSnapHelper()
       binding.promotedStoryListRecyclerView.layoutManager = horizontalLayoutManager
-      binding.promotedStoryListRecyclerView.setOnFlingListener(null)
+      binding.promotedStoryListRecyclerView.onFlingListener = null
       snapHelper.attachToRecyclerView(binding.promotedStoryListRecyclerView)
 
       val paddingEnd = if (orientation == Configuration.ORIENTATION_PORTRAIT) {

diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingFragmentPresenter.kt b/app/src/main/java/org/oppia/app/onboarding/OnboardingFragmentPresenter.kt
@@ -68,11 +68,11 @@ class OnboardingFragmentPresenter @Inject constructor(
 
   private fun onboardingStatusBarColorUpdate(position: Int) {
     when (position) {
-      0 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding1StatusBar, activity, false)
-      1 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding2StatusBar, activity, false)
-      2 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding3StatusBar, activity, false)
-      3 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding4StatusBar, activity, false)
-      else -> StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity, false)
+      0 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding1StatusBar, activity,binding.statusBarBackground, false)
+      1 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding2StatusBar, activity,binding.statusBarBackground, false)
+      2 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding3StatusBar, activity,binding.statusBarBackground, false)
+      3 -> StatusBarColor.statusBarColorUpdate(R.color.onboarding4StatusBar, activity,binding.statusBarBackground, false)
+      else -> StatusBarColor.statusBarColorUpdate(R.color.colorPrimaryDark, activity,binding.statusBarBackground, false)
     }
   }
 

diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
@@ -184,7 +184,7 @@ class StateFragmentPresenter @Inject constructor(
         if (bottom < oldBottom) {
           binding.stateRecyclerView.postDelayed({
             binding.stateRecyclerView.scrollToPosition(
-              stateRecyclerViewAdapter.getItemCount() - 1
+              stateRecyclerViewAdapter.itemCount - 1
             )
           }, 100)
         }
@@ -545,7 +545,7 @@ class StateFragmentPresenter @Inject constructor(
   }
 
   private fun showCongratulationMessageOnCorrectAnswer() {
-    binding.congratulationTextview.setVisibility(View.VISIBLE)
+    binding.congratulationTextview.visibility = View.VISIBLE
 
     val fadeIn = AlphaAnimation(0f, 1f)
     fadeIn.interpolator = DecelerateInterpolator() //add this
@@ -559,7 +559,7 @@ class StateFragmentPresenter @Inject constructor(
     val animation = AnimationSet(false) //change to false
     animation.addAnimation(fadeIn)
     animation.addAnimation(fadeOut)
-    binding.congratulationTextview.setAnimation(animation)
+    binding.congratulationTextview.animation = animation
 
     Handler().postDelayed({
       binding.congratulationTextview.clearAnimation()

diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt
@@ -40,7 +40,6 @@ class PinPasswordActivityPresenter @Inject constructor(
 
   @ExperimentalCoroutinesApi
   fun handleOnCreate() {
-    StatusBarColor.statusBarColorUpdate(R.color.pinInputStatusBar, activity, true)
     val adminPin = activity.intent.getStringExtra(KEY_PIN_PASSWORD_ADMIN_PIN)
     profileId = activity.intent.getIntExtra(KEY_PIN_PASSWORD_PROFILE_ID, -1)
     val binding = DataBindingUtil.setContentView<PinPasswordActivityBinding>(activity, R.layout.pin_password_activity)
@@ -49,7 +48,7 @@ class PinPasswordActivityPresenter @Inject constructor(
       lifecycleOwner = activity
       viewModel = pinViewModel
     }
-
+    StatusBarColor.statusBarColorUpdate(R.color.pinInputStatusBar, activity,binding.statusBarBackground, true)
     binding.showPin.setOnClickListener {
       pinViewModel.showPassword.set(!pinViewModel.showPassword.get()!!)
     }

diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt b/app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt
@@ -3,9 +3,13 @@ package org.oppia.app.profile
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.os.Build
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.databinding.ObservableField
@@ -78,12 +82,12 @@ class ProfileChooserFragmentPresenter @Inject constructor(
 
   /** Binds ViewModel and sets up RecyclerView Adapter. */
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
-    StatusBarColor.statusBarColorUpdate(R.color.profileStatusBar, activity, false)
     binding = ProfileChooserFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.apply {
       viewModel = chooserViewModel
       lifecycleOwner = fragment
     }
+    StatusBarColor.statusBarColorUpdate(R.color.profileStatusBar, activity,  binding.statusBarBackground, false)
     binding.profileRecyclerView.isNestedScrollingEnabled = false
     subscribeToWasProfileEverBeenAdded()
     binding.profileRecyclerView.apply {

diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityPresenter.kt b/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityPresenter.kt
@@ -28,14 +28,14 @@ class ProfilePictureActivityPresenter @Inject constructor(
   private lateinit var profileId: ProfileId
 
   fun handleOnCreate(internalProfileId: Int) {
-    StatusBarColor.statusBarColorUpdate(R.color.profileStatusBar, activity, false)
     val binding = DataBindingUtil.setContentView<ProfilePictureActivityBinding>(activity, R.layout.profile_picture_activity)
     profilePictureActivityViewModel = ProfilePictureActivityViewModel()
 
     binding.apply {
       viewModel = profilePictureActivityViewModel
       lifecycleOwner = activity
     }
+    StatusBarColor.statusBarColorUpdate(R.color.profileStatusBar, activity,binding.statusBarBackground, false)
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
 
     subscribeToProfileLiveData()

diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressViewModel.kt b/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressViewModel.kt
@@ -97,7 +97,7 @@ class ProfileProgressViewModel @Inject constructor(
       ongoingStoryList.recentStoryList
     }
     itemViewModelList.addAll(itemList.map { story ->
-      RecentlyPlayedStorySummaryViewModel(story) as ProfileProgressItemViewModel
+      RecentlyPlayedStorySummaryViewModel(story)
     })
     return itemViewModelList
   }

diff --git a/app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt b/app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt
@@ -33,7 +33,6 @@ class BindableAdapter<T : Any> internal constructor(
   private val dataList: MutableList<T> = ArrayList()
 
   // TODO(#170): Introduce support for stable IDs.
-
   /** Sets the data of this adapter. This is expected to be called by Android via data-binding. */
   private fun setData(newDataList: List<T>) {
     dataList.clear()

diff --git a/app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt b/app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt
@@ -60,9 +60,6 @@ class InputInteractionViewTestActivity : AppCompatActivity(), StateKeyboardButto
   override fun onPendingAnswerError(
     pendingAnswerError: String?
   ) {
-    if (pendingAnswerError != null)
-      binding.submitButton.isEnabled = false
-    else
-      binding.submitButton.isEnabled = true
+    binding.submitButton.isEnabled = pendingAnswerError == null
   }
 }
diff --git a/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeViewModel.kt b/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeViewModel.kt
@@ -58,7 +58,7 @@ class TopicPracticeViewModel @Inject constructor(
     itemViewModelList.add(TopicPracticeHeaderViewModel() as TopicPracticeItemViewModel)
 
     itemViewModelList.addAll(topic.subtopicList.map { subtopic ->
-      TopicPracticeSubtopicViewModel(subtopic) as TopicPracticeItemViewModel
+      TopicPracticeSubtopicViewModel(subtopic)
     })
 
     itemViewModelList.add(TopicPracticeFooterViewModel() as TopicPracticeItemViewModel)

diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityPresenter.kt b/app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityPresenter.kt
@@ -29,7 +29,7 @@ class WalkthroughActivityPresenter @Inject constructor(
       presenter = this@WalkthroughActivityPresenter
       lifecycleOwner = activity
     }
-    StatusBarColor.statusBarColorUpdate(R.color.walkthroughStatusBar, activity, true)
+    StatusBarColor.statusBarColorUpdate(R.color.walkthroughStatusBar, activity,binding.statusBarBackground, true)
     val currentFragmentIndex = getWalkthroughViewModel().currentProgress.get()?.minus(1)
 
     if (currentFragmentIndex == -1 && getWalkthroughWelcomeFragment() == null) {

diff --git a/app/src/main/res/layout-land/onboarding_fragment.xml b/app/src/main/res/layout-land/onboarding_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -19,6 +20,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/oppiaBackgroundYellowIvory">
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.viewpager.widget.ViewPager
       android:id="@+id/onboarding_slide_view_pager"

diff --git a/app/src/main/res/layout-land/pin_password_activity.xml b/app/src/main/res/layout-land/pin_password_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -20,6 +21,12 @@
     android:paddingTop="48dp"
     android:paddingBottom="76dp">
 
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
       android:id="@+id/hello_text_view"
       android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -24,7 +25,12 @@
         android:id="@+id/profile_chooser_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
+        <View
+          android:id="@+id/statusBarBackground"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:layout_editor_absoluteX="-16dp" />
         <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout-land/profile_picture_activity.xml b/app/src/main/res/layout-land/profile_picture_activity.xml
@@ -15,6 +15,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
     <ImageView
       android:id="@+id/profile_picture_image_view"
       android:layout_width="0dp"

diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -14,7 +15,6 @@
   <com.google.android.material.navigation.NavigationView
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <androidx.core.widget.NestedScrollView
       android:id="@+id/drawer_nested_scroll_view"
       android:layout_width="match_parent"
@@ -26,7 +26,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
+        <View
+          android:id="@+id/statusBarBackground"
+          android:layout_width="match_parent"
+          android:layout_height="0dp"
+          android:visibility="invisible"
+          app:layout_constraintTop_toTopOf="parent"
+          />
         <com.google.android.material.navigation.NavigationView
           android:id="@+id/fragment_drawer_nav_view"
           android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/onboarding_fragment.xml b/app/src/main/res/layout/onboarding_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -19,7 +20,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/oppiaBackgroundYellowIvory">
-
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent" />
     <androidx.viewpager.widget.ViewPager
       android:id="@+id/onboarding_slide_view_pager"
       android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -19,6 +20,12 @@
     android:background="@color/oppiaLightGreen"
     android:paddingTop="96dp">
 
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent"/>
+
     <TextView
       android:id="@+id/hello_text_view"
       android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
@@ -13,6 +14,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
     <androidx.core.widget.NestedScrollView
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -25,6 +27,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <View
+          android:id="@+id/statusBarBackground"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:layout_editor_absoluteX="-16dp" />
+
         <ImageView
           android:id="@+id/profile_chooser_language_icon"
           android:layout_width="48dp"

diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
@@ -15,6 +15,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <View
+      android:id="@+id/statusBarBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
     <ImageView
       android:id="@+id/profile_picture_image_view"
       android:layout_width="0dp"