기프티콘 등록 API 연동

app/build.gradle

@@ -60,6 +60,7 @@ dependencies {
 
     // androidx
     implementation libs.androidx.core.ktx
+    implementation libs.androidx.splashscreen
 
     // compose
     implementation libs.androidx.activity.compose

app/src/main/AndroidManifest.xml

@@ -11,9 +11,9 @@
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.BuddyCon"
         tools:targetApi="31"
@@ -22,7 +22,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.BuddyCon">
+            android:theme="@style/Theme.BuddyCon.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/yapp/buddycon/MainActivity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 import com.yapp.buddycon.navigation.BuddyConNavHost
 import dagger.hilt.android.AndroidEntryPoint
@@ -12,6 +13,8 @@ import dagger.hilt.android.AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        installSplashScreen()
         setContent {
             BuddyConApp()
         }

app/src/main/res/values/colors.xml

@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="pink100">#FFFF4E6E</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">BuddyCon</string>
+    <string name="app_name">MOA</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -2,4 +2,11 @@
 <resources>
 
     <style name="Theme.BuddyCon" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Theme.BuddyCon.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenAnimationDuration">2000</item>
+        <item name="windowSplashScreenBackground">@color/pink100</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_logo</item>
+        <item name="postSplashScreenTheme">@style/Theme.BuddyCon</item>
+    </style>
 </resources>

core/designsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/ConfirmDialog.kt

@@ -3,25 +3,33 @@ package com.yapp.buddycon.designsystem.component.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.yapp.buddycon.designsystem.R
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 
 @Composable
 fun ConfirmDialog(
     dialogTitle: String,
     dialogContent: String? = null,
-    onClick: (() -> Unit)? = null
+    onClick: (() -> Unit)? = null,
+    onDismissRequest: () -> Unit = {}
 ) {
-    BaseDialog(
-        dialogTitle = dialogTitle,
-        dialogContent = dialogContent,
-        dialogButtons = listOf(
-            DialogButtons.Light(
-                title = stringResource(id = R.string.confirm),
-                action = onClick
+    Dialog(
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+        onDismissRequest = onDismissRequest
+    ) {
+        BaseDialog(
+            dialogTitle = dialogTitle,
+            dialogContent = dialogContent,
+            dialogButtons = listOf(
+                DialogButtons.Light(
+                    title = stringResource(id = R.string.confirm),
+                    action = onClick
+                )
             )
         )
-    )
+    }
 }
 
 @Preview

core/designsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/DefaultDialog.kt

@@ -2,6 +2,8 @@ package com.yapp.buddycon.designsystem.component.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 
 @Composable
@@ -10,23 +12,28 @@ fun DefaultDialog(
     dismissText: String,
     confirmText: String,
     dialogContent: String? = null,
-    onDismiss: (() -> Unit)? = null,
-    onConfirm: (() -> Unit)? = null
+    onConfirm: (() -> Unit)? = null,
+    onDismissRequest: (() -> Unit) = {}
 ) {
-    BaseDialog(
-        dialogTitle = dialogTitle,
-        dialogContent = dialogContent,
-        dialogButtons = listOf(
-            DialogButtons.Dark(
-                title = dismissText,
-                action = onDismiss
-            ),
-            DialogButtons.Light(
-                title = confirmText,
-                action = onConfirm
+    Dialog(
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+        onDismissRequest = onDismissRequest
+    ) {
+        BaseDialog(
+            dialogTitle = dialogTitle,
+            dialogContent = dialogContent,
+            dialogButtons = listOf(
+                DialogButtons.Dark(
+                    title = dismissText,
+                    action = onDismissRequest
+                ),
+                DialogButtons.Light(
+                    title = confirmText,
+                    action = onConfirm
+                )
             )
         )
-    )
+    }
 }
 
 @Preview

core/designsystem/src/main/java/com/yapp/buddycon/designsystem/component/modal/CategoryModalSheet.kt

@@ -39,15 +39,14 @@ import com.yapp.buddycon.designsystem.R
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 import com.yapp.buddycon.designsystem.theme.Paddings
 import com.yapp.buddycon.domain.model.type.GifticonCategory
-import java.lang.IllegalStateException
 
 private val CategoryModalSheetHeight = 498.dp
 private val CategoryModalSheetRadius = 24.dp
 private val CategoryModalSheetDragHandleHeight = 24.dp
 private val CategoryModalSheetDragHandleTopPadding = 17.dp
 private val CategoryModalSheetItemTopPadding = 25.dp
 private val CategoryModalSheetItemBottomPadding = 35.dp
-private val CategoryModalSheetItemImageSize = 104.dp
+private val CategoryModalSheetItemImageSize = 68.dp
 private val CateogryModalSheetCloseDescription = "Close"
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -94,18 +93,18 @@ fun CategoryModalSheet(
         }
     ) {
         LazyVerticalGrid(
-            columns = GridCells.Fixed(3),
+            columns = GridCells.Fixed(4),
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = Paddings.xlarge)
                 .padding(
                     top = CategoryModalSheetItemTopPadding,
                     bottom = CategoryModalSheetItemBottomPadding
                 ),
-            verticalArrangement = Arrangement.spacedBy(Paddings.xlarge),
-            horizontalArrangement = Arrangement.spacedBy(Paddings.medium)
+            verticalArrangement = Arrangement.spacedBy(Paddings.xextra),
+            horizontalArrangement = Arrangement.spacedBy(Paddings.xlarge)
         ) {
-            items(GifticonCategory.values().dropLast(1)) {
+            items(GifticonCategory.values().copyOfRange(1, GifticonCategory.values().size - 1)) {
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -136,12 +135,15 @@ fun CategoryModalSheet(
 
 private fun GifticonCategory.logo(): Int = when (this) {
     GifticonCategory.STARBUCKS -> R.drawable.ic_starbucks
-    GifticonCategory.TWOSOME -> R.drawable.ic_twosome
-    GifticonCategory.MCDONALD -> R.drawable.ic_mcdonald
+    GifticonCategory.TWOSOME_PLACE -> R.drawable.ic_twosome
+    GifticonCategory.ANGELINUS -> R.drawable.ic_angelinus
+    GifticonCategory.MEGA_COFFEE -> R.drawable.ic_mega_coffee
+    GifticonCategory.COFFEE_BEAN -> R.drawable.ic_coffee_bean
+    GifticonCategory.GONG_CHA -> R.drawable.ic_gongcha
     GifticonCategory.BASKINROBBINS -> R.drawable.ic_baskinrobbins
-    GifticonCategory.GONGCHA -> R.drawable.ic_gongcha
-    GifticonCategory.CU -> R.drawable.ic_cu
+    GifticonCategory.MCDONALD -> R.drawable.ic_mcdonald
     GifticonCategory.GS25 -> R.drawable.ic_gs25
+    GifticonCategory.CU -> R.drawable.ic_cu
     GifticonCategory.ETC -> R.drawable.ic_etc
     else -> throw IllegalStateException()
 }

core/designsystem/src/main/java/com/yapp/buddycon/designsystem/theme/Theme.kt

@@ -1,23 +1,14 @@
 package com.yapp.buddycon.designsystem.theme
 
-import android.app.Activity
-import android.os.Build
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
-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.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -38,23 +29,7 @@ fun BuddyConTheme(
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
+    val colorScheme = LightColorScheme
 
     val buddyConTypography = BuddyConTypography(
         largeTitle = TextStyle(
@@ -175,10 +150,7 @@ fun BuddyConTheme(
         LocalBuddyConTypography provides buddyConTypography,
         LocalBuddyConColors provides buddyConColors
     ) {
-        MaterialTheme(
-            colorScheme = colorScheme,
-            content = content
-        )
+        MaterialTheme(content = content)
     }
 }
 

core/designsystem/src/main/res/drawable/ic_full_logo.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="97dp"
+    android:height="97dp"
+    android:viewportWidth="97"
+    android:viewportHeight="97">
+  <path
+      android:pathData="M41.389,32C44.297,32 46.878,30.604 48.5,28.445C50.122,30.604 52.703,32 55.611,32C60.52,32 64.5,28.02 64.5,23.111C64.5,20.203 63.104,17.622 60.945,16C63.104,14.378 64.5,11.797 64.5,8.889C64.5,3.98 60.52,0 55.611,0C52.703,0 50.122,1.396 48.5,3.555C46.878,1.396 44.297,0 41.389,0C36.48,0 32.5,3.98 32.5,8.889C32.5,11.797 33.896,14.378 36.055,16C33.896,17.622 32.5,20.203 32.5,23.111C32.5,28.02 36.48,32 41.389,32Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M1.778,75.786C1.778,69.8 3.254,57.09 4.812,51.555C5.673,48.521 7.805,47.619 10.306,47.619C12.889,47.619 14.652,49.136 15.677,51.145C17.03,53.769 18.588,58.32 20.433,64.47H20.597C22.442,58.32 24.205,53.646 25.394,51.145C26.378,49.095 28.141,47.619 30.724,47.619C33.225,47.619 35.357,48.521 36.218,51.555C37.776,57.09 39.252,69.8 39.252,75.786C39.252,78.779 38.268,81.075 35.316,81.403C32.364,81.731 31.011,80.337 30.314,77.467C29.781,75.294 29.166,70.005 28.797,64.552H28.592C27.239,70.128 25.763,75.171 24.656,77.795C23.836,79.763 22.606,80.624 20.515,80.624C18.424,80.624 17.194,79.763 16.374,77.795C15.308,75.294 13.75,69.882 12.438,64.552H12.233C11.864,70.005 11.249,75.294 10.716,77.467C10.019,80.337 8.666,81.731 5.714,81.403C2.762,81.075 1.778,78.779 1.778,75.786ZM53.115,81.444C44.259,81.444 37.207,75.54 37.207,64.552C37.207,53.523 44.259,47.619 53.115,47.619C61.971,47.619 69.023,53.523 69.023,64.552C69.023,75.54 61.971,81.444 53.115,81.444ZM53.115,71.563C56.477,71.563 58.568,68.816 58.568,64.552C58.568,60.247 56.518,57.5 53.115,57.5C49.712,57.5 47.662,60.206 47.662,64.552C47.662,68.857 49.712,71.563 53.115,71.563ZM65.535,75.335C66.683,69.226 70.619,57.418 72.833,52.662C74.227,49.71 75.826,48.111 78.245,47.742C80.049,47.455 81.443,47.455 83.247,47.742C85.666,48.111 87.019,49.751 88.577,52.662C90.955,57.131 94.973,69.226 95.916,75.13C96.408,78.328 95.506,80.46 92.595,81.239C89.725,82.018 87.552,80.583 86.404,77.877C86.035,77.016 85.584,75.376 85.297,74.064C82.632,74.474 78.778,74.474 76.195,74.105C75.949,75.294 75.457,77.016 75.129,77.836C73.858,80.993 71.644,82.018 68.733,81.239C65.863,80.46 64.961,78.287 65.535,75.335ZM78.286,65.167C79.434,65.126 82.14,65.126 83.288,65.167C82.509,62.338 81.443,58.648 80.828,56.229H80.664C80.09,58.689 79.065,62.338 78.286,65.167Z"
+      android:fillColor="#000000"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_logo.xml

@@ -1,23 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="118dp"
-    android:height="66dp"
-    android:viewportWidth="118"
-    android:viewportHeight="66">
-  <group>
-    <clip-path
-        android:pathData="M0,0h118v66h-118z"/>
-    <path
-        android:pathData="M0.56,29V1.33H13.79C16.94,1.33 19.06,1.88 20.16,2.96C21.25,4.05 21.79,5.76 21.79,8.09V8.18C21.79,10.08 21.44,11.47 20.75,12.29C20.18,13.22 19.18,13.77 17.76,13.97V14.53C19.04,14.56 20.13,15.07 21.03,16.05C21.93,17.05 22.38,18.73 22.38,21.11C22.38,24.05 21.84,26.09 20.77,27.25C19.7,28.42 17.55,29 14.33,29H0.56ZM7.51,11.62H13.48C14.73,11.62 15.09,10.8 15.09,9.12C15.09,7.46 14.77,6.84 13.56,6.84H7.51V11.62ZM7.51,23.42H13.69C14.37,23.42 14.82,23.19 15.03,22.74C15.24,22.3 15.35,21.46 15.35,20.25C15.35,19.06 15.24,18.2 15.02,17.69C14.79,17.19 14.3,16.92 13.55,16.92H7.51V23.42ZM34.94,29.14C27.31,29.14 23.65,25.92 23.65,19.01V1.33H30.68V18.36C30.68,20.28 31.02,21.58 31.66,22.23C32.31,22.89 33.4,23.23 34.94,23.23C36.48,23.23 37.58,22.89 38.23,22.25C38.87,21.6 39.19,20.3 39.19,18.36V1.33H46.22V19.01C46.22,25.92 42.57,29.14 34.94,29.14ZM47.49,29V1.33H60.02C63.31,1.33 65.74,2.35 67.32,4.39C68.87,6.44 69.66,10.03 69.66,15.14C69.66,20.28 68.87,23.87 67.32,25.92C65.74,27.97 63.31,29 60.02,29H47.49ZM54.49,23.42H58.85C60.12,23.42 61.09,23.03 61.72,22.26C62.35,21.49 62.66,19.11 62.66,15.14C62.66,11.22 62.35,8.86 61.72,8.07C61.09,7.28 60.12,6.9 58.85,6.9H54.49V23.42ZM70.83,29V1.33H83.36C86.65,1.33 89.09,2.35 90.66,4.39C92.22,6.44 93.01,10.03 93.01,15.14C93.01,20.28 92.22,23.87 90.66,25.92C89.09,27.97 86.65,29 83.36,29H70.83ZM77.83,23.42H82.19C83.47,23.42 84.43,23.03 85.06,22.26C85.69,21.49 86.01,19.11 86.01,15.14C86.01,11.22 85.69,8.86 85.06,8.07C84.43,7.28 83.47,6.9 82.19,6.9H77.83V23.42ZM105.24,10.92L109.57,1.33H117.18L107.96,19.02V29H100.92V19.02L91.66,1.33H99.28L103.65,10.92C103.95,11.32 104.16,11.94 104.18,12.44L104.21,13.83H104.68L104.72,12.44C104.72,11.94 104.95,11.32 105.24,10.92ZM12.13,62.14C7.98,62.14 5.01,61.14 3.22,59.15C1.42,57.15 0.52,53.49 0.52,48.19C0.52,42.85 1.42,39.2 3.22,37.26C5.01,35.31 7.96,34.33 12.11,34.33C16.29,34.33 19.2,35.26 20.83,37.1C22.45,38.95 23.27,42.03 23.27,46.35H16.19C16.19,42.94 15.91,41.02 15.33,40.56C14.75,40.13 13.67,39.9 12.07,39.9C10.45,39.9 9.29,40.19 8.63,40.79C7.95,41.38 7.61,43.85 7.61,48.21C7.61,52.55 7.95,55.03 8.63,55.65C9.29,56.26 10.45,56.58 12.07,56.58C13.67,56.58 14.75,56.33 15.33,55.84C15.91,55.35 16.19,53.44 16.19,50.12H23.27C23.27,54.32 22.45,57.36 20.83,59.27C19.2,61.18 16.29,62.14 12.13,62.14ZM36.31,62.21C32.66,62.21 29.79,61.26 27.67,59.39C25.55,57.52 24.5,53.81 24.5,48.26C24.5,42.73 25.55,39.02 27.67,37.15C29.79,35.28 32.66,34.33 36.31,34.33C39.97,34.33 42.84,35.28 44.96,37.15C47.06,39.02 48.11,42.73 48.11,48.26C48.11,53.81 47.06,57.52 44.96,59.39C42.84,61.26 39.97,62.21 36.31,62.21ZM36.31,56.66C37.78,56.66 38.96,56.31 39.81,55.61C40.67,54.91 41.11,52.46 41.11,48.26C41.11,44.06 40.67,41.61 39.81,40.91C38.96,40.21 37.78,39.86 36.31,39.86C34.83,39.86 33.65,40.21 32.8,40.91C31.94,41.61 31.5,44.06 31.5,48.26C31.5,52.46 31.94,54.91 32.8,55.61C33.65,56.31 34.83,56.66 36.31,56.66ZM56.27,46.81V62H49.27V34.33H61.71L68.27,56.21H68.73L67.9,49.82C67.83,49.49 67.78,49.01 67.78,48.67V34.33H74.8V62H62.76L55.81,39.25H55.34L56.16,45.76C56.23,46.06 56.27,46.49 56.27,46.81Z"
-        android:fillColor="#000000"/>
-    <path
-        android:strokeWidth="1"
-        android:pathData="M113.5,57C113.5,57.47 113.21,58 112.51,58.55C111.82,59.1 110.78,59.62 109.45,60.06C106.8,60.94 103.1,61.5 99,61.5C94.9,61.5 91.2,60.94 88.55,60.06C87.22,59.62 86.18,59.1 85.49,58.55C84.79,58 84.5,57.47 84.5,57C84.5,56.53 84.79,56 85.49,55.45C86.18,54.9 87.22,54.38 88.55,53.94C91.2,53.06 94.9,52.5 99,52.5C103.1,52.5 106.8,53.06 109.45,53.94C110.78,54.38 111.82,54.9 112.51,55.45C113.21,56 113.5,56.53 113.5,57Z"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"/>
-    <path
-        android:pathData="M100.33,53.82C99.57,54.49 98.43,54.49 97.67,53.82L97.55,53.71C92.4,49.12 89,46.1 89,42.4C89,39.37 91.42,37 94.5,37C96.04,37 97.53,37.62 98.6,38.63C98.82,38.84 99.18,38.84 99.4,38.63C100.47,37.62 101.96,37 103.5,37C106.58,37 109,39.37 109,42.4C109,46.1 105.6,49.12 100.45,53.71L100.33,53.82Z"
-        android:strokeWidth="3"
-        android:fillColor="#FF4E6E"
-        android:strokeColor="#000000"/>
-  </group>
+    android:width="360dp"
+    android:height="360dp"
+    android:viewportWidth="360"
+    android:viewportHeight="360">
+  <path
+      android:pathData="M0,0h360v360h-360z"
+      android:fillColor="#FF4E6E"/>
+  <path
+      android:pathData="M140,270C156.36,270 170.88,262.15 180,250.01C189.12,262.15 203.64,270 220,270C247.61,270 270,247.61 270,220C270,203.64 262.15,189.12 250.01,180C262.15,170.88 270,156.36 270,140C270,112.39 247.61,90 220,90C203.64,90 189.12,97.85 180,110C170.88,97.85 156.36,90 140,90C112.39,90 90,112.39 90,140C90,156.36 97.85,170.88 110,180C97.85,189.12 90,203.64 90,220C90,247.61 112.39,270 140,270Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>

core/designsystem/src/main/res/drawable/ic_splash_logo.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="56dp"
+        android:height="56dp"
+        android:gravity="center"
+        android:drawable="@drawable/ic_full_logo" />
+
+</layer-list>