diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index da9890fe..660881e2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt @@ -23,10 +23,12 @@ import android.app.ActivityManager import android.graphics.BitmapFactory import android.os.Build import android.os.Bundle +import android.view.View import androidx.core.view.iterator import androidx.lifecycle.Lifecycle import com.moez.QKSMS.R 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.util.Preferences import com.uber.autodispose.android.lifecycle.scope @@ -77,6 +79,13 @@ abstract class QkThemedActivity : QkActivity() { .autoDisposable(scope()) .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 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt index 5a43e0ad..69284929 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt @@ -43,6 +43,13 @@ fun Context.resolveThemeAttribute(attributeId: Int, default: Int = 0): Int { 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 { val outValue = TypedValue() val wasResolved = theme.resolveAttribute(attributeId, outValue, true) diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml index 97e52ecc..28232b29 100644 --- a/presentation/src/main/res/values-night/themes.xml +++ b/presentation/src/main/res/values-night/themes.xml @@ -21,7 +21,7 @@ - -