Fix seance color can be too dark when dark mode is enabled (#196)

Make the color lean toward white when dark theme is on or toward black when it's off
ApplETS · Aug 15, 2019 · 0352a7e · 0352a7e
1 parent 3a87886
commit 0352a7e
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 12 deletions.
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ContextExt.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ContextExt.kt
@@ -2,6 +2,7 @@ package ca.etsmtl.applets.etsmobile.extension
 
 import android.Manifest
 import android.content.Context
+import android.content.res.Configuration
 import android.net.ConnectivityManager
 import android.util.TypedValue
 import androidx.annotation.AttrRes
@@ -16,6 +17,16 @@ import model.UserCredentials
  * Created by Sonphil on 18-05-18.
  */
 
+/**
+ * Returns true when dark theme is on, false otherwise.
+ */
+inline val Context.isDarkMode: Boolean
+    get() {
+        val uiMode = resources.configuration.uiMode
+
+        return uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+    }
+
 /**
  * Check if the device is connected
  *

diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/SeanceExt.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/SeanceExt.kt
@@ -1,5 +1,6 @@
 package ca.etsmtl.applets.etsmobile.extension
 
+import android.content.Context
 import android.graphics.Color
 import androidx.core.graphics.ColorUtils
 import model.Seance
@@ -8,8 +9,16 @@ import model.Seance
  * Created by Sonphil on 13-08-19.
  */
 
-fun Seance.generateColor() = ColorUtils.blendARGB(
-    sigleCours.hashCode(),
-    Color.BLACK,
-    0.3f
-)
+fun Seance.generateColor(context: Context): Int {
+    val secondColor = if (context.isDarkMode) {
+        Color.WHITE
+    } else {
+        Color.BLACK
+    }
+
+    return ColorUtils.blendARGB(
+        sigleCours.hashCode(),
+        secondColor,
+        0.3f
+    )
+}
diff --git a/...p/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt b/...p/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt
@@ -121,4 +121,10 @@ class DashboardFragment : DaggerFragment() {
 
         super.onPause()
     }
+
+    override fun onDestroyView() {
+        rvCards.adapter = null
+
+        super.onDestroyView()
+    }
 }
diff --git a/...in/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsActivity.kt b/...in/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsActivity.kt
@@ -6,12 +6,12 @@ import android.transition.TransitionInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.util.Pair
 import androidx.core.view.isVisible
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.extension.getColorCompat
+import ca.etsmtl.applets.etsmobile.extension.isDarkMode
 import ca.etsmtl.applets.etsmobile.extension.toast
 import ca.etsmtl.applets.etsmobile.presentation.BaseActivity
 import kotlinx.android.synthetic.main.activity_grades_details.*
@@ -71,7 +71,7 @@ class GradesDetailsActivity : BaseActivity() {
 
         setupToolbar()
 
-        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+        if (isDarkMode) {
             window.statusBarColor = getColorCompat(R.color.etsRougeClair)
         }
 
@@ -133,7 +133,7 @@ class GradesDetailsActivity : BaseActivity() {
             }
         }
 
-        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+        if (isDarkMode) {
             window.statusBarColor = getColorCompat(R.color.colorPrimaryDark)
         }
 

diff --git a/...app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleFragment.kt b/...app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleFragment.kt
@@ -105,7 +105,7 @@ class ScheduleFragment : DaggerFragment() {
     private fun Seance.toWeekViewEvent(): WeekViewEvent<Seance> {
         val style = WeekViewEvent.Style
             .Builder()
-            .setBackgroundColor(generateColor())
+            .setBackgroundColor(generateColor(requireContext()))
             .build()
 
         return WeekViewEvent.Builder<Seance>()

diff --git a/...in/ca/etsmtl/applets/etsmobile/presentation/schedule/week/ScheduleWeekInnerListAdapter.kt b/...in/ca/etsmtl/applets/etsmobile/presentation/schedule/week/ScheduleWeekInnerListAdapter.kt
@@ -66,7 +66,7 @@ class ScheduleWeekInnerListAdapter : RecyclerView.Adapter<ScheduleWeekInnerListA
                     dateFin.timeInMilliseconds,
                     DateUtils.FORMAT_SHOW_TIME
                 )
-            holder.separatorSchedule.setBackgroundColor(generateColor())
+            holder.separatorSchedule.setBackgroundColor(generateColor(holder.itemView.context))
         }
     }
 

diff --git a/...app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/settings/SettingsFragment.kt b/...app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/settings/SettingsFragment.kt
@@ -51,8 +51,6 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan
     private fun handleDarkThemePreferenceChange(newValue: Any?) {
         if (newValue is String) {
             context?.applyDarkThemePref(newValue)
-
-            activity?.recreate()
         }
     }