From c962668d68c3a690142c9ff45ce9b306fa389904 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 10 Sep 2022 22:09:55 +0200
Subject: [PATCH] Revert "Icon shape preference: remove labels"

This reverts commit 060cbdc582f2d01fae49a16049d436c682338b73.
---
 .../appearance/AppearanceSettingsScreen.kt    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
index d76e6582..7ff49a8e 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
@@ -409,12 +409,12 @@ fun IconShapePreference(
                         columns = GridCells.Adaptive(96.dp),
                         modifier = Modifier
                             .fillMaxWidth()
-                            .padding(bottom = 16.dp)
+                            .padding(bottom = 16.dp, start = 16.dp, end = 16.dp)
                     ) {
                         items(shapes) {
                             Column(
                                 modifier = Modifier
-                                    .padding(vertical = 16.dp),
+                                    .padding(8.dp),
                                 horizontalAlignment = Alignment.CenterHorizontally
                             ) {
                                 val context = LocalContext.current
@@ -442,6 +442,12 @@ fun IconShapePreference(
                                     },
                                     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(
                                 composition,