feat: builtin minimal usable schema

WhiredPlanck · WhiredPlanck · commit 2ce23418cba3 · 2025-09-02T21:45:45.000+08:00
diff --git a/.gitmodules b/.gitmodules
@@ -27,5 +27,8 @@
 	path = app/src/main/jni/librime-predict
 	url = https://github.com/rime/librime-predict
 [submodule "prelude"]
-	path = app/src/main/assets/prelude
+	path = app/data/rime/prelude
 	url = https://github.com/rime/rime-prelude
+[submodule "luna-pinyin"]
+	path = app/data/rime/luna-pinyin
+	url = https://github.com/rime/rime-luna-pinyin
diff --git a/app/data/rime/luna-pinyin b/app/data/rime/luna-pinyin
@@ -0,0 +1 @@
+Subproject commit 46acf03142c12b5aeed7002675046bf7255eed35
diff --git a/app/data/rime/prelude b/app/data/rime/prelude
diff --git a/app/src/main/assets/shared/default.custom.yaml b/app/src/main/assets/shared/default.custom.yaml
@@ -0,0 +1,4 @@
+patch:
+  schema_list:
+    - schema: luna_pinyin
+    - schema: luna_pinyin_simp
diff --git a/app/src/main/assets/shared/default.yaml b/app/src/main/assets/shared/default.yaml
@@ -1 +1 @@
-../prelude/default.yaml
+../../../../data/rime/prelude/default.yaml
diff --git a/app/src/main/assets/shared/key_bindings.yaml b/app/src/main/assets/shared/key_bindings.yaml
@@ -1 +1 @@
-../prelude/key_bindings.yaml
+../../../../data/rime/prelude/key_bindings.yaml
diff --git a/app/src/main/assets/shared/luna_pinyin.dict.yaml b/app/src/main/assets/shared/luna_pinyin.dict.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_pinyin.dict.yaml
diff --git a/app/src/main/assets/shared/luna_pinyin.schema.yaml b/app/src/main/assets/shared/luna_pinyin.schema.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_pinyin.schema.yaml
diff --git a/app/src/main/assets/shared/luna_pinyin_fluency.schema.yaml b/app/src/main/assets/shared/luna_pinyin_fluency.schema.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_pinyin_fluency.schema.yaml
diff --git a/app/src/main/assets/shared/luna_pinyin_simp.schema.yaml b/app/src/main/assets/shared/luna_pinyin_simp.schema.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_pinyin_simp.schema.yaml
diff --git a/app/src/main/assets/shared/luna_pinyin_tw.schema.yaml b/app/src/main/assets/shared/luna_pinyin_tw.schema.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_pinyin_tw.schema.yaml
diff --git a/app/src/main/assets/shared/luna_quanpin.schema.yaml b/app/src/main/assets/shared/luna_quanpin.schema.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/luna_quanpin.schema.yaml
diff --git a/app/src/main/assets/shared/pinyin.yaml b/app/src/main/assets/shared/pinyin.yaml
@@ -0,0 +1 @@
+../../../../data/rime/luna-pinyin/pinyin.yaml
diff --git a/app/src/main/assets/shared/punctuation.yaml b/app/src/main/assets/shared/punctuation.yaml
@@ -1 +1 @@
-../prelude/punctuation.yaml
+../../../../data/rime/prelude/punctuation.yaml
diff --git a/app/src/main/assets/shared/symbols.yaml b/app/src/main/assets/shared/symbols.yaml
@@ -1 +1 @@
-../prelude/symbols.yaml
+../../../../data/rime/prelude/symbols.yaml
diff --git a/app/src/main/java/com/osfans/trime/data/base/DataManager.kt b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt
@@ -98,20 +98,6 @@ object DataManager {
 
         ResourceUtils.copyFile(DATA_CHECKSUMS_NAME, dataDir.resolve(DATA_CHECKSUMS_NAME).absolutePath)
 
-        // 创建 default.custom.yaml 并用空方案列表覆盖 default.yaml 默认的方案列表
-        // TODO: 内置明月拼音等方案，提供最小开箱即用环境
-        runCatching {
-            val defaultCustom = File(userDataDir, DEFAULT_CUSTOM_FILE_NAME)
-            if (defaultCustom.createNewFile()) {
-                defaultCustom.writeText(
-                    """
-                        patch:
-                            schema_list: []
-                    """.trimIndent(),
-                )
-            }
-        }.getOrElse { Timber.e(it, "Failed to create default.custom.yaml") }
-
         Timber.d("Synced!")
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/DataChecksumsPlugin.kt b/build-logic/convention/src/main/kotlin/DataChecksumsPlugin.kt
@@ -16,6 +16,7 @@ import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.task
 import org.gradle.work.ChangeType
 import org.gradle.work.Incremental
@@ -37,16 +38,15 @@ class DataChecksumsPlugin : Plugin<Project> {
     }
 
     override fun apply(target: Project) {
-        target.task<DataChecksumsTask>(TASK) {
-            inputDir.set(target.assetsDir.resolve("shared"))
+        target.tasks.register<DataChecksumsTask>(TASK) {
+            inputDir.set(target.assetsDir)
             outputFile.set(target.assetsDir.resolve(FILE_NAME))
         }
-        target
-            .task<Delete>(CLEAN_TASK) {
-                delete(target.assetsDir.resolve(FILE_NAME))
-            }.also {
-                target.tasks.findByName("clean")?.dependsOn(it)
-            }
+        target.tasks.register<Delete>(CLEAN_TASK) {
+            delete(target.assetsDir.resolve(FILE_NAME))
+        }.also {
+            target.tasks.findByName("clean")?.dependsOn(it)
+        }
     }
 
     abstract class DataChecksumsTask : DefaultTask() {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../prelude/default.yaml`
	`1`	`+../../../../data/rime/prelude/default.yaml`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../prelude/key_bindings.yaml`
	`1`	`+../../../../data/rime/prelude/key_bindings.yaml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../data/rime/luna-pinyin/luna_pinyin.dict.yaml`