Block-Network
diff --git a/‎app/build.gradle.kts‎
Lines changed: 17 additions & 16 deletions b/‎app/build.gradle.kts‎
Lines changed: 17 additions & 16 deletions
diff --git a/‎app/proguard-rules.pro‎
Lines changed: 0 additions & 1 deletion b/‎app/proguard-rules.pro‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎app/src/main/kotlin/statusbar/lyric/App.kt‎
Lines changed: 70 additions & 54 deletions b/‎app/src/main/kotlin/statusbar/lyric/App.kt‎
Lines changed: 70 additions & 54 deletions
@@ -1,30 +1,31 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import org.jetbrains.kotlin.konan.properties.Properties
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.android)
 }
 
-val localProperties = org.jetbrains.kotlin.konan.properties.Properties()
-if (rootProject.file("local.properties").canRead()) localProperties.load(rootProject.file("local.properties").inputStream())
+val buildTime = System.currentTimeMillis()
+val localProperties = Properties()
+if (rootProject.file("local.properties").canRead()) {
+    localProperties.load(rootProject.file("local.properties").inputStream())
+}
 
 android {
     namespace = "statusbar.lyric"
     compileSdk = 36
-    val buildTime = System.currentTimeMillis()
+
     defaultConfig {
         applicationId = "statusbar.lyric"
-        minSdk = 26
+        minSdk = 30
         targetSdk = 36
-        versionCode = 713
-        versionName = "7.1.3"
-        aaptOptions.cruncherEnabled = false
-        dependenciesInfo.includeInApk = false
+        versionCode = 720
+        versionName = "7.2.0"
         buildConfigField("long", "BUILD_TIME", "$buildTime")
-        buildConfigField("int", "API_VERSION", "6")
         buildConfigField("int", "COMPOSE_CONFIG_VERSION", "1")
     }
     val config = localProperties.getProperty("androidStoreFile")?.let {
@@ -48,18 +49,16 @@ android {
             setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
         }
     }
-    packaging {
-        resources {
-            excludes += "**"
-        }
-    }
     applicationVariants.all {
         outputs.all {
             (this as BaseVariantOutputImpl).outputFileName = "StatusBarLyric-$versionName($versionCode)-$name-$buildTime.apk"
         }
     }
+    aaptOptions.cruncherEnabled = false
     buildFeatures.buildConfig = true
+    dependenciesInfo.includeInApk = false
     kotlin.jvmToolchain(21)
+    packaging.resources.excludes += "**"
 }
 
 dependencies {
@@ -71,11 +70,13 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
-    implementation(libs.ezXHelper)
+
     implementation(libs.haze)
-    implementation(libs.lyric.getter.api)
     implementation(libs.miuix)
 
+    implementation(libs.ezXHelper)
+    implementation(libs.superlyricapi)
+
     debugImplementation(libs.androidx.ui.tooling.preview)
     debugImplementation(libs.androidx.ui.tooling)
 }
@@ -22,7 +22,6 @@
 -optimizationpasses 5
 -keep class statusbar.lyric.hook.MainHook { <init>(); }
 -keep class statusbar.lyric.tools.ActivityTools { isHook(); }
--keep class cn.lyric.getter.api.data.* { *; }
 -dontskipnonpubliclibraryclassmembers
 -allowaccessmodification
 -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable
 
@@ -1,3 +1,25 @@
+/*
+ * StatusBarLyric
+ * Copyright (C) 2021-2022 [email protected]
+ * https://github.com/Block-Network/StatusBarLyric
+ *
+ * This software is free opensource software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version and our eula as
+ * published by Block-Network contributors.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and eula along with this software.  If not, see
+ * <https://www.gnu.org/licenses/>
+ * <https://github.com/Block-Network/StatusBarLyric/blob/main/LICENSE>.
+ */
+
 package statusbar.lyric
 
 import android.annotation.SuppressLint
@@ -8,31 +30,34 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.draggable
+import androidx.compose.foundation.gestures.rememberDraggableState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import statusbar.lyric.config.ActivityOwnSP.config
 import statusbar.lyric.ui.page.ChoosePage
 import statusbar.lyric.ui.page.ExtendPage
 import statusbar.lyric.ui.page.HomePage
@@ -44,6 +69,7 @@ import statusbar.lyric.ui.page.TestPage
 import statusbar.lyric.ui.theme.AppTheme
 import top.yukonga.miuix.kmp.basic.Icon
 import top.yukonga.miuix.kmp.basic.Scaffold
+import top.yukonga.miuix.kmp.basic.VerticalDivider
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.getWindowSize
 
@@ -54,14 +80,9 @@ fun App() {
     val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
     val navController = rememberNavController()
 
-    val currentRoute = remember {
-        mutableStateOf(navController.currentDestination?.route ?: "")
-    }
-
-    LaunchedEffect(navController) {
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            currentRoute.value = destination.route ?: ""
-        }
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute by remember(navBackStackEntry) {
+        derivedStateOf { navBackStackEntry?.destination?.route ?: "HomePage" }
     }
 
     AppTheme {
@@ -80,9 +101,10 @@ fun App() {
 @Composable
 fun PortraitLayout(
     navController: NavHostController,
-    currentRoute: MutableState<String>
+    currentRoute: String
 ) {
-    val windowWidth = getWindowSize().width
+    val getWindowSize by rememberUpdatedState(getWindowSize())
+    val windowWidth = getWindowSize.width
     val easing = CubicBezierEasing(0.12f, 0.38f, 0.2f, 1f)
 
     NavHost(
@@ -127,55 +149,50 @@ fun PortraitLayout(
 @Composable
 fun LandscapeLayout(
     navController: NavHostController,
-    currentRoute: MutableState<String>
+    currentRoute: String
 ) {
-    val windowWidth = getWindowSize().width
-    val easing = CubicBezierEasing(0.12f, 0.88f, 0.2f, 1f)
-    val dividerLineColor = MiuixTheme.colorScheme.dividerLine
+    val getWindowSize by rememberUpdatedState(getWindowSize())
+    val windowWidth = getWindowSize.width
+    var weight by remember { mutableFloatStateOf(config.pageRatio) }
+    var potentialWeight by remember { mutableFloatStateOf(weight) }
+    val dragState = rememberDraggableState {
+        val nextPotentialWeight = potentialWeight + it / windowWidth
+        potentialWeight = nextPotentialWeight
+        weight = nextPotentialWeight.coerceIn(0.35f, 0.65f)
+    }
+    var finalWeight by remember { mutableFloatStateOf(weight) }
 
     Row(
         modifier = Modifier
             .fillMaxSize()
             .padding(horizontal = 12.dp)
     ) {
         Box(
-            modifier = Modifier.weight(0.88f)
+            modifier = Modifier.weight(weight)
         ) {
             HomePage(navController, currentRoute)
         }
-        Canvas(
-            Modifier
-                .fillMaxHeight()
+        VerticalDivider(
+            modifier = Modifier
+                .draggable(
+                    state = dragState,
+                    orientation = Orientation.Horizontal,
+                    onDragStarted = {
+                        potentialWeight = weight
+                    },
+                    onDragStopped = {
+                        finalWeight = weight
+                        config.pageRatio = finalWeight
+                    }
+                )
                 .padding(horizontal = 12.dp)
-                .width(0.75.dp)
-        ) {
-            drawLine(
-                color = dividerLineColor,
-                strokeWidth = 0.75.dp.toPx(),
-                start = Offset(0.75.dp.toPx() / 2, 0f),
-                end = Offset(0.75.dp.toPx() / 2, size.height),
-            )
-        }
+        )
         NavHost(
             navController = navController,
             startDestination = "HomePage",
-            modifier = Modifier.weight(1f),
-            enterTransition = {
-                slideInHorizontally(
-                    initialOffsetX = { windowWidth },
-                    animationSpec = tween(durationMillis = 500, easing = easing)
-                ) + fadeIn(
-                    animationSpec = tween(durationMillis = 200)
-                )
-            },
-            exitTransition = {
-                slideOutHorizontally(
-                    targetOffsetX = { windowWidth / 5 },
-                    animationSpec = tween(durationMillis = 500, easing = easing)
-                ) + fadeOut(
-                    animationSpec = tween(durationMillis = 500)
-                )
-            },
+            modifier = Modifier.weight(1f - weight),
+            enterTransition = { fadeIn(initialAlpha = 1f) },
+            exitTransition = { fadeOut(targetAlpha = 1f) },
         ) {
             composable("HomePage") { EmptyPage() }
             pageDestinations(navController, currentRoute)
@@ -185,7 +202,7 @@ fun LandscapeLayout(
 
 fun NavGraphBuilder.pageDestinations(
     navController: NavHostController,
-    currentRoute: MutableState<String>
+    currentRoute: String
 ) {
     composable("ChoosePage") { ChoosePage(navController) }
     composable("TestPage") { TestPage(navController, currentRoute) }
@@ -194,7 +211,6 @@ fun NavGraphBuilder.pageDestinations(
     composable("IconPage") { IconPage(navController) }
     composable("ExtendPage") { ExtendPage(navController) }
     composable("SystemSpecialPage") { SystemSpecialPage(navController) }
-
 }
 
 @Composable
@@ -207,7 +223,7 @@ fun EmptyPage() {
             painter = painterResource(R.drawable.ic_launcher_foreground),
             contentDescription = null,
             tint = MiuixTheme.colorScheme.secondary,
-            modifier = Modifier.size(256.dp)
+            modifier = Modifier.size(300.dp)
         )
     }
 }