Merge pull request #26 from Eynnzerr/feat_v10103

feat: version v1.1.3

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "com.eynnzerr.yuukatalk"
         minSdk = 24
         targetSdk = 34
-        versionCode = 16
-        versionName = "1.1.1"
+        versionCode = 18
+        versionName = "1.1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.1",
+      "versionCode": 18,
+      "versionName": "1.1.3",
       "outputFile": "app-release.apk"
     }
   ],

app/schemas/com.eynnzerr.yuukatalk.data.database.source.YuukaTalkDatabase/3.json

@@ -0,0 +1,202 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "2468fabaac18fffa10da98afb9d87857",
+    "entities": [
+      {
+        "tableName": "momotalk_project",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `talkHistory` TEXT NOT NULL, `studentList` TEXT NOT NULL, `currentStudent` TEXT NOT NULL DEFAULT '', `isFirstTalking` INTEGER NOT NULL DEFAULT true, `createdDate` TEXT NOT NULL DEFAULT 'empty', `modifiedDate` TEXT NOT NULL DEFAULT 'empty', `folderId` INTEGER, FOREIGN KEY(`folderId`) REFERENCES `momotalk_folder`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "talkHistory",
+            "columnName": "talkHistory",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentList",
+            "columnName": "studentList",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currentStudent",
+            "columnName": "currentStudent",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isFirstTalking",
+            "columnName": "isFirstTalking",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "createdDate",
+            "columnName": "createdDate",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'empty'"
+          },
+          {
+            "fieldPath": "modifiedDate",
+            "columnName": "modifiedDate",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'empty'"
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folderId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_momotalk_project_folderId",
+            "unique": false,
+            "columnNames": [
+              "folderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_momotalk_project_folderId` ON `${TABLE_NAME}` (`folderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "momotalk_folder",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "folderId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "momotalk_character",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `nameRoma` TEXT NOT NULL DEFAULT '', `school` TEXT NOT NULL DEFAULT '', `isAsset` INTEGER NOT NULL, `avatarPath` TEXT NOT NULL DEFAULT '', `emojiPath` TEXT NOT NULL DEFAULT '', `currentAvatar` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nameRoma",
+            "columnName": "nameRoma",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "school",
+            "columnName": "school",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isAsset",
+            "columnName": "isAsset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarPath",
+            "columnName": "avatarPath",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "emojiPath",
+            "columnName": "emojiPath",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "currentAvatar",
+            "columnName": "currentAvatar",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "momotalk_folder",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `createdDate` TEXT NOT NULL DEFAULT 'empty')",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdDate",
+            "columnName": "createdDate",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'empty'"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2468fabaac18fffa10da98afb9d87857')"
+    ]
+  }
+}

app/src/main/assets/characters.json

@@ -1,5 +1,5 @@
 {
-  "version": 5,
+  "version": 6,
   "characters": [
     {
       "name": "白子",
@@ -764,6 +764,13 @@
       "avatarPath": "Valkyrie/PublicPeaceBureau/Kanna/avatar",
       "emojiPath": "Valkyrie/PublicPeaceBureau/Kanna/emoji"
     },
+    {
+      "name": "心华",
+      "nameRoma": "Konoka",
+      "school": "Valkyrie",
+      "avatarPath": "Valkyrie/PublicPeaceBureau/Konoka/avatar",
+      "emojiPath": "Valkyrie/PublicPeaceBureau/Konoka/emoji"
+    },
     {
       "name": "公安局成员",
       "nameRoma": "PublicPeaceBureauMember",
@@ -1393,6 +1400,13 @@
       "school": "Highlander",
       "avatarPath": "Highlander/Student/avatar",
       "emojiPath": "Highlander/Student/emoji"
+    },
+    {
+      "name": "笑面教授",
+      "nameRoma": "Nyanya",
+      "school": "Empty",
+      "avatarPath": "ETC/EmptyClub/Nyanya/avatar",
+      "emojiPath": "ETC/EmptyClub/Nyanya/emoji"
     }
   ]
 }

app/src/main/java/com/eynnzerr/yuukatalk/YuukaTalkApp.kt

@@ -52,6 +52,7 @@ import com.eynnzerr.yuukatalk.ui.page.settings.about.AboutPage
 import com.eynnzerr.yuukatalk.ui.page.settings.about.AboutViewModel
 import com.eynnzerr.yuukatalk.ui.page.settings.appearance.AppearancePage
 import com.eynnzerr.yuukatalk.ui.page.settings.appearance.AppearanceViewModel
+import com.eynnzerr.yuukatalk.ui.page.settings.dimension.DimensionPage
 import com.eynnzerr.yuukatalk.ui.page.settings.editor_options.EditorOptionsPage
 import com.eynnzerr.yuukatalk.ui.page.settings.editor_options.EditorOptionsViewModel
 import com.eynnzerr.yuukatalk.ui.page.settings.preview.FontPage
@@ -82,20 +83,20 @@ fun YuukaTalkApp() {
         }
 
         val screenInfo = RememberScreenInfo()
-        val talkPieceProperty = TalkPieceProperty(
-            avatarSize = 56.dp,
-            nameFontSize = TextUnit.Unspecified,
-            textStartPadding = 64.dp,
-            textFontSize = 16.sp,
-            verticalMargin = 8.dp,
-            photoWidth = 192.dp,
-            narrationPadding = 16.dp,
-            narrationFontSize = 18.sp,
-            branchStartPadding = if (screenInfo.widthType is ScreenInfo.ScreenType.Compact) 72.dp else 288.dp,
-            loveSceneStartPadding = if (screenInfo.widthType is ScreenInfo.ScreenType.Compact) 72.dp else 288.dp,
-        )
+//        val talkPieceProperty = TalkPieceProperty(
+//            avatarSize = 56.dp,
+//            nameFontSize = TextUnit.Unspecified,
+//            textStartPadding = 64.dp,
+//            textFontSize = 16.sp,
+//            verticalMargin = 8.dp,
+//            photoWidth = 192.dp,
+//            narrationPadding = 16.dp,
+//            narrationFontSize = 18.sp,
+//            branchStartPadding = if (screenInfo.widthType is ScreenInfo.ScreenType.Compact) 72.dp else 288.dp,
+//            loveSceneStartPadding = if (screenInfo.widthType is ScreenInfo.ScreenType.Compact) 72.dp else 288.dp,
+//        )
         val appNavController = rememberNavController()
-        CompositionLocalProvider(LocalTalkPieceProperty provides talkPieceProperty) {
+        CompositionLocalProvider(LocalTalkPieceProperty provides dimensionState) {
             if (screenInfo.widthType is ScreenInfo.ScreenType.Compact) {
                 AppNavGraph(appNavController)
             } else {
@@ -200,7 +201,9 @@ private fun ExpandedAppNavGraph(
                 animatedComposable(
                     route = Destinations.DIMENSION_ROUTE,
                 ) {
-                    // TODO
+                    DimensionPage {
+                        appNavController.popBackStack()
+                    }
                 }
             }
         }
@@ -285,7 +288,9 @@ private fun AppNavGraph(
         animatedComposable(
             route = Destinations.DIMENSION_ROUTE,
         ) {
-            // TODO
+            DimensionPage {
+                appNavController.popBackStack()
+            }
         }
     }
 }