lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Icon shape preference: remove labels"

Browse Source 
This reverts commit 060cbdc582f2d01fae49a16049d436c682338b73.
This commit is contained in:
MM20 2022-09-10 22:09:55 +02:00
parent 060cbdc582
commit c962668d68
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
View File

@ -409,12 +409,12 @@ fun IconShapePreference(
columns = GridCells.Adaptive(96.dp), columns = GridCells.Adaptive(96.dp),
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(bottom = 16.dp) .padding(bottom = 16.dp, start = 16.dp, end = 16.dp)
) { ) {
items(shapes) { items(shapes) {
Column( Column(
modifier = Modifier modifier = Modifier
.padding(vertical = 16.dp), .padding(8.dp),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
val context = LocalContext.current val context = LocalContext.current
@ -442,6 +442,12 @@ fun IconShapePreference(
}, },
shape = getShape(it) shape = getShape(it)
) )
Text(
getShapeName(it) ?: "",
textAlign = TextAlign.Center,
style = MaterialTheme.typography.labelMedium,
modifier = Modifier.padding(top = 4.dp)
)
} }
} }
} }
@ -544,6 +550,15 @@ fun LayoutPreference(
) )
) )
/*LaunchedEffect(null) {
val drw = LottieDrawable()
drw.composition = composition
val list = drw.resolveKeyPath(KeyPath("**"))
list.forEach {
Log.d("MM20", it.keysToString())
}
}*/
val progress by animateLottieCompositionAsState( val progress by animateLottieCompositionAsState(
composition, composition,