Skip to content

Commit 3d8d3fc

Browse files
authored
[#124] Fixed Overlap in settings screen list and footer (#127)
1 parent 165bcf3 commit 3d8d3fc

File tree

1 file changed

+12
-8
lines changed
  • app/src/main/java/com/yogeshpaliyal/deepr/ui/screens

1 file changed

+12
-8
lines changed

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Settings.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import android.widget.Toast
77
import androidx.activity.compose.rememberLauncherForActivityResult
88
import androidx.activity.result.contract.ActivityResultContracts
99
import androidx.compose.foundation.clickable
10-
import androidx.compose.foundation.layout.Arrangement
11-
import androidx.compose.foundation.layout.Box
1210
import androidx.compose.foundation.layout.Column
1311
import androidx.compose.foundation.layout.Spacer
1412
import androidx.compose.foundation.layout.consumeWindowInsets
@@ -174,14 +172,19 @@ fun SettingsScreen(
174172
}
175173
},
176174
) { innerPadding ->
177-
Box(
175+
Column(
178176
modifier =
179177
Modifier
180178
.padding(innerPadding)
181179
.consumeWindowInsets(innerPadding)
182180
.fillMaxSize(),
183181
) {
184-
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
182+
Column(
183+
modifier =
184+
Modifier
185+
.weight(1f, fill = true)
186+
.verticalScroll(rememberScrollState()),
187+
) {
185188
HorizontalDivider()
186189

187190
ListItem(
@@ -397,9 +400,11 @@ fun SettingsScreen(
397400
}
398401

399402
Column(
400-
modifier = Modifier.align(Alignment.BottomCenter),
401-
horizontalAlignment = Alignment.CenterHorizontally,
402-
verticalArrangement = Arrangement.Center,
403+
modifier =
404+
Modifier
405+
.fillMaxWidth()
406+
.align(Alignment.CenterHorizontally)
407+
.padding(8.dp),
403408
) {
404409
Text(
405410
stringResource(R.string.app_version, BuildConfig.VERSION_NAME),
@@ -414,7 +419,6 @@ fun SettingsScreen(
414419
textAlign = TextAlign.Center,
415420
modifier = Modifier.fillMaxWidth(),
416421
)
417-
Spacer(modifier = Modifier.height(16.dp))
418422
}
419423
}
420424

0 commit comments

Comments
 (0)