diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index 6cdba18e5..e9021fcb6 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -1,3 +1,12 @@
+---
+name: ISSUE_TEMPLATE
+about: Issue Template
+title: ''
+labels:
+assignees:
+
+---
+
## ๐ TO DO
- [ ] task1
- [ ] task2
diff --git a/.github/workflows/debug_build_ci.yml b/.github/workflows/debug_build_ci.yml
index 6ced41fcb..261ac31ab 100644
--- a/.github/workflows/debug_build_ci.yml
+++ b/.github/workflows/debug_build_ci.yml
@@ -22,7 +22,7 @@ jobs:
- name: Add local.properties
run: |
- echo ${{ secrets.LOCAL_PROPERTIES }} >> ./local.properties
+ echo '${{ secrets.LOCAL_PROPERTIES }}' >> ./local.properties
- name: Access Google-Service file
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
diff --git a/.github/workflows/firebase_cd.yml b/.github/workflows/firebase_cd.yml
index de95b072e..8f29cb6c6 100644
--- a/.github/workflows/firebase_cd.yml
+++ b/.github/workflows/firebase_cd.yml
@@ -3,15 +3,9 @@ name: Firebase CD
on:
workflow_dispatch:
inputs:
- major:
- description: 'Major version'
- required: true
- minor:
- description: 'Minor version'
- required: true
- patch:
- description: 'Patch version'
- required: true
+ releaseNotes:
+ description: 'Release Notes'
+ required: false
jobs:
deploy:
@@ -38,7 +32,7 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- - name: Save Keystore
+ - name: Decode and save Keystore
run: |
echo "${{ secrets.JKS_BASE64 }}" > keystore.b64
base64 -d -i keystore.b64 > keystore.jks
@@ -51,31 +45,15 @@ jobs:
- name: Access Google-Service file
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
-
- - name: Debug - Check keystore file size
- run: ls -lh keystore.jks
-
- - name: Debug - Check SHA256 of keystore
- run: sha256sum keystore.jks
-
- - name: Debug - Check local.properties
- run: cat local.properties
- name: Build with Gradle
run: ./gradlew assembleRelease
- - name: Rename APK file
- run: |
- major=${{ github.event.inputs.major }}
- minor=${{ github.event.inputs.minor }}
- patch=${{ github.event.inputs.patch }}
- formatted_version="${major}_${minor}_${patch}"
- mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/Acon-${formatted_version}.apk
-
- name: Upload artifact to Firebase App Distribution
uses: wzieba/Firebase-Distribution-Github-Action@v1
with:
appId: ${{ secrets.FIREBASE_APP_ID }}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: Acon
- file: app/build/outputs/apk/release/Acon-${{ github.event.inputs.major }}_${{ github.event.inputs.minor }}_${{ github.event.inputs.patch }}.apk
+ releaseNotes: ${{ github.event.inputs.releaseNotes }}
+ file: app/build/outputs/apk/release/app-release.apk
diff --git a/.gitignore b/.gitignore
index 2a37cc12b..eec19d547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ output.json
# IntelliJ
*.iml
.idea/
+.idea/deploymentTargetSelector.xml
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
@@ -150,6 +151,8 @@ obj/
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/navEditor.xml
+.idea/*.iml
+.idea/appInsightsSettings.xml
# Legacy Eclipse project files
.classpath
diff --git a/README.md b/README.md
index f6c45e735..283342cb5 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ acon์ โNo more researchโ๋ผ๋ ์ฌ๋ก๊ฑด์ ๊ฐ์ง ์ง๋์ฑ์
๋๋ค.
| ์ฅ์ํ์ | ์
๋ก๋ |
|:---:|:-----------------------------------------------------------------------------:|
-| | |
+ | | |
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e3156d2d3..94a78dbfe 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,69 +1,52 @@
+/** See AndroidApplicationConventionPlugin.kt */
+
plugins {
- alias(libs.plugins.android.application)
- alias(libs.plugins.kotlin.android)
+ alias(libs.plugins.acon.android.application)
+ alias(libs.plugins.acon.android.application.compose)
+ alias(libs.plugins.acon.android.library.hilt)
+ alias(libs.plugins.acon.android.library.haze)
+ alias(libs.plugins.acon.android.library.naver.map)
+ alias(libs.plugins.acon.firebase)
}
android {
namespace = "com.acon.acon"
- compileSdk = 35
-
- defaultConfig {
- applicationId = "com.acon.acon"
- minSdk = 28
- targetSdk = 35
- versionCode = 1
- versionName = "1.0"
-
- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
- vectorDrawables {
- useSupportLibrary = true
- }
- }
buildTypes {
+ debug {
+ applicationIdSuffix = ".debug"
+ versionNameSuffix = "-debug"
+ manifestPlaceholders["app_name"] = "Acon Debug"
+ }
release {
- isMinifyEnabled = false
+ isMinifyEnabled = true
+ isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
- }
- }
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = "1.8"
- }
- buildFeatures {
- compose = true
- }
- composeOptions {
- kotlinCompilerExtensionVersion = "1.5.1"
- }
- packaging {
- resources {
- excludes += "/META-INF/{AL2.0,LGPL2.1}"
+ signingConfig = signingConfigs.getByName("release")
+ manifestPlaceholders["app_name"] = "Acon"
}
}
}
dependencies {
- implementation(libs.androidx.core.ktx)
- implementation(libs.androidx.lifecycle.runtime.ktx)
- implementation(libs.androidx.activity.compose)
- implementation(platform(libs.androidx.compose.bom))
- implementation(libs.androidx.ui)
- implementation(libs.androidx.ui.graphics)
- implementation(libs.androidx.ui.tooling.preview)
- implementation(libs.androidx.material3)
- testImplementation(libs.junit)
- androidTestImplementation(libs.androidx.junit)
- androidTestImplementation(libs.androidx.espresso.core)
- androidTestImplementation(platform(libs.androidx.compose.bom))
- androidTestImplementation(libs.androidx.ui.test.junit4)
- debugImplementation(libs.androidx.ui.tooling)
- debugImplementation(libs.androidx.ui.test.manifest)
+ implementation(projects.core.designsystem)
+ implementation(projects.core.utils.feature)
+ implementation(projects.core.map)
+ implementation(projects.domain)
+ implementation(projects.data)
+ implementation(projects.feature.signin)
+ implementation(projects.feature.spot)
+ implementation(projects.feature.onboarding)
+ implementation(projects.feature.areaverification)
+ implementation(projects.feature.upload)
+ implementation(projects.feature.settings)
+ implementation(projects.feature.profile)
+
+ implementation(libs.play.services.location)
+
+ implementation(libs.androidx.core.splashscreen)
}
\ No newline at end of file
diff --git a/app/keystore/keystore_base64.txt b/app/keystore/keystore_base64.txt
new file mode 100644
index 000000000..0212d2764
--- /dev/null
+++ b/app/keystore/keystore_base64.txt
@@ -0,0 +1,56 @@
+MIIKYAIBAzCCCgoGCSqGSIb3DQEHAaCCCfsEggn3MIIJ8zCCBaoGCSqGSIb3DQEH
+AaCCBZsEggWXMIIFkzCCBY8GCyqGSIb3DQEMCgECoIIFQDCCBTwwZgYJKoZIhvcN
+AQUNMFkwOAYJKoZIhvcNAQUMMCsEFB+DyVRlwRO1rvf/BqaRx1hm95DlAgInEAIB
+IDAMBggqhkiG9w0CCQUAMB0GCWCGSAFlAwQBKgQQ4RQx7qNGg6PG+wdJWH2cZgSC
+BNB4Litum3+Fmbj7cqkI43Fc6BjIu5+R1nFtMLRmByFmn5m/LpOohKOAmI6dQsrb
+sItA8Ze/WOykVZsuBsC+Rmr9W9JZpWCvESpzXKWCAtgfbv/LS5oDEbt/MR17HEbk
+4qZ0l0kHosTSzXFIkYxXqUkst9JgGSoUANTvNEjcsKFUaVBBXJvxH6c0l3PPiCzt
+TBBGb7DP0GKGzzw+7eEK5fEcJ/0D6S4rKilTtpZMojAwJT6T3oBYQdIsfeG/v2kQ
+brWB0U3qkNArl9BCg2dlDyLvMl4L8EBvByMED46DTLh0dljz0cHtLVoh2OhmJPjE
+ej36JBvjSbL9vSu+vnXCoPOQMqME05rj8OoJ1ueOjKltFbLNLOf1WiCGf0oEm9WU
+3S2dme2+UfULqwGmepk3zCHBultoWGaWar2npyVNZ6u5WsZZn+0P8vXJJbslh6FI
+zrCyCLmTSJCD6OFt42QHk8ZrzZwegscb1rvwDG4qCKdHj5YTUUzJlTQCotwM9EFD
+XO7ai9Rwee6a9vAnWFEpXz9S2A5S6lqP+I9ks5RvZtZKrfJap+CN2xTS91W/+fj2
+R5P+hady5sYo6nC93d8r1hlAN57DvjEUM8jIZVQfTL5r6fYP7R7bxiHTu8teFmYq
+FI+xvCW0bnO+dplnz+WGtHTjC/3mktX3cEQwU703Cily/JfQ7dNNbldpXSh/UJ60
+0Bm0C/iL0rnWquJhv9JLwp1I2sf0lblE4ZPlVPC0uNDr0rXnuwNCMQeB7SkdKLCr
+qc6m0R+i93BP0hmta4jjAqSGqed6XABwv9nCrX2FykJ43CNwakIhC1pNlR1S8Kko
+NAGHZOPcIacVxy4AdEyU7C3UrqFcvIiqLGfnTqSZwadGiqX6o9JdF8wdivu+ieD2
+wX3ec6daFGEeRzA298gXcUktphM6+bAbt+PAjloTCtAVGA/RKpmLm/6nHn6cw3fB
+lqBuIXOUhQPglD3MTC4FKB2IhgT+ZECEZ7iM6NbQsIP6RSRgI774cFlBCQoNHw4W
+y58TzapwijKNpvExvjcsn+Z3zhAIBkkJIg0J6bEZ1puyxyak9qgrKXHJ5MpGVi1L
+KB/sDjr5jCjQLEZkCQtFkov8epsg63h1TuOul+31N/fTYRrU83kU0xZ/C2RubTfA
+oiO2Q29HIa9+4/tGQXwjpqmI2EKNQ7Bi8BoOGeHaena94BkQZZK5+MEgdsGezwHT
+LYhT4mbjrhR+joCkro5eksCtdKIWVExnTt54tEQy2BgFsT5g1Xrp3vITvSYXDSak
+cu1Q7PuT2GvbT2/wQeXcc2guHHWPzhK3rzGRTQRfgQ8al9k66ygvcuPqPIVAmVOe
+U6ALUJb1+LB9Mch3hCSbY6pDT8jxYpI9K8mjj58dkIoKzmpS2zyWD6hC0uEdB3x1
+GOYIAPjVYl60ED4ha2J4Pf6wrB/TlIrLkUkAr6632aPuaV99HoJUIXl7mtlE5AQO
+1oCHtt4ehYVN/MQKnswvVuuEgRN8QTV2XHrrWJsUNmvPkinhePLsozqAAMLRXK3u
+Y8fRcozuCxZLXABtMyUX8446yOhWsTo9URleJNvZtwp3CL36KteMZ+lQKPSoYcQY
+SIf3f77xBWDQT+IKs3mqW89E8wxXbe/EXlOqy7ZAlCRskzE8MBcGCSqGSIb3DQEJ
+FDEKHggAYQBjAG8AbjAhBgkqhkiG9w0BCRUxFAQSVGltZSAxNzQxNDE3NDY2MDUy
+MIIEQQYJKoZIhvcNAQcGoIIEMjCCBC4CAQAwggQnBgkqhkiG9w0BBwEwZgYJKoZI
+hvcNAQUNMFkwOAYJKoZIhvcNAQUMMCsEFNoxWH/fYs780OFimtcSgLvcqtizAgIn
+EAIBIDAMBggqhkiG9w0CCQUAMB0GCWCGSAFlAwQBKgQQ0oFqYCaPT3QyFlJymqAl
+UoCCA7AT/EBZrIyFrNRYSl/qWuI89n947dgOlWT3VNPN46cav7LNs92QlXEuoViD
+a3burJem2D2TmZN95UclLZq8+U3JoQmBnGL0170A4Ito5X52VE8lqYCWShl973U6
+e5bpvNdWLUCxXM6szmPJfGHj4w5/PM0RX06PxoIULRoC+qvjCspJ5BmJ1Sb5h2eT
+MoPNS6eOQvWknV6BOItIoQdZd+y0eikCHOSFV79ScQq+mw6UKzml38gb9089t4oa
+bptuD2f9KhSc3uy8sJJQzZDIsdfuNYCSMudgA82vPbXePm4pRElnBCF7IezOci4z
+eoen9oC+0Okzxg/Hu1QJQQu4D7WnDmaAxUMUCx5LF0LGQcVN5nVt3kYZvNzSnWKE
+5kNsSA4d/0Rl3qc3Y0c7f+ELcVMf9Y8WJXrMMp8QBnCwjj0VDD+aFkMyiYKGJ9XH
+iiMrQ+rs8E0nCYKsTN96us/EGWfldOYBzt9bc2B7ahKuqV812yoWUz8TmugxGNIP
+pLMCEi7y9KMMsbsqcbPRFDs6UKxscgdIzbHjxS2YJ8Z8bHtbz7mj3WszdTWEQQpr
+RzUi/q6+LhAGjy4y5xuXIj9vGjWQJWj3axjv7JNe/gD7oGtd7et3GZtEKO+KjFP1
+bj/VJM7KP0hDKTLD4j3ATbrPwlzWxfNRIb0hOFrIP9hv9KWqwt6j//PXEM4YMd9R
+SLDJIhAGmLR2Dksh9tUomR6a2OO/7S9djWOougR7C32ZL41mpcEL2TQksrr2iZVo
+no+XxhSWs3V/weW1yKhIOnkm4Vx/DQvOqKHhhcfdiCqUhq6jiYwSOsxX9e9OR/e8
+RIiGJgpo3DOW97zU9/h2UtMLiHSS8YZclmLZTL4vVS3J4uVo/cHTPxp82o7y1poJ
+bOnPguGulEefBqS+zgawDjaL2mSsmyeWLUvRa5IGErwXq/EfHPs9vFoUpxms+ic8
+/uV6N5BguyY7nSuY4W3mCIBJPDBVYH9COouYFDQWkkJY+GErnNsY+o2lw78dj7e2
+eQFZqydRyy9u3z4ag8GTTGtUKMj32R3b4C0hL5pVG+H+x6KNkzc3fr6PQmFEuOFH
+r3ITV31P/3DNF916adI8nj3Qnn1tpOiZH/9FFJYvBUnv5Yflx2zt5GLOvQl/WgEw
+TOQTeRSbgtKVFzzkTFFdysw9dfoOJFi1SeiOclmgm2OILDyiGT5Xa3Dup63ZY1Ms
+lByCeCoj8ITUyDfXSDAVZMjl7ye5xlMUclCbSqkWz06yesxXnjBNMDEwDQYJYIZI
+AWUDBAIBBQAEIL891FxLs+p3ZlCQQTXBjTpc94V0LfbGyQwJa7OoMXXvBBSZpk46
+eaZf9tJzrjh/UJwWLbb1ZQICJxA=
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb4348..fd3604fef 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,4 +18,121 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+# ๊ธฐ๋ณธ ProGuard ์ต์ ํ
+-keepattributes *Annotation*
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes EnclosingMethod
+
+# kotlin
+-keepclassmembers class kotlin.Metadata { *; }
+-keep class kotlin.** { *; }
+-dontwarn kotlin.**
+
+-keep interface com.acon.acon.feature.profile.composable.ProfileRoute { *; }
+-keep interface com.acon.acon.feature.spot.SpotRoute { *; }
+
+# Android ๊ธฐ๋ณธ ๊ตฌ์ฑ ์์
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.Application
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+-keepclassmembers enum * { *; }
+-keepclassmembers class * {
+ public void *(android.os.Bundle);
+ public void *(android.view.Menu, android.view.MenuItem);
+}
+-dontwarn android.**
+
+# Kotlin Serialization์์ ์ฌ์ฉํ๋ ํด๋์ค ์ ์ง
+-keep class kotlinx.serialization.** { *; }
+-keep @kotlinx.serialization.Serializable class * {*;}
+-keepclassmembers class * { @kotlinx.serialization.* ; }
+
+# Compose Navigation์์ `@Serializable`์ ์ฌ์ฉํ๋ ๊ฒฝ์ฐ
+-keep class androidx.navigation.** { *; }
+-keep class androidx.navigation.compose.** { *; }
+-dontwarn androidx.navigation.**
+
+# Compose
+-keep class androidx.compose.** { *; }
+-dontwarn androidx.compose.**
+
+# Lifecycle & ViewModel
+-keep class androidx.lifecycle.** { *; }
+-keepclassmembers class androidx.lifecycle.ViewModel {
+ public (...);
+}
+-dontwarn androidx.lifecycle.**
+
+# Navigation Compose
+-keep class androidx.navigation.** { *; }
+-dontwarn androidx.navigation.**
+
+# Hilt
+-keep class dagger.hilt.** { *; }
+-keep class androidx.hilt.** { *; }
+-dontwarn dagger.**
+
+# Coil
+-keep class coil.** { *; }
+-dontwarn coil.**
+
+# Naver Maps
+-keep class io.github.fornewid.naver.maps.** { *; }
+-dontwarn io.github.fornewid.naver.maps.**
+
+# Credentials
+-keep class androidx.credentials.** { *; }
+-keep class androidx.credentials.playservices.** { *; }
+-keepclassmembers class androidx.credentials.** { *; }
+-keepclassmembers class androidx.credentials.playservices.** { *; }
+-dontwarn androidx.credentials.**
+
+# Retrofit & OkHttp
+-keep class com.squareup.okhttp3.** { *; }
+-dontwarn com.squareup.okhttp3.**
+-keep class com.squareup.retrofit2.** { *; }
+-keep interface com.squareup.retrofit2.** { *; }
+-keepclasseswithmembers class * { @retrofit2.http.* ; }
+-dontwarn com.squareup.retrofit2.**
+
+# domain classes
+-keep class com.acon.acon.domain.model.** { *; }
+
+# Coroutines
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.coroutines.**
+
+# Amplitude
+-keep class com.amplitude.** { *; }
+-dontwarn com.amplitude.**
+
+# Lottie
+-keep class com.airbnb.lottie.** { *; }
+-dontwarn com.airbnb.lottie.**
+
+# ๊ธฐํ ์ค์
+-dontnote okhttp3.**
+-dontnote retrofit2.**
+-dontnote kotlinx.coroutines.**
+
+# ์๋ฌ ๋ฐ์์ ๋ผ์ธ ํ์
+-keepattributes SourceFile,LineNumberTable
+
+# jdk ์ปดํ์ผํ ๋ ๋ฐ์ํ๋ ์ค๋ฅ ๋ฉ์์ง ๋ฐฉ์ง
+-keepattributes EnclosingMethod
+
+# Begin : material, androidx
+-keep class com.google.android.material.** { *; }
+-dontwarn com.google.android.material.**
+
+-dontwarn androidx.**
+-keep class androidx.** { *; }
+-keep interface androidx.** { *; }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/acon/acon/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/acon/acon/ExampleInstrumentedTest.kt
index 299785006..4cb637e97 100644
--- a/app/src/androidTest/java/com/acon/acon/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/acon/acon/ExampleInstrumentedTest.kt
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.acon.acon", appContext.packageName)
+ assertEquals("com.android.acon", appContext.packageName)
}
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 53e1a6a04..6c2d125bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,27 +2,45 @@
+
+
+
+
+
+
+
+
+
+ android:theme="@style/LaunchTheme">
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/AconApplication.kt b/app/src/main/java/com/acon/acon/AconApplication.kt
new file mode 100644
index 000000000..0c85d139f
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/AconApplication.kt
@@ -0,0 +1,16 @@
+package com.acon.acon
+
+import android.app.Application
+import com.acon.acon.core.utils.feature.amplitude.AconAmplitude
+import com.acon.acon.core.utils.feature.amplitude.AconTestAmplitude
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class AconApplication: Application() {
+
+ override fun onCreate() {
+ super.onCreate()
+ AconAmplitude.initialize(this)
+ AconTestAmplitude.initialize(this)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/MainActivity.kt b/app/src/main/java/com/acon/acon/MainActivity.kt
index 7182c5f6f..fab60f845 100644
--- a/app/src/main/java/com/acon/acon/MainActivity.kt
+++ b/app/src/main/java/com/acon/acon/MainActivity.kt
@@ -1,47 +1,59 @@
package com.acon.acon
+import android.graphics.Color
+import android.os.Build
import android.os.Bundle
import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.acon.acon.ui.theme.AconTheme
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.WindowCompat
+import androidx.navigation.compose.rememberNavController
+import com.acon.acon.core.designsystem.theme.AconTheme
+import com.acon.acon.domain.repository.SocialRepository
+import com.acon.acon.domain.repository.UserRepository
+import com.acon.acon.navigation.AconNavigation
+import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
+import javax.inject.Inject
+@AndroidEntryPoint
class MainActivity : ComponentActivity() {
+ @Inject
+ lateinit var socialRepository: SocialRepository
+
+ @Inject
+ lateinit var userRepository: UserRepository
+
override fun onCreate(savedInstanceState: Bundle?) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ installSplashScreen()
+ }
super.onCreate(savedInstanceState)
- enableEdgeToEdge()
+
+ if (BuildConfig.DEBUG) {
+ Timber.plant(Timber.DebugTree())
+ }
+
+ enableEdgeToEdge(
+ navigationBarStyle = SystemBarStyle.light(
+ scrim = Color.BLACK, darkScrim = Color.BLACK
+ )
+ )
+ val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+ windowInsetsController.isAppearanceLightStatusBars = false
setContent {
AconTheme {
- Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
- Greeting(
- name = "Android",
- modifier = Modifier.padding(innerPadding)
- )
- }
+ AconNavigation(
+ modifier = Modifier.fillMaxSize(),
+ navController = rememberNavController(),
+ socialRepository = socialRepository,
+ userRepository = userRepository
+ )
}
}
}
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
- Text(
- text = "Hello $name!",
- modifier = modifier
- )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
- AconTheme {
- Greeting("Android")
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/amplitude/BottomAmplitude.kt b/app/src/main/java/com/acon/acon/amplitude/BottomAmplitude.kt
new file mode 100644
index 000000000..340ab1447
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/amplitude/BottomAmplitude.kt
@@ -0,0 +1,26 @@
+package com.acon.acon.amplitude
+
+import com.acon.acon.core.utils.feature.amplitude.AconAmplitude
+import com.acon.acon.core.utils.feature.amplitude.AconTestAmplitude
+
+fun bottomAmplitudeSignIn() {
+ AconAmplitude.trackEvent(
+ eventName = "place_upload",
+ properties = mapOf("did_modal_login?" to true)
+ )
+ AconTestAmplitude.trackEvent(
+ eventName = "place_upload",
+ properties = mapOf("did_modal_login?" to true)
+ )
+}
+
+fun bottomAmplitudeUpload() {
+ AconAmplitude.trackEvent(
+ eventName = "place_upload",
+ properties = mapOf("click_upload?" to true)
+ )
+ AconTestAmplitude.trackEvent(
+ eventName = "place_upload",
+ properties = mapOf("click_upload?" to true)
+ )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/di/CoroutineDispatchersModule.kt b/app/src/main/java/com/acon/acon/di/CoroutineDispatchersModule.kt
new file mode 100644
index 000000000..087d66af0
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/di/CoroutineDispatchersModule.kt
@@ -0,0 +1,25 @@
+package com.acon.acon.di
+
+import com.acon.acon.core.common.DefaultDispatcher
+import com.acon.acon.core.common.IODispatcher
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutineDispatchersModule {
+
+ @Singleton
+ @Provides
+ @IODispatcher
+ fun providesIoDispatcher() = Dispatchers.IO
+
+ @Singleton
+ @Provides
+ @DefaultDispatcher
+ fun providesDefaultDispatcher() = Dispatchers.Default
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/di/CoroutineScopesModule.kt b/app/src/main/java/com/acon/acon/di/CoroutineScopesModule.kt
new file mode 100644
index 000000000..f99819323
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/di/CoroutineScopesModule.kt
@@ -0,0 +1,31 @@
+package com.acon.acon.di
+
+import com.acon.acon.core.common.DefaultDispatcher
+import com.acon.acon.core.common.IODispatcher
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutineScopesModule {
+
+ @Singleton
+ @Provides
+ @IODispatcher
+ fun providesIOCoroutineScope(
+ @IODispatcher ioDispatcher: CoroutineDispatcher
+ ) = CoroutineScope(SupervisorJob() + ioDispatcher)
+
+ @Singleton
+ @Provides
+ @DefaultDispatcher
+ fun providesDefaultCoroutineScope(
+ @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
+ ) = CoroutineScope(SupervisorJob() + defaultDispatcher)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/AconNavigation.kt b/app/src/main/java/com/acon/acon/navigation/AconNavigation.kt
new file mode 100644
index 000000000..7fd67ba58
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/AconNavigation.kt
@@ -0,0 +1,236 @@
+package com.acon.acon.navigation
+
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavDestination
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.currentBackStackEntryAsState
+import com.acon.acon.amplitude.bottomAmplitudeSignIn
+import com.acon.acon.amplitude.bottomAmplitudeUpload
+import com.acon.acon.core.designsystem.animation.defaultEnterTransition
+import com.acon.acon.core.designsystem.animation.defaultExitTransition
+import com.acon.acon.core.designsystem.animation.defaultPopEnterTransition
+import com.acon.acon.core.designsystem.animation.defaultPopExitTransition
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.blur.rememberHazeState
+import com.acon.acon.core.designsystem.component.bottomsheet.LoginBottomSheet
+import com.acon.acon.core.designsystem.component.snackbar.AconTextSnackBar
+import com.acon.acon.core.designsystem.theme.AconTheme
+import com.acon.acon.core.utils.feature.constants.AppURL
+import com.acon.acon.domain.repository.SocialRepository
+import com.acon.acon.domain.repository.UserRepository
+import com.acon.acon.domain.type.UserType
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.profile.composable.ProfileRoute
+import com.acon.acon.feature.signin.screen.SignInRoute
+import com.acon.acon.feature.spot.SpotRoute
+import com.acon.acon.feature.upload.UploadRoute
+import com.acon.acon.navigation.bottom.BottomBar
+import com.acon.acon.navigation.bottom.BottomNavType
+import com.acon.acon.navigation.nested.areaVerificationNavigation
+import com.acon.acon.navigation.nested.onboardingNavigationNavigation
+import com.acon.acon.navigation.nested.profileNavigation
+import com.acon.acon.navigation.nested.settingsNavigation
+import com.acon.acon.navigation.nested.signInNavigationNavigation
+import com.acon.acon.navigation.nested.splashNavigationNavigation
+import com.acon.acon.navigation.nested.spotNavigation
+import com.acon.acon.navigation.nested.uploadNavigation
+import kotlinx.coroutines.launch
+
+@Composable
+fun AconNavigation(
+ modifier: Modifier = Modifier,
+ navController: NavHostController,
+ socialRepository: SocialRepository,
+ userRepository: UserRepository
+) {
+ val snackbarHostState = remember { SnackbarHostState() }
+ val backStackEntry by navController.currentBackStackEntryAsState()
+ var selectedBottomNavItem by rememberSaveable { mutableStateOf(BottomNavType.SPOT) }
+ val currentRoute by remember { derivedStateOf { backStackEntry?.destination?.route } }
+
+ val hazeState = rememberHazeState()
+
+ val context = LocalContext.current
+ var showLoginBottomSheet by remember { mutableStateOf(false) }
+ val coroutineScope = rememberCoroutineScope()
+
+ val userType by userRepository.getUserType().collectAsStateWithLifecycle(
+ initialValue = UserType.GUEST
+ )
+
+ CompositionLocalProvider(LocalHazeState provides hazeState) {
+ if(showLoginBottomSheet) {
+ LoginBottomSheet(
+ hazeState = LocalHazeState.current,
+ onDismissRequest = { showLoginBottomSheet = false },
+ onGoogleSignIn = {
+ coroutineScope.launch {
+ bottomAmplitudeSignIn()
+ socialRepository.googleLogin()
+ .onSuccess {
+ if (it.hasVerifiedArea) {
+ showLoginBottomSheet = false
+ navController.navigate(SpotRoute.SpotList) {
+ popUpTo {
+ inclusive = true
+ }
+ }
+ } else {
+ showLoginBottomSheet = false
+ navController.navigate(AreaVerificationRoute.RequireAreaVerification("onboarding")) {
+ popUpTo {
+ inclusive = true
+ }
+ }
+ }
+ }
+ .onFailure {
+ showLoginBottomSheet = false
+ }
+ }
+ },
+ onTermOfUse = {
+ val url = AppURL.TERM_OF_USE
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+ context.startActivity(intent)
+ },
+ onPrivatePolicy = {
+ val url = AppURL.PRIVATE_POLICY
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+ context.startActivity(intent)
+ }
+ )
+ }
+
+ Scaffold(
+ containerColor = AconTheme.color.Gray9,
+ modifier = modifier.navigationBarsPadding(),
+ snackbarHost = {
+ SnackbarHost(
+ modifier = Modifier.padding(bottom = 36.dp),
+ hostState = snackbarHostState
+ ) { snackbarData: SnackbarData ->
+ AconTextSnackBar(
+ message = snackbarData.visuals.message
+ )
+ }
+ },
+ topBar = {
+ Spacer(modifier = Modifier.padding(0.dp))
+ },
+ bottomBar = {
+ if (backStackEntry?.destination?.shouldShowBottomNav() == true) {
+ BottomBar(
+ modifier = Modifier
+ .background(color = AconTheme.color.Black) // TODO Color?
+ .fillMaxWidth()
+ .defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.Dim_b_30
+ ),
+ selectedItem = selectedBottomNavItem,
+ onItemClick = { item ->
+ if (item == BottomNavType.UPLOAD) {
+ coroutineScope.launch {
+ if (userType != UserType.GUEST) {
+ bottomAmplitudeUpload()
+ navController.navigate(UploadRoute.Upload)
+ } else {
+ showLoginBottomSheet = true
+ }
+ }
+ } else {
+ if (selectedBottomNavItem != item) {
+ selectedBottomNavItem = item
+ navController.navigate(
+ when (item) {
+ BottomNavType.SPOT -> SpotRoute.SpotList
+ BottomNavType.PROFILE -> ProfileRoute.Profile
+ else -> SpotRoute.SpotList
+ }
+ ) {
+ popUpTo(SpotRoute.SpotList) { inclusive = false }
+ launchSingleTop = true
+ }
+ }
+ }
+ }
+ )
+ }
+ }
+ ) { innerPadding ->
+ NavHost(
+ navController = navController,
+ startDestination = SignInRoute.Graph,
+ modifier = Modifier.padding(innerPadding),
+ enterTransition = {
+ defaultEnterTransition()
+ }, exitTransition = {
+ defaultExitTransition()
+ }, popEnterTransition = {
+ defaultPopEnterTransition()
+ }, popExitTransition = {
+ defaultPopExitTransition()
+ }
+ ) {
+ splashNavigationNavigation(navController)
+
+ signInNavigationNavigation(navController, socialRepository)
+
+ areaVerificationNavigation(navController)
+
+ onboardingNavigationNavigation(navController)
+
+ spotNavigation(navController, socialRepository)
+
+ uploadNavigation(navController)
+
+ profileNavigation(navController, socialRepository, snackbarHostState)
+
+ settingsNavigation(navController)
+ }
+ }
+ }
+
+ LaunchedEffect(currentRoute) { // ๋ค๋ก๊ฐ๊ธฐ์ ์ํ ํ๋จ ํญ ์ ํ ์ํ ๋ณ๊ฒฝ ์ฒ๋ฆฌ
+ selectedBottomNavItem = when (currentRoute) {
+ SpotRoute.SpotList::class.qualifiedName -> BottomNavType.SPOT
+ ProfileRoute.Profile::class.qualifiedName -> BottomNavType.PROFILE
+ else -> BottomNavType.SPOT // TODO : Route
+ }
+ }
+}
+
+private fun NavDestination.shouldShowBottomNav(): Boolean {
+ return when (route) {
+ SpotRoute.SpotList::class.qualifiedName -> true
+ ProfileRoute.Profile::class.qualifiedName -> true
+ else -> false
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/bottom/BottomBar.kt b/app/src/main/java/com/acon/acon/navigation/bottom/BottomBar.kt
new file mode 100644
index 000000000..6f95a2411
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/bottom/BottomBar.kt
@@ -0,0 +1,86 @@
+package com.acon.acon.navigation.bottom
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEach
+import com.acon.acon.core.designsystem.noRippleClickable
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun BottomBar(
+ modifier: Modifier = Modifier,
+ selectedItem: BottomNavType = BottomNavType.SPOT,
+ onItemClick: (BottomNavType) -> Unit = {}
+) {
+
+ Column(
+ modifier = modifier
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ ) {
+ BottomNavType.entries.fastForEach {
+ BottomBarItem(
+ type = it,
+ isSelected = selectedItem == it,
+ modifier = Modifier.weight(1f).noRippleClickable {
+ onItemClick(it)
+ }
+ )
+ }
+ }
+ Spacer(modifier = Modifier.height(24.dp))
+ }
+}
+
+@Composable
+private fun BottomBarItem(
+ type: BottomNavType,
+ isSelected: Boolean,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ modifier = modifier,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Icon(
+ modifier = Modifier.padding(top = 8.dp),
+ imageVector = ImageVector.vectorResource(
+ if (isSelected) type.selectedIconRes else type.unselectedIconRes),
+ contentDescription = stringResource(type.titleRes),
+ tint = AconTheme.color.White
+ )
+ Text(
+ modifier = Modifier.padding(top = 4.dp),
+ text = stringResource(type.titleRes),
+ style = AconTheme.typography.body4_12_reg,
+ color = AconTheme.color.White
+ )
+ }
+}
+
+@Preview
+@Composable
+fun BottomBarPreview() {
+ BottomBar(
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(color = AconTheme.color.Dim_b_30)
+ )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/bottom/BottomNavType.kt b/app/src/main/java/com/acon/acon/navigation/bottom/BottomNavType.kt
new file mode 100644
index 000000000..e697191a0
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/bottom/BottomNavType.kt
@@ -0,0 +1,15 @@
+package com.acon.acon.navigation.bottom
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.acon.acon.R
+
+enum class BottomNavType(
+ @StringRes val titleRes: Int,
+ @DrawableRes val selectedIconRes: Int,
+ @DrawableRes val unselectedIconRes: Int
+) {
+ SPOT(R.string.title_spot, com.acon.acon.core.designsystem.R.drawable.ic_spot_w_24, com.acon.acon.core.designsystem.R.drawable.ic_spot_gla_24),
+ UPLOAD(R.string.title_upload, com.acon.acon.core.designsystem.R.drawable.ic_upload_gla_24 , com.acon.acon.core.designsystem.R.drawable.ic_upload_gla_24),
+ PROFILE(R.string.title_profile, com.acon.acon.core.designsystem.R.drawable.ic_mypage_w_24, com.acon.acon.core.designsystem.R.drawable.ic_mypage_gla_24)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt
new file mode 100644
index 000000000..fd7c182ab
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt
@@ -0,0 +1,89 @@
+package com.acon.acon.navigation.nested
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import androidx.navigation.toRoute
+import com.acon.acon.feature.SettingsRoute
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.areaverification.AreaVerificationScreenContainer
+import com.acon.acon.feature.areaverification.PreferenceMapScreen
+import com.acon.acon.feature.onboarding.OnboardingRoute
+
+fun NavGraphBuilder.areaVerificationNavigation(
+ navController: NavHostController
+) {
+ navigation(
+ startDestination = AreaVerificationRoute.RequireAreaVerification()
+ ) {
+ composable { backStackEntry ->
+
+ val routeData = backStackEntry.arguments?.let {
+ AreaVerificationRoute.RequireAreaVerification(
+ route = it.getString("route"),
+ isEdit = it.getBoolean("isEdit", false)
+ )
+ }
+
+ AreaVerificationScreenContainer(
+ modifier = Modifier.fillMaxSize(),
+ route = routeData?.route ?: "onboarding",
+ onNewAreaClick = { latitude, longitude ->
+ navController.navigate(
+ AreaVerificationRoute.CheckInMap(
+ latitude = latitude,
+ longitude = longitude,
+ route = routeData?.route,
+ isEdit = routeData?.isEdit ?: false
+ )
+ )
+ },
+ onNextScreen = { latitude, longitude ->
+ navController.navigate(
+ AreaVerificationRoute.CheckInMap(
+ latitude = latitude,
+ longitude = longitude,
+ route = routeData?.route,
+ isEdit = routeData?.isEdit ?: false
+ )
+ )
+ },
+ onNavigateBack = {
+ navController.popBackStack()
+ }
+ )
+ }
+
+ composable { backStackEntry ->
+ val route = backStackEntry.toRoute()
+
+ PreferenceMapScreen(
+ latitude = route.latitude,
+ longitude = route.longitude,
+ isEdit = route.isEdit,
+ onConfirmClick = {
+ navController.navigate(AreaVerificationRoute.Complete)
+ },
+ onNavigateToNext = {
+ if (route.route == "settings") {
+ navController.navigate(SettingsRoute.LocalVerification) {
+ popUpTo(SettingsRoute.LocalVerification) {
+ inclusive = true
+ }
+ }
+ } else {
+ navController.navigate(OnboardingRoute.Graph) {
+ popUpTo(0) { inclusive = true }
+ }
+ }
+ },
+ onBackClick = {
+ navController.popBackStack()
+ }
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/OnboardingNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/OnboardingNavigation.kt
new file mode 100644
index 000000000..da7d2d033
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/OnboardingNavigation.kt
@@ -0,0 +1,69 @@
+package com.acon.acon.navigation.nested
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import androidx.navigation.navArgument
+import androidx.navigation.toRoute
+import com.acon.acon.feature.SettingsRoute
+import com.acon.acon.feature.onboarding.OnboardingRoute
+import com.acon.acon.feature.onboarding.screen.OnboardingScreen.composable.OnboardingContainer
+import com.acon.acon.feature.onboarding.screen.PrefResultLoadingScreen.composable.PrefResultLoadingScreenContainer
+import com.acon.acon.feature.profile.composable.ProfileRoute
+import com.acon.acon.feature.spot.SpotRoute
+
+
+internal fun NavGraphBuilder.onboardingNavigationNavigation(
+ navController: NavHostController
+) {
+
+ navigation(
+ startDestination = OnboardingRoute.OnboardingScreen.notfromSettings()
+ ) {
+ composable { backStackEntry ->
+ val args = backStackEntry.toRoute()
+ val fromSettings = args.fromSettings
+
+ OnboardingContainer(
+ navigateToLoadingView = {
+ navController.navigate(OnboardingRoute.LastLoading)
+ },
+ navigateToSpotListView = {
+ navController.navigate(SpotRoute.SpotList)
+ },
+ cancelOnboarding = {
+ if (fromSettings) {
+ navController.navigate(SettingsRoute.Settings) {
+ popUpTo(SettingsRoute.Settings) {
+ inclusive = false
+ }
+ }
+ } else {
+ navController.popBackStack()
+ }
+ },
+ skipOnboarding = {
+ if (fromSettings) {
+ navController.navigate(SettingsRoute.Settings) {
+ popUpTo(SettingsRoute.Settings) {
+ inclusive = false
+ }
+ }
+ } else {
+ navController.navigate(SpotRoute.SpotList)
+ }
+ }
+ )
+ }
+
+ composable {
+ PrefResultLoadingScreenContainer(
+ navigateToSpotListView = {
+ navController.navigate(SpotRoute.SpotList)
+ }
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/ProfileNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/ProfileNavigation.kt
new file mode 100644
index 000000000..6f6a18920
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/ProfileNavigation.kt
@@ -0,0 +1,140 @@
+package com.acon.acon.navigation.nested
+
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import androidx.navigation.toRoute
+import com.acon.acon.domain.repository.SocialRepository
+import com.acon.acon.feature.SettingsRoute
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.profile.composable.ProfileRoute
+import com.acon.acon.feature.profile.composable.screen.galleryGrid.composable.GalleryGridContainer
+import com.acon.acon.feature.profile.composable.screen.galleryList.composable.GalleryListContainer
+import com.acon.acon.feature.profile.composable.screen.photoCrop.composable.PhotoCropContainer
+import com.acon.acon.feature.profile.composable.screen.profile.composable.ProfileScreenContainer
+import com.acon.acon.feature.profile.composable.screen.profileMod.composable.ProfileModScreenContainer
+import com.acon.acon.feature.spot.SpotRoute
+import kotlinx.coroutines.launch
+
+internal fun NavGraphBuilder.profileNavigation(
+ navController: NavHostController,
+ socialRepository: SocialRepository,
+ snackbarHostState: SnackbarHostState
+) {
+
+ navigation(
+ startDestination = ProfileRoute.Profile,
+ enterTransition = { EnterTransition.None },
+ exitTransition = { ExitTransition.None }
+ ) {
+ composable {
+ ProfileScreenContainer(
+ socialRepository = socialRepository,
+ modifier = Modifier.fillMaxSize(),
+ onNavigateToSpotListScreen = {
+ navController.navigate(SpotRoute.SpotList) {
+ popUpTo(ProfileRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ onNavigateToSettingsScreen = { navController.navigate(SettingsRoute.Settings) },
+ onNavigateToProfileEditScreen = { navController.navigate(ProfileRoute.ProfileMod(null)) },
+ onNavigateToAreaVerificationScreen = {
+ navController.navigate(AreaVerificationRoute.RequireAreaVerification("onboarding")) {
+ popUpTo(ProfileRoute.Graph) {
+ inclusive = true
+ }
+ }
+ }
+ )
+ }
+
+ composable { backStackEntry ->
+ val savedStateHandle = backStackEntry.savedStateHandle
+ val selectedPhotoId by savedStateHandle
+ .getStateFlow("selectedPhotoId", null)
+ .collectAsState()
+
+ val coroutineScope = rememberCoroutineScope()
+ val snackbar = stringResource(com.acon.acon.feature.profile.R.string.snackbar_profile_save_success)
+
+ ProfileModScreenContainer(
+ modifier = Modifier.fillMaxSize(),
+ selectedPhotoId = selectedPhotoId,
+ backToProfile = {
+ navController.popBackStack()
+ },
+ onClickComplete = {
+ coroutineScope.launch {
+ snackbarHostState.showSnackbar(
+ message = snackbar,
+ duration = SnackbarDuration.Long,
+ )
+ }
+ navController.popBackStack()
+ },
+ onNavigateToCustomGallery = {
+ navController.navigate(ProfileRoute.GalleryList)
+ }
+ )
+ }
+
+ composable {
+ GalleryListContainer(
+ modifier = Modifier.fillMaxSize(),
+ onAlbumSelected = { albumId, albumName ->
+ navController.navigate(ProfileRoute.GalleryGrid(albumId, albumName))
+ },
+ onBackClicked = {
+ navController.popBackStack()
+ }
+ )
+ }
+
+ composable { backStackEntry ->
+ val route = backStackEntry.toRoute()
+
+ GalleryGridContainer(
+ modifier = Modifier.fillMaxSize(),
+ albumId = route.albumId,
+ albumName = route.albumName,
+ onBackClicked = {
+ navController.popBackStack()
+ },
+ onNavigateToPhotoCrop = { photoId ->
+ navController.navigate(ProfileRoute.PhotoCrop(photoId))
+ }
+ )
+ }
+
+ composable { backStackEntry ->
+ val route = backStackEntry.toRoute()
+
+ PhotoCropContainer(
+ modifier = Modifier.fillMaxSize(),
+ photoId = route.photoId,
+ onCloseClicked = {
+ navController.popBackStack()
+ },
+ onCompleteSelected = { photoId: String ->
+ navController.getBackStackEntry(ProfileRoute.ProfileMod(null))
+ .savedStateHandle["selectedPhotoId"] = photoId
+
+ navController.popBackStack(ProfileRoute.ProfileMod(null), false)
+ }
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/SettingsNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/SettingsNavigation.kt
new file mode 100644
index 000000000..5660d3fdb
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/SettingsNavigation.kt
@@ -0,0 +1,100 @@
+package com.acon.acon.navigation.nested
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import com.acon.acon.BuildConfig
+import com.acon.acon.feature.SettingsRoute
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.onboarding.OnboardingRoute
+import com.acon.acon.feature.profile.composable.ProfileRoute
+import com.acon.acon.feature.settings.screen.composable.SettingsScreenContainer
+import com.acon.acon.feature.signin.screen.SignInRoute
+import com.acon.acon.feature.verification.screen.composable.LocalVerificationScreenContainer
+import com.acon.acon.feature.withdraw.screen.composable.DeleteAccountScreenContainer
+
+internal fun NavGraphBuilder.settingsNavigation(
+ navController: NavHostController
+) {
+ val versionName = BuildConfig.VERSION_NAME
+
+ navigation(
+ startDestination = SettingsRoute.Settings,
+ ) {
+ composable {
+ SettingsScreenContainer(
+ modifier = Modifier.fillMaxSize(),
+ versionName = versionName,
+ onNavigateToProfileScreen = {
+ navController.navigate(ProfileRoute.Profile) {
+ popUpTo(SettingsRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ onNavigateToOnboardingScreen = {
+ navController.navigate(OnboardingRoute.OnboardingScreen.fromSettings())
+ },
+ onNavigateLocalVerificationScreen = {
+ navController.navigate(SettingsRoute.LocalVerification)
+ },
+ onNavigateToSignInScreen = {
+ navController.navigate(SignInRoute.SignIn) {
+ popUpTo(SettingsRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ onNavigateToDeleteAccountScreen = {
+ navController.navigate(SettingsRoute.DeleteAccount)
+ }
+ )
+ }
+
+ composable {
+ LocalVerificationScreenContainer(
+ modifier = Modifier.fillMaxSize(),
+ navigateToSettingsScreen = { navController.popBackStack() },
+ navigateToAreaVerificationToAdd = {
+ navController.navigate(
+ AreaVerificationRoute.RequireAreaVerification(
+ route = "settings",
+ isEdit = false
+ )
+ )
+ },
+ navigateToAreaVerificationToEdit = {
+ navController.navigate(
+ AreaVerificationRoute.RequireAreaVerification(
+ route = "settings",
+ isEdit = true
+ )
+ )
+ }
+ )
+ }
+
+ composable {
+ DeleteAccountScreenContainer(
+ modifier = Modifier.fillMaxSize(),
+ navigateToSettings = {
+ navController.navigate(SettingsRoute.Settings) {
+ popUpTo(SettingsRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ navigateToSignIn = {
+ navController.navigate(SignInRoute.SignIn) {
+ popUpTo(SettingsRoute.Graph) {
+ inclusive = true
+ }
+ }
+ }
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/SignInNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/SignInNavigation.kt
new file mode 100644
index 000000000..8a169df8d
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/SignInNavigation.kt
@@ -0,0 +1,35 @@
+package com.acon.acon.navigation.nested
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import com.acon.acon.domain.repository.SocialRepository
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.signin.screen.SignInRoute
+import com.acon.acon.feature.signin.screen.SignInScreenContainer
+import com.acon.acon.feature.spot.SpotRoute
+
+internal fun NavGraphBuilder.signInNavigationNavigation(
+ navController: NavHostController,
+ socialRepository: SocialRepository
+) {
+
+ navigation(
+ startDestination = SignInRoute.SignIn,
+ ) {
+ composable {
+ SignInScreenContainer(
+ navigateToSpotListView = {
+ navController.navigate(SpotRoute.SpotList)
+ },
+ navigateToAreaVerification = {
+ navController.navigate(
+ AreaVerificationRoute.RequireAreaVerification("onboarding")
+ )
+ },
+ socialRepository = socialRepository,
+ )
+ }
+ }
+}
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/SplashNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/SplashNavigation.kt
new file mode 100644
index 000000000..8efea479c
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/SplashNavigation.kt
@@ -0,0 +1,37 @@
+package com.acon.acon.navigation.nested
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
+import com.acon.acon.feature.signin.screen.SignInRoute
+import com.acon.acon.feature.signin.splash.SplashScreenContainer
+import com.acon.acon.feature.spot.SpotRoute
+import com.acon.acon.navigation.route.SplashRoute
+
+internal fun NavGraphBuilder.splashNavigationNavigation(
+ navController: NavHostController
+) {
+ navigation(
+ startDestination = SplashRoute.Splash
+ ) {
+ composable {
+ SplashScreenContainer(
+ navigationToSignIn = {
+ navController.navigate(SignInRoute.Graph) {
+ popUpTo(SignInRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ navigationToSpotListView = {
+ navController.navigate(SpotRoute.Graph) {
+ popUpTo(SpotRoute.Graph) {
+ inclusive = true
+ }
+ }
+ }
+ )
+ }
+ }
+}
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/SpotNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/SpotNavigation.kt
new file mode 100644
index 000000000..2b6fad1d9
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/SpotNavigation.kt
@@ -0,0 +1,53 @@
+package com.acon.acon.navigation.nested
+
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
+import com.acon.acon.domain.repository.SocialRepository
+import com.acon.acon.feature.areaverification.AreaVerificationRoute
+import com.acon.acon.feature.spot.SpotRoute
+import com.acon.acon.feature.spot.screen.spotdetail.composable.SpotDetailScreenContainer
+import com.acon.acon.feature.spot.screen.spotlist.composable.SpotListScreenContainer
+
+internal fun NavGraphBuilder.spotNavigation(
+ navController: NavHostController,
+ socialRepository: SocialRepository
+) {
+
+ navigation(
+ startDestination = SpotRoute.SpotList
+ ) {
+ composable(
+ enterTransition = { EnterTransition.None },
+ exitTransition = { ExitTransition.None }
+ ){
+ SpotListScreenContainer(
+ socialRepository = socialRepository,
+ modifier = Modifier.fillMaxSize(),
+ onNavigateToAreaVerification = {
+ navController.navigate(AreaVerificationRoute.RequireAreaVerification("onboarding")) {
+ popUpTo(SpotRoute.Graph) {
+ inclusive = true
+ }
+ }
+ },
+ onNavigateToSpotDetailScreen = {
+ navController.navigate(SpotRoute.SpotDetail(it))
+ }
+ )
+ }
+
+ composable {
+ SpotDetailScreenContainer(
+ onNavigateToSpotListView = {
+ navController.popBackStack()
+ },
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/navigation/nested/UploadNavigation.kt b/app/src/main/java/com/acon/acon/navigation/nested/UploadNavigation.kt
new file mode 100644
index 000000000..f6695c0b3
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/nested/UploadNavigation.kt
@@ -0,0 +1,41 @@
+package com.acon.acon.navigation.nested
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
+import com.acon.acon.feature.spot.SpotRoute
+import com.acon.acon.feature.upload.UploadContainer
+import com.acon.acon.feature.upload.UploadRoute
+import com.acon.acon.feature.upload.UploadSuccessContainer
+
+internal fun NavGraphBuilder.uploadNavigation(
+ navController: NavHostController
+) {
+ navigation(
+ startDestination = UploadRoute.Upload
+ ) {
+ composable {
+ UploadContainer(
+ onNavigateBack = {
+ navController.popBackStack()
+ },
+ onNavigateToSuccess = {
+ navController.navigate(UploadRoute.Success)
+ }
+ )
+ }
+
+ composable {
+ UploadSuccessContainer(
+ onNavigateToSpotList = {
+ navController.navigate(SpotRoute.SpotList) {
+ popUpTo(UploadRoute.Graph) {
+ inclusive = true
+ }
+ }
+ }
+ )
+ }
+ }
+}
diff --git a/app/src/main/java/com/acon/acon/navigation/route/SplashRoute.kt b/app/src/main/java/com/acon/acon/navigation/route/SplashRoute.kt
new file mode 100644
index 000000000..bcd1a960e
--- /dev/null
+++ b/app/src/main/java/com/acon/acon/navigation/route/SplashRoute.kt
@@ -0,0 +1,13 @@
+package com.acon.acon.navigation.route
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface SplashRoute {
+
+ @Serializable
+ data object Graph: SplashRoute
+
+ @Serializable
+ data object Splash : SplashRoute
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/ui/theme/Color.kt b/app/src/main/java/com/acon/acon/ui/theme/Color.kt
deleted file mode 100644
index 2cf3a91ce..000000000
--- a/app/src/main/java/com/acon/acon/ui/theme/Color.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.acon.acon.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/ui/theme/Type.kt b/app/src/main/java/com/acon/acon/ui/theme/Type.kt
deleted file mode 100644
index 440b83950..000000000
--- a/app/src/main/java/com/acon/acon/ui/theme/Type.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.acon.acon.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
- bodyLarge = TextStyle(
- fontFamily = FontFamily.Default,
- fontWeight = FontWeight.Normal,
- fontSize = 16.sp,
- lineHeight = 24.sp,
- letterSpacing = 0.5.sp
- )
- /* Other default text styles to override
- titleLarge = TextStyle(
- fontFamily = FontFamily.Default,
- fontWeight = FontWeight.Normal,
- fontSize = 22.sp,
- lineHeight = 28.sp,
- letterSpacing = 0.sp
- ),
- labelSmall = TextStyle(
- fontFamily = FontFamily.Default,
- fontWeight = FontWeight.Medium,
- fontSize = 11.sp,
- lineHeight = 16.sp,
- letterSpacing = 0.5.sp
- )
- */
-)
\ No newline at end of file
diff --git a/app/src/main/res/drawable/aconlogo.xml b/app/src/main/res/drawable/aconlogo.xml
new file mode 100644
index 000000000..18fed0189
--- /dev/null
+++ b/app/src/main/res/drawable/aconlogo.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9cb..e93e11ade 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -167,4 +167,4 @@
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/launch_background.xml b/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 000000000..3090a7221
--- /dev/null
+++ b/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,10 @@
+
+
+ AnimatedContentTransitionScope.defaultEnterTransition() = slideInHorizontally(
+ animationSpec = tween(TRANSITION_DURATION),
+ initialOffsetX = { it }
+)
+
+fun AnimatedContentTransitionScope.defaultExitTransition() = fadeOut(
+ animationSpec = tween(TRANSITION_DURATION),
+ targetAlpha = FADE_RATIO
+) + scaleOut(
+ animationSpec = tween(TRANSITION_DURATION),
+ targetScale = SCALE_RATIO
+) + slideOutOfContainer(
+ towards = AnimatedContentTransitionScope.SlideDirection.Left,
+ animationSpec = tween(TRANSITION_DURATION),
+ targetOffset = { it / SLIDE_DIVIDE_RATIO }
+)
+
+fun AnimatedContentTransitionScope.defaultPopEnterTransition() = fadeIn(
+ animationSpec = tween(TRANSITION_DURATION),
+ initialAlpha = FADE_RATIO
+) + scaleIn(
+ animationSpec = tween(TRANSITION_DURATION),
+ initialScale = SCALE_RATIO
+) + slideIntoContainer(
+ towards = AnimatedContentTransitionScope.SlideDirection.Right,
+ animationSpec = tween(TRANSITION_DURATION),
+ initialOffset = { it / SLIDE_DIVIDE_RATIO }
+)
+
+fun AnimatedContentTransitionScope.defaultPopExitTransition() = slideOutOfContainer(
+ towards = AnimatedContentTransitionScope.SlideDirection.Right,
+ animationSpec = tween(TRANSITION_DURATION),
+)
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/animation/Skeleton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/animation/Skeleton.kt
new file mode 100644
index 000000000..32692820b
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/animation/Skeleton.kt
@@ -0,0 +1,62 @@
+package com.acon.acon.core.designsystem.animation
+
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+internal object Skeleton {
+ val brush: Brush
+ @Composable
+ get() = getCommonSkeletonBrush()
+
+ val shape: Shape = RoundedCornerShape(4.dp)
+}
+
+@Composable
+fun Modifier.skeleton(
+ brush: Brush = Skeleton.brush,
+ shape: Shape = Skeleton.shape
+) = this.background(
+ brush = brush,
+ shape = shape
+)
+
+@Composable
+internal fun getCommonSkeletonBrush() : Brush {
+ val skeletonColors = listOf(
+ AconTheme.color.Gray7.copy(alpha = 0.6f),
+ AconTheme.color.Gray2.copy(alpha = 0.2f),
+ AconTheme.color.Gray7.copy(alpha = 0.6f),
+ )
+
+ val transition = rememberInfiniteTransition()
+ val translateAnim = transition.animateFloat(
+ initialValue = -1000f,
+ targetValue = 1000f,
+ animationSpec = infiniteRepeatable(
+ animation = tween(
+ durationMillis = 2000,
+ easing = FastOutSlowInEasing
+ ),
+ repeatMode = RepeatMode.Restart
+ )
+ )
+
+ return Brush.linearGradient(
+ colors = skeletonColors,
+ start = Offset(x = -translateAnim.value, y = -translateAnim.value),
+ end = Offset(x = translateAnim.value, y = translateAnim.value)
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/blur/BlurUtils.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/blur/BlurUtils.kt
new file mode 100644
index 000000000..25bf70cbf
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/blur/BlurUtils.kt
@@ -0,0 +1,49 @@
+package com.acon.acon.core.designsystem.blur
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import dev.chrisbanes.haze.HazeDefaults
+import dev.chrisbanes.haze.HazeState
+import dev.chrisbanes.haze.HazeStyle
+import dev.chrisbanes.haze.HazeTint
+import dev.chrisbanes.haze.hazeEffect
+
+@Composable
+fun rememberHazeState() = remember {
+ HazeState()
+}
+
+fun Modifier.defaultHazeEffect(
+ hazeState: HazeState,
+ tintColor: Color,
+ blurRadius: Dp = 40.dp,
+ alpha: Float = .4f,
+ backgroundColor: Color = Color.Black
+): Modifier {
+ return this.then(
+ Modifier.hazeEffect(
+ state = hazeState, style = HazeStyle(
+ backgroundColor = backgroundColor,
+ tints = listOf(
+ HazeTint(
+ tintColor.copy(
+ alpha = alpha
+ )
+ )
+ ),
+ blurRadius = blurRadius,
+ noiseFactor = HazeDefaults.noiseFactor,
+ )
+ )
+ )
+
+}
+
+val LocalHazeState = staticCompositionLocalOf {
+ HazeState()
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/bottomsheet/LoginBottomSheet.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/bottomsheet/LoginBottomSheet.kt
new file mode 100644
index 000000000..05444f739
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/bottomsheet/LoginBottomSheet.kt
@@ -0,0 +1,148 @@
+package com.acon.acon.core.designsystem.component.bottomsheet
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.component.button.AconGoogleLoginButton
+import com.acon.acon.core.designsystem.theme.AconTheme
+import dev.chrisbanes.haze.HazeState
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LoginBottomSheet(
+ hazeState: HazeState,
+ modifier: Modifier = Modifier,
+ onDismissRequest: () -> Unit = {},
+ onGoogleSignIn: () -> Unit = {},
+ onTermOfUse: () -> Unit = {},
+ onPrivatePolicy: () -> Unit = {},
+) {
+ ModalBottomSheet(
+ sheetState = rememberModalBottomSheetState(
+ skipPartiallyExpanded = true
+ ),
+ contentColor = AconTheme.color.Gray9.copy(alpha = 0.5f),
+ modifier = modifier,
+ onDismissRequest = onDismissRequest,
+ dragHandle = null
+ ) {
+ Box {
+ Column(
+ modifier = modifier
+ .fillMaxWidth()
+ .fillMaxHeight(0.6f)
+ .background(AconTheme.color.Gray9.copy(alpha = 0.5f))
+ .defaultHazeEffect(
+ hazeState = hazeState,
+ tintColor = AconTheme.color.Gray8,
+ alpha = 0.7f,
+ blurRadius = 20.dp
+ )
+ ) {
+ Spacer(
+ modifier = Modifier
+ .align(Alignment.CenterHorizontally)
+ .padding(vertical = 8.dp)
+ .clip(CircleShape)
+ .size(width = 36.dp, height = 5.dp)
+ .background(AconTheme.color.Gray5)
+ )
+
+ Column(
+ modifier = Modifier
+ .padding(horizontal = 16.dp)
+ .padding(top = 32.dp, bottom = 80.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text(
+ text = stringResource(R.string.login_bottom_sheet_title),
+ style = AconTheme.typography.head5_22_sb,
+ color = AconTheme.color.White
+ )
+
+ Spacer(Modifier.height(8.dp))
+ Text(
+ text = stringResource(R.string.login_bottom_sheet_content),
+ style = AconTheme.typography.body1_15_reg,
+ color = AconTheme.color.Gray2,
+ textAlign = TextAlign.Center,
+ modifier = Modifier.weight(1f)
+ )
+
+ AconGoogleLoginButton(
+ onClick = onGoogleSignIn,
+ textStyle = AconTheme.typography.subtitle1_16_med,
+ )
+
+ Spacer(Modifier.height(16.dp))
+ Text(
+ text = stringResource(R.string.login_bottom_sheet_policy_agreement),
+ style = AconTheme.typography.body2_14_reg,
+ color = AconTheme.color.Gray3,
+ textAlign = TextAlign.Center,
+ )
+
+ Spacer(Modifier.height(4.dp))
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ Text(
+ text = stringResource(R.string.login_bottom_sheet_term_of_use),
+ style = AconTheme.typography.body2_14_reg,
+ color = AconTheme.color.Gray5,
+ textDecoration = TextDecoration.Underline,
+ modifier = Modifier.clickable { onTermOfUse() }
+ )
+
+ Text(
+ text = stringResource(R.string.login_bottom_sheet_private_policy),
+ style = AconTheme.typography.body2_14_reg,
+ color = AconTheme.color.Gray5,
+ textDecoration = TextDecoration.Underline,
+ modifier = Modifier.clickable { onPrivatePolicy() }
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun LoginBottomSheetPreview() {
+ AconTheme {
+ LoginBottomSheet(
+ hazeState = HazeState(),
+ onDismissRequest = {},
+ onGoogleSignIn = {},
+ onTermOfUse = {},
+ onPrivatePolicy = {}
+ )
+ }
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconButton.kt
new file mode 100644
index 000000000..d9b9c7835
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconButton.kt
@@ -0,0 +1,68 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconButton(
+ backGroundColor: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ borderColor: Color = Color.Transparent,
+ borderWidth: Dp = 0.dp,
+ cornerRadius: Dp = 0.dp,
+ contentPadding: PaddingValues = PaddingValues(horizontal = 0.dp, vertical = 0.dp),
+ enabled: Boolean = true,
+ content: @Composable () -> Unit,
+) {
+ Box(
+ modifier = modifier
+ .clip(RoundedCornerShape(cornerRadius))
+ .background(color = backGroundColor)
+ .clickable(
+ enabled = enabled,
+ onClick = onClick
+ )
+ .border(
+ width = borderWidth,
+ color = borderColor,
+ shape = RoundedCornerShape(cornerRadius)
+ )
+ .padding(contentPadding),
+ contentAlignment = Alignment.Center
+ ) {
+ content()
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAcornButton() {
+ AconTheme {
+ AconButton(
+ backGroundColor = AconTheme.color.Main_org1,
+ onClick = {},
+ content = {},
+ modifier = Modifier,
+ borderColor = AconTheme.color.Main_org1,
+ borderWidth = Dp.Hairline,
+ cornerRadius = 4.dp,
+ contentPadding = PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+ enabled = true,
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledLargeButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledLargeButton.kt
new file mode 100644
index 000000000..25b09003e
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledLargeButton.kt
@@ -0,0 +1,63 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+@Composable
+fun AconFilledLargeButton(
+ text: String,
+ textStyle: TextStyle,
+ enabledBackgroundColor: Color,
+ disabledBackgroundColor: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabledTextColor: Color = AconTheme.color.White,
+ disabledTextColor: Color = AconTheme.color.Gray3,
+ isEnabled: Boolean = true,
+ cornerRadius: Dp = 6.dp,
+ contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 16.dp),
+) {
+ AconButton(
+ backGroundColor = if (isEnabled) enabledBackgroundColor else disabledBackgroundColor,
+ modifier = modifier,
+ cornerRadius = cornerRadius,
+ contentPadding = contentPadding,
+ onClick = onClick,
+ enabled = isEnabled
+ ) {
+ Text(
+ text = text,
+ style = textStyle,
+ color = if (isEnabled) enabledTextColor else disabledTextColor
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconLargeButton() {
+ AconTheme {
+ AconFilledLargeButton(
+ text = stringResource(R.string.login_btn_preview_content),
+ textStyle = AconTheme.typography.head8_16_sb,
+ enabledTextColor = AconTheme.color.White,
+ disabledTextColor = AconTheme.color.Gray3,
+ enabledBackgroundColor = AconTheme.color.Main_org1,
+ disabledBackgroundColor = AconTheme.color.Main_org1,
+ isEnabled = true,
+ cornerRadius = 6.dp,
+ modifier = Modifier,
+ contentPadding = PaddingValues(horizontal = 16.dp, vertical = 14.dp),
+ onClick = {}
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledMediumButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledMediumButton.kt
new file mode 100644
index 000000000..75ad5fe96
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconFilledMediumButton.kt
@@ -0,0 +1,61 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+@Composable
+fun AconFilledMediumButton(
+ text: String,
+ textStyle: TextStyle,
+ enabledBackgroundColor: Color,
+ disabledBackgroundColor: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textColor: Color = AconTheme.color.White,
+ isEnabled: Boolean = true,
+ cornerRadius: Dp = 4.dp,
+ contentPadding: PaddingValues = PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+) {
+ AconButton(
+ backGroundColor = if(isEnabled) enabledBackgroundColor else disabledBackgroundColor,
+ modifier = modifier,
+ cornerRadius = cornerRadius,
+ contentPadding = contentPadding,
+ onClick = onClick,
+ enabled = isEnabled
+ ) {
+ Text(
+ text = text,
+ style = textStyle,
+ color = textColor
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconMediumButton() {
+ AconTheme {
+ AconFilledMediumButton(
+ text = stringResource(R.string.login_btn_preview_content),
+ textStyle = AconTheme.typography.head8_16_sb,
+ textColor = AconTheme.color.White,
+ enabledBackgroundColor = AconTheme.color.Main_org1,
+ disabledBackgroundColor = AconTheme.color.Main_org1,
+ isEnabled = true,
+ cornerRadius = 4.dp,
+ modifier = Modifier,
+ contentPadding =PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+ onClick = {}
+ )
+ }
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconGoogleLoginButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconGoogleLoginButton.kt
new file mode 100644
index 000000000..6b52796a7
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconGoogleLoginButton.kt
@@ -0,0 +1,78 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+@Composable
+fun AconGoogleLoginButton(
+ onClick: () -> Unit = {},
+ modifier: Modifier = Modifier,
+ backgroundColor: Color = AconTheme.color.White,
+ borderColor: Color = AconTheme.color.Gray1,
+ borderWidth: Dp = 1.dp,
+ cornerRadius: Dp = 6.dp,
+ textColor: Color = AconTheme.color.Black,
+ textStyle: TextStyle = AconTheme.typography.subtitle2_14_med,
+) {
+ AconButton(
+ backGroundColor = backgroundColor,
+ borderColor = borderColor,
+ modifier = modifier
+ .fillMaxWidth(),
+ borderWidth = borderWidth,
+ cornerRadius = cornerRadius,
+ contentPadding = PaddingValues(vertical = 12.dp),
+ onClick = onClick
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Image(
+ imageVector = ImageVector.vectorResource(R.drawable.ic_google),
+ contentDescription = stringResource(R.string.google_login_btn_description)
+ )
+ Spacer(modifier = Modifier.size(4.dp))
+ Text(
+ text = stringResource(R.string.google_login_btn_content),
+ style = textStyle,
+ color = textColor,
+ textAlign = TextAlign.Center,
+ maxLines = 1,
+ modifier = Modifier
+ .align(Alignment.CenterVertically)
+ )
+ }
+ }
+
+}
+
+@Preview
+@Composable
+private fun PreviewAconGoogleLoginButton() {
+ AconTheme {
+ AconGoogleLoginButton(
+ modifier = Modifier,
+ textColor = AconTheme.color.Black,
+ backgroundColor = AconTheme.color.White,
+ onClick = {},
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedLargeButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedLargeButton.kt
new file mode 100644
index 000000000..383f200eb
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedLargeButton.kt
@@ -0,0 +1,76 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+@Composable
+fun AconOutlinedLargeButton(
+ text: String,
+ enabledBorderColor: Color,
+ enabledBackgroundColor: Color,
+ disabledBorderColor: Color,
+ disabledBackgroundColor: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textColor: Color? = null,
+ borderColor: Color? = null,
+ backgroundColor: Color? = null,
+ textStyle: TextStyle = AconTheme.typography.head8_16_sb,
+ enabledTextColor: Color = AconTheme.color.White,
+ disabledTextColor: Color = AconTheme.color.Gray3,
+ isEnabled: Boolean = true,
+ borderWidth: Dp = 1.dp,
+ cornerRadius: Dp = 6.dp,
+ contentPadding: PaddingValues = PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+) {
+ val effectiveBackgroundColor = backgroundColor ?: if (isEnabled) enabledBackgroundColor else disabledBackgroundColor
+ val effectiveBorderColor = borderColor ?: if (isEnabled) enabledBorderColor else disabledBorderColor
+ val effectiveTextColor = textColor ?: if (isEnabled) enabledTextColor else disabledTextColor
+
+ AconButton (
+ backGroundColor = effectiveBackgroundColor,
+ borderColor = effectiveBorderColor,
+ borderWidth = borderWidth,
+ modifier = modifier,
+ cornerRadius = cornerRadius,
+ contentPadding = contentPadding,
+ onClick = onClick,
+ enabled = isEnabled
+ ) {
+ Text(
+ text = text,
+ style = textStyle,
+ color = effectiveTextColor
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconOutlinedButton() {
+ AconTheme {
+ AconOutlinedLargeButton(
+ text = stringResource(R.string.login_btn_preview_content),
+ textStyle = AconTheme.typography.head8_16_sb,
+ enabledBorderColor = AconTheme.color.Gray5,
+ enabledBackgroundColor = AconTheme.color.Gray9,
+ disabledBorderColor = AconTheme.color.Gray6,
+ disabledBackgroundColor = AconTheme.color.Gray8,
+ isEnabled = true,
+ borderWidth = 1.dp,
+ cornerRadius = 6.dp,
+ modifier = Modifier,
+ contentPadding =PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+ onClick = {}
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedMediumButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedMediumButton.kt
new file mode 100644
index 000000000..49ef8bfaf
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/AconOutlinedMediumButton.kt
@@ -0,0 +1,69 @@
+package com.acon.acon.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+@Composable
+fun AconOutlinedMediumButton(
+ text: String,
+ enabledBorderColor: Color,
+ enabledBackgroundColor: Color,
+ disabledBorderColor: Color,
+ disabledBackgroundColor: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textColor: Color = AconTheme.color.White,
+ textStyle: TextStyle = AconTheme.typography.head8_16_sb,
+ isEnabled: Boolean = true,
+ borderWidth: Dp = 1.dp,
+ cornerRadius: Dp = 4.dp,
+ contentPadding: PaddingValues = PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+) {
+ AconButton (
+ backGroundColor = if(isEnabled) enabledBackgroundColor else disabledBackgroundColor,
+ borderColor = if(isEnabled) enabledBorderColor else disabledBorderColor,
+ borderWidth = borderWidth,
+ modifier = modifier,
+ cornerRadius = cornerRadius,
+ contentPadding = contentPadding,
+ onClick = onClick,
+ enabled = isEnabled
+ ) {
+ Text(
+ text = text,
+ style = textStyle,
+ color = textColor
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconOutlinedMediumButton() {
+ AconTheme {
+ AconOutlinedMediumButton(
+ text = stringResource(R.string.login_btn_preview_content),
+ textStyle = AconTheme.typography.head8_16_sb,
+ textColor = AconTheme.color.Gray3,
+ enabledBorderColor = AconTheme.color.Gray5,
+ enabledBackgroundColor = AconTheme.color.Gray9,
+ disabledBorderColor = AconTheme.color.Gray6,
+ disabledBackgroundColor = AconTheme.color.Gray8,
+ isEnabled = true,
+ borderWidth = 1.dp,
+ cornerRadius = 4.dp,
+ modifier = Modifier,
+ contentPadding =PaddingValues(horizontal = 14.dp, vertical = 14.dp),
+ onClick = {}
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledButton.kt
new file mode 100644
index 000000000..014974f4e
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledButton.kt
@@ -0,0 +1,94 @@
+package com.acon.acon.core.designsystem.component.button.v2
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ButtonElevation
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.component.loading.AconCircularProgressBar
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconFilledButton(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ isLoading: Boolean = false,
+ enabled: Boolean = true,
+ shape: Shape = RoundedCornerShape(12.dp),
+ colors: ButtonColors = ButtonDefaults.buttonColors(
+ containerColor = AconTheme.color.GlassWhiteDefault,
+ contentColor = AconTheme.color.White,
+ disabledContainerColor = AconTheme.color.GlassWhiteDisabled,
+ disabledContentColor = AconTheme.color.Gray300,
+ ),
+ elevation: ButtonElevation? = ButtonDefaults.buttonElevation(),
+ border: BorderStroke? = null,
+ contentPadding: PaddingValues = PaddingValues(vertical = 15.dp),
+ interactionSource: MutableInteractionSource? = null,
+ content: @Composable() (RowScope.() -> Unit)
+) {
+
+ Button(
+ onClick = onClick,
+ modifier = modifier.defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.GlassWhiteDefault,
+ ),
+ enabled = enabled,
+ shape = shape,
+ colors = colors,
+ elevation = elevation,
+ border = border,
+ contentPadding = contentPadding,
+ interactionSource = interactionSource,
+ ) {
+ if (isLoading) {
+ AconCircularProgressBar()
+ } else {
+ content()
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconFilledButtonPreview() {
+ AconTheme {
+ AconFilledButton(
+ onClick = { },
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Text(
+ text = "Button",
+ style = AconTheme.typography.Title4,
+ fontWeight = FontWeight.SemiBold
+ )
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconFilledButtonLoadingPreview() {
+ AconTheme {
+ AconFilledButton(
+ onClick = { },
+ modifier = Modifier.fillMaxWidth(),
+ isLoading = true,
+ ) { }
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledTextButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledTextButton.kt
new file mode 100644
index 000000000..7d828bcf2
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconFilledTextButton.kt
@@ -0,0 +1,69 @@
+package com.acon.acon.core.designsystem.component.button.v2
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ButtonElevation
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconFilledTextButton(
+ text: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textStyle: TextStyle = AconTheme.typography.Title4.copy(fontWeight = FontWeight.SemiBold),
+ isLoading: Boolean = false,
+ enabled: Boolean = true,
+ shape: Shape = RoundedCornerShape(12.dp),
+ colors: ButtonColors = ButtonDefaults.buttonColors(
+ containerColor = AconTheme. color. GlassWhiteDefault,
+ contentColor = AconTheme. color. White,
+ disabledContainerColor = AconTheme. color. GlassWhiteDisabled,
+ disabledContentColor = AconTheme. color. Gray300
+ ),
+ elevation: ButtonElevation? = ButtonDefaults.buttonElevation(),
+ border: BorderStroke? = null,
+ contentPadding: PaddingValues = PaddingValues(vertical = 15.dp),
+ interactionSource: MutableInteractionSource? = null,
+) {
+ AconFilledButton(
+ onClick = onClick,
+ modifier = modifier,
+ isLoading = isLoading,
+ enabled = enabled,
+ shape = shape,
+ colors = colors,
+ elevation = elevation,
+ border = border,
+ contentPadding = contentPadding,
+ interactionSource = interactionSource,
+ ) {
+ Text(
+ text = text,
+ style = textStyle
+ )
+ }
+}
+
+@Composable
+@Preview
+private fun PreviewAconFilledTextButton() {
+ AconFilledTextButton(
+ text = "Text Button",
+ onClick = { },
+ modifier = Modifier.fillMaxWidth(),
+ isLoading = false,
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedButton.kt
new file mode 100644
index 000000000..050498fdf
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedButton.kt
@@ -0,0 +1,97 @@
+package com.acon.acon.core.designsystem.component.button.v2
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ButtonElevation
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.component.loading.AconCircularProgressBar
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconOutlinedButton(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ isLoading: Boolean = false,
+ enabled: Boolean = true,
+ shape: Shape = CircleShape,
+ colors: ButtonColors = ButtonDefaults.buttonColors(
+ containerColor = Color.Transparent,
+ contentColor = AconTheme.color.White,
+ disabledContainerColor = AconTheme.color.GlassWhiteDisabled,
+ disabledContentColor = Color.Transparent,
+ ),
+ elevation: ButtonElevation? = ButtonDefaults.buttonElevation(),
+ border: BorderStroke = if (enabled) BorderStroke(
+ width = 1.dp,
+ color = AconTheme.color.GlassWhiteDefault,
+ ) else BorderStroke(
+ width = 1.dp,
+ color = AconTheme.color.GlassWhiteDisabled,
+ ),
+ contentPadding: PaddingValues = PaddingValues(vertical = 12.dp, horizontal = 46.dp),
+ interactionSource: MutableInteractionSource? = null,
+ content: @Composable() (RowScope.() -> Unit)
+) {
+
+ Button(
+ onClick = onClick,
+ modifier = modifier.defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.GlassWhiteDefault,
+ ),
+ enabled = enabled,
+ shape = shape,
+ colors = colors,
+ elevation = elevation,
+ border = border,
+ contentPadding = contentPadding,
+ interactionSource = interactionSource,
+ ) {
+ if (isLoading) {
+ AconCircularProgressBar()
+ } else {
+ content()
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconOutlinedButtonPreview() {
+ AconOutlinedButton(
+ onClick = { },
+ isLoading = false,
+ content = {
+ Text(
+ text = "Button",
+ style = AconTheme.typography.Body1,
+ fontWeight = FontWeight.SemiBold
+ )
+ }
+ )
+}
+
+@Composable
+@Preview
+private fun AconOutlinedButtonLoadingPreview() {
+ AconOutlinedButton(
+ onClick = { },
+ isLoading = true,
+ content = {}
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedTextButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedTextButton.kt
new file mode 100644
index 000000000..710205aba
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/button/v2/AconOutlinedTextButton.kt
@@ -0,0 +1,77 @@
+package com.acon.acon.core.designsystem.component.button.v2
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ButtonElevation
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconOutlinedTextButton(
+ text: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textStyle: TextStyle = AconTheme.typography.Title4.copy(fontWeight = FontWeight.SemiBold),
+ isLoading: Boolean = false,
+ enabled: Boolean = true,
+ shape: Shape = CircleShape,
+ colors: ButtonColors = ButtonDefaults.buttonColors(
+ containerColor = Color.Transparent,
+ contentColor = AconTheme.color.White,
+ disabledContainerColor = AconTheme.color.GlassWhiteDisabled,
+ disabledContentColor = Color.Transparent,
+ ),
+ elevation: ButtonElevation? = ButtonDefaults.buttonElevation(),
+ border: BorderStroke = if (enabled) BorderStroke(
+ width = 1.dp,
+ color = AconTheme.color.GlassWhiteDefault,
+ ) else BorderStroke(
+ width = 1.dp,
+ color = AconTheme.color.GlassWhiteDisabled,
+ ),
+ contentPadding: PaddingValues = PaddingValues(vertical = 12.dp, horizontal = 46.dp),
+ interactionSource: MutableInteractionSource? = null,
+) {
+ AconOutlinedButton (
+ onClick = onClick,
+ modifier = modifier,
+ isLoading = isLoading,
+ enabled = enabled,
+ shape = shape,
+ colors = colors,
+ elevation = elevation,
+ border = border,
+ contentPadding = contentPadding,
+ interactionSource = interactionSource,
+ ) {
+ Text(
+ text = text,
+ style = textStyle
+ )
+ }
+}
+
+@Composable
+@Preview
+private fun PreviewAconFilledTextButton() {
+ AconOutlinedTextButton(
+ text = "Text Button",
+ onClick = { },
+ modifier = Modifier.fillMaxWidth(),
+ isLoading = false,
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChip.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChip.kt
new file mode 100644
index 000000000..9f666e38c
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChip.kt
@@ -0,0 +1,81 @@
+package com.acon.acon.core.designsystem.component.chip
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.noRippleClickable
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconChip(
+ title: String,
+ isSelected: Boolean,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ textStyle: TextStyle = AconTheme.typography.subtitle1_16_med.copy(
+ color = AconTheme.color.White
+ )
+) {
+
+ val borderColor =
+ if (isSelected)
+ AconTheme.color.Main_org1
+ else AconTheme.color.Gray6
+
+ val containerColor =
+ if (isSelected)
+ AconTheme.color.Main_org35
+ else AconTheme.color.Gray8
+
+ Row(
+ modifier = modifier
+ .clip(CircleShape)
+ .border(
+ shape = CircleShape,
+ width = 1.dp,
+ color = borderColor
+ ).background(containerColor).noRippleClickable {
+ onClick()
+ },
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.Center
+ ) {
+ Text(
+ modifier = Modifier
+ .padding(vertical = 10.dp, horizontal = 18.dp),
+ text = title,
+ style = textStyle
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun AconChipPreview() {
+ AconChip(
+ title = "ํ์",
+ isSelected = false,
+ onClick = {}
+ )
+}
+
+@Preview
+@Composable
+private fun SelectedAconChipPreview() {
+ AconChip(
+ title = "ํ์",
+ isSelected = true,
+ onClick = {}
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChipFlowRow.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChipFlowRow.kt
new file mode 100644
index 000000000..757d69d05
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/chip/AconChipFlowRow.kt
@@ -0,0 +1,35 @@
+package com.acon.acon.core.designsystem.component.chip
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEachIndexed
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun AconChipFlowRow(
+ titles: List,
+ vararg selectedChipIndexes: Int,
+ onChipSelected: (index: Int) -> Unit,
+ modifier: Modifier = Modifier,
+ horizontalArrangement: Arrangement.Horizontal = Arrangement.spacedBy(6.dp),
+ verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(6.dp)
+) {
+
+ FlowRow(
+ modifier = modifier,
+ horizontalArrangement = horizontalArrangement,
+ verticalArrangement = verticalArrangement
+ ) {
+ titles.fastForEachIndexed { index, title ->
+ AconChip(
+ title = title,
+ isSelected = selectedChipIndexes.contains(index),
+ onClick = { onChipSelected(index) }
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconDialog.kt
new file mode 100644
index 000000000..f6bdaf734
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconDialog.kt
@@ -0,0 +1,21 @@
+package com.acon.acon.core.designsystem.component.dialog
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+
+@Composable
+fun AconDialog(
+ onDismissRequest: () -> Unit,
+ content: @Composable () -> Unit,
+) {
+ Dialog(
+ onDismissRequest = onDismissRequest,
+ properties = DialogProperties(
+ dismissOnBackPress = false,
+ dismissOnClickOutside = false
+ )
+ ) {
+ content()
+ }
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconOneButtonDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconOneButtonDialog.kt
new file mode 100644
index 000000000..2b21e5a11
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconOneButtonDialog.kt
@@ -0,0 +1,104 @@
+package com.acon.acon.core.designsystem.component.dialog
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.component.button.AconFilledMediumButton
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+
+@Composable
+fun AconOneButtonDialog(
+ title: String,
+ content: String,
+ buttonContent: String,
+ onDismissRequest: () -> Unit,
+ onClickConfirm: () -> Unit,
+ modifier: Modifier = Modifier,
+ imageSize: Dp? = null,
+ @DrawableRes contentImage: Int? = null,
+ isImageEnabled: Boolean = false,
+) {
+ AconDialog(
+ onDismissRequest = onDismissRequest
+ ) {
+ Column(
+ modifier = modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(8.dp))
+ .background(AconTheme.color.Gray8)
+ .padding(24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ if(isImageEnabled && contentImage != null) {
+ Image(
+ imageVector = ImageVector.vectorResource(contentImage),
+ contentDescription = "",
+ modifier = if (imageSize != null) {
+ Modifier.size(imageSize)
+ } else {
+ Modifier
+ }
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ }
+ Text(
+ text = title,
+ style = AconTheme.typography.head6_20_sb,
+ textAlign = TextAlign.Center,
+ color = AconTheme.color.White
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+
+ Text(
+ text = content,
+ style = AconTheme.typography.body2_14_reg,
+ textAlign = TextAlign.Center,
+ color = AconTheme.color.Gray3
+ )
+ Spacer(modifier = Modifier.height(24.dp))
+
+ AconFilledMediumButton(
+ text = buttonContent,
+ textStyle = AconTheme.typography.subtitle1_16_med,
+ enabledBackgroundColor = AconTheme.color.Gray5,
+ disabledBackgroundColor = AconTheme.color.Gray5,
+ onClick = onClickConfirm,
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewAconOneButtonDialog() {
+ AconOneButtonDialog(
+ title = "์ธ์ฆ ์คํจ",
+ content = "์ธ์ฆ ๊ฐ๋ฅํ ์ง์ญ์ด ์์ด์.\nํ์ฌ ์์น๋ก ์ธ์ฆ์ ์งํํ ์ ์์ด์.",
+ buttonContent = "์ค์ ์ผ๋ก ๊ฐ๊ธฐ",
+ contentImage = R.drawable.ic_review_g_40,
+ onDismissRequest = {},
+ onClickConfirm = {},
+ isImageEnabled = false
+ )
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconTwoButtonDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconTwoButtonDialog.kt
new file mode 100644
index 000000000..8814cd92e
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/AconTwoButtonDialog.kt
@@ -0,0 +1,129 @@
+package com.acon.acon.core.designsystem.component.dialog
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.component.button.AconFilledMediumButton
+import com.acon.acon.core.designsystem.theme.AconTheme
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.component.button.AconOutlinedMediumButton
+
+@Composable
+fun AconTwoButtonDialog(
+ title: String,
+ content: String? = null,
+ leftButtonContent: String,
+ rightButtonContent: String,
+ onDismissRequest: () -> Unit,
+ onClickLeft: () -> Unit,
+ onClickRight: () -> Unit,
+ @DrawableRes contentImage: Int? = null,
+
+ isImageEnabled: Boolean = false,
+) {
+ AconDialog(
+ onDismissRequest = onDismissRequest,
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(8.dp))
+ .background(AconTheme.color.Gray8)
+ .padding(20.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ if(isImageEnabled) {
+ contentImage?.let {
+ Image(
+ imageVector = ImageVector.vectorResource(contentImage),
+ contentDescription = ""
+ )
+ }
+ Spacer(modifier = Modifier.height(16.dp))
+ }
+
+ Text(
+ text = title,
+ style = AconTheme.typography.head6_20_sb,
+ textAlign = TextAlign.Center,
+ color = AconTheme.color.White
+ )
+
+ if (content != null) {
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ text = content,
+ style = AconTheme.typography.body2_14_reg,
+ textAlign = TextAlign.Center,
+ color = AconTheme.color.Gray3
+ )
+ }
+
+ Spacer(modifier = Modifier.height(24.dp))
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ ) {
+ AconOutlinedMediumButton(
+ text = leftButtonContent,
+ enabledBorderColor = AconTheme.color.Gray5,
+ enabledBackgroundColor = AconTheme.color.Gray8,
+ disabledBorderColor = AconTheme.color.Gray5,
+ disabledBackgroundColor = AconTheme.color.Gray5,
+ onClick = onClickLeft,
+ textColor = AconTheme.color.Gray3,
+ textStyle = AconTheme.typography.subtitle1_16_med,
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth()
+ )
+ Spacer(modifier = Modifier.width(7.dp))
+
+ AconFilledMediumButton(
+ text = rightButtonContent,
+ textStyle = AconTheme.typography.subtitle1_16_med,
+ enabledBackgroundColor = AconTheme.color.Gray5,
+ disabledBackgroundColor = AconTheme.color.Gray5,
+ onClick = onClickRight,
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth()
+ )
+ }
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewAconTwoButtonDialog() {
+ AconTwoButtonDialog(
+ title = "์ธ์ฆ ์คํจ",
+ content = "์ธ์ฆ ๊ฐ๋ฅํ ์ง์ญ์ด ์์ด์.\nํ์ฌ ์์น๋ก ์ธ์ฆ์ ์งํํ ์ ์์ด์.",
+ leftButtonContent = "์ทจ์",
+ rightButtonContent = "ํ์ธ",
+ contentImage = R.drawable.ic_review_g_40,
+ onDismissRequest = {},
+ onClickLeft = { },
+ onClickRight = { },
+ isImageEnabled = false
+ )
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/PermissionDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/PermissionDialog.kt
new file mode 100644
index 000000000..cda824e43
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/PermissionDialog.kt
@@ -0,0 +1,54 @@
+package com.acon.acon.core.designsystem.component.dialog
+
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.content.ContextCompat
+import com.acon.acon.core.designsystem.R
+
+@Composable
+fun AconPermissionDialog(
+ modifier: Modifier = Modifier,
+ onPermissionGranted: () -> Unit = {}
+) {
+
+ val context = LocalContext.current
+ val settingsLauncher = rememberLauncherForActivityResult(
+ ActivityResultContracts.StartActivityForResult()
+ ) {
+ if (ContextCompat.checkSelfPermission(
+ context,
+ Manifest.permission.ACCESS_FINE_LOCATION
+ ) == PackageManager.PERMISSION_GRANTED
+ ) { onPermissionGranted() }
+ }
+
+ AconOneButtonDialog(
+ modifier = modifier,
+ title = stringResource(R.string.no_permission_title),
+ content = stringResource(R.string.no_permission_content),
+ buttonContent = stringResource(R.string.go_to_setting),
+ onDismissRequest = {},
+ onClickConfirm = {
+ val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+ data = Uri.parse("package:${context.packageName}")
+ }
+ settingsLauncher.launch(intent)
+ }
+ )
+}
+
+@Preview
+@Composable
+private fun AconPermissionDialogPreview() {
+ AconPermissionDialog()
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconDefaultDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconDefaultDialog.kt
new file mode 100644
index 000000000..0d3b51fc6
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconDefaultDialog.kt
@@ -0,0 +1,116 @@
+package com.acon.acon.core.designsystem.component.dialog.v2
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.SecureFlagPolicy
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.noRippleClickable
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconDefaultDialog(
+ title: String,
+ action: String,
+ onAction: () -> Unit,
+ onDismissRequest: () -> Unit,
+ properties: DialogProperties = DialogProperties(
+ dismissOnBackPress = true,
+ dismissOnClickOutside = true,
+ securePolicy = SecureFlagPolicy.Inherit,
+ usePlatformDefaultWidth = true,
+ decorFitsSystemWindows = true
+ ),
+ content: @Composable () -> Unit,
+) {
+ Dialog(
+ onDismissRequest = onDismissRequest,
+ properties = properties,
+ ) {
+ Surface(
+ shape = RoundedCornerShape(14.dp),
+ color = AconTheme.color.GlassWhiteDefault.copy(alpha = .4f),
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Column(
+ modifier = Modifier.fillMaxWidth().defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.GlassWhiteDefault,
+ ), horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text(
+ text = title,
+ style = AconTheme.typography.Title4,
+ fontWeight = FontWeight.SemiBold,
+ color = AconTheme.color.White,
+ modifier = Modifier
+ .padding(top = 24.dp, bottom = 22.dp)
+ .padding(horizontal = 16.dp)
+ )
+ content()
+ HorizontalDivider(
+ color = AconTheme.color.Light.copy(alpha = 0.3f),
+ thickness = 1.dp,
+ modifier = Modifier
+ )
+ Text(
+ text = action,
+ style = AconTheme.typography.Title4,
+ color = AconTheme.color.Action,
+ modifier = Modifier
+ .fillMaxWidth()
+ .noRippleClickable {
+ onAction()
+ }
+ .padding(vertical = 10.dp),
+ textAlign = TextAlign.Center
+ )
+ }
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconDefaultDialogPreview() {
+ AconDefaultDialog(
+ title = "Title",
+ action = "Action",
+ onDismissRequest = {},
+ onAction = {}
+ ) {}
+}
+
+@Composable
+@Preview
+private fun AconDefaultDialogWithContentPreview() {
+ AconDefaultDialog(
+ title = "Title",
+ action = "Action",
+ onDismissRequest = {},
+ onAction = {}
+ ) {
+ Text(
+ text = "Content",
+ style = AconTheme.typography.Body1,
+ color = AconTheme.color.Gray200,
+ modifier = Modifier
+ .padding(horizontal = 16.dp)
+ .padding(bottom = 20.dp)
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconTwoButtonDialog.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconTwoButtonDialog.kt
new file mode 100644
index 000000000..1f02b25f1
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconTwoButtonDialog.kt
@@ -0,0 +1,135 @@
+package com.acon.acon.core.designsystem.component.dialog.v2
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.VerticalDivider
+import androidx.compose.runtime.Composable
+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.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.SecureFlagPolicy
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.noRippleClickable
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconTwoActionDialog(
+ title: String,
+ action1: String,
+ action2: String,
+ onAction1: () -> Unit,
+ onAction2: () -> Unit,
+ onDismissRequest: () -> Unit,
+ action1Color: Color = AconTheme.color.White,
+ action2Color: Color = AconTheme.color.Action,
+ properties: DialogProperties = DialogProperties(
+ dismissOnBackPress = true,
+ dismissOnClickOutside = true,
+ securePolicy = SecureFlagPolicy.Inherit,
+ usePlatformDefaultWidth = true,
+ decorFitsSystemWindows = true
+ ),
+ content: @Composable () -> Unit = {},
+) {
+ Dialog(
+ onDismissRequest = onDismissRequest,
+ properties = properties,
+ ) {
+ Surface(
+ shape = RoundedCornerShape(14.dp),
+ color = AconTheme.color.GlassWhiteDefault.copy(alpha = .4f),
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.GlassWhiteDefault,
+ ), horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text(
+ text = title,
+ style = AconTheme.typography.Title4,
+ fontWeight = FontWeight.SemiBold,
+ color = AconTheme.color.White,
+ modifier = Modifier
+ .padding(top = 24.dp, bottom = 22.dp)
+ .padding(horizontal = 16.dp)
+ )
+ content()
+ HorizontalDivider(
+ color = AconTheme.color.Light.copy(alpha = 0.3f),
+ thickness = 1.dp,
+ modifier = Modifier
+ )
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(IntrinsicSize.Min)
+ ) {
+ Text(
+ text = action1,
+ style = AconTheme.typography.Title4,
+ fontWeight = FontWeight.W400,
+ color = action1Color,
+ modifier = Modifier
+ .weight(1f)
+ .noRippleClickable {
+ onAction1()
+ }
+ .padding(vertical = 10.dp),
+ textAlign = TextAlign.Center
+ )
+ VerticalDivider(
+ color = AconTheme.color.Light.copy(alpha = 0.3f),
+ thickness = 1.dp,
+ modifier = Modifier.fillMaxHeight()
+ )
+ Text(
+ text = action2,
+ style = AconTheme.typography.Title4,
+ fontWeight = FontWeight.SemiBold,
+ color = action2Color,
+ modifier = Modifier
+ .weight(1f)
+ .noRippleClickable {
+ onAction2()
+ }
+ .padding(vertical = 10.dp),
+ textAlign = TextAlign.Center
+ )
+ }
+ }
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconTwoActionDialogPreview() {
+ AconTwoActionDialog(
+ title = "Title",
+ action1 = "Action 1",
+ action2 = "Action 2",
+ onDismissRequest = {},
+ onAction1 = {},
+ onAction2 = {}
+ )
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/AconCircularProgressBar.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/AconCircularProgressBar.kt
new file mode 100644
index 000000000..c9774b00d
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/AconCircularProgressBar.kt
@@ -0,0 +1,30 @@
+package com.acon.acon.core.designsystem.component.loading
+
+import androidx.annotation.RawRes
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.rememberLottieComposition
+
+@Composable
+fun AconCircularProgressBar(
+ modifier: Modifier = Modifier,
+ size: Dp = 20.dp,
+ @RawRes lottie: Int = R.raw.lottie_progress_w,
+) {
+ val lottieComposition by rememberLottieComposition(
+ LottieCompositionSpec.RawRes(lottie)
+ )
+
+ LottieAnimation(
+ modifier = modifier.size(size),
+ composition = lottieComposition,
+ iterations = Int.MAX_VALUE,
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/SkeletonItem.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/SkeletonItem.kt
new file mode 100644
index 000000000..25b5767cb
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/loading/SkeletonItem.kt
@@ -0,0 +1,24 @@
+package com.acon.acon.core.designsystem.component.loading
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Shape
+import com.acon.acon.core.designsystem.animation.Skeleton
+import com.acon.acon.core.designsystem.animation.skeleton
+
+@Composable
+fun SkeletonItem(
+ modifier: Modifier = Modifier,
+ brush: Brush = Skeleton.brush,
+ shape: Shape = Skeleton.shape
+) {
+
+ Box(
+ modifier = modifier.skeleton(
+ brush = brush,
+ shape = shape
+ )
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/radiobutton/AconRadioButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/radiobutton/AconRadioButton.kt
new file mode 100644
index 000000000..5ff9d8053
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/radiobutton/AconRadioButton.kt
@@ -0,0 +1,100 @@
+package com.acon.acon.core.designsystem.component.radiobutton
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconRadioButton(
+ selected: Boolean,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+) {
+ val borderColor = if (enabled.not()) {
+ Color.Transparent
+ } else {
+ if (selected)
+ Color.Transparent
+ else AconTheme.color.Gray5
+ }
+
+ val containerColor = if (enabled.not()) {
+ AconTheme.color.Gray8
+ } else {
+ if (selected)
+ AconTheme.color.Main_org35
+ else AconTheme.color.Gray9
+ }
+
+ val contentColor = if (enabled.not()) {
+ AconTheme.color.Gray7
+ } else {
+ if (selected)
+ AconTheme.color.Main_org1
+ else Color.Transparent
+ }
+
+ Box(
+ modifier = modifier
+ .size(22.dp)
+ .clip(CircleShape)
+ .border(
+ shape = CircleShape,
+ width = 1.dp,
+ color = borderColor
+ ).background(containerColor).clickable {
+ onClick()
+ },
+ contentAlignment = Alignment.Center
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(6.dp)
+ .clip(CircleShape)
+ .background(contentColor)
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun AconRadioButtonPreview() {
+ AconRadioButton(
+ selected = false,
+ onClick = {}
+ )
+}
+
+@Preview
+@Composable
+private fun AconSelectedRadioButtonPreview() {
+ AconRadioButton(
+ selected = true,
+ onClick = {}
+ )
+}
+
+@Preview
+@Composable
+private fun AconDisabledRadioButtonPreview() {
+ AconRadioButton(
+ selected = false,
+ onClick = {},
+ enabled = false
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/slider/AconSlider.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/slider/AconSlider.kt
new file mode 100644
index 000000000..e00df33f8
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/slider/AconSlider.kt
@@ -0,0 +1,134 @@
+package com.acon.acon.core.designsystem.component.slider
+
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderColors
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEach
+import androidx.compose.ui.util.fastForEachIndexed
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AconSlider(
+ labels: List,
+ sliderIndex: Int,
+ onSliderIndexChange: (Int) -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ colors: SliderColors = SliderDefaults.colors(
+ thumbColor = AconTheme.color.White,
+ activeTrackColor = AconTheme.color.Main_org50,
+ inactiveTrackColor = AconTheme.color.Gray8
+ ),
+ interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+ val spacing = (labels.size.toFloat() / (labels.size - 1)) / labels.size
+ val floatPositions = remember {
+ buildList {
+ repeat(labels.size) {
+ add(spacing * it)
+ }
+ }
+ }
+ Column {
+ Slider(
+ modifier = modifier,
+ value = floatPositions[sliderIndex],
+ onValueChange = {
+ onSliderIndexChange(floatPositions.indexOfFirst { position -> position + spacing / 2f >= it })
+ },
+ colors = colors,
+ thumb = {
+ SliderDefaults.Thumb(
+ interactionSource = interactionSource,
+ colors = colors,
+ enabled = enabled,
+ thumbSize = DpSize(22.dp, 22.dp)
+ )
+ },
+ track = { sliderState ->
+ SliderDefaults.Track(
+ modifier = Modifier.scale(scaleX = 1f, scaleY = 0.8f),
+ colors = colors,
+ enabled = enabled,
+ sliderState = sliderState,
+ drawStopIndicator = {},
+ drawTick = { _, _ -> },
+ trackInsideCornerSize = 0.dp,
+ thumbTrackGapSize = 0.dp
+ )
+ },
+ )
+ CenterBasedSpaceBetweenRow(
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ labels.fastForEach { label ->
+ Text(
+ text = label,
+ style = AconTheme.typography.body2_14_reg,
+ color = AconTheme.color.Gray4
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun CenterBasedSpaceBetweenRow(
+ modifier: Modifier = Modifier,
+ content: @Composable () -> Unit
+) {
+ Layout(
+ modifier = modifier,
+ content = content
+ ) { measurables, constraints ->
+
+ val containerWidth = constraints.maxWidth
+
+ val spacing = if (measurables.size == 1) 0 else containerWidth / (measurables.size - 1)
+ val placeables = measurables.map {
+ it.measure(
+ Constraints(
+ maxWidth = Constraints.Infinity,
+ maxHeight = Constraints.Infinity
+ )
+ )
+ }
+ val containerHeight = placeables.maxOf { it.height }
+ layout(containerWidth, containerHeight) {
+ placeables.fastForEachIndexed { i, placeable ->
+ if (i != measurables.size - 1)
+ placeable.placeRelative(
+ ((spacing * i) - (placeable.width / 2)).coerceAtLeast(0),
+ 0
+ )
+ else placeable.placeRelative(containerWidth - placeable.width, 0)
+ }
+ }
+ }
+}
+
+
+@Composable
+@Preview
+private fun AconSliderPreview() {
+ AconSlider(
+ labels = listOf("5๋ถ ์ด๋ด", "10๋ถ", "15๋ถ", "20๋ถ", "20๋ถ ์ด์"),
+ sliderIndex = 3,
+ onSliderIndexChange = {}
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconSnackBar.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconSnackBar.kt
new file mode 100644
index 000000000..45e3d3d5f
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconSnackBar.kt
@@ -0,0 +1,41 @@
+package com.acon.acon.core.designsystem.component.snackbar
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconSnackBar(
+ content: @Composable () -> Unit,
+ modifier: Modifier = Modifier,
+) {
+ Box(
+ modifier = modifier
+ .clip(RoundedCornerShape(4.dp))
+ .background(color = AconTheme.color.Gray8)
+ .padding(vertical = 12.dp, horizontal = 16.dp)
+ ) {
+ content()
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun AconSnackBarPreview() {
+ AconSnackBar(
+ content = {
+ Text(
+ text = "๊ธฐ๋ณธ ์ค๋ต๋ฐ ๋ฉ์์ง์
๋๋ค.",
+ color = AconTheme.color.White,
+ )
+ }
+ )
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBar.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBar.kt
new file mode 100644
index 000000000..c72a2833e
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBar.kt
@@ -0,0 +1,54 @@
+package com.acon.acon.core.designsystem.component.snackbar
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconTextSnackBar(
+ message: String,
+ modifier: Modifier = Modifier,
+) {
+ Box(
+ modifier = modifier
+ .fillMaxWidth()
+ ) {
+ AconSnackBar(
+ modifier = Modifier.fillMaxWidth(),
+ content = {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 4.dp),
+ contentAlignment = Alignment.CenterStart
+ ) {
+ Text(
+ text = message,
+ style = AconTheme.typography.body1_15_reg,
+ color = AconTheme.color.White
+ )
+ }
+ }
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconTextSnackBar() {
+ AconTextSnackBar(message = "ํ ์คํธ๋ฉ์ธ์ง๊ฐ ์์ฑ๋ฉ๋๋ค.", modifier = Modifier)
+}
+
+@Preview
+@Composable
+private fun PreviewAconTextSnackBar1() {
+ AconTextSnackBar(message = "2025.01.07 ๋ง์ผํ
์์ ์ ๊ฑฐ๋ถํ์
จ์ต๋๋ค.")
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBarWithButton.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBarWithButton.kt
new file mode 100644
index 000000000..6f2c00923
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/snackbar/AconTextSnackBarWithButton.kt
@@ -0,0 +1,81 @@
+package com.acon.acon.core.designsystem.component.snackbar
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconTextSnackBarWithButton(
+ message: String,
+ modifier: Modifier = Modifier,
+ buttonText: String = "button",
+ onClick: () -> Unit,
+) {
+ Box(
+ modifier = modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ ) {
+ AconSnackBar(
+ modifier = Modifier.fillMaxWidth(),
+ content = {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 4.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = message,
+ style = AconTheme.typography.body3_13_reg,
+ color = AconTheme.color.White,
+ modifier = Modifier.weight(1f)
+ )
+ Spacer(modifier = Modifier.width(10.dp))
+ Text(
+ text = buttonText,
+ style = AconTheme.typography.body3_13_reg,
+ color = AconTheme.color.Success_blue1,
+ modifier = Modifier.clickable { onClick() }
+ )
+ }
+ }
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconTextSnackBarWithButton() {
+ AconTheme {
+ AconTextSnackBarWithButton(
+ message = "๋ฉ์ธ์ง๊ฐ ์์ฑ๋ฉ๋๋ค.",
+ modifier = Modifier,
+ onClick = {}
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun PreviewAconTextSnackBarWithButton2() {
+ AconTheme {
+ AconTextSnackBarWithButton(
+ message = "๋ชจ๋ ์ถ์ฒ ๋ฆฌ์คํธ๋ฅผ ํ์ธํ์
จ์ต๋๋ค.",
+ buttonText = "๋งต๋ทฐ๋ก ๋ณด๊ธฐ",
+ modifier = Modifier,
+ onClick = {}
+ )
+ }
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/tag/AconTag.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/tag/AconTag.kt
new file mode 100644
index 000000000..7aee0ba6b
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/tag/AconTag.kt
@@ -0,0 +1,50 @@
+package com.acon.acon.core.designsystem.component.tag
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconTag(
+ text: String,
+ backgroundColor: Color,
+ modifier: Modifier = Modifier,
+ shape: Shape = RoundedCornerShape(4.dp),
+ textStyle: TextStyle = AconTheme.typography.Caption1.copy(fontWeight = FontWeight.W400),
+ contentPadding: PaddingValues = PaddingValues(vertical = 3.dp, horizontal = 17.dp)
+) {
+ Row(
+ modifier = modifier
+ .background(
+ color = backgroundColor,
+ shape = shape
+ ).padding(contentPadding),
+ ) {
+ Text(
+ text = text,
+ style = textStyle,
+ color = AconTheme.color.White
+ )
+ }
+}
+
+@Composable
+@Preview
+private fun AconTagPreview() {
+ AconTag(
+ text = "Tag",
+ backgroundColor = AconTheme.color.New,
+ )
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/AconSearchBar.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/AconSearchBar.kt
new file mode 100644
index 000000000..59cfbd225
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/AconSearchBar.kt
@@ -0,0 +1,169 @@
+package com.acon.acon.core.designsystem.component.textfield
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.theme.AconColors
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconSearchBar(
+ status: SearchBarStatus,
+ modifier: Modifier = Modifier,
+ text: String = "",
+ placeholder: String = "",
+ onTextChanged: (String) -> Unit = {},
+ onFocusChanged: (Boolean) -> Unit = {},
+ keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+ keyboardActions: KeyboardActions = KeyboardActions.Default,
+ leadingIcon: @Composable () -> Unit = {
+ Row {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_search),
+ contentDescription = "Search",
+ tint = AconColors.White
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ }
+ },
+ tailingIcon: @Composable () -> Unit = {
+ if (status == SearchBarStatus.Active) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_dissmiss_circle_gray),
+ contentDescription = "Clear",
+ tint = Color.Unspecified,
+ modifier = Modifier
+ .size(20.dp)
+ .clickable { onTextChanged("") }
+ )
+ }
+ },
+) {
+ val focusRequester = remember { FocusRequester() }
+ val focusManager = LocalFocusManager.current
+
+ val backgroundColor = when (status) {
+ SearchBarStatus.Inactive -> AconColors.Gray8
+ SearchBarStatus.Focused -> AconColors.Gray8
+ SearchBarStatus.Active -> AconColors.Gray8
+ }
+
+ val borderColor = when (status) {
+ SearchBarStatus.Inactive -> AconColors.Gray6
+ SearchBarStatus.Focused -> AconColors.Gray5
+ SearchBarStatus.Active -> AconColors.Gray5
+ }
+
+ val textColor = when (status) {
+ SearchBarStatus.Inactive -> AconColors.Gray5
+ SearchBarStatus.Focused -> AconColors.Gray5
+ SearchBarStatus.Active -> AconColors.White
+ }
+
+ Box(
+ modifier = modifier
+ .fillMaxWidth()
+ .background(color = backgroundColor, shape = RoundedCornerShape(8.dp))
+ .border(width = 1.dp, borderColor, shape = RoundedCornerShape(8.dp))
+ .padding(horizontal = 12.dp, vertical = 8.dp),
+ ){
+ BasicTextField(
+ modifier = Modifier
+ .fillMaxWidth()
+ .align(Alignment.Center)
+ .onFocusChanged { focusState ->
+ onFocusChanged(focusState.isFocused)
+ },
+ value = text,
+ onValueChange = onTextChanged,
+ textStyle = AconTheme.typography.body2_14_reg.copy(
+ color = textColor,
+ textAlign = TextAlign.Start
+ ),
+ singleLine = true,
+ keyboardOptions = keyboardOptions,
+ keyboardActions = KeyboardActions(
+ onDone = {
+ focusManager.clearFocus()
+ }
+ ),
+ decorationBox = { innerTextField ->
+ Row(
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ leadingIcon()
+
+ Box(
+ modifier = modifier.weight(1f),
+ contentAlignment = Alignment.CenterStart
+ ){
+ innerTextField()
+ if (text.isEmpty()) {
+ Text(
+ text = placeholder,
+ style = AconTheme.typography.body2_14_reg,
+ color = textColor,
+ )
+ }
+ }
+ tailingIcon()
+ }
+ },
+ )
+ }
+}
+
+sealed interface SearchBarStatus {
+ data object Inactive: SearchBarStatus
+ data object Focused: SearchBarStatus
+ data object Active: SearchBarStatus
+}
+
+@Preview
+@Composable
+private fun AconSearchBarPreview(){
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ ){
+ AconSearchBar(
+ status = SearchBarStatus.Inactive,
+ )
+ Spacer(modifier = Modifier.height(30.dp))
+ AconSearchBar(
+ status = SearchBarStatus.Focused
+ )
+ Spacer(modifier = Modifier.height(30.dp))
+ AconSearchBar(
+ status = SearchBarStatus.Active
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconFilledTextField.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconFilledTextField.kt
new file mode 100644
index 000000000..1f7aa846b
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconFilledTextField.kt
@@ -0,0 +1,78 @@
+package com.acon.acon.core.designsystem.component.textfield.v2
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.blur.LocalHazeState
+import com.acon.acon.core.designsystem.blur.defaultHazeEffect
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconFilledTextField(
+ value: String,
+ onValueChange: (String) -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ readOnly: Boolean = false,
+ textStyle: TextStyle = AconTheme.typography.Title4.copy(fontWeight = FontWeight.Normal, color = AconTheme.color.White),
+ keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+ keyboardActions: KeyboardActions = KeyboardActions.Default,
+ maxLines: Int = Int.MAX_VALUE,
+ minLines: Int = 1,
+ visualTransformation: VisualTransformation = VisualTransformation.None,
+ onTextLayout: (TextLayoutResult) -> Unit = {},
+ decorationBox: @Composable (innerTextField: @Composable () -> Unit) -> Unit = @Composable { innerTextField -> innerTextField() }
+) {
+ BasicTextField(
+ value = value,
+ onValueChange = onValueChange,
+ modifier = modifier
+ .background(
+ shape = RoundedCornerShape(10.dp),
+ color = AconTheme.color.GlassWhiteDefault
+ ).padding(horizontal = 8.dp, vertical = 10.dp)
+ .defaultHazeEffect(
+ hazeState = LocalHazeState.current,
+ tintColor = AconTheme.color.GlassWhiteDefault,
+ ),
+ enabled = enabled,
+ readOnly = readOnly,
+ textStyle = textStyle,
+ keyboardOptions = keyboardOptions,
+ keyboardActions = keyboardActions,
+ singleLine = false,
+ maxLines = maxLines,
+ minLines = minLines,
+ visualTransformation = visualTransformation,
+ onTextLayout = onTextLayout,
+ cursorBrush = SolidColor(AconTheme.color.Action)
+ ) { innerTextField ->
+ decorationBox(innerTextField)
+ }
+}
+
+@Composable
+@Preview
+private fun AconDefaultTextFieldPreview(
+) {
+ AconFilledTextField(
+ value = "Search Text",
+ onValueChange = { },
+ modifier = Modifier.fillMaxWidth(),
+ ) { innerTextField ->
+ innerTextField()
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconSearchTextField.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconSearchTextField.kt
new file mode 100644
index 000000000..952a3525f
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/textfield/v2/AconSearchTextField.kt
@@ -0,0 +1,113 @@
+package com.acon.acon.core.designsystem.component.textfield.v2
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import com.acon.acon.core.designsystem.noRippleClickable
+import com.acon.acon.core.designsystem.theme.AconTheme
+
+@Composable
+fun AconSearchTextField(
+ value: String,
+ onValueChange: (String) -> Unit,
+ placeholder: String,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ readOnly: Boolean = false,
+ textStyle: TextStyle = AconTheme.typography.Title4.copy(fontWeight = FontWeight.Normal, color = AconTheme.color.White),
+ keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+ keyboardActions: KeyboardActions = KeyboardActions.Default,
+ visualTransformation: VisualTransformation = VisualTransformation.None,
+ onTextLayout: (TextLayoutResult) -> Unit = {},
+) {
+ AconFilledTextField(
+ value = value,
+ onValueChange = onValueChange,
+ modifier = modifier,
+ enabled = enabled,
+ readOnly = readOnly,
+ textStyle = textStyle,
+ keyboardOptions = keyboardOptions,
+ keyboardActions = keyboardActions,
+ maxLines = 1,
+ visualTransformation = visualTransformation,
+ onTextLayout = onTextLayout,
+ ) { innerTextField ->
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Row(modifier = Modifier.weight(1f)) {
+ Icon(
+ imageVector = ImageVector.vectorResource(id = R.drawable.ic_search),
+ contentDescription = stringResource(R.string.search_content_description),
+ tint = AconTheme.color.Gray50,
+ modifier = Modifier.width(18.dp)
+ )
+ Spacer(modifier = Modifier.width(8.dp))
+ if (value.isEmpty()) {
+ Text(
+ text = placeholder,
+ style = textStyle.copy(color = AconTheme.color.Gray500),
+ )
+ }
+ innerTextField()
+ }
+ if (value.isNotEmpty()) {
+ Spacer(modifier = Modifier.width(8.dp))
+ Icon(
+ imageVector = ImageVector.vectorResource(id = R.drawable.ic_clear),
+ contentDescription = stringResource(R.string.clear_search_content_description),
+ tint = AconTheme.color.Gray50,
+ modifier = Modifier
+ .width(18.dp)
+ .noRippleClickable { onValueChange("") }
+ )
+ }
+ }
+ }
+}
+
+@Composable
+@Preview
+private fun AconSearchTextFieldPlaceholderPreview() {
+ AconTheme {
+ AconSearchTextField(
+ value = "",
+ onValueChange = { },
+ placeholder = "์ฅ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์",
+ modifier = Modifier.fillMaxWidth(),
+ )
+ }
+}
+
+@Composable
+@Preview
+private fun AconSearchTextFieldPreview() {
+ AconTheme {
+ AconSearchTextField(
+ value = "๋ฒ๊ฑฐํน",
+ onValueChange = { },
+ placeholder = "์ฅ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์",
+ modifier = Modifier.fillMaxWidth(),
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/topbar/AconTopBar.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/topbar/AconTopBar.kt
new file mode 100644
index 000000000..7981d542d
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/topbar/AconTopBar.kt
@@ -0,0 +1,117 @@
+package com.acon.acon.core.designsystem.component.topbar
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun AconTopBar(
+ modifier: Modifier = Modifier,
+ paddingValues: PaddingValues = PaddingValues(horizontal = 16.dp),
+ leadingIcon: @Composable () -> Unit = {},
+ content: @Composable () -> Unit = {},
+ trailingIcon: @Composable () -> Unit = {},
+ isStartAlignment: Boolean = false
+) {
+ Box(
+ modifier = modifier
+ .fillMaxWidth()
+ .height(56.dp)
+ .padding(paddingValues)
+ ) {
+ if (isStartAlignment) {
+ Row(
+ modifier = Modifier.align(Alignment.CenterStart),
+ horizontalArrangement = Arrangement.Start,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Box {
+ leadingIcon()
+ }
+ Spacer(modifier = Modifier.width(8.dp))
+ Box {
+ content()
+ }
+ }
+ } else {
+ Box(
+ modifier = Modifier.align(Alignment.CenterStart)
+ ) {
+ leadingIcon()
+ }
+ Box(
+ modifier = Modifier.align(Alignment.Center)
+ ) {
+ content()
+ }
+ }
+
+ Box(
+ modifier = Modifier.align(Alignment.CenterEnd)
+ ) {
+ trailingIcon()
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun AconTopBarPreview() {
+ AconTopBar(
+ leadingIcon = {
+ IconButton(onClick = {}) {
+ Icon(
+ imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+ contentDescription = "Back"
+ )
+ }
+ },
+ content = {
+ Text("๋ฆฌ๋ฉ๊ณผ ํธ๋ ์ผ๋ง์ด ์๋ ํ๋ฐ")
+ },
+ trailingIcon = {
+ IconButton(onClick = {}) {
+ Icon(
+ imageVector = Icons.Default.Settings,
+ contentDescription = "Settings"
+ )
+ }
+ }
+ )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun AconTopBarStartAlignmentPreview() {
+ AconTopBar(
+ leadingIcon = {
+ IconButton(onClick = {}) {
+ Icon(
+ imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+ contentDescription = "Back"
+ )
+ }
+ },
+ content = {
+ Text("์ผ์ชฝ ์ ๋ ฌ ํ๋ฐ")
+ },
+ isStartAlignment = true
+ )
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/keyboard/keyboardAsState.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/keyboard/keyboardAsState.kt
new file mode 100644
index 000000000..9a3783631
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/keyboard/keyboardAsState.kt
@@ -0,0 +1,18 @@
+package com.acon.acon.core.designsystem.keyboard
+
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.ime
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalDensity
+
+@Composable
+fun keyboardAsState(): State {
+ val ime = WindowInsets.ime
+ val density = LocalDensity.current
+ return remember(ime, density) {
+ derivedStateOf { ime.getBottom(density) }
+ }
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Color.kt
new file mode 100644
index 000000000..1f639d3f0
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Color.kt
@@ -0,0 +1,174 @@
+package com.acon.acon.core.designsystem.theme
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
+
+internal val AconColors = AconColor(
+
+ //Main
+ Main_org0_deep = Color(0xFFF24B00),
+ Main_org0 = Color(0xFFFF5402),
+ Main_org1 = Color(0xFFFF6928),
+ Main_org2 = Color(0xFFFF8950),
+ Main_org3 = Color(0xFFFFAA7C),
+ Main_org4 = Color(0xFFFFCCAD),
+ Main_org5 = Color(0xFFFFEEE3),
+ Main_org50 = Color(0x80FF6928),
+ Main_org35 = Color(0x59FF8950),
+
+ //Gray Scale
+ White = Color(0xFFFFFFFF),
+ Gray0 = Color(0xFFF7F7FB),
+ Gray1 = Color(0xFFEFF0F4),
+ Gray2 = Color(0xFFD9DADD),
+ Gray3 = Color(0xFFC5C6CB),
+ Gray4 = Color(0xFF93959D),
+ Gray5 = Color(0xFF5E6068),
+ Gray6 = Color(0xFF37383E),
+ Gray7 = Color(0xFF323339),
+ Gray8 = Color(0xFF2B2C31),
+ Gray9 = Color(0xFF1A1B1E),
+ Black = Color(0xFF000000),
+ Dim_b_60 = Color(0x99000000),
+ Dim_b_30 = Color(0x4D000000),
+ Dim_g_30 = Color(0x4D93959D),
+ Gla_w_30 = Color(0x4DFFFFFF),
+ Gla_w_20 = Color(0x33FFFFFF),
+ Gla_w_10 = Color(0x1AFFFFFF),
+
+ Fab_shaodw_1 = Color(0x1A000000),
+
+ Dim_gra_1 = Brush.horizontalGradient(
+ colors = listOf(Color(0x0D000000), Color(0x00000000), Color(0x0D000000))
+ ),
+ Dim_gra_2 = Brush.verticalGradient(
+ colors = listOf(Color(0x80111111), Color(0x00111111), Color(0xCC111111))
+ ),
+
+ //Error Case
+ Error_red1 = Color(0xFFFF3434),
+ Error_red2 = Color(0xFFFFD9D9),
+ Success_blue1 = Color(0xFF4375FF),
+ Error_blue2 = Color(0xFFD2DEFF),
+
+
+ // Acon 2.0
+ PrimaryLighten = Color(0xFFFF692D),
+ PrimaryDefault = Color(0xFFFF4A02),
+ PrimaryDark = Color(0xFFDE3F00),
+
+ Gray900 = Color(0xFF111111),
+ Gray800 = Color(0xFF333333),
+ Gray700 = Color(0xFF505050),
+ Gray600 = Color(0xFF666666),
+ Gray500 = Color(0xFF767676),
+ Gray400 = Color(0xFF888888),
+ Gray300 = Color(0xFF999999),
+ Gray200 = Color(0xFFBBBBBB),
+ Gray100 = Color(0xFFE1E1E1),
+ Gray50 = Color(0xFFF1F1F5),
+
+ Danger = Color(0xFFFF2C51),
+ Success = Color(0xFF04B014),
+ Action = Color(0xFF00AAFE),
+
+ GlassWhiteDefault = Color(0X33FFFFFF),
+ GlassWhitePressed = Color(0X99FFFFFF),
+ GlassWhiteSelected = Color(0X4DFFFFFF),
+ GlassWhiteDisabled = Color(0X1AFFFFFF),
+
+ GlassBlackDefault = Color(0X33000000),
+
+ Light = Color(0x33E1E1E1),
+
+ New = Color(0xFFFF4646)
+)
+
+@Immutable
+data class AconColor(
+
+ val Main_org0_deep: Color,
+ val Main_org0: Color,
+ val Main_org1: Color,
+ val Main_org2: Color,
+ val Main_org3: Color,
+ val Main_org4: Color,
+ val Main_org5: Color,
+ val Main_org50: Color,
+ val Main_org35: Color,
+
+ val White: Color,
+ val Gray0: Color,
+ val Gray1: Color,
+ val Gray2: Color,
+ val Gray3: Color,
+ val Gray4: Color,
+ val Gray5: Color,
+ val Gray6: Color,
+ val Gray7: Color,
+ val Gray8: Color,
+ val Gray9: Color,
+ val Black: Color,
+ val Dim_b_60: Color,
+ val Dim_b_30: Color,
+ val Dim_g_30: Color,
+ val Gla_w_30: Color,
+ val Gla_w_20: Color,
+ val Gla_w_10: Color,
+
+ val Fab_shaodw_1: Color,
+
+ val Dim_gra_1: Brush,
+ val Dim_gra_2: Brush,
+
+ val Error_red1: Color,
+ val Error_red2: Color,
+ val Success_blue1: Color,
+ val Error_blue2: Color,
+
+
+ // Acon 2.0
+ val PrimaryLighten: Color,
+ val PrimaryDefault: Color,
+ val PrimaryDark: Color,
+
+ val Gray900: Color,
+ val Gray800: Color,
+ val Gray700: Color,
+ val Gray600: Color,
+ val Gray500: Color,
+ val Gray400: Color,
+ val Gray300: Color,
+ val Gray200: Color,
+ val Gray100: Color,
+ val Gray50: Color,
+
+ val Danger: Color,
+ val Success: Color,
+ val Action: Color,
+
+ val GlassWhiteDefault: Color,
+ val GlassWhitePressed: Color,
+ val GlassWhiteSelected: Color,
+ val GlassWhiteDisabled: Color,
+
+ val GlassBlackDefault: Color,
+
+ val Light: Color,
+
+ val New: Color
+)
+
+internal val LocalAconColor = staticCompositionLocalOf {
+ AconColors
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acon/acon/ui/theme/Theme.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Theme.kt
similarity index 69%
rename from app/src/main/java/com/acon/acon/ui/theme/Theme.kt
rename to core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Theme.kt
index 06fa066eb..faf496723 100644
--- a/app/src/main/java/com/acon/acon/ui/theme/Theme.kt
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Theme.kt
@@ -1,6 +1,5 @@
-package com.acon.acon.ui.theme
+package com.acon.acon.core.designsystem.theme
-import android.app.Activity
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
@@ -9,6 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalContext
private val DarkColorScheme = darkColorScheme(
@@ -50,9 +50,21 @@ fun AconTheme(
else -> LightColorScheme
}
- MaterialTheme(
- colorScheme = colorScheme,
- typography = Typography,
- content = content
- )
-}
\ No newline at end of file
+ val aconTypography = Typography
+ val aconColor = AconColors
+
+ CompositionLocalProvider(LocalAconTypography provides aconTypography, LocalAconColor provides aconColor) {
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = androidx.compose.material3.Typography(),
+ content = content
+ )
+ }
+}
+
+object AconTheme {
+ val typography: AconTypography
+ @Composable get() = LocalAconTypography.current
+ val color: AconColor
+ @Composable get() = LocalAconColor.current
+}
diff --git a/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Type.kt
new file mode 100644
index 000000000..fd3666aa5
--- /dev/null
+++ b/core/designsystem/src/main/java/com/acon/acon/core/designsystem/theme/Type.kt
@@ -0,0 +1,291 @@
+package com.acon.acon.core.designsystem.theme
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import com.acon.acon.core.designsystem.R
+
+private val Pretendard = FontFamily(
+ Font(resId = R.font.pretendard_bold, weight = FontWeight.W700),
+ Font(resId = R.font.pretendard_extrabold, weight = FontWeight.ExtraBold),
+ Font(resId = R.font.pretendard_light, weight = FontWeight.Light),
+ Font(resId = R.font.pretendard_medium, weight = FontWeight.W500),
+ Font(resId = R.font.pretendard_regular, weight = FontWeight.W400),
+ Font(resId = R.font.pretendard_semibold, weight = FontWeight.W600),
+ Font(resId = R.font.pretendard_thin, weight = FontWeight.Thin),
+)
+
+internal val Typography = AconTypography(
+ //headline
+ head1_32_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 32.sp,
+ lineHeight = 42.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head2_28_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 28.sp,
+ lineHeight = 38.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head3_26_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 26.sp,
+ lineHeight = 36.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head4_24_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 24.sp,
+ lineHeight = 34.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head5_22_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 22.sp,
+ lineHeight = 30.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head6_20_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 20.sp,
+ lineHeight = 28.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head7_18_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 18.sp,
+ lineHeight = 26.sp,
+ letterSpacing = (-0.023).em
+ ),
+ head8_16_sb = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W600,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = (-0.023).em
+ ),
+ //title
+ title1_24_b = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W700,
+ fontSize = 24.sp,
+ lineHeight = 34.sp,
+ letterSpacing = (-0.023).em
+ ),
+ title2_20_b = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W700,
+ fontSize = 20.sp,
+ lineHeight = 28.sp,
+ letterSpacing = (-0.023).em
+ ),
+ title3_18_b = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W700,
+ fontSize = 18.sp,
+ lineHeight = 26.sp,
+ letterSpacing = (-0.023).em
+ ),
+ //subtitle
+ subtitle1_16_med = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W500,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = (-0.023).em
+ ),
+ subtitle2_14_med = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W500,
+ fontSize = 14.sp,
+ lineHeight = 20.sp,
+ letterSpacing = (-0.023).em
+ ),
+ //body
+ body1_15_reg = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W400,
+ fontSize = 15.sp,
+ lineHeight = 22.sp,
+ letterSpacing = (-0.023).em
+ ),
+ body2_14_reg = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W400,
+ fontSize = 14.sp,
+ lineHeight = 20.sp,
+ letterSpacing = (-0.023).em
+ ),
+ body3_13_reg = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W400,
+ fontSize = 13.sp,
+ lineHeight = 18.sp,
+ letterSpacing = (-0.023).em
+ ),
+ body4_12_reg = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W400,
+ fontSize = 12.sp,
+ lineHeight = 18.sp,
+ letterSpacing = (-0.023).em
+ ),
+ //caption
+ cap1_11_reg = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.W400,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = (-0.023).em
+ ),
+
+ Headline1 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.SemiBold,
+ fontSize = 32.sp,
+ lineHeight = 42.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Headline2 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.SemiBold,
+ fontSize = 28.sp,
+ lineHeight = 38.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Headline3 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.SemiBold,
+ fontSize = 24.sp,
+ lineHeight = 34.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Headline4 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.SemiBold,
+ fontSize = 20.sp,
+ lineHeight = 28.sp,
+ letterSpacing = (-0.025).em
+ ),
+
+ Title1 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Bold,
+ fontSize = 24.sp,
+ lineHeight = 34.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Title2 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Bold,
+ fontSize = 20.sp,
+ lineHeight = 28.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Title3 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Bold,
+ fontSize = 18.sp,
+ lineHeight = 26.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Title4 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Bold,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Title5 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Bold,
+ fontSize = 14.sp,
+ lineHeight = 20.sp,
+ letterSpacing = (-0.025).em
+ ),
+
+ Body1 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Normal,
+ fontSize = 14.sp,
+ lineHeight = 20.sp,
+ letterSpacing = (-0.025).em
+ ),
+
+ Caption1 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Normal,
+ fontSize = 12.sp,
+ lineHeight = 18.sp,
+ letterSpacing = (-0.025).em
+ ),
+ Caption2 = TextStyle(
+ fontFamily = Pretendard,
+ fontWeight = FontWeight.Normal,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = (-0.025).em
+ ),
+)
+
+@Immutable
+data class AconTypography(
+ val head1_32_sb: TextStyle,
+ val head2_28_sb: TextStyle,
+ val head3_26_sb: TextStyle,
+ val head4_24_sb: TextStyle,
+ val head5_22_sb: TextStyle,
+ val head6_20_sb: TextStyle,
+ val head7_18_sb: TextStyle,
+ val head8_16_sb: TextStyle,
+
+ val title1_24_b: TextStyle,
+ val title2_20_b: TextStyle,
+ val title3_18_b: TextStyle,
+
+ val subtitle1_16_med: TextStyle,
+ val subtitle2_14_med: TextStyle,
+
+ val body1_15_reg: TextStyle,
+ val body2_14_reg: TextStyle,
+ val body3_13_reg: TextStyle,
+ val body4_12_reg: TextStyle,
+
+ val cap1_11_reg: TextStyle,
+
+ // Acon 2.0
+ val Headline1: TextStyle,
+ val Headline2: TextStyle,
+ val Headline3: TextStyle,
+ val Headline4: TextStyle,
+
+ val Title1: TextStyle,
+ val Title2: TextStyle,
+ val Title3: TextStyle,
+ val Title4: TextStyle,
+ val Title5: TextStyle,
+
+ val Body1: TextStyle,
+
+ val Caption1: TextStyle,
+ val Caption2: TextStyle,
+
+)
+
+internal val LocalAconTypography = staticCompositionLocalOf {
+ Typography
+}
diff --git a/core/designsystem/src/main/res/drawable/and_ic_progress_w_28.xml b/core/designsystem/src/main/res/drawable/and_ic_progress_w_28.xml
new file mode 100644
index 000000000..5a5000331
--- /dev/null
+++ b/core/designsystem/src/main/res/drawable/and_ic_progress_w_28.xml
@@ -0,0 +1,22 @@
+
+
+
+
+