[UI/#124] 전체 그래픽 추가 작업

app/src/main/java/com/terning/point/di/AuthInterceptor.kt

@@ -28,51 +28,51 @@ class AuthInterceptor @Inject constructor(
 
         Timber.d("GET REFRESH TOKEN : ${terningDataStore.refreshToken}")
 
-        val authRequest = if (terningDataStore.accessToken.isNotBlank()) {
+        val authRequest = if (terningDataStore.refreshToken.isNotBlank()) {
             originalRequest.newBuilder().newAuthBuilder().build()
         } else {
             originalRequest
         }
 
         val response = chain.proceed(authRequest)
 
-        when (response.code) {
-            CODE_TOKEN_EXPIRED -> {
-                try {
-                    runBlocking {
-                        tokenReissueRepository.postReissueToken(
-                            terningDataStore.refreshToken
-                        )
-                    }.onSuccess { data ->
-                        terningDataStore.apply {
-                            refreshToken = data.refreshToken
-                        }
-
-                        response.close()
-
-                        val newRequest =
-                            authRequest.newBuilder().removeHeader(AUTHORIZATION).newAuthBuilder()
-                                .build()
-
-                        return chain.proceed(newRequest)
-                    }
-                } catch (t: Throwable) {
-                    Timber.d(t.message)
-                }
-
-                terningDataStore.clearInfo()
-
-                Handler(Looper.getMainLooper()).post {
-                    context.stringToast(TOKEN_EXPIRED_ERROR)
-                    Handler(Looper.getMainLooper()).post {
-                        ProcessPhoenix.triggerRebirth(
-                            context,
-                            Intent(context, MainActivity::class.java)
-                        )
-                    }
-                }
-            }
-        }
+//        when (response.code) {
+//            CODE_TOKEN_EXPIRED -> {
+//                try {
+//                    runBlocking {
+//                        tokenReissueRepository.postReissueToken(
+//                            terningDataStore.refreshToken
+//                        )
+//                    }.onSuccess { data ->
+//                        terningDataStore.apply {
+//                            refreshToken = data.refreshToken
+//                        }
+//
+//                        response.close()
+//
+//                        val newRequest =
+//                            authRequest.newBuilder().removeHeader(AUTHORIZATION).newAuthBuilder()
+//                                .build()
+//
+//                        return chain.proceed(newRequest)
+//                    }
+//                } catch (t: Throwable) {
+//                    Timber.d(t.message)
+//                }
+//
+//                terningDataStore.clearInfo()
+//
+//                Handler(Looper.getMainLooper()).post {
+//                    context.stringToast(TOKEN_EXPIRED_ERROR)
+//                    Handler(Looper.getMainLooper()).post {
+//                        ProcessPhoenix.triggerRebirth(
+//                            context,
+//                            Intent(context, MainActivity::class.java)
+//                        )
+//                    }
+//                }
+//            }
+//        }
         return response
     }
 

core/build.gradle.kts

@@ -70,4 +70,5 @@ dependencies {
     //ThirdPartyDependencies
     implementation(libs.compose.coil)
     implementation(libs.okhttp)
+    implementation(libs.lottie)
 }

core/src/main/java/com/terning/core/designsystem/component/bottomsheet/SignUpBottomSheet.kt

@@ -1,14 +1,20 @@
 package com.terning.core.designsystem.component.bottomsheet
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -20,11 +26,15 @@ 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.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.terning.core.R
 import com.terning.core.designsystem.component.button.RoundButton
+import com.terning.core.designsystem.theme.TerningMain
+import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.noRippleClickable
 import kotlinx.coroutines.launch
@@ -88,12 +98,12 @@ fun RadioButtonGroup(
     onOptionSelected: (Int) -> Unit
 ) {
     val options = listOf(
-        R.drawable.ic_character1,
-        R.drawable.ic_character2,
-        R.drawable.ic_character3,
-        R.drawable.ic_character4,
-        R.drawable.ic_character5,
-        R.drawable.ic_character6
+        R.drawable.ic_terning_profile_00,
+        R.drawable.ic_terning_profile_01,
+        R.drawable.ic_terning_profile_02,
+        R.drawable.ic_terning_profile_03,
+        R.drawable.ic_terning_profile_04,
+        R.drawable.ic_terning_profile_05
     )
 
     var selectedOption by rememberSaveable { mutableIntStateOf(options[0]) }
@@ -106,19 +116,40 @@ fun RadioButtonGroup(
             .padding(horizontal = 42.dp)
     ) {
         itemsIndexed(options) { index, option ->
+            val imageModifier = if (selectedOption == options[index]) {
+                modifier
+                    .border(
+                        color = TerningMain,
+                        width = 2.dp,
+                        shape = CircleShape
+                    )
+            } else {
+                modifier
+            }
+
             Image(
                 painter = painterResource(
-                    id = if (option == selectedOption) R.drawable.ic_selected_character
-                    else option
+                    id = option
                 ),
                 contentDescription = stringResource(id = R.string.sign_up_bottom_sheet_description),
-                modifier = modifier
+                modifier = imageModifier
                     .aspectRatio(1f)
                     .noRippleClickable {
                         onOptionSelected(index)
                         selectedOption = option
                     }
+                    .clip(shape = CircleShape)
             )
         }
     }
 }
+
+@Preview(showBackground = true)
+@Composable
+fun SignUpBottomSheetPreview() {
+    TerningPointTheme {
+        RadioButtonGroup(
+            onOptionSelected = {}
+        )
+    }
+}

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapCancelDialogContent.kt

@@ -9,18 +9,25 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.rememberLottieComposition
 import com.terning.core.R
 import com.terning.core.designsystem.component.button.RoundButton
+import com.terning.core.designsystem.component.item.TerningLottieAnimation
 import com.terning.core.designsystem.theme.Grey200
 import com.terning.core.designsystem.theme.Grey350
 import com.terning.core.designsystem.theme.Grey500
@@ -34,7 +41,7 @@ fun ScrapCancelDialogContent(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 60.dp),
+            .padding(top = 50.dp),
         contentAlignment = Alignment.TopCenter
     ) {
         Column(
@@ -43,34 +50,16 @@ fun ScrapCancelDialogContent(
                 .padding(horizontal = 16.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            Image(
-                painter = painterResource(
-                    id = R.drawable.ic_character1
-                ),
-                modifier = Modifier
-                    .padding(horizontal = 4.dp)
-                    .fillMaxWidth()
-                    .aspectRatio(1.3f)
-                    .background(
-                        Grey200,
-                        shape = RoundedCornerShape(size = 15.dp)
-                    )
-                    .border(
-                        width = 1.dp,
-                        color = TerningMain,
-                        shape = RoundedCornerShape(size = 15.dp)
-                    ),
-                contentDescription = null,
-                contentScale = ContentScale.Fit,
-                alignment = Alignment.Center
+            TerningLottieAnimation(
+                jsonString = "terning_scrap_cancel.json",
+                modifier = Modifier.fillMaxWidth().aspectRatio(1f)
             )
 
             Text(
                 text = stringResource(id = R.string.dialog_content_scrap_cancel_main_title),
                 textAlign = TextAlign.Center,
                 style = TerningTheme.typography.title4,
                 color = Grey500,
-                modifier = Modifier.padding(top = 21.dp)
             )
             Text(
                 text = stringResource(id = R.string.dialog_content_scrap_cancel_sub_title),

core/src/main/java/com/terning/core/designsystem/component/item/TerningLottieAnimation.kt

@@ -0,0 +1,20 @@
+package com.terning.core.designsystem.component.item
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.rememberLottieComposition
+
+@Composable
+fun TerningLottieAnimation(
+    jsonString: String,
+    modifier: Modifier = Modifier
+) {
+    val lottieComposition by rememberLottieComposition(LottieCompositionSpec.Asset(jsonString))
+    LottieAnimation(
+        modifier = modifier,
+        composition = lottieComposition
+    )
+}

core/src/main/java/com/terning/core/designsystem/component/topappbar/LogoTopAppBar.kt

@@ -1,22 +1,35 @@
 package com.terning.core.designsystem.component.topappbar
 
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import com.terning.core.R
+import com.terning.core.designsystem.theme.TerningMain
 
 @Composable
 fun LogoTopAppBar(
     modifier: Modifier = Modifier
 ) {
+    val configuration = LocalConfiguration.current
+    val heightRatio = 780f / configuration.screenHeightDp
+    val widthRatio = 360f / configuration.screenWidthDp
+
     TerningBasicTopAppBar(
         showBackButton = false,
         actions = listOf {
             Icon(
-                painter = painterResource(id = R.drawable.ic_logo),
+                painter = painterResource(id = R.drawable.ic_terning_logo_typo),
                 contentDescription = stringResource(id = R.string.ic_logo),
+                tint = TerningMain,
+                modifier = Modifier
+                    .padding(start = 24.dp, end = 16.dp, top = 16.dp)
+                    .size(width = (109 * widthRatio).dp, height = (26 * heightRatio).dp)
             )
         },
         modifier = modifier

core/src/main/java/com/terning/core/designsystem/theme/Color.kt

@@ -43,4 +43,5 @@ val CalPink = Color(0xFFF260AC)
 
 // Other
 val WarningRed = Color(0xFFF54645)
-val SundayRed = Color(0xFFEB1211)
+val SundayRed = Color(0xFFEB1211)
+val KakaoYellow = Color(0xFFFEE500)