From 4bbdcd9a63868ed2663d410f9962c405d5e8a153 Mon Sep 17 00:00:00 2001 From: kangshulong <1095887643@qq.com> Date: Fri, 6 Mar 2026 17:28:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=BF=AB=E6=8D=B7=E6=A0=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E7=95=8C=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=95=8C=E9=9D=A2=E3=80=81myapp=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=95=BF=E5=90=8D=E7=A7=B0=E5=BA=94=E7=94=A8=E8=B5=B0=E9=A9=AC?= =?UTF-8?q?=E7=81=AF=E5=87=BA=E7=8E=B0=E8=8A=B1=E5=B1=8F=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout-sw480dp/add_apps_grid_item.xml | 7 +++++-- app/src/main/res/layout-sw480dp/apps_grid_item.xml | 2 ++ app/src/main/res/layout-sw480dp/childgrid_item.xml | 1 + app/src/main/res/layout-sw540dp/add_apps_grid_item.xml | 5 ++++- app/src/main/res/layout-sw540dp/apps_grid_item.xml | 2 ++ app/src/main/res/layout-sw540dp/childgrid_item.xml | 1 + app/src/main/res/layout-sw720dp/add_apps_grid_item.xml | 3 +++ app/src/main/res/layout-sw720dp/apps_grid_item.xml | 2 ++ app/src/main/res/layout-sw720dp/childgrid_item.xml | 1 + app/src/main/res/layout/add_apps_grid_item.xml | 7 +++++-- app/src/main/res/layout/childgrid_item.xml | 3 ++- 11 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout-sw480dp/add_apps_grid_item.xml b/app/src/main/res/layout-sw480dp/add_apps_grid_item.xml index 7551bf1..6cd9ab5 100644 --- a/app/src/main/res/layout-sw480dp/add_apps_grid_item.xml +++ b/app/src/main/res/layout-sw480dp/add_apps_grid_item.xml @@ -4,9 +4,11 @@ android:layout_height="100dp" android:focusable="true" android:padding="5dp" + android:clipChildren="false" android:descendantFocusability="beforeDescendants"> @@ -22,13 +24,14 @@ android:layout_height="wrap_content" android:paddingStart="10dp" android:paddingEnd="10dp" + android:includeFontPadding="false" android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" - android:textSize="13dp" - android:layout_marginVertical="5dp" + android:textSize="11sp" + android:layout_marginVertical="2dp" android:layout_alignParentBottom="true" android:textColor="@color/item_text_color" /> diff --git a/app/src/main/res/layout-sw480dp/apps_grid_item.xml b/app/src/main/res/layout-sw480dp/apps_grid_item.xml index f40e897..672d025 100644 --- a/app/src/main/res/layout-sw480dp/apps_grid_item.xml +++ b/app/src/main/res/layout-sw480dp/apps_grid_item.xml @@ -12,6 +12,7 @@ tools:ignore="MissingDefaultResource"> @@ -38,6 +39,7 @@ android:paddingEnd="6dp" android:layout_centerHorizontal="true" android:gravity="center" + android:includeFontPadding="false" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" diff --git a/app/src/main/res/layout-sw480dp/childgrid_item.xml b/app/src/main/res/layout-sw480dp/childgrid_item.xml index b622075..f8ff8a6 100644 --- a/app/src/main/res/layout-sw480dp/childgrid_item.xml +++ b/app/src/main/res/layout-sw480dp/childgrid_item.xml @@ -3,6 +3,7 @@ android:layout_width="93dp" android:layout_height="98dp" android:id="@+id/item_bg" + android:clipChildren="false" android:background="@drawable/app_info_bg" android:descendantFocusability="beforeDescendants" android:focusable="true"> diff --git a/app/src/main/res/layout-sw540dp/add_apps_grid_item.xml b/app/src/main/res/layout-sw540dp/add_apps_grid_item.xml index 2ac63c3..8f06426 100644 --- a/app/src/main/res/layout-sw540dp/add_apps_grid_item.xml +++ b/app/src/main/res/layout-sw540dp/add_apps_grid_item.xml @@ -4,9 +4,11 @@ android:layout_height="99dp" android:focusable="true" android:gravity="center" + android:clipChildren="false" android:focusableInTouchMode="true"> @@ -22,12 +24,13 @@ android:layout_height="wrap_content" android:paddingStart="7dp" android:paddingEnd="7dp" + android:includeFontPadding="false" android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" - android:textSize="11sp" + android:textSize="13sp" android:layout_marginVertical="2dp" android:layout_alignParentBottom="true" android:textColor="@color/item_text_color" diff --git a/app/src/main/res/layout-sw540dp/apps_grid_item.xml b/app/src/main/res/layout-sw540dp/apps_grid_item.xml index 7286281..82d2582 100644 --- a/app/src/main/res/layout-sw540dp/apps_grid_item.xml +++ b/app/src/main/res/layout-sw540dp/apps_grid_item.xml @@ -12,6 +12,7 @@ tools:ignore="MissingDefaultResource"> @@ -41,6 +42,7 @@ android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" android:textSize="16sp" + android:includeFontPadding="false" android:layout_marginVertical="10dp" android:layout_alignParentBottom="true" android:textColor="@color/item_text_color" diff --git a/app/src/main/res/layout-sw540dp/childgrid_item.xml b/app/src/main/res/layout-sw540dp/childgrid_item.xml index 47e24e0..fb64d72 100644 --- a/app/src/main/res/layout-sw540dp/childgrid_item.xml +++ b/app/src/main/res/layout-sw540dp/childgrid_item.xml @@ -4,6 +4,7 @@ android:layout_height="110dp" android:id="@+id/item_bg" android:background="@drawable/app_info_bg" + android:clipChildren="false" android:descendantFocusability="beforeDescendants" android:focusable="true"> diff --git a/app/src/main/res/layout-sw720dp/add_apps_grid_item.xml b/app/src/main/res/layout-sw720dp/add_apps_grid_item.xml index f7a7ab5..02eb213 100644 --- a/app/src/main/res/layout-sw720dp/add_apps_grid_item.xml +++ b/app/src/main/res/layout-sw720dp/add_apps_grid_item.xml @@ -4,9 +4,11 @@ android:layout_height="132dp" android:focusable="true" android:gravity="center" + android:clipChildren="false" android:focusableInTouchMode="true"> @@ -22,6 +24,7 @@ android:layout_height="wrap_content" android:paddingStart="10dp" android:paddingEnd="10dp" + android:includeFontPadding="false" android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" diff --git a/app/src/main/res/layout-sw720dp/apps_grid_item.xml b/app/src/main/res/layout-sw720dp/apps_grid_item.xml index 367b752..cf58222 100644 --- a/app/src/main/res/layout-sw720dp/apps_grid_item.xml +++ b/app/src/main/res/layout-sw720dp/apps_grid_item.xml @@ -12,6 +12,7 @@ tools:ignore="MissingDefaultResource"> @@ -39,6 +40,7 @@ android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" + android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" android:textSize="21sp" diff --git a/app/src/main/res/layout-sw720dp/childgrid_item.xml b/app/src/main/res/layout-sw720dp/childgrid_item.xml index f4de8a2..e9fb4bd 100644 --- a/app/src/main/res/layout-sw720dp/childgrid_item.xml +++ b/app/src/main/res/layout-sw720dp/childgrid_item.xml @@ -4,6 +4,7 @@ android:layout_height="147dp" android:id="@+id/item_bg" android:background="@drawable/app_info_bg" + android:clipChildren="false" android:descendantFocusability="beforeDescendants" android:focusable="true"> diff --git a/app/src/main/res/layout/add_apps_grid_item.xml b/app/src/main/res/layout/add_apps_grid_item.xml index ea0bbeb..8d8e559 100644 --- a/app/src/main/res/layout/add_apps_grid_item.xml +++ b/app/src/main/res/layout/add_apps_grid_item.xml @@ -4,9 +4,11 @@ android:layout_height="150dp" android:focusable="true" android:padding="5dp" + android:clipChildren="false" android:descendantFocusability="beforeDescendants"> @@ -22,13 +24,14 @@ android:layout_height="wrap_content" android:paddingStart="10dp" android:paddingEnd="10dp" + android:includeFontPadding="false" android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" android:ellipsize="marquee" - android:textSize="18sp" - android:layout_marginVertical="5dp" + android:textSize="15sp" + android:layout_marginVertical="3dp" android:layout_alignParentBottom="true" android:textColor="@color/item_text_color" /> diff --git a/app/src/main/res/layout/childgrid_item.xml b/app/src/main/res/layout/childgrid_item.xml index 8470bbe..9f4e8be 100644 --- a/app/src/main/res/layout/childgrid_item.xml +++ b/app/src/main/res/layout/childgrid_item.xml @@ -5,6 +5,7 @@ android:id="@+id/item_bg" android:layout_margin="5dp" android:descendantFocusability="beforeDescendants" + android:clipChildren="false" android:focusable="true"> + android:textSize="20sp"/>