From 181b6319f4d3e17412f798331846899c49236b48 Mon Sep 17 00:00:00 2001 From: Natsu Date: Tue, 18 Jun 2024 02:43:10 +0700 Subject: [PATCH] style: Material Design 3 --- .../gakumas/localify/GakumasHookMain.kt | 4 +- .../chinosk/gakumas/localify/MainActivity.kt | 9 ++- .../gakumas/localify/ui/theme/Color.kt | 11 --- .../gakumas/localify/ui/theme/Theme.kt | 70 ------------------- .../chinosk/gakumas/localify/ui/theme/Type.kt | 34 --------- app/src/main/res/layout/activity_main.xml | 49 +++++++------ app/src/main/res/values-zh-rCN/strings.xml | 46 ------------ app/src/main/res/values/colors.xml | 10 --- app/src/main/res/values/strings.xml | 18 ++--- app/src/main/res/values/themes.xml | 2 +- 10 files changed, 45 insertions(+), 208 deletions(-) delete mode 100644 app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Color.kt delete mode 100644 app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Theme.kt delete mode 100644 app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Type.kt delete mode 100644 app/src/main/res/values-zh-rCN/strings.xml delete mode 100644 app/src/main/res/values/colors.xml diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt index 56d12e1..56a37c3 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt @@ -107,10 +107,10 @@ class GakumasHookMain : IXposedHookLoadPackage, IXposedHookZygoteInit { val app = AndroidAppHelper.currentApplication() if (nativeLibLoadSuccess) { - showToast("lib$nativeLibName.so loaded.") + showToast("Loaded lib$nativeLibName.so") } else { - showToast("Load native library lib$nativeLibName.so failed.") + showToast("lib$nativeLibName.so failed to load") return } diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt index 094d222..8ca7bcb 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt @@ -100,7 +100,7 @@ class MainActivity : AppCompatActivity(), ConfigUpdateListener { configFile.readText() } else { - showToast("检测到第一次启动，初始化配置文件...") + showToast("Initializing configuration file...") "{}" } } @@ -122,8 +122,7 @@ class MainActivity : AppCompatActivity(), ConfigUpdateListener { val packInfo = packageManager.getPackageInfo(packageName, 0) val version = packInfo.versionName - val versionCode = packInfo.longVersionCode - titleLabel.text = "${titleLabel.text} $version ($versionCode)" + titleLabel.text = "${titleLabel.text} $version" } catch (_: Exception) {} versionLabel.text = "Assets Version: $versionText" @@ -135,7 +134,7 @@ class MainActivity : AppCompatActivity(), ConfigUpdateListener { Gson().fromJson(configStr, GakumasConfig::class.java) } catch (e: JsonSyntaxException) { - showToast("配置文件异常，已重置: $e") + showToast("Configuration file has been reset: $e") Gson().fromJson("{}", GakumasConfig::class.java) } saveConfig() @@ -158,7 +157,7 @@ class MainActivity : AppCompatActivity(), ConfigUpdateListener { binding.config!!.dbgMode = !origDbg checkConfigAndUpdateView() saveConfig() - showToast("TestMode: ${!origDbg}") + showToast("Test Mode: ${!origDbg}") } } return if (event.action == 1145) true else super.dispatchKeyEvent(event) diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Color.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Color.kt deleted file mode 100644 index 5bf3fb0..0000000 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Color.kt +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.chinosk.gakumas.localify.ui.theme - -import androidx.compose.ui.graphics.Color - -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) - -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Theme.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Theme.kt deleted file mode 100644 index afe5886..0000000 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Theme.kt +++ /dev/null @@ -1,70 +0,0 @@ -package io.github.chinosk.gakumas.localify.ui.theme - -import android.app.Activity -import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.SideEffect -import androidx.compose.ui.graphics.toArgb -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat - -private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 -) - -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ -) - -@Composable -fun GakumasLocalifyTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, - content: @Composable () -> Unit -) { - val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } - - darkTheme -> DarkColorScheme - else -> LightColorScheme - } - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = colorScheme.primary.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme - } - } - - MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content - ) -} \ No newline at end of file diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Type.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Type.kt deleted file mode 100644 index ac2fd74..0000000 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/theme/Type.kt +++ /dev/null @@ -1,34 +0,0 @@ -package io.github.chinosk.gakumas.localify.ui.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp - -// Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ -) \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 63238cf..247633f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,6 +26,7 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="match_parent" + android:scrollbars="none" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -45,14 +46,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/gakumas_localify" - android:textColor="@color/black" android:textSize="20sp" /> + android:layout_height="wrap_content" /> @@ -131,7 +130,7 @@ + android:text="@string/orientation_lock" /> + android:text="@string/max_high" + android:textSize="12sp" /> + android:text="@string/very_high" + android:textSize="12sp" /> + android:text="@string/hign" + android:textSize="12sp" /> + android:text="@string/middle" + android:textSize="12sp" /> + android:text="@string/low" + android:textSize="12sp" /> @@ -422,6 +425,7 @@ android:id="@+id/editTextRenderScaleLayout" android:layout_width="match_parent" android:layout_height="48dp" + android:layout_marginRight="6dp" android:layout_weight="1" android:background="@android:color/transparent" android:hint="@string/renderscale" @@ -448,7 +452,7 @@ android:layout_height="48dp" android:layout_weight="1" android:background="@android:color/transparent" - android:hint="QualityLevel (1/1/2/3/5)" + android:hint="Quality Level (1-5)" app:boxBackgroundColor="@android:color/transparent"> - Gakumas Localify - Gakumas Localify - 启用插件 (不可热重载) - 启用自由视角（可热重载; 需使用实体键盘） - 以上述配置启动游戏/重载配置 - 最大 FPS (0 为保持游戏原设置) - 解锁所有 Live - Live 使用自定义角色 - Live 自定义头部 ID (例: costume_head_hski-cstm-0002) - Live 自定义服装 ID (例: hski-cstm-0002) - 使用自定义画质设置 - RenderScale (0.5/0.59/0.67/0.77/1.0) - 文本 hook 测试模式 - 导出文本 - 启动后强制导出资源 - 极高 - 超高 - 高 - 中 - 低 - 游戏原版 - 竖屏 - 横屏 - 方向锁定 - 启用胸部参数 - 阻尼 (Damping) - 刚度 (Stiffness) - 弹簧系数 (Spring) - 钟摆系数 (Pendulum) - 钟摆范围 (PendulumRange) - Average - RootWeight - 范围限制倍率 (0 为不限制, 1 为原版) - 使用手臂矫正 - IsDirty - 应用缩放 - 胸部缩放倍率 - 启用范围限制倍率 - axisX.x - axisY.x - axisZ.x - axisX.y - axisY.y - axisZ.y - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index f8c6127..0000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c5a5203..7783d47 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,29 +1,29 @@ Gakumas Localify EN Gakumas Localify EN - Enable Plugin (Not Hot Reloadable) + Enable Plugin (Require Game Restart) Enable Free Camera - Start Game / Hot Reload Config - Max FPS (0 is Use Original Settings) + Start Game / Reload Config + Custom Max FPS (0 is Disabled) Unlock All Live Live Custom Character Live Custom Head ID (eg. costume_head_hski-cstm-0002) Live Custom Dress ID (eg. hski-cstm-0002) Use Custom Graphics Settings - RenderScale (0.5/0.59/0.67/0.77/1.0) - Text Hook Test Mode - Export Text + Render Scale (0.5-1.0) + Text Hook Test Mode (For Testing Only) + Export Text (For Collecting Strings) Force Update Resource Ultra Very High High - Mid + Med Low - Original + None Portrait Landscape Orientation Lock - Enable Breast Param + Custom Breast Parameters Damping Stiffness Spring diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9e0090c..d756493 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ -