Merge pull request #49 from Team-B1ND/feature/1.3.3

Release 1.3.3
Team-B1ND · Dec 16, 2024 · 86a6923 · 86a6923
2 parents caa6b38 + 57eca32
commit 86a6923
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![version](https://img.shields.io/badge/version-1.3.2-blue)
+![version](https://img.shields.io/badge/version-1.3.3-blue)
 
 ## How to use?
 in your project

diff --git a/app/src/main/java/com/b1nd/dodam/designsystem/MainActivity.kt b/app/src/main/java/com/b1nd/dodam/designsystem/MainActivity.kt
@@ -30,6 +30,8 @@ import com.b1nd.dodam.designsystem.component.DodamCircularProgressIndicator
 import com.b1nd.dodam.designsystem.component.DodamFilledTextField
 import com.b1nd.dodam.designsystem.component.DodamLinerProgressIndicator
 import com.b1nd.dodam.designsystem.component.DodamTextField
+import com.b1nd.dodam.designsystem.component.DodamTopAppBar
+import com.b1nd.dodam.designsystem.component.TopAppBarType
 import com.b1nd.dodam.designsystem.foundation.DodamIcons
 
 @ExperimentalMaterial3Api
@@ -44,6 +46,12 @@ class MainActivity : ComponentActivity() {
                 Column(
                     verticalArrangement = Arrangement.spacedBy(16.dp)
                 ) {
+                    DodamTopAppBar(
+                        title = "‘B1ND’ 그룹\n" +
+                                "가입 신청 대기 중인 멤버",
+                        onBackClick = {},
+                        type = TopAppBarType.Large
+                    )
                     DodamTextField(
                         modifier = Modifier.weight(1f),
                         value = value,

diff --git a/dodam-design-system/build.gradle.kts b/dodam-design-system/build.gradle.kts
@@ -80,7 +80,7 @@ mavenPublishing {
     coordinates(
         groupId = "com.b1nd.dodam",
         artifactId = "dodam-design-system",
-        version = "1.3.2"
+        version = "1.3.3"
     )
 
     pom {

diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
 import com.b1nd.dodam.designsystem.DodamTheme
@@ -77,8 +78,10 @@ fun DodamTopAppBar(
                         icon = DodamIcons.ArrowLeft,
                         type = IconButtonType.Strong,
                     )
-                    Spacer(modifier = Modifier.height(40.dp))
-                    Row {
+                    Row(
+                        modifier = Modifier.height(80.dp),
+                        verticalAlignment = Alignment.Bottom
+                    ) {
                         Spacer(modifier = Modifier.width(TopAppBarDefaults.TitleStartSpacing))
                         Text(
                             text = title,