mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-10-15 15:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed horizontal scroll (bitfireAT/davx5#447)

Browse source 
* Fixed sizing

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Small changes

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
Co-authored-by: Ricki Hirner <hirner@bitfire.at>
This commit is contained in:
Arnau Mora 2023-11-12 02:32:16 -08:00 committed by Ricki Hirner
parent 0c1e4fd3cb
commit 6055749e42
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/at/bitfire/davdroid/ui/AboutActivity.kt
View file

@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -148,7 +149,14 @@ class AboutActivity: AppCompatActivity() {
} }
} }
HorizontalPager(state, modifier = Modifier.padding(8.dp)) { index -> HorizontalPager(
state,
modifier = Modifier
.fillMaxWidth()
.weight(1f),
contentPadding = PaddingValues(8.dp),
verticalAlignment = Alignment.Top
) { index ->
when (index) { when (index) {
0 -> AboutApp(licenseInfoProvider = licenseInfoProvider.getOrNull()) 0 -> AboutApp(licenseInfoProvider = licenseInfoProvider.getOrNull())
1 -> { 1 -> {
@ -232,8 +240,7 @@ class AboutActivity: AppCompatActivity() {
@Composable @Composable
fun AboutApp(licenseInfoProvider: AboutActivity.AppLicenseInfoProvider? = null) { fun AboutApp(licenseInfoProvider: AboutActivity.AppLicenseInfoProvider? = null) {
Column( Column(
Modifier modifier = Modifier
.padding(8.dp)
.fillMaxWidth() .fillMaxWidth()
.verticalScroll(rememberScrollState())) { .verticalScroll(rememberScrollState())) {
Image( Image(
@ -300,23 +307,23 @@ fun AboutApp_Preview() {
@Composable @Composable
fun TranslatorsGallery( fun TranslatorsGallery(
translations: List<AboutActivity.Model.Translation>, translations: List<AboutActivity.Model.Translation>
modifier: Modifier = Modifier
) { ) {
val collator = Collator.getInstance() val collator = Collator.getInstance()
LazyColumn (modifier) { LazyColumn {
items(translations) { translation -> items(translations) { translation ->
Text( Text(
translation.language, translation.language,
style = MaterialTheme.typography.h6 style = MaterialTheme.typography.h6,
modifier = Modifier.padding(vertical = 4.dp)
) )
Text( Text(
translation.translators translation.translators
.sortedWith { a, b -> collator.compare(a, b) } .sortedWith { a, b -> collator.compare(a, b) }
.joinToString(" · "), .joinToString(" · "),
style = MaterialTheme.typography.body1 style = MaterialTheme.typography.body1,
modifier = Modifier.padding(bottom = 16.dp)
) )
Divider(Modifier.padding(vertical = 8.dp))
} }
} }
} }