diff --git a/app/build.gradle b/app/build.gradle index 58c4294..e13e8c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - def nav_version = "2.3.0-alpha04" + def nav_version = "2.3.0-beta01" implementation "androidx.navigation:navigation-fragment:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' diff --git a/app/src/main/assets/apk/StardewModdingAPI.dll b/app/src/main/assets/apk/StardewModdingAPI.dll index 8f748e2..920c725 100644 Binary files a/app/src/main/assets/apk/StardewModdingAPI.dll and b/app/src/main/assets/apk/StardewModdingAPI.dll differ diff --git a/app/src/main/assets/smapi/0Harmony.dll b/app/src/main/assets/smapi/0Harmony.dll index e57270a..401c27a 100644 Binary files a/app/src/main/assets/smapi/0Harmony.dll and b/app/src/main/assets/smapi/0Harmony.dll differ diff --git a/app/src/main/assets/smapi/MonoMod.RuntimeDetour.dll b/app/src/main/assets/smapi/MonoMod.RuntimeDetour.dll deleted file mode 100644 index ec1859a..0000000 Binary files a/app/src/main/assets/smapi/MonoMod.RuntimeDetour.dll and /dev/null differ diff --git a/app/src/main/assets/smapi/MonoMod.Utils.dll b/app/src/main/assets/smapi/MonoMod.Utils.dll deleted file mode 100644 index 956871c..0000000 Binary files a/app/src/main/assets/smapi/MonoMod.Utils.dll and /dev/null differ diff --git a/app/src/main/assets/smapi/TMXTile.dll b/app/src/main/assets/smapi/TMXTile.dll index 1524527..489e7c5 100644 Binary files a/app/src/main/assets/smapi/TMXTile.dll and b/app/src/main/assets/smapi/TMXTile.dll differ diff --git a/app/src/main/assets/smapi_files_manifest.json b/app/src/main/assets/smapi_files_manifest.json index 494b3dc..f8ed030 100644 --- a/app/src/main/assets/smapi_files_manifest.json +++ b/app/src/main/assets/smapi_files_manifest.json @@ -24,16 +24,6 @@ "assetPath": "assemblies/MonoGame.Framework.dll", "origin": 1 }, - { - "targetPath": "smapi-internal/MonoMod.RuntimeDetour.dll", - "assetPath": "smapi/MonoMod.RuntimeDetour.dll", - "origin": 0 - }, - { - "targetPath": "smapi-internal/MonoMod.Utils.dll", - "assetPath": "smapi/MonoMod.Utils.dll", - "origin": 0 - }, { "targetPath": "smapi-internal/mscorlib.dll", "assetPath": "assemblies/mscorlib.dll", diff --git a/app/src/main/res/drawable/horizontal_divider.xml b/app/src/main/res/drawable/horizontal_divider.xml index a20901d..03b6780 100644 --- a/app/src/main/res/drawable/horizontal_divider.xml +++ b/app/src/main/res/drawable/horizontal_divider.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml index 6d81870..bf21d1d 100644 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ b/app/src/main/res/drawable/side_nav_bar.xml @@ -2,8 +2,8 @@ android:shape="rectangle"> \ No newline at end of file diff --git a/app/src/main/res/drawable/vertical_divider.xml b/app/src/main/res/drawable/vertical_divider.xml index 5b27a81..5f24cf6 100644 --- a/app/src/main/res/drawable/vertical_divider.xml +++ b/app/src/main/res/drawable/vertical_divider.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..0cd9f14 --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,13 @@ + + + #310077 + #1B0059 + #016D62 + #456 + #CCC + #777 + #275B56 + #004B44 + #00342E + #0C0C0C + diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..74ac31f --- /dev/null +++ b/app/src/main/res/values-night/styles.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a19573c..7615927 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -77,7 +77,7 @@ วิเคราะห์ กำลังตรวจหาการอัปเดตของ Mod ใช้งานล่าสุด: %s - ปิดการใช้งาน MonoMod + ปิดการใช้งาน Harmony ขนาดไพล์บันทึกสูงสุด QQ Group diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fb66564..0d225da 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -72,7 +72,7 @@ 格式化 正在檢查 MOD 更新 最近執行:%s - 停用 MonoMod + 停用 Harmony 最大日誌檔案大小 QQ群 隱私權條款 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index afdbd1b..201160f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -72,7 +72,7 @@ 格式化 正在检查MOD更新 最近运行: %s - 禁用MonoMod + 禁用Harmony 最大日志大小 QQ群 隐私权政策 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8423202..32604db 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,4 +4,10 @@ #3700B3 #03DAC5 #8BD + #333 + #EEE + #4DB6AC + #009688 + #00695C + #F3F3F3 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37c7e7d..bf23c40 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ Parser Checking for mod updates Latest running: %s - Disable MonoMod + Disable Harmony Max Log Size QQ Group Privacy Policy diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fcec61e..f68ef33 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,12 +1,12 @@ - diff --git a/build.gradle b/build.gradle index 5bd5c24..207100b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-alpha04" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-beta01" classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // NOTE: Do not place your application dependencies here; they belong