Merge branch 'topjohnwu:master' into meta-quest-zygisk-fix

Author: xAstroBoy

AGENTS.md

@@ -25,7 +25,7 @@ Guidelines and instructions for AI models and automated agents operating in the
 
 ## 4. Guidelines for AI Models
 
-1. **Git / Commit Control:** NEVER commit changes or amend an existing git commit without the user's explicit request or approval. When explicitly requested to commit changes, follow the 50/72 rule for commit messages (subject line <= 50 characters, blank line before body, wrap body lines at 72 characters) and include an `Assisted-by: <ModelVersion>` trailer in the commit message body (using a pretty name, e.g., `Assisted-by: Gemini 3.6 Flash`).
+1. **Git / Commit Control:** NEVER commit changes or amend an existing git commit without the user's explicit request or approval. When explicitly requested to commit changes, follow the 50/72 rule for commit messages (subject line <= 50 characters, blank line before body, wrap body lines at 72 characters) and include an `Assisted-by: <Friendly Name of Current Model>` trailer in the commit message body.
 2. **Build Invocation:** Execute `./build.py <command>` directly without `scripts/env.py`. Prefix standalone tool executions (like `./gradlew` or raw `cargo`) with `scripts/env.py`.
 3. **Pre-build Native Code:** Before modifying code in `native/`, build native binaries at least once with `./build.py native` to generate required bindings and header files.
 4. **App Subproject Context:** Refer to [`app/AGENTS.md`](app/AGENTS.md) when working inside the `app/` subproject.

app/AGENTS.md

@@ -1,9 +1,10 @@
 # AGENTS.md (app subproject)
 
-Guidelines for AI models operating inside the `app/` subproject.
+Guidelines for AI models operating inside the `app/` subproject. Always include and follow the top-level [`AGENTS.md`](../AGENTS.md).
 
 ## 1. Environment & Gradle Setup
 
+- **General Guidelines:** Always follow the top-level [`AGENTS.md`](../AGENTS.md) for general repository rules, environment execution setup, and commit control policies.
 - **Working Directory:** Set working directory to `app/` when working on app code.
 - **Environment Wrapper:** Standalone `./gradlew` commands MUST be prefixed with `../scripts/env.py` (e.g., `../scripts/env.py ./gradlew assembleDebug`), or run `./build.py app` from root.
 

app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/MagiskTheme.kt

@@ -2,7 +2,10 @@ package com.topjohnwu.magisk.ui
 
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Shapes
+import androidx.compose.material3.Typography
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
@@ -11,13 +14,152 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.topjohnwu.magisk.core.Config
 
+private val MagiskLightColorScheme = lightColorScheme(
+    primary = Color(0xFF006A5E),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF70F7E2),
+    onPrimaryContainer = Color(0xFF00201C),
+    secondary = Color(0xFF4A635E),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFFCCE8E1),
+    onSecondaryContainer = Color(0xFF05201B),
+    tertiary = Color(0xFF456179),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFFCCE5FF),
+    onTertiaryContainer = Color(0xFF001E31),
+    error = Color(0xFFBA1A1A),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
+    onErrorContainer = Color(0xFF410002),
+    background = Color(0xFFFAFDFB),
+    onBackground = Color(0xFF191C1B),
+    surface = Color(0xFFFAFDFB),
+    onSurface = Color(0xFF191C1B),
+    surfaceVariant = Color(0xFFDAE5E1),
+    onSurfaceVariant = Color(0xFF3F4946),
+    outline = Color(0xFF6F7976),
+    outlineVariant = Color(0xFFBFC9C5),
+)
+
+private val MagiskDarkColorScheme = darkColorScheme(
+    primary = Color(0xFF51DBC6),
+    onPrimary = Color(0xFF003730),
+    primaryContainer = Color(0xFF005047),
+    onPrimaryContainer = Color(0xFF70F7E2),
+    secondary = Color(0xFFB1CCC6),
+    onSecondary = Color(0xFF1C3530),
+    secondaryContainer = Color(0xFF334B46),
+    onSecondaryContainer = Color(0xFFCCE8E1),
+    tertiary = Color(0xFFAEC9E6),
+    onTertiary = Color(0xFF143349),
+    tertiaryContainer = Color(0xFF2D4960),
+    onTertiaryContainer = Color(0xFFCCE5FF),
+    error = Color(0xFFFFB4AB),
+    onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
+    onErrorContainer = Color(0xFFFFDAD6),
+    background = Color(0xFF191C1B),
+    onBackground = Color(0xFFE0E3E1),
+    surface = Color(0xFF191C1B),
+    onSurface = Color(0xFFE0E3E1),
+    surfaceVariant = Color(0xFF3F4946),
+    onSurfaceVariant = Color(0xFFBFC9C5),
+    outline = Color(0xFF899390),
+    outlineVariant = Color(0xFF3F4946),
+)
+
 object ThemeState {
     var colorMode by mutableIntStateOf(Config.colorMode)
 }
 
+val MagiskShapes = Shapes(
+    extraSmall = RoundedCornerShape(6.dp),
+    small = RoundedCornerShape(10.dp),
+    medium = RoundedCornerShape(16.dp),
+    large = RoundedCornerShape(24.dp),
+    extraLarge = RoundedCornerShape(32.dp),
+)
+
+val MagiskTypography = Typography(
+    headlineLarge = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 32.sp,
+        lineHeight = 40.sp,
+        letterSpacing = (-0.25).sp,
+    ),
+    headlineMedium = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 28.sp,
+        lineHeight = 36.sp,
+    ),
+    headlineSmall = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 24.sp,
+        lineHeight = 32.sp,
+    ),
+    titleLarge = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 20.sp,
+        lineHeight = 26.sp,
+    ),
+    titleMedium = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.15.sp,
+    ),
+    titleSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.1.sp,
+    ),
+    bodyLarge = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp,
+    ),
+    bodyMedium = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.25.sp,
+    ),
+    bodySmall = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.4.sp,
+    ),
+    labelLarge = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.1.sp,
+    ),
+    labelMedium = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp,
+    ),
+    labelSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp,
+    ),
+)
+
 @Composable
 fun MagiskTheme(
     content: @Composable () -> Unit
@@ -40,12 +182,14 @@ fun MagiskTheme(
     val colorScheme = when {
         useDynamicColor && isDarkTheme -> dynamicDarkColorScheme(context)
         useDynamicColor && !isDarkTheme -> dynamicLightColorScheme(context)
-        isDarkTheme -> darkColorScheme()
-        else -> lightColorScheme()
+        isDarkTheme -> MagiskDarkColorScheme
+        else -> MagiskLightColorScheme
     }
 
     MaterialTheme(
         colorScheme = colorScheme,
+        shapes = MagiskShapes,
+        typography = MagiskTypography,
         content = content
     )
-}
+}

app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt

@@ -1,10 +1,13 @@
 package com.topjohnwu.magisk.ui
 
 import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,9 +21,11 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -33,14 +38,16 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.scale
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.activity.compose.LocalActivity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.VMFactory
@@ -152,18 +159,18 @@ private fun FloatingNavigationBar(
     modifier: Modifier = Modifier
 ) {
     val scope = rememberCoroutineScope()
-    val shape = RoundedCornerShape(28.dp)
+    val shape = RoundedCornerShape(32.dp)
     val navBarInset = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
 
     Row(
         modifier = modifier
-            .padding(bottom = navBarInset + 12.dp, start = 24.dp, end = 24.dp)
-            .shadow(elevation = 6.dp, shape = shape)
+            .padding(bottom = navBarInset + 12.dp, start = 20.dp, end = 20.dp)
+            .shadow(elevation = 8.dp, shape = shape)
             .clip(shape)
             .background(MaterialTheme.colorScheme.surfaceContainer)
             .fillMaxWidth()
-            .height(64.dp)
-            .padding(horizontal = 4.dp),
+            .height(68.dp)
+            .padding(horizontal = 6.dp, vertical = 6.dp),
         horizontalArrangement = Arrangement.SpaceEvenly,
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -189,39 +196,80 @@ private fun FloatingNavItem(
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val contentColor by animateColorAsState(
+    val indicatorColor by animateColorAsState(
+        targetValue = if (selected) MaterialTheme.colorScheme.secondaryContainer else Color.Transparent,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMedium),
+        label = "navIndicatorColor"
+    )
+
+    val iconTint by animateColorAsState(
+        targetValue = when {
+            !enabled -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
+            selected -> MaterialTheme.colorScheme.onSecondaryContainer
+            else -> MaterialTheme.colorScheme.onSurfaceVariant
+        },
+        animationSpec = tween(150),
+        label = "navIconTint"
+    )
+
+    val labelColor by animateColorAsState(
         targetValue = when {
             !enabled -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
-            selected -> MaterialTheme.colorScheme.primary
+            selected -> MaterialTheme.colorScheme.onSurface
             else -> MaterialTheme.colorScheme.onSurfaceVariant
         },
-        animationSpec = tween(200),
-        label = "navItemColor"
+        animationSpec = tween(150),
+        label = "navLabelColor"
+    )
+
+    val iconScale by animateFloatAsState(
+        targetValue = if (selected) 1.08f else 1.0f,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy, stiffness = Spring.StiffnessMedium),
+        label = "navIconScale"
+    )
+
+    val indicatorWidth by animateDpAsState(
+        targetValue = if (selected) 48.dp else 24.dp,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioLowBouncy, stiffness = Spring.StiffnessMedium),
+        label = "navIndicatorWidth"
     )
 
     Column(
         modifier = modifier
+            .clip(CircleShape)
             .clickable(
                 enabled = enabled,
-                indication = null,
-                interactionSource = remember { MutableInteractionSource() },
                 role = Role.Tab,
                 onClick = onClick,
-            ),
+            )
+            .padding(vertical = 2.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = label,
-            modifier = Modifier.size(24.dp),
-            tint = contentColor,
-        )
+        Box(
+            modifier = Modifier
+                .width(indicatorWidth)
+                .height(28.dp)
+                .clip(CircleShape)
+                .background(indicatorColor),
+            contentAlignment = Alignment.Center
+        ) {
+            Icon(
+                imageVector = icon,
+                contentDescription = label,
+                modifier = Modifier
+                    .size(22.dp)
+                    .scale(iconScale),
+                tint = iconTint,
+            )
+        }
         Spacer(Modifier.height(2.dp))
         Text(
             text = label,
-            fontSize = 11.sp,
-            color = contentColor,
+            style = MaterialTheme.typography.labelSmall,
+            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+            color = labelColor,
+            maxLines = 1,
         )
     }
 }