Эх сурвалжийг харах

Merge pull request #3900 from nextcloud/improveBarColorsForLogin

set light or dark bar colors for login screens instead primary color
Sowjanya Kota 1 жил өмнө
parent
commit
500f2ca1a9

+ 1 - 1
app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -91,7 +91,7 @@ class AccountVerificationActivity : BaseActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setContentView(binding.root)
         actionBar?.hide()
-        setupPrimaryColors()
+        setupSystemColors()
 
         handleIntent()
     }

+ 1 - 1
app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt

@@ -78,7 +78,7 @@ class ServerSelectionActivity : BaseActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setContentView(binding.root)
         actionBar?.hide()
-        setupPrimaryColors()
+        setupSystemColors()
 
         onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
     }

+ 1 - 1
app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt

@@ -86,7 +86,7 @@ class SwitchAccountActivity : BaseActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setContentView(binding.root)
         setupActionBar()
-        setupPrimaryColors()
+        setupSystemColors()
 
         Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
 

+ 1 - 1
app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt

@@ -114,7 +114,7 @@ class WebViewLoginActivity : BaseActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setContentView(binding.root)
         actionBar?.hide()
-        setupPrimaryColors()
+        setupSystemColors()
 
         onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
         handleIntent()

+ 0 - 13
app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt

@@ -108,19 +108,6 @@ open class BaseActivity : AppCompatActivity() {
         colorizeNavigationBar()
     }
 
-    fun setupPrimaryColors() {
-        if (resources != null) {
-            DisplayUtils.applyColorToStatusBar(
-                this,
-                ResourcesCompat.getColor(resources!!, R.color.colorPrimary, null)
-            )
-            DisplayUtils.applyColorToNavigationBar(
-                window,
-                ResourcesCompat.getColor(resources!!, R.color.colorPrimary, null)
-            )
-        }
-    }
-
     open fun colorizeStatusBar() {
         if (resources != null) {
             if (appBarLayoutType == AppBarLayoutType.SEARCH_BAR) {