Fix light nav support for API 26

This commit is contained in:
moezbhatti
2019-08-27 22:47:07 +02:00
parent 0f96209eca
commit eb151bba55
4 changed files with 20 additions and 4 deletions
@@ -23,10 +23,12 @@ import android.app.ActivityManager
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.View
import androidx.core.view.iterator import androidx.core.view.iterator
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.extensions.resolveThemeBoolean
import com.moez.QKSMS.common.util.extensions.resolveThemeColor import com.moez.QKSMS.common.util.extensions.resolveThemeColor
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
@@ -77,6 +79,13 @@ abstract class QkThemedActivity : QkActivity() {
.autoDisposable(scope()) .autoDisposable(scope())
.subscribe { recreate() } .subscribe { recreate() }
// We can only set light nav bar on API 27 in attrs, but we can do it in API 26 here
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
val night = !resolveThemeBoolean(R.attr.isLightTheme)
window.decorView.systemUiVisibility = if (night) 0 else
View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
}
// Some devices don't let you modify android.R.attr.navigationBarColor // Some devices don't let you modify android.R.attr.navigationBarColor
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground)
@@ -43,6 +43,13 @@ fun Context.resolveThemeAttribute(attributeId: Int, default: Int = 0): Int {
return if (wasResolved) outValue.resourceId else default return if (wasResolved) outValue.resourceId else default
} }
fun Context.resolveThemeBoolean(attributeId: Int, default: Boolean = false): Boolean {
val outValue = TypedValue()
val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
return if (wasResolved) outValue.data != 0 else default
}
fun Context.resolveThemeColor(attributeId: Int, default: Int = 0): Int { fun Context.resolveThemeColor(attributeId: Int, default: Int = 0): Int {
val outValue = TypedValue() val outValue = TypedValue()
val wasResolved = theme.resolveAttribute(attributeId, outValue, true) val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
@@ -21,7 +21,7 @@
<style name="AppTheme" parent="AppBaseTheme" /> <style name="AppTheme" parent="AppBaseTheme" />
<style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="AppBaseTheme" parent="Theme.AppCompat.NoActionBar">
<item name="android:divider">@color/separatorDark</item> <item name="android:divider">@color/separatorDark</item>
<item name="android:navigationBarColor">@color/backgroundDark</item> <item name="android:navigationBarColor">@color/backgroundDark</item>
<item name="android:queryBackground">@color/toolbarSearchBackgroundDark</item> <item name="android:queryBackground">@color/toolbarSearchBackgroundDark</item>
@@ -44,7 +44,7 @@
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
</style> </style>
<style name="AppThemeDialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="AppThemeDialog" parent="Theme.AppCompat.Dialog">
<item name="android:textColorPrimary">@color/textPrimaryDark</item> <item name="android:textColorPrimary">@color/textPrimaryDark</item>
<item name="android:textColorSecondary">@color/textSecondaryDark</item> <item name="android:textColorSecondary">@color/textSecondaryDark</item>
<item name="android:textColorTertiary">@color/textTertiaryDark</item> <item name="android:textColorTertiary">@color/textTertiaryDark</item>
+2 -2
View File
@@ -34,7 +34,7 @@
<style name="AppTheme" parent="AppBaseTheme" /> <style name="AppTheme" parent="AppBaseTheme" />
<style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:divider">@color/separatorLight</item> <item name="android:divider">@color/separatorLight</item>
<item name="android:queryBackground">@color/toolbarSearchBackgroundLight</item> <item name="android:queryBackground">@color/toolbarSearchBackgroundLight</item>
<item name="android:statusBarColor">@color/black</item> <item name="android:statusBarColor">@color/black</item>
@@ -56,7 +56,7 @@
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
</style> </style>
<style name="AppThemeDialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="AppThemeDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:textColorPrimary">@color/textPrimary</item> <item name="android:textColorPrimary">@color/textPrimary</item>
<item name="android:textColorSecondary">@color/textSecondary</item> <item name="android:textColorSecondary">@color/textSecondary</item>
<item name="android:textColorTertiary">@color/textTertiary</item> <item name="android:textColorTertiary">@color/textTertiary</item>