chore: update soraX with upstream changes

.github/workflows/gradle.yml

@@ -17,6 +17,11 @@ jobs:
   build:
     name: Build debug APK
     runs-on: ubuntu-latest
+    env:
+      SIGNING_STORE_BIN: ${{ secrets.SIGNING_STORE_BIN }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.13.0

.gitignore

@@ -91,3 +91,7 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+# Local Signing Config
+signing.properties
+signing.keystore

README.es.md

@@ -54,7 +54,7 @@ Consulte las [combinaciones de teclas admitidas](./keybindings.md).
 
 <div style="overflow: hidden">
 <img src="/images/general.jpg" alt="GeneralAppearance" width="40%" align="bottom" />
-<img src="/images/problem_indicators.jpg" alt="ProblemIndicator" width="40%" align="bottom" />
+<img src="/images/auto_completion.jpg" alt="AutoCompletion" width="40%" align="bottom" />
 </div>
 
 ## Para empezar

README.jp.md

@@ -51,7 +51,7 @@ sora-editor は効率的な Android コードエディターです
 
 <div style="overflow: hidden">
 <img src="/images/general.jpg" alt="GeneralAppearance" width="40%" align="bottom" />
-<img src="/images/problem_indicators.jpg" alt="ProblemIndicator" width="40%" align="bottom" />
+<img src="/images/auto_completion.jpg" alt="AutoCompletion" width="40%" align="bottom" />
 </div>
 
 ## 始めに

README.zh-cn.md

@@ -48,7 +48,7 @@ sora-editor是一款高效的安卓代码编辑器
 
 <div style="overflow: hidden">
 <img src="/images/general.jpg" alt="GeneralAppearance" width="40%" align="bottom" />
-<img src="/images/problem_indicators.jpg" alt="ProblemIndicator" width="40%" align="bottom" />
+<img src="/images/auto_completion.jpg" alt="AutoCompletion" width="40%" align="bottom" />
 </div>
 
 ## 讨论

app/build.gradle.kts

@@ -27,43 +27,53 @@ plugins {
 }
 
 android {
+    namespace = "io.github.rosemoe.sora.app"
+
     defaultConfig {
         applicationId = "io.github.rosemoe.sora.app"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName + "-" + System.currentTimeMillis()
     }
+
     signingConfigs {
-        create("general") {
-            storeFile = file("../debug.jks")
-            storePassword = "114514"
-            keyAlias = "debug"
-            keyPassword = "114514"
-            enableV1Signing = true
-            enableV2Signing = true
-        }
+        AppSigning.getAppSigningConfigOptional(project)
+            .onSuccess {
+                create("general") {
+                    storeFile = it.storeFile
+                    storePassword = it.storePassword
+                    keyAlias = it.keyAlias
+                    keyPassword = it.keyPassword
+
+                    enableV1Signing = true
+                    enableV2Signing = true
+                }
+
+                buildTypes.forEach { buildType ->
+                    buildType.signingConfig = signingConfigs.getByName("general")
+                }
+            }.onFailure {
+                logger.error("Failed to get signing config. Signing configuration is left as is.")
+            }
     }
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            signingConfig = signingConfigs.getByName("general")
-            proguardFiles("proguard-rules.pro")
-        }
-        debug {
+
+    for (buildType in buildTypes) {
+        buildType.apply {
             isMinifyEnabled = false
-            signingConfig = signingConfigs.getByName("general")
             proguardFiles("proguard-rules.pro")
         }
     }
+
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
+
     androidResources {
         additionalParameters.add("--warn-manifest-validation")
     }
+
     buildFeatures {
         viewBinding = true
     }
+
     packaging {
         resources.pickFirsts.addAll(
             arrayOf(
@@ -75,7 +85,6 @@ android {
             )
         )
     }
-    namespace = "io.github.rosemoe.sora.app"
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:name=".EditorApplication"
         android:theme="@style/AppTheme">
         <service
             android:name=".lsp.LspLanguageServerService"
@@ -50,22 +51,22 @@
 
         <activity
             android:name=".tests.TestActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboard|navigation"
+            android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".lsp.LspTestActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboard|navigation"
+            android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".lsp.LspTestJavaActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboard|navigation"
+            android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboard|navigation"
+            android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>

app/src/main/assets/samples/sample.txt

@@ -1,25 +1,5 @@
 /*
- *    sora-editor - the awesome code editor for Android
- *    https://github.com/Rosemoe/sora-editor
- *    Copyright (C) 2020-2022  Rosemoe
- *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
- *     USA
- *
- *     Please contact Rosemoe by email 2073412493@qq.com if you need
- *     additional information or have any questions
+ * Sample Java source file.
  */
 package io.github.rosemoe.sora.util;
 

app/src/main/java/io/github/rosemoe/sora/app/BaseEditorActivity.java

@@ -47,7 +47,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         setContentView(binding.getRoot());
         setSupportActionBar(binding.activityToolbar);
-        UtilsKt.applyEdgeToEdgeForViews(binding.toolbarContainer, binding.getRoot());
+        UtilsKt.applyEdgeToEdge(this, binding.toolbarContainer, binding.getRoot());
 
         var supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {

app/src/main/java/io/github/rosemoe/sora/app/EditorApplication.kt

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *    sora-editor - the awesome code editor for Android
+ *    https://github.com/Rosemoe/sora-editor
+ *    Copyright (C) 2020-2026  Rosemoe
+ *
+ *     This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU Lesser General Public
+ *     License as published by the Free Software Foundation; either
+ *     version 2.1 of the License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *     Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public
+ *     License along with this library; if not, write to the Free Software
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ *     USA
+ *
+ *     Please contact Rosemoe by email 2073412493@qq.com if you need
+ *     additional information or have any questions
+ ******************************************************************************/
+
+package io.github.rosemoe.sora.app
+
+import android.app.Application
+import com.google.android.material.color.DynamicColors
+
+class EditorApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
+    }
+
+}