Skip to content

Commit bed159e

Browse files
committed
Fix dynamic colors on activity start
1 parent 49ec30a commit bed159e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

app/src/main/java/com/philkes/notallyx/presentation/activity/LockedActivity.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
1717
import androidx.core.content.ContextCompat
1818
import androidx.lifecycle.lifecycleScope
1919
import androidx.viewbinding.ViewBinding
20+
import com.google.android.material.color.DynamicColors
2021
import com.google.android.material.dialog.MaterialAlertDialogBuilder
2122
import com.philkes.notallyx.NotallyXApplication
2223
import com.philkes.notallyx.R
@@ -40,10 +41,16 @@ abstract class LockedActivity<T : ViewBinding> : AppCompatActivity() {
4041
override fun onCreate(savedInstanceState: Bundle?) {
4142
super.onCreate(savedInstanceState)
4243
notallyXApplication = (application as NotallyXApplication)
43-
preferences = NotallyXPreferences.getInstance(application)
44-
when (preferences.theme.value) {
45-
Theme.SUPER_DARK -> theme.applyStyle(R.style.AppTheme_SuperDark, true)
46-
else -> theme.applyStyle(R.style.AppTheme, true)
44+
preferences = NotallyXPreferences.getInstance(notallyXApplication)
45+
if (preferences.useDynamicColors.value) {
46+
if (DynamicColors.isDynamicColorAvailable()) {
47+
DynamicColors.applyToActivitiesIfAvailable(notallyXApplication)
48+
}
49+
} else {
50+
when (preferences.theme.value) {
51+
Theme.SUPER_DARK -> theme.applyStyle(R.style.AppTheme_SuperDark, true)
52+
else -> theme.applyStyle(R.style.AppTheme, true)
53+
}
4754
}
4855
biometricAuthenticationActivityResultLauncher =
4956
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->

0 commit comments

Comments
 (0)