Merge pull request #300 from Team-Offroad/feature/298

refactor: 3차 QA 추가 수정사항 반영

Author: junseo511

README.md

@@ -1,16 +1,20 @@
 # 📗 OFFROAD-Android
+
 <img src="https://github.com/user-attachments/assets/3d153cb7-f0e7-410a-baa3-9fb3ca21ae82" width="500">
 
-> 오프로드, 일상을 모험하는 온오프라인 연계형 어드벤처 게임
+> 오브, 일상을 모험하는 온오프라인 연계형 어드벤처 게임
 </br>
 
 ## 💻 IDE
+
 <div><img src="https://img.shields.io/badge/kotlin-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white"><img src="https://img.shields.io/badge/android-3DDC84?style=for-the-badge&logo=android&logoColor=white"><img src="https://img.shields.io/badge/Android%20Studio-3E81F2.svg?style=for-the-badge&logo=android-studio&logoColor=white"></div>
 </br>
 
 ## 📁 Overview
-> 오프로드는 반복되는 일상 속에서 권태를 느끼는 현대인들에게</br>
+
+> 오브는 반복되는 일상 속에서 권태를 느끼는 현대인들에게</br>
 > 더욱 즐겁고 설레는 일상을 선물하고자 기획되었습니다.</br>
+
 ```
 📦com.teamoffroad.offroad
 ├─📂app
@@ -47,9 +51,11 @@
 │  └─📂mypage
 └─📂build-logic
 ```
+
 </br>
 
 ## 🏭 Libraries
+
 - Jetpack Compose: UI 개발의 간소화 및 유지보수성 향상
 - Retrofit2: API 통합 간소화
 - Naver Map: 위치 기반 서비스 추가
@@ -66,13 +72,15 @@
 </br>
 
 ## 🥕 Extensions
+
 - BaseResponse: 공용되는 네트워크 응답을 사용하기 위해 만들었습니다.
 - Retrofit: 공용되는 네트워크 모듈을 사용하기 위해 만들었습니다.
 - 디자인 시스템 및 기타 공용 컴포넌트: 디자인의 일관성 유지 및 유지보수성을 위해 만들었습니다.
 
 </br>
 
 ## 🏭 Tech Stacks
+
 - Clean Architecture: 의존성 분리 및 유지보수
 - Multi Module: 빌드 속도 개선
 - MVVM pattern: 비즈니스 로직 분리
@@ -82,22 +90,26 @@
 </br>
 
 ## 🏷️ Convention
+
 - Adheres to the [OFFROAD-Android-Convention](https://github.com/Team-Offroad/Offroad-Android).
 
 </br>
 
 ## ⭐️ Did you find this repository helpful?
+
 - Don't forget give a star.
 
 </br>
 
 ## 🍴 Didn't you?
+
 - Then fork this repo, make it better and don't forget give a STAR.
 
 </br>
 
 ## 👨‍👩‍👧‍👦 Contributers
-|<img src="https://avatars.githubusercontent.com/u/127238018?v=4" width="128" />|<img src="https://avatars.githubusercontent.com/u/81751105?v=4" width="128" />|<img src="https://avatars.githubusercontent.com/u/112953135?v=4" width="128" />|
-|:---------:|:---------:|:---------:|
-|[👑최준서](https://github.com/junseo511)|[유정현](https://github.com/OliviaYJH)|[이석찬](https://github.com/leeseokchan00)|
-|탐험 뷰</br>모듈 분리|홈 뷰</br>디자인 세팅|로그인 뷰</br>온보딩 뷰</br>네비게이션 세팅|
+
+| <img src="https://avatars.githubusercontent.com/u/127238018?v=4" width="128" /> | <img src="https://avatars.githubusercontent.com/u/81751105?v=4" width="128" /> | <img src="https://avatars.githubusercontent.com/u/112953135?v=4" width="128" /> |
+|:-------------------------------------------------------------------------------:|:------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------:|
+|                      [👑최준서](https://github.com/junseo511)                      |                      [유정현](https://github.com/OliviaYJH)                       |                     [이석찬](https://github.com/leeseokchan00)                     |
+|                                 탐험 뷰</br>모듈 분리                                  |                                 홈 뷰</br>디자인 세팅                                 |                          로그인 뷰</br>온보딩 뷰</br>네비게이션 세팅                           |

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/component/AgreeTermsAndConditionsItem.kt

@@ -36,7 +36,7 @@ fun AgreeTermsAndConditionsItem(
             .fillMaxWidth()
             .padding(horizontal = 44.dp)
             .padding(bottom = 18.dp)
-            .clickableWithoutRipple { onClick() },
+            .clickableWithoutRipple { dialogShown() },
         verticalAlignment = Alignment.CenterVertically,
 
         ) {
@@ -49,7 +49,9 @@ fun AgreeTermsAndConditionsItem(
                     false -> painterResource(R.drawable.ic_agree_check_empty)
                 },
                 contentDescription = "check",
-                modifier = Modifier.padding(end = 12.dp)
+                modifier = Modifier
+                    .padding(end = 12.dp)
+                    .clickableWithoutRipple { onClick() }
             )
         }
         Box(
@@ -81,7 +83,6 @@ fun AgreeTermsAndConditionsItem(
         Image(
             painter = painterResource(R.drawable.ic_agree_click_next),
             contentDescription = "next",
-            modifier = Modifier.clickableWithoutRipple { dialogShown() },
             alignment = Alignment.CenterEnd,
         )
     }

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/component/BirthDateTextField.kt

@@ -6,7 +6,9 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
@@ -18,12 +20,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.teamoffroad.core.designsystem.theme.ErrorNew
@@ -45,7 +45,6 @@ fun BirthDateTextField(
     minLines: Int = 1,
     maxLength: Int,
     textStyle: TextStyle = OffroadTheme.typography.textAuto,
-    textAlign: Alignment = Alignment.CenterStart,
     isError: Boolean = false,
     keyboardOptions: KeyboardOptions,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
@@ -103,23 +102,31 @@ fun BirthDateTextField(
                         color = borderLineColor.value,
                         shape = shape,
                     )
-                    .padding(vertical = 12.dp, horizontal = innerPadding),
+                    .wrapContentWidth()
+                    .padding(vertical = 12.dp),
             ) {
                 Box(
-                    modifier = Modifier
-                        .clip(shape = shape),
-                    contentAlignment = textAlign,
+                    modifier = Modifier,
+                    contentAlignment = Alignment.CenterStart,
                 ) {
                     if (value.isEmpty()) {
                         Text(
                             text = placeholder,
                             color = Gray300,
                             style = textStyle,
                             maxLines = 1,
-                            overflow = TextOverflow.Clip,
+                            modifier = Modifier
+                                .align(Alignment.Center)
+                                .wrapContentWidth(),
                         )
                     }
-                    innerText()
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = innerPadding)
+                    ) {
+                        innerText()
+                    }
                 }
             }
         },

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/component/OffroadBasicButton.kt

@@ -12,9 +12,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import com.teamoffroad.core.designsystem.theme.Main2
+import com.teamoffroad.core.designsystem.theme.OffroadTheme
 import com.teamoffroad.core.designsystem.theme.White
 
 @Composable
@@ -45,8 +45,8 @@ fun OffroadBasicBtn(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
-                fontSize = with(LocalDensity.current) { 13.dp.toSp() },
                 text = text,
+                style = OffroadTheme.typography.textRegular,
                 color = White,
             )
         }

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/signin/SignInScreen.kt

@@ -32,8 +32,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.teamoffroad.core.designsystem.component.ChangeBottomBarColor
 import com.teamoffroad.core.designsystem.component.OffroadActionBar
 import com.teamoffroad.core.designsystem.component.navigationPadding
-import com.teamoffroad.core.designsystem.theme.Black
-import com.teamoffroad.core.designsystem.theme.Kakao
 import com.teamoffroad.core.designsystem.theme.Main1
 import com.teamoffroad.core.designsystem.theme.Main2
 import com.teamoffroad.core.designsystem.theme.OffroadTheme
@@ -108,6 +106,7 @@ internal fun SignInScreen(
             contentScale = ContentScale.FillHeight,
             contentDescription = "auth_logo",
         )
+        /*
         ClickableImage(
             modifier = Modifier
                 .fillMaxWidth(),
@@ -118,6 +117,7 @@ internal fun SignInScreen(
             contentDescription = "auth_kakao",
             onClick = { viewModel.startKakaoSignIn() },
         )
+        */
         ClickableImage(
             modifier = Modifier
                 .fillMaxWidth(),

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/signup/BirthDateScreen.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Row
 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.layout.wrapContentWidth
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -76,7 +75,6 @@ internal fun BirthDateScreen(
             BirthDateTextField(
                 modifier = Modifier
                     .weight(1.4f)
-                    .width(84.dp)
                     .height(43.dp)
                     .focusRequester(focusRequester)
                     .onFocusChanged { updateFocus(BirthDateFocus.YEAR) },
@@ -87,7 +85,7 @@ internal fun BirthDateScreen(
                         updateYear(it)
                     }
                 },
-                innerPadding = 32.dp,
+                innerPadding = 30.dp,
                 maxLength = 4,
                 isError = uiState.yearValidateResult == DateValidateResult.Error,
                 keyboardOptions = KeyboardOptions.Default.copy(
@@ -107,7 +105,6 @@ internal fun BirthDateScreen(
             BirthDateTextField(
                 modifier = Modifier
                     .weight(1f)
-                    .width(66.dp)
                     .height(43.dp)
                     .focusRequester(focusRequester)
                     .onFocusChanged {
@@ -121,7 +118,7 @@ internal fun BirthDateScreen(
                         updateMonth(it)
                     }
                 },
-                innerPadding = 24.dp,
+                innerPadding = 23.dp,
                 maxLength = 2,
                 isError = uiState.monthValidateResult == DateValidateResult.Error,
                 keyboardOptions = KeyboardOptions.Default.copy(
@@ -141,7 +138,6 @@ internal fun BirthDateScreen(
             BirthDateTextField(
                 modifier = Modifier
                     .weight(1f)
-                    .width(66.dp)
                     .height(43.dp)
                     .focusRequester(focusRequester)
                     .onFocusChanged {
@@ -155,7 +151,7 @@ internal fun BirthDateScreen(
                         updateDate(it)
                     }
                 },
-                innerPadding = 24.dp,
+                innerPadding = 23.dp,
                 maxLength = 2,
                 isError = uiState.dayValidateResult == DateValidateResult.Error,
                 keyboardOptions = KeyboardOptions.Default.copy(

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/signup/SetCharacterScreen.kt

@@ -155,7 +155,7 @@ internal fun SetCharacterScreen(
                     .padding(bottom = 72.dp)
                     .height(50.dp)
                     .align(Alignment.CenterHorizontally),
-                text = stringResource(R.string.auth_basic_button),
+                text = stringResource(R.string.auth_select),
                 onClick = { showDialog = true },
                 isActive = true,
             )

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/signup/SignUpScreen.kt

@@ -187,7 +187,7 @@ internal fun SignUpScreen(
                 .padding(horizontal = 24.dp)
                 .padding(bottom = 72.dp)
                 .height(50.dp),
-            text = stringResource(R.string.auth_basic_button),
+            text = stringResource(R.string.auth_next),
             onClick = {
                 if (pagerState.currentPage.toSignUpPage() == SignUpPage.NICKNAME || pagerState.currentPage.toSignUpPage() == SignUpPage.BIRTHDATE) {
                     coroutineScope.launch {

feature/auth/src/main/java/com/teamoffroad/feature/auth/presentation/termandcondition/AgreeTermsAndConditionsScreen.kt

@@ -119,7 +119,7 @@ internal fun AgreeTermsAndConditionsScreen(
                     .padding(horizontal = 24.dp)
                     .padding(bottom = 72.dp)
                     .height(50.dp),
-                text = stringResource(R.string.auth_basic_button),
+                text = stringResource(R.string.auth_next),
                 updateState = { viewModel.changedMarketingAgree(uiState.isMarketing) },
                 onClick = {
                     isToastShown = true