Merge pull request #343 from team-yello/ui/#342-onboarding-skip-btn

[UI/#342] Onboarding / 추천인 코드 건너뛰기 버튼 변경
team-yello · Dec 27, 2023 · a7a4650 · a7a4650
2 parents 009719f + 987fb04
commit a7a4650
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/activity/OnBoardingViewModel.kt b/app/src/main/java/com/el/yello/presentation/onboarding/activity/OnBoardingViewModel.kt
@@ -152,7 +152,7 @@ class OnBoardingViewModel @Inject constructor(
     }
 
     fun addUniversityStudentId() {
-        val studentIdList = listOf(15, 16, 17, 18, 19, 20, 21, 22, 23)
+        val studentIdList = listOf(15, 16, 17, 18, 19, 20, 21, 22, 23, 24)
         _studentIdResult.value = studentIdList
     }
 

diff --git a/app/src/main/res/drawable/shape_black_fill_grayscales200_line_8_rect.xml b/app/src/main/res/drawable/shape_black_fill_grayscales200_line_8_rect.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="@color/grayscales_200" />
+    <corners android:radius="100dp" />
+    <solid android:color="@color/black" />
+</shape>
diff --git a/app/src/main/res/layout/fragment_code.xml b/app/src/main/res/layout/fragment_code.xml
@@ -156,12 +156,13 @@
             android:id="@+id/btn_code_skip"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="2dp"
-            android:background="@null"
+            android:layout_marginBottom="14dp"
             android:gravity="center"
-            android:padding="12dp"
+            android:background="@drawable/shape_black_fill_grayscales200_line_8_rect"
+            android:paddingVertical="16dp"
             android:layout_marginHorizontal="16dp"
             android:text="@string/onboarding_btn_code_skip"
+            android:textAlignment="center"
             android:clickable="@{vm.codeText.isEmpty()}"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@color/grayscales_200"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
     <string name="onboarding_tv_code_subtitle_1">추천인의 아이디를 입력하면</string>
     <string name="onboarding_tv_code_subtitle_2">+100</string>
     <string name="onboarding_tv_code_subtitle_3">point!</string>
-    <string name="onboarding_btn_code_skip"><u>건너뛰기</u></string>
+    <string name="onboarding_btn_code_skip">건너뛰기</string>
     <string name="onboarding_tv_startapp_title">띵동! 쪽지 도착 </string>
     <string name="onboarding_tv_startapp_subtitle">친구들이 비밀 쪽지를 보내면\n 알림을 드릴게요. </string>
     <string name="onboarding_tv_start_yello">쪽지 알림 받기</string>