From b1a7b88638d9a28a06d380648ec8b5110b40caeb Mon Sep 17 00:00:00 2001
From: huyang <1184394624@qq.com>
Date: Thu, 15 Jan 2026 15:54:35 +0800
Subject: [PATCH] UI: fix problem in TopbarControlWindow

---
 .../systemui/view/AppOverviewWindow.kt         | 18 ++++++++++++++++--
 .../systemui/view/TopBarControlWindow.kt       |  4 ++--
 app/src/main/res/anim/lp_exit.xml              | 11 +++++++++++
 .../main/res/drawable/control_oval_gray_22.xml |  5 +++++
 .../main/res/drawable/control_oval_grep.xml    |  3 ++-
 .../main/res/layout/window_topbar_control.xml  |  6 ++----
 6 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/anim/lp_exit.xml
 create mode 100644 app/src/main/res/drawable/control_oval_gray_22.xml

diff --git a/app/src/main/java/com/boringdroid/systemui/view/AppOverviewWindow.kt b/app/src/main/java/com/boringdroid/systemui/view/AppOverviewWindow.kt
index 44530648..bd9830c6 100644
--- a/app/src/main/java/com/boringdroid/systemui/view/AppOverviewWindow.kt
+++ b/app/src/main/java/com/boringdroid/systemui/view/AppOverviewWindow.kt
@@ -25,6 +25,7 @@ import android.view.ViewGroup.LayoutParams
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
@@ -317,8 +318,21 @@ class AppOverviewWindow(
     }
 
     override fun dismiss() {
-//        runFadeAnimationSet(false, null, null)
-        destroy()
+//        val anim = AnimationUtils.loadAnimation(getContext(), R.anim.lp_exit)
+//
+//        anim.setAnimationListener(object : Animation.AnimationListener {
+//            override fun onAnimationStart(animation: Animation) {
+//            }
+//
+//            override fun onAnimationEnd(animation: Animation) {
+                destroy()
+//            }
+
+//            override fun onAnimationRepeat(animation: Animation) {
+//            }
+//        })
+//
+//        appsVp?.startAnimation(anim)
     }
 
     fun destroy(){
diff --git a/app/src/main/java/com/boringdroid/systemui/view/TopBarControlWindow.kt b/app/src/main/java/com/boringdroid/systemui/view/TopBarControlWindow.kt
index 3d64d21a..21fdcf88 100644
--- a/app/src/main/java/com/boringdroid/systemui/view/TopBarControlWindow.kt
+++ b/app/src/main/java/com/boringdroid/systemui/view/TopBarControlWindow.kt
@@ -302,7 +302,7 @@ class TopBarControlWindow(
         try {
             wifiStatus = Settings.Global.getInt(getContext().contentResolver, "wifi_status")
             wifiImage?.apply {
-                setBackgroundResource(if (wifiStatus == 1) R.drawable.control_oval_blue else R.drawable.control_oval_grep)
+                setBackgroundResource(if (wifiStatus == 1) R.drawable.control_oval_blue else R.drawable.control_oval_gray_22)
                 setImageResource(if (wifiStatus == 1) R.drawable.icon_wifi_select_full else R.drawable.icon_wifi_select_empty)
             }
             val wifiName = Settings.Global.getString(getContext().contentResolver, "wifi_name")
@@ -360,7 +360,7 @@ class TopBarControlWindow(
             getContext().sendBroadcast(intent)
 
             wifiImage?.apply {
-                setBackgroundResource(if (wifiStatus == 0) R.drawable.control_oval_blue else R.drawable.control_oval_grep)
+                setBackgroundResource(if (wifiStatus == 0) R.drawable.control_oval_blue else R.drawable.control_oval_gray_22)
                 setImageResource(if (wifiStatus == 0) R.drawable.icon_wifi_select_full else R.drawable.icon_wifi_select_empty)
             }
         }
diff --git a/app/src/main/res/anim/lp_exit.xml b/app/src/main/res/anim/lp_exit.xml
new file mode 100644
index 00000000..9f0ddec1
--- /dev/null
+++ b/app/src/main/res/anim/lp_exit.xml
@@ -0,0 +1,11 @@
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:duration="120">
+    <scale
+        android:fromXScale="1.0" android:toXScale="1.1"
+        android:fromYScale="1.0" android:toYScale="1.1"
+        android:pivotX="50%" android:pivotY="50%" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/control_oval_gray_22.xml b/app/src/main/res/drawable/control_oval_gray_22.xml
new file mode 100644
index 00000000..58fbd4ec
--- /dev/null
+++ b/app/src/main/res/drawable/control_oval_gray_22.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <corners android:radius="22dp" />
+    <solid android:color="#0f000000" />
+</shape>
diff --git a/app/src/main/res/drawable/control_oval_grep.xml b/app/src/main/res/drawable/control_oval_grep.xml
index b9cfd9c6..7f68f889 100644
--- a/app/src/main/res/drawable/control_oval_grep.xml
+++ b/app/src/main/res/drawable/control_oval_grep.xml
@@ -2,7 +2,8 @@
     android:width="44dp"
     android:height="44dp"
     android:viewportWidth="44"
-    android:viewportHeight="44">
+    android:viewportHeight="44"
+    >
   <path
       android:pathData="M0,22a22,22 0,1 0,44 0a22,22 0,1 0,-44 0z"
       android:fillColor="#000000"
diff --git a/app/src/main/res/layout/window_topbar_control.xml b/app/src/main/res/layout/window_topbar_control.xml
index 76aaefa2..e83b1883 100644
--- a/app/src/main/res/layout/window_topbar_control.xml
+++ b/app/src/main/res/layout/window_topbar_control.xml
@@ -43,7 +43,6 @@
                 android:layout_marginTop="15dp"
                 android:background="@drawable/round_rect_12dp_top"
                 android:elevation="@dimen/elevation_control_panel"
-                android:paddingBottom="15dp"
                 >
                 <ImageView
                     android:id="@+id/wifi_img"
@@ -51,7 +50,6 @@
                     android:layout_height="44dp"
                     android:layout_gravity="center_vertical"
                     android:padding="10dp"
-                    android:layout_marginTop="8dp"
                     android:layout_marginLeft="10dp"
                     android:src="@drawable/icon_wifi_select_full"
                     android:background="@drawable/control_oval_blue"
@@ -61,6 +59,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_marginLeft="6dp"
+                    android:layout_marginBottom="15dp"
                     >
                     <TextView
                         android:layout_width="wrap_content"
@@ -98,7 +97,6 @@
                 android:layout_alignParentRight="true"
                 android:background="@drawable/round_rect_12dp_top"
                 android:elevation="@dimen/elevation_control_panel"
-                android:paddingBottom="15dp"
                 >
                 <ImageView
                     android:layout_width="44dp"
@@ -107,7 +105,6 @@
                     android:layout_marginLeft="10dp"
                     android:src="@drawable/icon_light_unselect"
                     android:padding="10dp"
-                    android:layout_marginTop="8dp"
                     android:background="@drawable/control_oval_gray"
                     />
                 <LinearLayout
@@ -115,6 +112,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_marginLeft="6dp"
+                    android:layout_marginBottom="15dp"
                     >
                     <TextView
                         android:layout_width="wrap_content"