diff --git a/app/src/main/java/org/sopt/pingle/presentation/type/GroupType.kt b/app/src/main/java/org/sopt/pingle/presentation/type/GroupType.kt
index af2962ac..f44acdfe 100644
--- a/app/src/main/java/org/sopt/pingle/presentation/type/GroupType.kt
+++ b/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
)
}
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt
index 21c3e02c..61037737 100644
--- a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt
+++ b/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()
}
}
diff --git a/app/src/main/res/drawable-xhdpi/img_app_logo.png b/app/src/main/res/drawable-xhdpi/img_app_logo.png
new file mode 100644
index 00000000..9647cefc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_app_logo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_create_graphic.png b/app/src/main/res/drawable-xhdpi/img_create_graphic.png
new file mode 100644
index 00000000..165eb37f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_create_graphic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_join_group_success_graphic.png b/app/src/main/res/drawable-xhdpi/img_join_group_success_graphic.png
new file mode 100644
index 00000000..c0881d33
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_join_group_success_graphic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_search_graphic.png b/app/src/main/res/drawable-xhdpi/img_search_graphic.png
new file mode 100644
index 00000000..9d73de15
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_search_graphic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_app_logo.png b/app/src/main/res/drawable-xxhdpi/img_app_logo.png
new file mode 100644
index 00000000..84484fe9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_app_logo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_create_graphic.png b/app/src/main/res/drawable-xxhdpi/img_create_graphic.png
new file mode 100644
index 00000000..f9798e7c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_create_graphic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_join_group_success_graphic.png b/app/src/main/res/drawable-xxhdpi/img_join_group_success_graphic.png
new file mode 100644
index 00000000..bd7fc6a5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_join_group_success_graphic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_search_graphic.png b/app/src/main/res/drawable-xxhdpi/img_search_graphic.png
new file mode 100644
index 00000000..8df0ceb8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_search_graphic.png differ
diff --git a/app/src/main/res/drawable/img_app_logo.png b/app/src/main/res/drawable/img_app_logo.png
new file mode 100644
index 00000000..61de956b
Binary files /dev/null and b/app/src/main/res/drawable/img_app_logo.png differ
diff --git a/app/src/main/res/drawable/img_create_graphic.png b/app/src/main/res/drawable/img_create_graphic.png
new file mode 100644
index 00000000..f62791a7
Binary files /dev/null and b/app/src/main/res/drawable/img_create_graphic.png differ
diff --git a/app/src/main/res/drawable/img_join_group_success_graphic.png b/app/src/main/res/drawable/img_join_group_success_graphic.png
new file mode 100644
index 00000000..8d824789
Binary files /dev/null and b/app/src/main/res/drawable/img_join_group_success_graphic.png differ
diff --git a/app/src/main/res/drawable/img_search_graphic.png b/app/src/main/res/drawable/img_search_graphic.png
new file mode 100644
index 00000000..f485a7ae
Binary files /dev/null and b/app/src/main/res/drawable/img_search_graphic.png differ
diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
index 537e9037..e0803aab 100644
--- a/app/src/main/res/layout/activity_auth.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/activity_join_group_code.xml b/app/src/main/res/layout/activity_join_group_code.xml
index e0414bf3..0700882c 100644
--- a/app/src/main/res/layout/activity_join_group_code.xml
+++ b/app/src/main/res/layout/activity_join_group_code.xml
@@ -32,7 +32,7 @@
diff --git a/app/src/main/res/layout/activity_join_group_search.xml b/app/src/main/res/layout/activity_join_group_search.xml
index 136d56af..0e6f9ea7 100644
--- a/app/src/main/res/layout/activity_join_group_search.xml
+++ b/app/src/main/res/layout/activity_join_group_search.xml
@@ -32,7 +32,7 @@
diff --git a/app/src/main/res/layout/activity_join_group_success.xml b/app/src/main/res/layout/activity_join_group_success.xml
index 08200ab8..c6cd8faa 100644
--- a/app/src/main/res/layout/activity_join_group_success.xml
+++ b/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" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/iv_join_group_success" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_on_boarding.xml b/app/src/main/res/layout/activity_on_boarding.xml
index 0da5389c..09ffdcab 100644
--- a/app/src/main/res/layout/activity_on_boarding.xml
+++ b/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" />
+ app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/view_all_topbar_arrow_with_title.xml b/app/src/main/res/layout/view_all_topbar_arrow_with_title.xml
index 629a8e57..ccc49e77 100644
--- a/app/src/main/res/layout/view_all_topbar_arrow_with_title.xml
+++ b/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="단체 입장하기" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_on_boarding_group.xml b/app/src/main/res/layout/view_on_boarding_group.xml
index e7d93a6c..f87c2b10 100644
--- a/app/src/main/res/layout/view_on_boarding_group.xml
+++ b/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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62779a9e..edbbabc4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,24 +20,25 @@
핑글에 오신걸\n환영합니다!
- 기존 단체\n입장하기
- 신규 단체\n개설하기
+ 이미 등록된\n 단체가 있어요
+ 새로운 단체를\n등록하고 싶어요
카카오로 시작하기
Ready to\nPINGLE?
가볍고 재미있는 모임 문화,
핑글과 함께 만들어요!
- 기존 단체 입장하기
- 단체 정보를 확인하고\n초대 코드를 입력해주세요
- 개설된 모임 수
- 총 인원
+ 단체 입장하기
+ 단체 정보를 확인하고\n초대 코드를 입력해주세요!
+ 개최된 핑글 수
+ 참여자 수
%d개
%d명
- 영문+숫자 12자리
+ 초대 코드를 입력해주세요
초대 코드
- 모임 개설자로부터 받은 초대코드를 입력해주세요.
+ 단체 개설자로부터 받은 초대 코드를 입력해주세요
입장하기
+ "초대 코드를 다시 확인해주세요!"
나중에 만드시겠어요?
@@ -69,7 +70,7 @@
입장하기
- 단체 입장\n완료!
+ 모든 준비가\n끝났어요!
%s에서
핑글 여정을 함께해보세요!