Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2025-12-10 21:49:38 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse Source 
# Conflicts:
#	app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
This commit is contained in:
white
2025-12-08 12:58:26 +03:00
parent 611e8ae39c 21e80d0463
commit fd69451adc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
View File

@@ -157,8 +157,7 @@ fun StrategySelectionScreen(navController: NavController, vpnLauncher: ActivityR
top = paddingValues.calculateTopPadding(), top = paddingValues.calculateTopPadding(),
bottom = paddingValues.calculateBottomPadding() + 40.dp bottom = paddingValues.calculateBottomPadding() + 40.dp
), ),
modifier = Modifier modifier = Modifier.fillMaxSize()
.fillMaxSize()
) { ) {
item { item {
Row ( Row (