Merge remote-tracking branch 'origin/m3e' into m3e

# Conflicts: # app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
2025-12-10 05:29:37 +05:00 · 2025-12-08 12:58:26 +03:00
parent 611e8ae39c 21e80d0463
commit fd69451adc
1 changed files with 1 additions and 2 deletions
--- a/app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
+++ b/app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
@@ -157,8 +157,7 @@ fun StrategySelectionScreen(navController: NavController, vpnLauncher: ActivityR
                    top = paddingValues.calculateTopPadding(),
                    bottom = paddingValues.calculateBottomPadding() + 40.dp
                ),
-                modifier = Modifier
-                    .fillMaxSize()
+                modifier = Modifier.fillMaxSize()
            ) {
                item {
                    Row (