1.Migrate to Harmony 2.0

2.Night mode support
This commit is contained in:
ZaneYork 2020-06-05 16:56:24 +08:00
parent d2809d099e
commit d4e291e22e
19 changed files with 52 additions and 25 deletions

View File

@ -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'

View File

@ -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",

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#eee"/>
<solid android:color="@color/colorDivider"/>
<size android:height="1dp"/>
</shape>

View File

@ -2,8 +2,8 @@
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#009688"
android:endColor="#00695C"
android:startColor="#4DB6AC"
android:startColor="@color/colorSiderNavBarStart"
android:centerColor="@color/colorSiderNavBarCenter"
android:endColor="@color/colorSiderNavBarEnd"
android:type="linear" />
</shape>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#eee"/>
<solid android:color="@color/colorDivider"/>
<size android:width="1dp"/>
</shape>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#310077</color>
<color name="colorPrimaryDark">#1B0059</color>
<color name="colorAccent">#016D62</color>
<color name="colorTitle">#456</color>
<color name="colorText">#CCC</color>
<color name="colorDivider">#777</color>
<color name="colorSiderNavBarStart">#275B56</color>
<color name="colorSiderNavBarCenter">#004B44</color>
<color name="colorSiderNavBarEnd">#00342E</color>
<color name="colorPopupBackground">#0C0C0C</color>
</resources>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColor">@color/colorText</item>
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" >
<item name="android:textColor">@color/colorText</item>
<item name="android:colorBackground">@color/colorPopupBackground</item>
</style>
</resources>

View File

@ -77,7 +77,7 @@
<string name="parser">วิเคราะห์</string>
<string name="mod_version_update_checking">กำลังตรวจหาการอัปเดตของ Mod</string>
<string name="smapi_version_runing">ใช้งานล่าสุด: %s</string>
<string name="settings_disable_mono_mod">ปิดการใช้งาน MonoMod</string>
<string name="settings_disable_mono_mod">ปิดการใช้งาน Harmony</string>
<string name="settings_set_max_log_size">ขนาดไพล์บันทึกสูงสุด</string>
<string name="button_qq_group_text">QQ Group</string>
</resources>

View File

@ -72,7 +72,7 @@
<string name="parser">格式化</string>
<string name="mod_version_update_checking">正在檢查 MOD 更新</string>
<string name="smapi_version_runing">最近執行:%s</string>
<string name="settings_disable_mono_mod">停用 MonoMod</string>
<string name="settings_disable_mono_mod">停用 Harmony</string>
<string name="settings_set_max_log_size">最大日誌檔案大小</string>
<string name="button_qq_group_text">QQ群</string>
<string name="privacy_policy">隱私權條款</string>

View File

@ -72,7 +72,7 @@
<string name="parser">格式化</string>
<string name="mod_version_update_checking">正在检查MOD更新</string>
<string name="smapi_version_runing">最近运行: %s</string>
<string name="settings_disable_mono_mod">禁用MonoMod</string>
<string name="settings_disable_mono_mod">禁用Harmony</string>
<string name="settings_set_max_log_size">最大日志大小</string>
<string name="button_qq_group_text">QQ群</string>
<string name="privacy_policy">隐私权政策</string>

View File

@ -4,4 +4,10 @@
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color>
<color name="colorTitle">#8BD</color>
<color name="colorText">#333</color>
<color name="colorDivider">#EEE</color>
<color name="colorSiderNavBarStart">#4DB6AC</color>
<color name="colorSiderNavBarCenter">#009688</color>
<color name="colorSiderNavBarEnd">#00695C</color>
<color name="colorPopupBackground">#F3F3F3</color>
</resources>

View File

@ -76,7 +76,7 @@
<string name="parser">Parser</string>
<string name="mod_version_update_checking">Checking for mod updates</string>
<string name="smapi_version_runing">Latest running: %s</string>
<string name="settings_disable_mono_mod">Disable MonoMod</string>
<string name="settings_disable_mono_mod">Disable Harmony</string>
<string name="settings_set_max_log_size">Max Log Size</string>
<string name="button_qq_group_text">QQ Group</string>
<string name="privacy_policy">Privacy Policy</string>

View File

@ -1,12 +1,12 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColor">#333</item>
<item name="android:textColor">@color/colorText</item>
</style>
<style name="AppTheme.NoActionBar">
@ -16,6 +16,9 @@
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" >
<item name="android:textColor">@color/colorText</item>
<item name="android:colorBackground">@color/colorPopupBackground</item>
</style>
</resources>

View File

@ -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