适配抖音24.9.0；增加WebDav

GangJust · Apr 10, 2023 · c475aaa · c475aaa
1 parent e064732
commit c475aaa
Show file tree

Hide file tree

Showing 37 changed files with 1,726 additions and 672 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.freegang.fplus"
         minSdk 21
         targetSdk 33
-        versionCode 6
-        versionName "1.0.5"
+        versionCode 7
+        versionName "1.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -28,8 +28,8 @@ android {
         }
 
         debug {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -55,6 +55,7 @@ android {
 
 dependencies {
     implementation project(":core")
+    implementation project(":webdav")
 
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
@@ -74,4 +75,6 @@ dependencies {
     implementation "com.google.accompanist:accompanist-insets-ui:0.28.0"
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0"
     implementation 'com.google.accompanist:accompanist-permissions:0.28.0'
+
+    implementation "androidx.compose.runtime:runtime-livedata:1.3.3"
 }
diff --git a/app/src/main/assets/update.log b/app/src/main/assets/update.log
@@ -20,3 +20,8 @@ v1.0.4
 v1.0.5
 适配抖音24.8.0
 适配抖音23.5.0、23.6.0、23.7.0、23.8.0、23.9.0
+
+v1.0.6
+适配抖音24.9.0
+增加WebDav
+QQ群: 770498642
diff --git a/app/src/main/java/com/freegang/fplus/Themes.kt b/app/src/main/java/com/freegang/fplus/Themes.kt
@@ -5,11 +5,16 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Typography
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.view.WindowCompat
 import com.freegang.fplus.resource.ColorRes
@@ -109,10 +114,12 @@ object Themes {
             shapes = ShapeRes.defaultShapes,
             content = {
                 //沉浸式状态栏
-                rememberSystemUiController().setSystemBarsColor(
-                    color = nowColors.colors.background,
-                    darkIcons = !Themes.isDark,
-                )
+                rememberSystemUiController().run {
+                    setSystemBarsColor(
+                        color = nowColors.colors.background,
+                        darkIcons = !Themes.isDark,
+                    )
+                }
                 //沉浸式则补充间隙
                 Surface(
                     modifier = if (Themes.isImmersive) Modifier.windowInsetsPadding(WindowInsets.systemBars) else Modifier,
@@ -123,4 +130,8 @@ object Themes {
             }
         )
     }
-}
+}
+
+val Dp.asSP: TextUnit get() = this.value.sp
+
+val TextUnit.asDp: Dp get() = this.value.dp