Add isNavigationBarContrastEnforced API

google · Apr 9, 2021 · a1fc18d · a1fc18d
1 parent 97d98ef
commit a1fc18d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/.../src/androidTest/java/com/google/accompanist/systemuicontroller/SystemUiControllerTest.kt b/.../src/androidTest/java/com/google/accompanist/systemuicontroller/SystemUiControllerTest.kt
@@ -191,9 +191,13 @@ class SystemUiControllerTest {
         val view = composeTestRule.contentView
         val window = composeTestRule.activity.window
 
-        // Now create an AndroidSystemUiController() and set the navigation bar with dark icons
-        // and enforce contrast
+        // Now create an AndroidSystemUiController()
         val controller = AndroidSystemUiController(view)
+
+        // Assert that the contrast is not enforced initially
+        assertThat(controller.isNavigationBarContrastEnforced()).isFalse()
+
+        // and set the navigation bar with dark icons and enforce contrast
         controller.setNavigationBarColor(
             Color.Transparent,
             darkIcons = true,
@@ -209,6 +213,9 @@ class SystemUiControllerTest {
 
         // Assert that the system applied the contrast enforced property
         assertThat(window.isNavigationBarContrastEnforced).isTrue()
+
+        // Assert that the controller reflects that the contrast is enforced
+        assertThat(controller.isNavigationBarContrastEnforced()).isTrue()
     }
 }
 

diff --git a/...icontroller/src/main/java/com/google/accompanist/systemuicontroller/SystemUiController.kt b/...icontroller/src/main/java/com/google/accompanist/systemuicontroller/SystemUiController.kt
@@ -97,6 +97,14 @@ interface SystemUiController {
             transformColorForLightContent
         )
     }
+
+    /**
+     * Returns whether the system is ensuring that the navigation bar has enough contrast when a
+     * fully transparent background is requested.
+     *
+     * @return true, if API is 29+ and the system is ensuring contrast, false otherwise.
+     */
+    fun isNavigationBarContrastEnforced(): Boolean = false
 }
 
 /**
@@ -160,6 +168,11 @@ class AndroidSystemUiController(view: View) : SystemUiController {
         }
     }
 
+    override fun isNavigationBarContrastEnforced(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+            && window?.isNavigationBarContrastEnforced == true
+    }
+
     private fun Context.findWindow(): Window? {
         var context = this
         while (context is ContextWrapper) {