Merge branch 'target-sdk-36'

yawnoc · yawnoc · commit 6c3d7aaaf3b8 · 2025-09-21T00:43:34.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 
 ## [Unreleased]
 
+- Upgraded Android SDK to Level 36
+  - Changed Help/About pages to non-fullscreen to avoid edge-to-edge breakage
+- Upgraded Android Gradle Plugin to 8.13.0
+- Upgraded Material Components For Android to 1.13.0
+- Upgraded androidx.test.ext:junit to 1.3.0
+- Upgraded androidx.test.espresso:espresso-core to 3.7.0
+
 
 ## [v1.4.4] (70) Cursed be Android 16 again (2025-08-24)
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android
   {
     applicationId "io.github.yawnoc.strokeinput"
     minSdkVersion 24
-    compileSdk 35
-    targetSdkVersion 35
+    compileSdk = 36
+    targetSdkVersion 36
     versionCode 70
     versionName "1.4.4"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,8 +42,8 @@ android
 
 dependencies
 {
-  implementation 'com.google.android.material:material:1.12.0'
+  implementation 'com.google.android.material:material:1.13.0'
   testImplementation 'junit:junit:4.13.2'
-  androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+  androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 }
diff --git a/app/src/main/assets/about-zh-Hans-CN.html b/app/src/main/assets/about-zh-Hans-CN.html
@@ -23,9 +23,9 @@ <h1>笔画输入法 (v1.4.4)</h1>
 以 <span lang="en">Apache-2.0</span> 授权，见&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>建件所倚靠的东西</h2>
-<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.12.0)</h3>
+<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.13.0)</h3>
 <p class="notice">
-©&nbsp;2024 <span lang="en">Android</span> 开源项目<br>
+©&nbsp;2025 <span lang="en">Android</span> 开源项目<br>
 以 <span lang="en">Apache-2.0</span> 授权，见&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>笔画输入资料</h2>
diff --git a/app/src/main/assets/about-zh-Hant-HK.html b/app/src/main/assets/about-zh-Hant-HK.html
@@ -23,9 +23,9 @@ <h1>筆畫輸入法 (v1.4.4)</h1>
 以 <span lang="en">Apache-2.0</span> 授權，見&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>建件所靠者</h2>
-<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.12.0)</h3>
+<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.13.0)</h3>
 <p class="notice">
-©&nbsp;2024 <span lang="en">Android</span> 開源項目<br>
+©&nbsp;2025 <span lang="en">Android</span> 開源項目<br>
 以 <span lang="en">Apache-2.0</span> 授權，見&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>筆畫輸入資料</h2>
diff --git a/app/src/main/assets/about-zh-Hant-TW.html b/app/src/main/assets/about-zh-Hant-TW.html
@@ -23,9 +23,9 @@ <h1>筆畫輸入法 (v1.4.4)</h1>
 以 <span lang="en">Apache-2.0</span> 授權，見&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>建體所靠者</h2>
-<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.12.0)</h3>
+<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.13.0)</h3>
 <p class="notice">
-©&nbsp;2024 <span lang="en">Android</span> 開源項目<br>
+©&nbsp;2025 <span lang="en">Android</span> 開源項目<br>
 以 <span lang="en">Apache-2.0</span> 授權，見&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
 </p>
 <h2>筆畫輸入資料</h2>
diff --git a/app/src/main/assets/about.html b/app/src/main/assets/about.html
@@ -26,9 +26,9 @@ <h1>Stroke Input Method (v1.4.4)</h1>
 Licensed under Apache-2.0, see &lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;.<br>
 </p>
 <h2>Build dependencies</h2>
-<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.12.0)</h3>
+<h3><a href="https://mvnrepository.com/artifact/com.google.android.material/material">Material Components For Android</a> (v1.13.0)</h3>
 <p class="notice">
-©&nbsp;2024 The Android Open Source Project<br>
+©&nbsp;2025 The Android Open Source Project<br>
 Licensed under Apache-2.0, see &lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;.<br>
 </p>
 <h2>Stroke input data</h2>
diff --git a/app/src/main/assets/links.cmdr b/app/src/main/assets/links.cmdr
@@ -17,8 +17,8 @@ OrdinaryDictionaryReplacement: #.links.software-properties
 - apply_mode: SIMULTANEOUS
 * \stroke-input-version --> v1.4.4
 * \stroke-input-years --> 2021--2025
-* \material-version --> v1.12.0
-* \material-years --> 2024
+* \material-version --> v1.13.0
+* \material-years --> 2025
 * \stroke-data-version --> v1.34.0
 * \sequence-characters-years --> 2021--2024
 * \stroke-font-version --> v2.0.1
diff --git a/app/src/main/java/io/github/yawnoc/strokeinput/MainActivity.java b/app/src/main/java/io/github/yawnoc/strokeinput/MainActivity.java
@@ -61,7 +61,6 @@ public class MainActivity
   protected void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    getTheme().applyStyle(R.style.NoEdgeToEdge, false);
     setTitle(R.string.label__main_activity__welcome);
     setContentView(R.layout.main_activity);
 
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2021–2023 Conway
+  Copyright 2021–2023, 2025 Conway
   Licensed under the GNU General Public License v3.0 (GPL-3.0-only).
   This is free software with NO WARRANTY etc. etc.,
   see LICENSE or <https://www.gnu.org/licenses/>.
@@ -9,6 +9,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
+  android:fitsSystemWindows="true"
 >
   <LinearLayout
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="NoEdgeToEdge">
-    <!-- API 34 or earlier does not need `android:windowOptOutEdgeToEdgeEnforcement` -->
-  </style>
   <style name="MainActivityText">
     <item name="android:layout_height">match_parent</item>
     <item name="android:layout_width">match_parent</item>
@@ -51,6 +48,7 @@
     <item name="android:padding">@dimen/padding__dialog_button</item>
   </style>
   <style name="StrokeInputAlert" parent="Theme.StrokeInput">
+    <item name="android:windowIsFloating">true</item>
     <item name="android:windowBackground">@color/very_dark_grey</item>
     <item name="android:backgroundDimEnabled">true</item>
   </style>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript
   }
   dependencies
   {
-    classpath 'com.android.tools.build:gradle:8.10.1'
+    classpath 'com.android.tools.build:gradle:8.13.0'
   }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public class MainActivity`
`61`	`61`	`protected void onCreate(final Bundle savedInstanceState)`
`62`	`62`	`{`
`63`	`63`	`super.onCreate(savedInstanceState);`
`64`		`- getTheme().applyStyle(R.style.NoEdgeToEdge, false);`
`65`	`64`	`setTitle(R.string.label__main_activity__welcome);`
`66`	`65`	`setContentView(R.layout.main_activity);`
`67`	`66`