优化卡片磁贴自定义页面UI

ReChronoRain · May 7, 2024 · 8a0ba67 · 8a0ba67
1 parent 9e4f59e
commit 8a0ba67
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 53 deletions.
diff --git a/...main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/prefs/CardTileEditPreference.java b/...main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/prefs/CardTileEditPreference.java
@@ -4,7 +4,6 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,6 +27,7 @@
 public class CardTileEditPreference extends Preference {
 
     GridLayoutManager mCradLayoutManager;
+    View mItemView;
     RecyclerView mCardTiles;
     RecyclerView mAddCardTiles;
     CardTileAdapter mCardTileAdapter;
@@ -53,9 +53,9 @@ public CardTileEditPreference(@NonNull Context context, @Nullable AttributeSet a
     @Override
     public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-        View itemView = holder.itemView;
-        mCardTiles = itemView.findViewById(android.R.id.list);
-        mAddCardTiles = itemView.findViewById(R.id.card_tile_add_list);
+        mItemView = holder.itemView;
+        mCardTiles = mItemView.findViewById(android.R.id.list);
+        mAddCardTiles = mItemView.findViewById(R.id.card_tile_add_list);
         initView();
     }
 
@@ -77,6 +77,12 @@ private void initView() {
         mAddCardTileAdapter.setOnDataChangeListener((changed, tile) -> {
             onDataSetChanged(tile, false);
         });
+        setVisibility(PrefsUtils.mSharedPreferences.getBoolean("prefs_key_systemui_plugin_card_tiles_enabled", false));
+    }
+
+    @Override
+    public void onDependencyChanged(@NonNull Preference dependency, boolean disableDependent) {
+        setVisibility(!disableDependent);
     }
 
     private void createCardView(RecyclerView cardView, RecyclerView.Adapter adapter) {
@@ -86,6 +92,12 @@ private void createCardView(RecyclerView cardView, RecyclerView.Adapter adapter)
         cardView.setNestedScrollingEnabled(false);
     }
 
+    public void setVisibility(boolean visibility) {
+        if (mItemView != null) {
+            mItemView.setVisibility(visibility ? View.VISIBLE : View.GONE);
+        }
+    }
+
     private List<String> getTileList() {
         String str = PrefsUtils.mSharedPreferences.getString("prefs_key_systemui_plugin_card_tiles", "");
         return TextUtils.isEmpty(str) ? new ArrayList<>() : Arrays.asList(str.split("\\|"));

diff --git a/app/src/main/res/layout/preference_card_tile.xml b/app/src/main/res/layout/preference_card_tile.xml
@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingHorizontal="25dp">
+    android:layout_height="match_parent">
 
-    <TextView
+    <LinearLayout
+        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="start|center"
-        android:text="已添加"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.PreferenceCategory" />
+        android:orientation="vertical"
+        android:paddingHorizontal="25dp">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:text="已添加"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.PreferenceCategory" />
 
-    <View style="@style/DividerViewStyle" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center"
-        android:text="未添加"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.PreferenceCategory" />
+        <View style="@style/DividerViewStyle" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/card_tile_add_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:overScrollMode="never" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:text="未添加"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.PreferenceCategory" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center"
-        android:layout_marginTop="@dimen/divider_margin_top"
-        android:text="仅xxx支持圆角磁贴"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/TextAppearance.PreferenceCategory" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/card_tile_add_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:layout_marginTop="@dimen/divider_margin_top"
+            android:text="仅xxx支持圆角磁贴"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.PreferenceCategory" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <style name="DividerViewStyle">
-        <item name="android:background" tools:ignore="PrivateResource">@color/preference_first_last_divider_line_light</item>
+        <item name="android:background">@color/card_tile_disabled_color_legacy</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">0.74dp</item>

diff --git a/app/src/main/res/xml/system_ui_control_center_card_tile.xml b/app/src/main/res/xml/system_ui_control_center_card_tile.xml
@@ -5,6 +5,8 @@
         android:key="prefs_key_systemui_plugin_card_tiles_enabled" />
 
     <com.sevtinge.hyperceiler.ui.fragment.systemui.prefs.CardTileEditPreference
+        android:persistent="false"
+        android:key="prefs_key_systemui_plugin_card_tiles_edit"
         android:dependency="prefs_key_systemui_plugin_card_tiles_enabled"/>
 
 </PreferenceScreen>