Merge branch 'develop' into feature/gael/toast

yourssu · Dec 29, 2023 · 32a91bc · 32a91bc
2 parents c0a2e3b + 5d97d2c
commit 32a91bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -9,7 +9,7 @@ android {
     compileSdk = 33
 
     defaultConfig {
-        minSdk = 26
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -66,4 +66,4 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-}
+}
diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt
@@ -25,7 +25,7 @@ import com.yourssu.design.system.compose.states.ButtonColorState
 fun TopBarButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
-    isDisabled: Boolean = true,
+    isDisabled: Boolean = false,
     text: String = "",
     @DrawableRes icon: Int? = null,
 ) {

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 versionName=2.4.0
-#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다
+#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다