From fd6be0b4ed11ffbb5c1414a496ad994f5e5c215d Mon Sep 17 00:00:00 2001
From: NUmeroAndDev <numero.dev.and@gmail.com>
Date: Mon, 2 Sep 2024 12:32:49 +0900
Subject: [PATCH 1/2] Bump targetSdk version to 35

---
 .../github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt
index a3bc5c17f..5988bf727 100644
--- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt
+++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt
@@ -31,11 +31,11 @@ fun Project.setupAndroid() {
         namespace?.let {
             this.namespace = it
         }
-        compileSdkVersion(34)
+        compileSdkVersion(35)
 
         defaultConfig {
             minSdk = 24
-            targetSdk = 34
+            targetSdk = 35
         }
 
         compileOptions {

From cfbceacd6aa87af3877235bf7215f5b0f189d20f Mon Sep 17 00:00:00 2001
From: NUmeroAndDev <numero.dev.and@gmail.com>
Date: Mon, 2 Sep 2024 12:33:11 +0900
Subject: [PATCH 2/2] Ignored edge-to-edge in licenses screen

---
 app-android/src/main/AndroidManifest.xml   | 4 ++--
 app-android/src/main/res/values/themes.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-android/src/main/AndroidManifest.xml b/app-android/src/main/AndroidManifest.xml
index 690a5929b..ddcc4d0b5 100644
--- a/app-android/src/main/AndroidManifest.xml
+++ b/app-android/src/main/AndroidManifest.xml
@@ -34,11 +34,11 @@
 
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
+            android:theme="@style/Theme.KaigiApp.Licenses" />
 
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
+            android:theme="@style/Theme.KaigiApp.Licenses" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app-android/src/main/res/values/themes.xml b/app-android/src/main/res/values/themes.xml
index 7f61d29ae..28918f934 100644
--- a/app-android/src/main/res/values/themes.xml
+++ b/app-android/src/main/res/values/themes.xml
@@ -4,4 +4,8 @@
     <style name="Theme.KaigiApp" parent="android:Theme.Material.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
+
+    <style name="Theme.KaigiApp.Licenses" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
 </resources>