fix(preferences): status bar color

Also make transparent the default color for the status bar in SingleFragmentActivity
ankidroid · Feb 9, 2025 · ed1ca6e · ed1ca6e
1 parent ce9eb68
commit ed1ca6e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -71,6 +71,7 @@ import androidx.core.util.component1
 import androidx.core.util.component2
 import androidx.core.view.MenuProvider
 import androidx.core.view.OnReceiveContentListener
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.draganddrop.DropHelper
 import androidx.fragment.app.Fragment
@@ -134,6 +135,7 @@ import com.ichi2.anki.ui.setupNoteTypeSpinner
 import com.ichi2.anki.utils.ext.isImageOcclusion
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.anki.utils.ext.window
 import com.ichi2.anki.widgets.DeckDropDownAdapter.SubtitleListener
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
@@ -516,6 +518,7 @@ class NoteEditor :
         view: View,
         savedInstanceState: Bundle?,
     ) {
+        WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightStatusBars = false
         @Suppress("deprecation", "API35 properly handle edge-to-edge")
         requireActivity().window.statusBarColor = Themes.getColorFromAttr(requireContext(), R.attr.appBarColor)
         super.onViewCreated(view, savedInstanceState)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
@@ -25,6 +25,7 @@ import androidx.fragment.app.commit
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
+import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.utils.FragmentFactoryUtils
 import timber.log.Timber
 import kotlin.reflect.KClass
@@ -50,6 +51,7 @@ open class SingleFragmentActivity : AnkiActivity() {
             return
         }
         setContentView(R.layout.single_fragment_activity)
+        setTransparentStatusBar()
 
         // avoid recreating the fragment on configuration changes
         // the fragment should handle state restoration

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
@@ -18,14 +18,12 @@ package com.ichi2.anki.pages
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import android.webkit.WebView
 import androidx.activity.OnBackPressedCallback
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
-import com.ichi2.themes.setTransparentStatusBar
 
 /**
  * Anki page used to import text/csv files
@@ -46,14 +44,6 @@ class CsvImporter : PageFragment() {
         return CsvImporterWebViewClient(backCallback)
     }
 
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?,
-    ) {
-        super.onViewCreated(view, savedInstanceState)
-        requireActivity().setTransparentStatusBar()
-    }
-
     inner class CsvImporterWebViewClient(
         private val backCallback: OnBackPressedCallback,
     ) : PageWebViewClient() {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt
@@ -30,7 +30,6 @@ import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.dialogs.DiscardChangesDialog
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.DeckId
-import com.ichi2.themes.setTransparentStatusBar
 import kotlinx.coroutines.launch
 import org.json.JSONObject
 import timber.log.Timber
@@ -41,7 +40,6 @@ class ImageOcclusion : PageFragment(R.layout.image_occlusion) {
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-        requireActivity().setTransparentStatusBar()
         with(requireActivity()) {
             onBackPressedDispatcher.addCallback(this) {
                 DiscardChangesDialog.showDialog(this@with) {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
@@ -32,7 +32,6 @@ import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.themes.Themes
-import com.ichi2.themes.setTransparentStatusBar
 import timber.log.Timber
 import kotlin.reflect.KClass
 
@@ -118,7 +117,6 @@ open class PageFragment(
         setupBridgeCommand(pageWebViewClient)
         onWebViewCreated(webView)
 
-        requireActivity().setTransparentStatusBar()
         val arguments = requireArguments()
         val path = requireNotNull(arguments.getString(PATH_ARG_KEY)) { "'$PATH_ARG_KEY' missing" }
         val title = arguments.getString(TITLE_ARG_KEY)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
@@ -37,7 +37,6 @@ import com.ichi2.anki.utils.getTimestamp
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.DeckNameId
 import com.ichi2.libanki.utils.TimeManager
-import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.utils.BundleUtils.getNullableLong
 
 class Statistics :
@@ -54,7 +53,6 @@ class Statistics :
         super.onViewCreated(view, savedInstanceState)
         webView.isNestedScrollingEnabled = true
 
-        requireActivity().setTransparentStatusBar()
         spinner = view.findViewById(R.id.deck_selector)
         view
             .findViewById<AppBarLayout>(R.id.app_bar)