From 1ce5846f76de69af6f7fc8cb6b54d07cf7693899 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Jun 2018 14:59:38 -0400 Subject: [PATCH] #1176 - Fix invisible navigation bar icons on API 26 --- presentation/src/main/java/common/base/QkThemedActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 30e283e8..abfe59a9 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -73,8 +73,7 @@ abstract class QkThemedActivity : QkActivity() { // When certain preferences change, we need to recreate the activity Observable.merge( - listOf(prefs.night, prefs.black, prefs.textSize, prefs.systemFont) - .map { it.asObservable().skip(1) }) + listOf(prefs.night, prefs.black, prefs.textSize, prefs.systemFont).map { it.asObservable().skip(1) }) .autoDisposable(scope()) .subscribe { recreate() } @@ -89,7 +88,9 @@ abstract class QkThemedActivity : QkActivity() { } // Some devices don't let you modify android.R.attr.navigationBarColor - if (Build.VERSION.SDK_INT >= 27) window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + } // Set the color for the overflow and navigation icon val textTertiary = resolveThemeColor(android.R.attr.textColorTertiary)