build: 更新compose版本

re-ovo · Jul 20, 2022 · 1cadb83 · 1cadb83
1 parent c6ff862
commit 1cadb83
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compiler_version
     }
     packagingOptions {
         resources {
@@ -53,8 +53,8 @@ dependencies {
     implementation 'com.tencent:mmkv:1.2.13'
 
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
+    implementation 'androidx.activity:activity-compose:1.5.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"

diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,13 @@
 buildscript {
     ext {
-        compose_version = '1.2.0-beta03'
-        md3_version = '1.0.0-alpha11'
+        compose_version = '1.3.0-alpha01'
+        compiler_version = '1.2.0'
+        md3_version = '1.0.0-alpha14'
     }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
+}
+
 plugins {
-    id 'com.android.application' version '7.4.0-alpha03' apply false
-    id 'com.android.library' version '7.4.0-alpha03' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '7.3.0-beta05' apply false
+    id 'com.android.library' version '7.3.0-beta05' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }
diff --git a/compose-setting/build.gradle b/compose-setting/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'me.rerere.compose_setting'
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 32
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -32,15 +32,15 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compiler_version
     }
 }
 
 dependencies {
     // Compose Library
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-alpha11'
+    implementation "androidx.compose.material3:material3:$md3_version"
 
     // MMKV
     implementation 'com.tencent:mmkv:1.2.13'

diff --git a/compose-setting/src/main/java/me/rerere/compose_setting/components/SettingComponent.kt b/compose-setting/src/main/java/me/rerere/compose_setting/components/SettingComponent.kt
@@ -9,7 +9,9 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.Popup
 
@@ -43,10 +45,14 @@ internal fun SettingBaseItem(
             Column(
                 modifier = Modifier.weight(1f)
             ) {
-                ProvideTextStyle(MaterialTheme.typography.titleLarge) {
+                ProvideTextStyle(
+                    MaterialTheme.typography.titleLarge.copy(
+                        fontSize = 20.sp
+                    )
+                ) {
                     title()
                 }
-                ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
+                ProvideTextStyle(MaterialTheme.typography.bodySmall) {
                     text?.invoke()
                 }
             }