Merge pull request #7 from YuS1aN/dev

更新版本号 1.2.2
YuS1aN · Jan 4, 2025 · ec52ac2 · ec52ac2
2 parents 147f0c4 + 22eabe2
commit ec52ac2
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 23 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "me.kbai.zhenxunui"
         minSdk 23
         targetSdk 34
-        versionCode 3
-        versionName "1.2.1"
+        versionCode 4
+        versionName "1.2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/...bai/zhenxunui/extends/CoroutineExtends.kt → ...bai/zhenxunui/extends/CoroutineExtends.kt b/...bai/zhenxunui/extends/CoroutineExtends.kt → ...bai/zhenxunui/extends/CoroutineExtends.kt
@@ -27,13 +27,17 @@ val Fragment.viewLifecycleScope: CoroutineScope
 
 inline fun <reified T> Flow<T>.launchAndCollectIn(
     owner: LifecycleOwner,
-    activeState: Lifecycle.State = Lifecycle.State.STARTED,
     collector: FlowCollector<T>
-) = owner.lifecycleScope.launch {
-    logI(T::class.java.name, "launchAndCollectIn")
-    assert(T::class.java != Resource::class.java) { "Resource 类型要用 apiCollect 实现 token 过期重新登录!" }
+) {
+    val scope = if (owner is Fragment) {
+        owner.viewLifecycleScope
+    } else {
+        owner.lifecycleScope
+    }
+    scope.launch {
+        logI(T::class.java.name, "launchAndCollectIn")
+        assert(T::class.java != Resource::class.java) { "Resource 类型要用 apiCollect 实现 token 过期重新登录!" }
 
-    owner.repeatOnLifecycle(activeState) {
         collect(collector)
     }
 }
diff --git a/app/src/main/java/me/kbai/zhenxunui/widget/SemicircleProgressView.kt b/app/src/main/java/me/kbai/zhenxunui/widget/SemicircleProgressView.kt
@@ -41,7 +41,7 @@ class SemicircleProgressView @JvmOverloads constructor(
             color = context.getColor(R.color.switch_unchecked)
         }
         mFillPaint = initPaint().apply {
-            color = context.getThemeColor(android.R.attr.colorPrimaryDark)
+            color = context.getThemeColor(android.R.attr.colorPrimary)
         }
     }
 

diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_16.xml b/app/src/main/res/drawable/ic_arrow_drop_down_16.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="1024">
   <path
       android:pathData="M587.4,688.6l264.3,-304.9c18.1,-20.8 15.8,-52.4 -5,-70.5A49.9,49.9 0,0 0,814.1 301H209.9C182.4,301 160,323.4 160,351a50,50 0,0 0,12.2 32.7l264.3,304.9c36.1,41.7 99.2,46.2 140.9,10a99.9,99.9 0,0 0,10 -10z"
-      android:fillColor="#000000" />
+      android:fillColor="@color/dn_black" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_back_32.xml b/app/src/main/res/drawable/ic_back_32.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/dn_black"
       android:pathData="M426.7,384V213.3l-298.7,298.7 298.7,298.7v-174.9c213.3,0 362.7,68.3 469.3,217.6 -42.7,-213.3 -170.7,-426.7 -469.3,-469.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_32.xml b/app/src/main/res/drawable/ic_file_32.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/dn_black"
       android:pathData="M896.2,336.1l0,576.2c0,26.5 -21.5,48 -48,48L175.9,960.4c-26.5,0 -48,-21.5 -48,-48L127.8,112c0,-26.5 21.5,-48 48,-48l448.2,0c26.5,0 63.5,15.5 82,34l156.1,156.1C880.6,272.6 896.2,309.6 896.2,336.1zM832.1,384.1 L624,384.1c-26.5,0 -48,-21.5 -48,-48L576,128 191.9,128l0,768.3 640.3,0L832.1,384.1zM335.9,448.2l352.1,0c9,0 16,7 16,16l0,32c0,9 -7,16 -16,16L335.9,512.2c-9,0 -16,-7 -16,-16l0,-32C319.9,455.2 326.9,448.2 335.9,448.2zM704.1,592.2l0,32c0,9 -7,16 -16,16L335.9,640.2c-9,0 -16,-7 -16,-16L319.9,592.2c0,-9 7,-16 16,-16l352.1,0C697.1,576.2 704.1,583.2 704.1,592.2zM704.1,720.3l0,32c0,9 -7,16 -16,16L335.9,768.3c-9,0 -16,-7 -16,-16l0,-32c0,-9 7,-16 16,-16l352.1,0C697.1,704.3 704.1,711.3 704.1,720.3zM640.1,320.1l188.1,0c-3,-8.5 -7.5,-17 -11,-20.5L660.6,143c-3.5,-3.5 -12,-8 -20.5,-11L640.1,320.1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home_24.xml b/app/src/main/res/drawable/ic_home_24.xml
diff --git a/app/src/main/res/layout/item_file_explorer_line.xml b/app/src/main/res/layout/item_file_explorer_line.xml
@@ -35,7 +35,7 @@
         style="@style/SingleLineText"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/dn_white_gray"
         android:drawablePadding="12dp"
         android:gravity="center_vertical"
         android:paddingHorizontal="12dp"

diff --git a/app/src/main/res/layout/layout_main_bar.xml b/app/src/main/res/layout/layout_main_bar.xml
@@ -4,6 +4,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
+        style="@style/AppBarLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true">

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -4,4 +4,5 @@
     <color name="dn_black">@color/white</color>
     <color name="dn_white">@color/black</color>
     <color name="dn_white_gray">@color/gray</color>
+    <color name="dn_app_bar">@color/gray_dark</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -3,15 +3,17 @@
     <style name="Theme.ZhenxunBotManager" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/pink_A100</item>
-        <item name="colorPrimaryDark">@color/pink_A100</item>
+        <item name="colorPrimaryDark">@color/gray_dark</item>
         <item name="colorPrimaryVariant">@color/pink_A100</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!--        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>-->
+        <!--        <item name="colorSurface">@color/gray_dark</item>-->
+        <!--        <item name="colorOnSurface">@color/gray_dark</item>-->
         <!-- Customize your theme here. -->
         <item name="android:textSize">@dimen/text_size_normal</item>
         <item name="android:windowTranslucentNavigation">true</item>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="gray">#333333</color>
+    <color name="gray_dark">#222222</color>
     <color name="trans_white_75">#BFFFFFFF</color>
     <color name="trans_black_25">#40000000</color>
     <color name="color_error">#FA5B30</color>
@@ -22,4 +23,5 @@
     <color name="dn_black">@color/black</color>
     <color name="dn_white">@color/white</color>
     <color name="dn_white_gray">@color/white</color>
+    <color name="dn_app_bar">@color/pink_A100</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
+
+    <style name="AppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+        <item name="android:background">@color/dn_app_bar</item>
+    </style>
 
     <style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
         <item name="errorTextColor">@color/color_error</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -11,7 +11,7 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!--        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>-->
         <!-- Customize your theme here. -->
         <item name="android:textSize">@dimen/text_size_normal</item>
         <item name="android:windowTranslucentNavigation">true</item>