[feat] 에셋 추가 및 수정사항 반영 - 민우

app/src/main/java/org/sopt/pingle/presentation/type/GroupType.kt

@@ -10,10 +10,10 @@ enum class GroupType(
 ) {
     ORIGINAL(
         R.string.on_boarding_original_group,
-        R.drawable.ic_launcher_background
+        R.drawable.img_search_graphic
     ),
     NEW(
         R.string.on_boarding_new_group,
-        R.drawable.ic_launcher_background
+        R.drawable.img_create_graphic
     )
 }

app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt

@@ -23,6 +23,8 @@ class JoinGroupCodeActivity :
 
     private fun addListeners() {
         binding.btnJoinGroupCodeNext.setOnClickListener {
+            // TODO 초대코드 일치하지 않을 시
+            // CustomSnackbar.makeSnackbar(binding.root, getString(R.string.join_group_code_snackbar_message), 97)
             navigateToJoinGroupSuccess()
         }
     }

app/src/main/res/layout/activity_auth.xml

@@ -24,7 +24,8 @@
             android:layout_width="73dp"
             android:layout_height="0dp"
             android:layout_marginTop="83dp"
-            android:src="@drawable/ic_launcher_background"
+            android:background="@drawable/shape_border_radius_12"
+            android:src="@drawable/img_app_logo"
             app:layout_constraintDimensionRatio="1"
             app:layout_constraintStart_toEndOf="@id/gl_start"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_join_group_code.xml

@@ -32,7 +32,7 @@
         <include
             android:id="@+id/include_join_group_code_topbar"
             layout="@layout/view_all_topbar_arrow_with_title"
-            text="@{@string/join_group_code_topbar}"
+            text="@{@string/join_group_topbar}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_join_group_search.xml

@@ -32,7 +32,7 @@
         <include
             android:id="@+id/include_join_group_search_topbar"
             layout="@layout/view_all_topbar_arrow_with_title"
-            text="@{@string/join_group_code_topbar}"
+            text="@{@string/join_group_topbar}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_join_group_success.xml

@@ -53,12 +53,12 @@
             android:id="@+id/iv_join_group_success"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/spacing26"
-            android:src="@drawable/ic_launcher_background"
+            android:layout_marginTop="16dp"
+            android:src="@drawable/img_join_group_success_graphic"
             app:layout_constraintBottom_toTopOf="@id/btn_join_group_success"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_join_group_success_description" />
+            app:layout_constraintTop_toBottomOf="@id/tv_join_group_success_title" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_join_group_success"
@@ -72,6 +72,7 @@
             android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/iv_join_group_success" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout/activity_on_boarding.xml

@@ -33,24 +33,24 @@
             android:id="@+id/tv_on_bording_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="147dp"
+            android:layout_marginBottom="34dp"
             android:text="@string/on_boarding_title"
             android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.30"
             android:textColor="@color/white"
-            app:layout_constraintStart_toEndOf="@id/gl_start"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintBottom_toTopOf="@id/include_on_bording_group_original"
+            app:layout_constraintStart_toEndOf="@id/gl_start" />
 
         <include
             android:id="@+id/include_on_bording_group_original"
             layout="@layout/view_on_boarding_group"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing34"
             app:group="@{group.ORIGINAL}"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/include_onbording_group_new"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toEndOf="@id/gl_start"
-            app:layout_constraintTop_toBottomOf="@id/tv_on_bording_title" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <include
             android:id="@+id/include_onbording_group_new"
@@ -60,7 +60,6 @@
             android:layout_marginStart="@dimen/spacing8"
             app:group="@{group.NEW}"
             app:layout_constraintBottom_toBottomOf="@id/include_on_bording_group_original"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/gl_end"
             app:layout_constraintStart_toEndOf="@+id/include_on_bording_group_original"
             app:layout_constraintTop_toTopOf="@id/include_on_bording_group_original" />

app/src/main/res/layout/view_all_topbar_arrow_with_title.xml

@@ -38,7 +38,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/iv_all_topbar_arrow_with_title_arrow_left"
-            tools:text="기존 단체 입장하기" />
+            tools:text="단체 입장하기" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout/view_on_boarding_group.xml

@@ -32,13 +32,12 @@
             android:id="@+id/tv_on_bording_group"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="38dp"
             android:layout_marginTop="@dimen/spacing9"
             android:layout_marginBottom="35dp"
             android:background="@color/g_10"
             android:gravity="center"
             android:text="@{group.groupTextRes}"
-            android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.20"
+            android:textAppearance="@style/TextAppearance.Pingle.Sub.Semi.16"
             android:textColor="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -20,24 +20,25 @@
 
     <!-- on boarding -->
     <string name="on_boarding_title">핑글에 오신걸\n환영합니다!</string>
-    <string name="on_boarding_original_group">기존 단체\n입장하기</string>
-    <string name="on_boarding_new_group">신규 단체\n개설하기</string>
+    <string name="on_boarding_original_group">이미 등록된\n 단체가 있어요</string>
+    <string name="on_boarding_new_group">새로운 단체를\n등록하고 싶어요</string>
     <string name="auth_kakao_login">카카오로 시작하기</string>
     <string name="auth_title">Ready to\nPINGLE?</string>
     <string name="auth_description_1">가볍고 재미있는 모임 문화,</string>
     <string name="auth_description_2">핑글과 함께 만들어요!</string>
 
     <!-- join group code -->
-    <string name="join_group_code_topbar">기존 단체 입장하기</string>
-    <string name="join_group_code_title">단체 정보를 확인하고\n초대 코드를 입력해주세요</string>
-    <string name="join_group_code_meeting">개설된 모임 수</string>
-    <string name="join_group_code_participant">총 인원</string>
+    <string name="join_group_topbar">단체 입장하기</string>
+    <string name="join_group_code_title">단체 정보를 확인하고\n초대 코드를 입력해주세요!</string>
+    <string name="join_group_code_meeting">개최된 핑글 수</string>
+    <string name="join_group_code_participant">참여자 수</string>
     <string name="join_group_code_meeting_count">%d개</string>
     <string name="join_group_code_participant_count">%d명</string>
-    <string name="join_group_code_invitation_hint">영문+숫자 12자리</string>
+    <string name="join_group_code_invitation_hint">초대 코드를 입력해주세요</string>
     <string name="join_group_code_invitation">초대 코드</string>
-    <string name="join_group_code_guide">모임 개설자로부터 받은 초대코드를 입력해주세요.</string>
+    <string name="join_group_code_guide">단체 개설자로부터 받은 초대 코드를 입력해주세요</string>
     <string name="join_group_code_next">입장하기</string>
+    <string name="join_group_code_snackbar_message">"초대 코드를 다시 확인해주세요!"</string>
 
     <!--  plan  -->
     <string name="plan_later_des">나중에 만드시겠어요?</string>
@@ -69,7 +70,7 @@
 
     <!-- join group success -->
     <string name="join_group_success_btn">입장하기</string>
-    <string name="join_gorup_success_title">단체 입장\n완료!</string>
+    <string name="join_gorup_success_title">모든 준비가\n끝났어요!</string>
     <string name="join_group_success_description_group_name">%s에서</string>
     <string name="join_group_success_description">핑글 여정을 함께해보세요!</string>