From 3a975310138ff06b68d3d837f8a4c768fdd77163 Mon Sep 17 00:00:00 2001
From: Hai Zhang <dreaming.in.code.zh@gmail.com>
Date: Tue, 3 Oct 2023 04:14:55 -0700
Subject: [PATCH] [Fix] Fix display cutout theming.

Display cutout value shortEdges is actually potentially available on API 27,
and display cutout value always is available on API 30.

See also
https://android-developers.googleblog.com/2018/07/supporting-display-cutouts-on-edge-to.html
about the potential backport to API 27.
---
 app/src/main/res/values-v27/themes.xml        |  6 ++++++
 .../main/res/values-v27/themes_material3.xml  |  6 ++++++
 app/src/main/res/values-v28/themes.xml        | 19 -------------------
 .../main/res/values-v28/themes_material3.xml  | 19 -------------------
 app/src/main/res/values-v29/themes.xml        |  4 ++--
 .../main/res/values-v29/themes_material3.xml  |  4 ++--
 app/src/main/res/values-v30/themes.xml        | 19 +++++++++++++++++++
 .../main/res/values-v30/themes_material3.xml  | 19 +++++++++++++++++++
 8 files changed, 54 insertions(+), 42 deletions(-)
 delete mode 100644 app/src/main/res/values-v28/themes.xml
 delete mode 100644 app/src/main/res/values-v28/themes_material3.xml
 create mode 100644 app/src/main/res/values-v30/themes.xml
 create mode 100644 app/src/main/res/values-v30/themes_material3.xml

diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index a22d421c1..c2c9b561e 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -9,7 +9,13 @@
 
     <style name="Platform.V27.Theme.MaterialFiles" parent="Platform.V23.Theme.MaterialFiles">
         <item name="android:navigationBarColor">?colorPrimaryDark</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
     </style>
     <style name="Platform.Theme.MaterialFiles" parent="Platform.V27.Theme.MaterialFiles" />
+
+    <style name="Platform.V27.Theme.MaterialFiles.Immersive" parent="Platform.V21.Theme.MaterialFiles.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Immersive" parent="Platform.V27.Theme.MaterialFiles.Immersive" />
 </resources>
diff --git a/app/src/main/res/values-v27/themes_material3.xml b/app/src/main/res/values-v27/themes_material3.xml
index ac7f459f3..0f5f6de3a 100644
--- a/app/src/main/res/values-v27/themes_material3.xml
+++ b/app/src/main/res/values-v27/themes_material3.xml
@@ -9,7 +9,13 @@
 
     <style name="Platform.V27.Theme.MaterialFiles.Material3" parent="Platform.V23.Theme.MaterialFiles.Material3">
         <item name="android:navigationBarColor">?colorPrimaryDark</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
     </style>
     <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V27.Theme.MaterialFiles.Material3" />
+
+    <style name="Platform.V27.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V21.Theme.MaterialFiles.Material3.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V27.Theme.MaterialFiles.Material3.Immersive" />
 </resources>
diff --git a/app/src/main/res/values-v28/themes.xml b/app/src/main/res/values-v28/themes.xml
deleted file mode 100644
index 1aff8844e..000000000
--- a/app/src/main/res/values-v28/themes.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2019 Hai Zhang <dreaming.in.code.zh@gmail.com>
-  ~ All Rights Reserved.
-  -->
-
-<resources>
-
-    <style name="Platform.V28.Theme.MaterialFiles" parent="Platform.V27.Theme.MaterialFiles">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-    <style name="Platform.Theme.MaterialFiles" parent="Platform.V28.Theme.MaterialFiles" />
-
-    <style name="Platform.V28.Theme.MaterialFiles.Immersive" parent="Platform.V21.Theme.MaterialFiles.Immersive">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-    <style name="Platform.Theme.MaterialFiles.Immersive" parent="Platform.V28.Theme.MaterialFiles.Immersive" />
-</resources>
diff --git a/app/src/main/res/values-v28/themes_material3.xml b/app/src/main/res/values-v28/themes_material3.xml
deleted file mode 100644
index 942994198..000000000
--- a/app/src/main/res/values-v28/themes_material3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2019 Hai Zhang <dreaming.in.code.zh@gmail.com>
-  ~ All Rights Reserved.
-  -->
-
-<resources>
-
-    <style name="Platform.V28.Theme.MaterialFiles.Material3" parent="Platform.V27.Theme.MaterialFiles.Material3">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-    <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V28.Theme.MaterialFiles.Material3" />
-
-    <style name="Platform.V28.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V21.Theme.MaterialFiles.Material3.Immersive">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-    <style name="Platform.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V28.Theme.MaterialFiles.Material3.Immersive" />
-</resources>
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
index a9400a7f0..9ab690b06 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/themes.xml
@@ -7,14 +7,14 @@
 
 <resources>
 
-    <style name="Platform.V29.Theme.MaterialFiles" parent="Platform.V28.Theme.MaterialFiles">
+    <style name="Platform.V29.Theme.MaterialFiles" parent="Platform.V27.Theme.MaterialFiles">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
     </style>
     <style name="Platform.Theme.MaterialFiles" parent="Platform.V29.Theme.MaterialFiles" />
 
-    <style name="Platform.V29.Theme.MaterialFiles.Immersive" parent="Platform.V28.Theme.MaterialFiles.Immersive">
+    <style name="Platform.V29.Theme.MaterialFiles.Immersive" parent="Platform.V27.Theme.MaterialFiles.Immersive">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
diff --git a/app/src/main/res/values-v29/themes_material3.xml b/app/src/main/res/values-v29/themes_material3.xml
index 7aa0e948c..a6c7d4166 100644
--- a/app/src/main/res/values-v29/themes_material3.xml
+++ b/app/src/main/res/values-v29/themes_material3.xml
@@ -7,14 +7,14 @@
 
 <resources>
 
-    <style name="Platform.V29.Theme.MaterialFiles.Material3" parent="Platform.V28.Theme.MaterialFiles.Material3">
+    <style name="Platform.V29.Theme.MaterialFiles.Material3" parent="Platform.V27.Theme.MaterialFiles.Material3">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
     </style>
     <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V29.Theme.MaterialFiles.Material3" />
 
-    <style name="Platform.V29.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V28.Theme.MaterialFiles.Material3.Immersive">
+    <style name="Platform.V29.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V27.Theme.MaterialFiles.Material3.Immersive">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
diff --git a/app/src/main/res/values-v30/themes.xml b/app/src/main/res/values-v30/themes.xml
new file mode 100644
index 000000000..1b70084af
--- /dev/null
+++ b/app/src/main/res/values-v30/themes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 Hai Zhang <dreaming.in.code.zh@gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<resources>
+
+    <style name="Platform.V30.Theme.MaterialFiles" parent="Platform.V29.Theme.MaterialFiles">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles" parent="Platform.V30.Theme.MaterialFiles" />
+
+    <style name="Platform.V30.Theme.MaterialFiles.Immersive" parent="Platform.V29.Theme.MaterialFiles.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Immersive" parent="Platform.V30.Theme.MaterialFiles.Immersive" />
+</resources>
diff --git a/app/src/main/res/values-v30/themes_material3.xml b/app/src/main/res/values-v30/themes_material3.xml
new file mode 100644
index 000000000..c67659383
--- /dev/null
+++ b/app/src/main/res/values-v30/themes_material3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2023 Hai Zhang <dreaming.in.code.zh@gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<resources>
+
+    <style name="Platform.V30.Theme.MaterialFiles.Material3" parent="Platform.V29.Theme.MaterialFiles.Material3">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V30.Theme.MaterialFiles.Material3" />
+
+    <style name="Platform.V30.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V29.Theme.MaterialFiles.Material3.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V30.Theme.MaterialFiles.Material3.Immersive" />
+</resources>