From 5c55f878f491b67aa01cbe594a12db5424ea274b Mon Sep 17 00:00:00 2001
From: lisonge <i@songe.li>
Date: Sat, 9 Mar 2024 14:43:05 +0800
Subject: [PATCH] fix: app icon size (#546)

---
 .../li/songe/gkd/ui/GlobalRuleExcludePage.kt    | 17 +++++++++++------
 .../li/songe/gkd/ui/component/SubsAppCard.kt    | 17 +++++++++++------
 .../kotlin/li/songe/gkd/ui/home/AppListPage.kt  | 17 +++++++++++------
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
index afa593e7b..df822c0e0 100644
--- a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
+++ b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
@@ -242,14 +242,19 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     if (appInfo.icon != null) {
-                        Image(
-                            painter = rememberDrawablePainter(appInfo.icon),
-                            contentDescription = null,
+                        Box(
                             modifier = Modifier
                                 .fillMaxHeight()
-                                .height(1.dp)
-                                .padding(4.dp)
-                        )
+                                .aspectRatio(1f)
+                        ) {
+                            Image(
+                                painter = rememberDrawablePainter(appInfo.icon),
+                                contentDescription = null,
+                                modifier = Modifier
+                                    .matchParentSize()
+                                    .padding(4.dp)
+                            )
+                        }
                     } else {
                         Icon(
                             imageVector = Icons.Default.Android,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt b/app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
index e272c405f..83c40266b 100644
--- a/app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
+++ b/app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
@@ -68,14 +68,19 @@ fun SubsAppCard(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (appInfo?.icon != null) {
-            Image(
-                painter = rememberDrawablePainter(appInfo.icon),
-                contentDescription = null,
+            Box(
                 modifier = Modifier
                     .fillMaxHeight()
-                    .height(1.dp)
-                    .padding(4.dp)
-            )
+                    .aspectRatio(1f)
+            ) {
+                Image(
+                    painter = rememberDrawablePainter(appInfo.icon),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .matchParentSize()
+                        .padding(4.dp)
+                )
+            }
         } else {
             Icon(
                 imageVector = Icons.Default.Android,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
index 765ee91b4..8f099cf15 100644
--- a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
+++ b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
@@ -238,14 +238,19 @@ fun useAppListPage(): ScaffoldExt {
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     if (appInfo.icon != null) {
-                        Image(
-                            painter = rememberDrawablePainter(appInfo.icon),
-                            contentDescription = null,
+                        Box(
                             modifier = Modifier
                                 .fillMaxHeight()
-                                .height(1.dp)
-                                .padding(4.dp)
-                        )
+                                .aspectRatio(1f)
+                        ) {
+                            Image(
+                                painter = rememberDrawablePainter(appInfo.icon),
+                                contentDescription = null,
+                                modifier = Modifier
+                                    .matchParentSize()
+                                    .padding(4.dp)
+                            )
+                        }
                     } else {
                         Icon(
                             imageVector = Icons.Default.Android,