From faf814fe96ad304b186b562b39e8bc16acf962a3 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 15:39:04 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[Design/#4]=20QuestActivity=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EB=B7=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/onboarding/QuestActivity.kt | 4 ++ app/src/main/res/drawable/progress_qeust.xml | 23 ++++++ .../main/res/layout/activity_invite_code.xml | 2 +- app/src/main/res/layout/activity_quest.xml | 72 +++++++++++++++++++ app/src/main/res/layout/basic_appbar.xml | 2 +- app/src/main/res/values/colors.xml | 8 +++ app/src/main/res/values/strings.xml | 3 +- 7 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt create mode 100644 app/src/main/res/drawable/progress_qeust.xml create mode 100644 app/src/main/res/layout/activity_quest.xml diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt new file mode 100644 index 00000000..6d204ffc --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt @@ -0,0 +1,4 @@ +package com.sopt.umbba_android.presentation.onboarding + +class QuestActivity { +} \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_qeust.xml b/app/src/main/res/drawable/progress_qeust.xml new file mode 100644 index 00000000..8dbcdcf4 --- /dev/null +++ b/app/src/main/res/drawable/progress_qeust.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml index 65141ca1..6cfa64ca 100644 --- a/app/src/main/res/layout/activity_invite_code.xml +++ b/app/src/main/res/layout/activity_invite_code.xml @@ -65,7 +65,7 @@ android:layout_marginVertical="24dp" android:background="@drawable/sel_invite_code_btn_next" android:enabled="false" - android:text="@string/invite_code_next" + android:text="@string/btn_next" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml new file mode 100644 index 00000000..d4ccf907 --- /dev/null +++ b/app/src/main/res/layout/activity_quest.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/basic_appbar.xml b/app/src/main/res/layout/basic_appbar.xml index 17376022..cb1b6c50 100644 --- a/app/src/main/res/layout/basic_appbar.xml +++ b/app/src/main/res/layout/basic_appbar.xml @@ -36,7 +36,7 @@ android:id="@+id/tv_appbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@{titleText == null ? `Title` : titleText}" + android:text="@{titleText == null ? ` ` : titleText}" android:textColor="@color/black" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index abd5c56d..112ad257 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,7 +7,15 @@ #F0EBE8 #E7E0DC + #D2D2D2 + #666666 + #999999 + #CFCFCF + #EAEAEA + #D4D4D4 #E5E5E5 + + #FF3A1F #419277 #32211B diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f9f98d3..a0e31b33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,8 +2,9 @@ umbba-android 바인딩 에러 + 다음으로 + - 다음으로 초대 코드를 입력해주세요. 초대코드를\n입력해주세요. \ No newline at end of file From a08ed3ecf4e3b66a8bd358f56b211f4973bc83e3 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 17:22:00 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[Design/#4]=20=EC=84=B8=EB=B6=80=20?= =?UTF-8?q?=EC=A7=88=EB=AC=B8=20fragment=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 + app/src/main/AndroidManifest.xml | 4 ++ .../com/sopt/umbba_android/MainActivity.kt | 3 +- .../presentation/onboarding/QuestActivity.kt | 17 ++++- .../onboarding/QuestSubFragment.kt | 21 ++++++ .../res/drawable/sel_quest_btn_answer.xml | 18 +++++ .../drawable/sel_quest_btn_text_answer.xml | 7 ++ .../res/drawable/shape_g300_fill_r50_rect.xml | 1 + .../res/drawable/shape_gd4d4_line_r8_rect.xml | 7 ++ app/src/main/res/layout/activity_quest.xml | 2 + .../main/res/layout/fragment_quest_one.xml | 66 +++++++++++++++++++ app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 3 +- 13 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt create mode 100644 app/src/main/res/drawable/sel_quest_btn_answer.xml create mode 100644 app/src/main/res/drawable/sel_quest_btn_text_answer.xml create mode 100644 app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml create mode 100644 app/src/main/res/layout/fragment_quest_one.xml diff --git a/app/build.gradle b/app/build.gradle index c5ea7487..44d8514a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,4 +99,7 @@ dependencies { def hilt_version = "2.42" implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version" + + //viewpager2 + implementation "androidx.viewpager2:viewpager2:1.0.0" } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 07cf552c..c5950dfc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,10 @@ android:exported="false" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize" /> + \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt index 4f78ed69..c6eb0a75 100644 --- a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt @@ -4,11 +4,12 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import com.sopt.umbba_android.presentation.onboarding.InviteCodeActivity +import com.sopt.umbba_android.presentation.onboarding.QuestActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - startActivity(Intent(this, InviteCodeActivity::class.java)) + startActivity(Intent(this, QuestActivity::class.java)) } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt index 6d204ffc..11499786 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt @@ -1,4 +1,19 @@ package com.sopt.umbba_android.presentation.onboarding -class QuestActivity { +import android.os.Bundle +import com.sopt.umbba_android.R +import androidx.fragment.app.Fragment +import com.sopt.umbba_android.databinding.ActivityQuestBinding +import com.sopt.umbba_android.util.binding.BindingActivity + +class QuestActivity : BindingActivity(R.layout.activity_quest) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + changeFragment(QuestSubFragment()) + } + private fun changeFragment(fragment:Fragment){ + supportFragmentManager.beginTransaction() + .add(R.id.fragment_question,fragment) + .commit() + } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt new file mode 100644 index 00000000..8efbf63d --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt @@ -0,0 +1,21 @@ +package com.sopt.umbba_android.presentation.onboarding + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.sopt.umbba_android.R +import com.sopt.umbba_android.databinding.FragmentQuestOneBinding +import com.sopt.umbba_android.util.binding.BindingFragment + +class QuestSubFragment : BindingFragment (R.layout.fragment_quest_one) { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return super.onCreateView(inflater, container, savedInstanceState) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/sel_quest_btn_answer.xml b/app/src/main/res/drawable/sel_quest_btn_answer.xml new file mode 100644 index 00000000..0fb596a8 --- /dev/null +++ b/app/src/main/res/drawable/sel_quest_btn_answer.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sel_quest_btn_text_answer.xml b/app/src/main/res/drawable/sel_quest_btn_text_answer.xml new file mode 100644 index 00000000..bc8948d8 --- /dev/null +++ b/app/src/main/res/drawable/sel_quest_btn_text_answer.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml b/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml index 0e0b51fa..b7b8886c 100644 --- a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml +++ b/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml @@ -1,3 +1,4 @@ + diff --git a/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml b/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml new file mode 100644 index 00000000..75596d43 --- /dev/null +++ b/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index d4ccf907..73a29f9f 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -50,6 +50,7 @@ android:layout_marginHorizontal="24dp"/> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml new file mode 100644 index 00000000..260a33a6 --- /dev/null +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 112ad257..8f75aa89 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,6 +13,7 @@ #CFCFCF #EAEAEA #D4D4D4 + #747474 #E5E5E5 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 798d93ca..634bcfc9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,7 +9,6 @@ + + \ No newline at end of file From 3a2f8b5fd60f953122032cca1e7b17d8e23ad87c Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 17:32:31 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[Design/#4]=20=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=ED=86=B5=EC=A7=80=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++ .../presentation/onboarding/GoPastActivity.kt | 9 ++++ app/src/main/res/layout/activity_go_past.xml | 42 +++++++++++++++++++ app/src/main/res/layout/activity_quest.xml | 4 +- app/src/main/res/values/strings.xml | 9 +++- 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt create mode 100644 app/src/main/res/layout/activity_go_past.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5950dfc..86e53bae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,10 @@ android:name=".presentation.onboarding.QuestActivity" android:exported="false" android:screenOrientation="portrait" /> + \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt new file mode 100644 index 00000000..af3f4699 --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt @@ -0,0 +1,9 @@ +package com.sopt.umbba_android.presentation.onboarding + +import com.sopt.umbba_android.R +import com.sopt.umbba_android.databinding.ActivityGoPastBinding +import com.sopt.umbba_android.util.binding.BindingActivity + +class GoPastActivity : BindingActivity(R.layout.activity_go_past) { + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_go_past.xml b/app/src/main/res/layout/activity_go_past.xml new file mode 100644 index 00000000..8f0ed89a --- /dev/null +++ b/app/src/main/res/layout/activity_go_past.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index 73a29f9f..f339d207 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="18dp" - android:text="간단한 질문에\n답해줘" + android:text="@string/quest_activity_title" android:textColor="@color/black" android:textSize="24sp" android:textStyle="bold" @@ -33,7 +33,7 @@ android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" - android:text="거의 다 왔어! 조금만 힘내줘!" + android:text="@string/quest_progressbar_comment" android:layout_marginStart="24dp" android:layout_marginTop="12dp" android:textColor="@color/grey_999999"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0e31b33..bbdda7df 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,17 @@ umbba-android 바인딩 에러 - 다음으로 초대 코드를 입력해주세요. 초대코드를\n입력해주세요. + + + 과거로 떠나기 + 매일 밤 11시에\n타임머신을 보내줄게 + + + 거의 다 왔어! 조금만 힘내줘! + 간단한 질문에\n답해줘 \ No newline at end of file From 37ac7b4e9015e38eeb5650c5197187dcd7f88c1f Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 17:35:25 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[Design/#4]=20tools:text=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_go_past.xml | 11 ++++--- app/src/main/res/layout/activity_quest.xml | 31 ++++++++++--------- .../main/res/layout/fragment_quest_one.xml | 12 ++++--- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/layout/activity_go_past.xml b/app/src/main/res/layout/activity_go_past.xml index 8f0ed89a..56bdffdb 100644 --- a/app/src/main/res/layout/activity_go_past.xml +++ b/app/src/main/res/layout/activity_go_past.xml @@ -2,6 +2,7 @@ + @@ -26,17 +27,17 @@ android:textSize="24sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/layout_appbar"/> + app:layout_constraintTop_toBottomOf="@id/layout_appbar" /> + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index f339d207..f25becb8 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -1,6 +1,8 @@ + + @@ -31,23 +33,24 @@ android:id="@+id/tv_progress_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_title" - android:text="@string/quest_progressbar_comment" android:layout_marginStart="24dp" android:layout_marginTop="12dp" - android:textColor="@color/grey_999999"/> + android:text="@string/quest_progressbar_comment" + android:textColor="@color/grey_999999" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_title" /> + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_progress_sub" /> + app:layout_constraintTop_toBottomOf="@id/progress_bar" /> + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml index 260a33a6..57b7b1e6 100644 --- a/app/src/main/res/layout/fragment_quest_one.xml +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -2,6 +2,7 @@ @@ -12,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="18dp" android:layout_marginTop="18dp" - android:text="어머니와 지금 같이 살고 있어?" + tools:text="어머니와 지금 같이 살고 있어?" android:textColor="@color/black" android:textSize="20sp" android:textStyle="bold" @@ -30,10 +31,11 @@ app:layout_constraintBottom_toBottomOf="parent"> Date: Tue, 4 Jul 2023 17:53:02 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[Feat/#4]=20intent=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sopt/umbba_android/MainActivity.kt | 3 ++- .../presentation/onboarding/GoPastActivity.kt | 13 +++++++++++++ .../presentation/onboarding/QuestActivity.kt | 5 +++-- .../presentation/onboarding/QuestSubFragment.kt | 2 +- app/src/main/res/layout/activity_go_past.xml | 2 +- app/src/main/res/layout/fragment_quest_one.xml | 8 ++++---- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt index c6eb0a75..35ba7e99 100644 --- a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt @@ -3,6 +3,7 @@ package com.sopt.umbba_android import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import com.sopt.umbba_android.presentation.onboarding.GoPastActivity import com.sopt.umbba_android.presentation.onboarding.InviteCodeActivity import com.sopt.umbba_android.presentation.onboarding.QuestActivity @@ -10,6 +11,6 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - startActivity(Intent(this, QuestActivity::class.java)) + startActivity(Intent(this, GoPastActivity::class.java)) } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt index af3f4699..196f079d 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt @@ -1,9 +1,22 @@ package com.sopt.umbba_android.presentation.onboarding +import android.content.Intent +import android.os.Bundle import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivityGoPastBinding import com.sopt.umbba_android.util.binding.BindingActivity class GoPastActivity : BindingActivity(R.layout.activity_go_past) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setClickButton() + } + private fun setClickButton() { + with(binding) { + btnGoPast.setOnClickListener { + startActivity(Intent(this@GoPastActivity, QuestActivity::class.java)) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt index 11499786..dea1501f 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt @@ -11,9 +11,10 @@ class QuestActivity : BindingActivity(R.layout.activity_qu super.onCreate(savedInstanceState) changeFragment(QuestSubFragment()) } - private fun changeFragment(fragment:Fragment){ + + private fun changeFragment(fragment: Fragment) { supportFragmentManager.beginTransaction() - .add(R.id.fragment_question,fragment) + .add(R.id.fragment_question, fragment) .commit() } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt index 8efbf63d..9eff34ca 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt @@ -9,7 +9,7 @@ import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.FragmentQuestOneBinding import com.sopt.umbba_android.util.binding.BindingFragment -class QuestSubFragment : BindingFragment (R.layout.fragment_quest_one) { +class QuestSubFragment : BindingFragment(R.layout.fragment_quest_one) { override fun onCreateView( inflater: LayoutInflater, diff --git a/app/src/main/res/layout/activity_go_past.xml b/app/src/main/res/layout/activity_go_past.xml index 56bdffdb..624c28ed 100644 --- a/app/src/main/res/layout/activity_go_past.xml +++ b/app/src/main/res/layout/activity_go_past.xml @@ -30,11 +30,11 @@ app:layout_constraintTop_toBottomOf="@id/layout_appbar" /> diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml index 57b7b1e6..57c5cdba 100644 --- a/app/src/main/res/layout/fragment_quest_one.xml +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="18dp" android:layout_marginTop="18dp" - tools:text="어머니와 지금 같이 살고 있어?" + android:text="어머니와 지금 같이 살고 있어?" android:textColor="@color/black" android:textSize="20sp" android:textStyle="bold" @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginBottom="12dp" - tools:text="응!" + android:text="응!" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginBottom="12dp" - tools:text="아니" + android:text="아니" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" @@ -58,7 +58,7 @@ android:id="@+id/btn_answer3" android:layout_width="match_parent" android:layout_height="48dp" - tools:text="애매해" + android:text="애매해" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" From 1ea9cac81485b6d42a9f6a38a49d5cef1b3b5440 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 18:02:20 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[Design/#4]=20button=20=EA=B8=80=EC=9E=90?= =?UTF-8?q?=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_go_past.xml | 1 + app/src/main/res/layout/activity_quest.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/layout/activity_go_past.xml b/app/src/main/res/layout/activity_go_past.xml index 624c28ed..b58fbd63 100644 --- a/app/src/main/res/layout/activity_go_past.xml +++ b/app/src/main/res/layout/activity_go_past.xml @@ -36,6 +36,7 @@ android:layout_margin="24dp" android:background="@drawable/shape_black_fill_r50_rect" android:text="@string/go_past" + android:textSize="16sp" android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index f25becb8..4513bb35 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -70,6 +70,7 @@ android:enabled="false" android:text="@string/btn_next" android:textColor="@color/white" + android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" /> From e727a47b085bf4bf9226d31c5af9e0e719910886 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Tue, 4 Jul 2023 21:32:01 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[Design/#4]=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/sel_quest_btn_answer.xml | 3 +-- app/src/main/res/layout/fragment_quest_one.xml | 8 ++++---- app/src/main/res/values/styles.xml | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable/sel_quest_btn_answer.xml b/app/src/main/res/drawable/sel_quest_btn_answer.xml index 0fb596a8..5814ef8d 100644 --- a/app/src/main/res/drawable/sel_quest_btn_answer.xml +++ b/app/src/main/res/drawable/sel_quest_btn_answer.xml @@ -10,8 +10,7 @@ - + diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml index 57c5cdba..57b7b1e6 100644 --- a/app/src/main/res/layout/fragment_quest_one.xml +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="18dp" android:layout_marginTop="18dp" - android:text="어머니와 지금 같이 살고 있어?" + tools:text="어머니와 지금 같이 살고 있어?" android:textColor="@color/black" android:textSize="20sp" android:textStyle="bold" @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginBottom="12dp" - android:text="응!" + tools:text="응!" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginBottom="12dp" - android:text="아니" + tools:text="아니" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" @@ -58,7 +58,7 @@ android:id="@+id/btn_answer3" android:layout_width="match_parent" android:layout_height="48dp" - android:text="애매해" + tools:text="애매해" android:textSize="16sp" android:textAlignment="center" android:background="@drawable/sel_quest_btn_answer" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 634bcfc9..b3246918 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -29,6 +29,4 @@ false 16sp - - \ No newline at end of file From 9a03d059d52c444b838edf84d95d50b517603aec Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Wed, 5 Jul 2023 17:24:36 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[Design/#4]=20margin=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/activity_input_info.xml | 2 +- .../main/res/layout/activity_invite_code.xml | 4 ++-- app/src/main/res/layout/activity_quest.xml | 18 ++++-------------- .../main/res/layout/activity_select_family.xml | 2 +- app/src/main/res/layout/basic_appbar.xml | 2 +- app/src/main/res/layout/fragment_quest_one.xml | 15 +++++++++++++-- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index 607a29cf..331f4763 100644 --- a/app/src/main/res/layout/activity_input_info.xml +++ b/app/src/main/res/layout/activity_input_info.xml @@ -209,7 +209,7 @@ android:layout_marginVertical="24dp" android:background="@drawable/sel_invite_code_btn_next" android:enabled="false" - android:text="@string/invite_code_next" + android:text="@string/btn_next" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml index 6cfa64ca..953e93fd 100644 --- a/app/src/main/res/layout/activity_invite_code.xml +++ b/app/src/main/res/layout/activity_invite_code.xml @@ -24,8 +24,8 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginTop="18dp" + android:layout_marginStart="28dp" + android:layout_marginTop="12dp" android:text="@string/invite_code_title" android:textColor="@color/black" android:textSize="24sp" diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index 4513bb35..153bb499 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:layout_marginTop="18dp" + android:layout_marginTop="12dp" android:text="@string/quest_activity_title" android:textColor="@color/black" android:textSize="24sp" @@ -29,17 +29,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_appbar" /> - - + app:layout_constraintTop_toBottomOf="@id/tv_title" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/basic_appbar.xml b/app/src/main/res/layout/basic_appbar.xml index e1c0a315..30156ad9 100644 --- a/app/src/main/res/layout/basic_appbar.xml +++ b/app/src/main/res/layout/basic_appbar.xml @@ -26,7 +26,7 @@ android:id="@+id/iv_back" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginStart="12dp" + android:layout_marginStart="16dp" android:src="@drawable/ic_arrow_back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml index 57b7b1e6..bddb8e24 100644 --- a/app/src/main/res/layout/fragment_quest_one.xml +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -11,14 +11,25 @@ android:id="@+id/tv_question" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="18dp" - android:layout_marginTop="18dp" + android:layout_marginStart="20dp" + android:layout_marginTop="16dp" tools:text="어머니와 지금 같이 살고 있어?" android:textColor="@color/black" android:textSize="20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + umbba-android 바인딩 에러 + 다음으로 - 다음으로 초대 코드를 입력해주세요. 초대코드를\n입력해주세요. From de751b21951b3fad9892da8f6b874ea3bcf3557b Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Wed, 5 Jul 2023 17:26:22 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[Design/#4]=20=EC=8B=9C=EA=B0=84=EA=B3=B5?= =?UTF-8?q?=EC=A7=80=EB=B7=B0=20activity=20=EC=9D=B4=EB=A6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/com/sopt/umbba_android/MainActivity.kt | 6 ++---- .../onboarding/{GoPastActivity.kt => NotifyTimeActivity.kt} | 6 +++--- .../{activity_go_past.xml => activity_notify_time.xml} | 0 4 files changed, 6 insertions(+), 8 deletions(-) rename app/src/main/java/com/sopt/umbba_android/presentation/onboarding/{GoPastActivity.kt => NotifyTimeActivity.kt} (64%) rename app/src/main/res/layout/{activity_go_past.xml => activity_notify_time.xml} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 773d8b71..ce2fad5b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,7 @@ android:exported="false" android:screenOrientation="portrait" /> diff --git a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt index 35ba7e99..17388cbd 100644 --- a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt @@ -3,14 +3,12 @@ package com.sopt.umbba_android import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import com.sopt.umbba_android.presentation.onboarding.GoPastActivity -import com.sopt.umbba_android.presentation.onboarding.InviteCodeActivity -import com.sopt.umbba_android.presentation.onboarding.QuestActivity +import com.sopt.umbba_android.presentation.onboarding.NotifyTimeActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - startActivity(Intent(this, GoPastActivity::class.java)) + startActivity(Intent(this, NotifyTimeActivity::class.java)) } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/NotifyTimeActivity.kt similarity index 64% rename from app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt rename to app/src/main/java/com/sopt/umbba_android/presentation/onboarding/NotifyTimeActivity.kt index 196f079d..b83a4303 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/GoPastActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/NotifyTimeActivity.kt @@ -3,10 +3,10 @@ package com.sopt.umbba_android.presentation.onboarding import android.content.Intent import android.os.Bundle import com.sopt.umbba_android.R -import com.sopt.umbba_android.databinding.ActivityGoPastBinding +import com.sopt.umbba_android.databinding.ActivityNotifyTimeBinding import com.sopt.umbba_android.util.binding.BindingActivity -class GoPastActivity : BindingActivity(R.layout.activity_go_past) { +class NotifyTimeActivity : BindingActivity(R.layout.activity_notify_time) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setClickButton() @@ -15,7 +15,7 @@ class GoPastActivity : BindingActivity(R.layout.activity_ private fun setClickButton() { with(binding) { btnGoPast.setOnClickListener { - startActivity(Intent(this@GoPastActivity, QuestActivity::class.java)) + startActivity(Intent(this@NotifyTimeActivity, QuestActivity::class.java)) } } } diff --git a/app/src/main/res/layout/activity_go_past.xml b/app/src/main/res/layout/activity_notify_time.xml similarity index 100% rename from app/src/main/res/layout/activity_go_past.xml rename to app/src/main/res/layout/activity_notify_time.xml From 29858c1b7165455d6d672ce625ba624ba0ac240a Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Wed, 5 Jul 2023 17:58:16 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[Design/#4]=20font=20style=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9,=20chip=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/color/sel_choice_chip_stroke.xml | 2 +- .../res/color/sel_quest_choice_chip_text.xml | 5 + ...gress_qeust.xml => progress_bar_qeust.xml} | 0 .../res/drawable/shape_gd4d4_line_r8_rect.xml | 7 - ...ect.xml => shape_gd4d4_stroke_r8_rect.xml} | 4 +- .../main/res/layout/activity_input_info.xml | 6 +- .../main/res/layout/activity_invite_code.xml | 4 +- .../main/res/layout/activity_notify_time.xml | 6 +- app/src/main/res/layout/activity_quest.xml | 9 +- .../res/layout/activity_select_family.xml | 4 +- app/src/main/res/layout/basic_appbar.xml | 2 +- .../main/res/layout/fragment_quest_one.xml | 137 +++++++++--------- app/src/main/res/values/styles.xml | 15 ++ 13 files changed, 105 insertions(+), 96 deletions(-) create mode 100644 app/src/main/res/color/sel_quest_choice_chip_text.xml rename app/src/main/res/drawable/{progress_qeust.xml => progress_bar_qeust.xml} (100%) delete mode 100644 app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml rename app/src/main/res/drawable/{shape_grey_stroke_r8_rect.xml => shape_gd4d4_stroke_r8_rect.xml} (67%) diff --git a/app/src/main/res/color/sel_choice_chip_stroke.xml b/app/src/main/res/color/sel_choice_chip_stroke.xml index 3b42ccce..5ab4bdf3 100644 --- a/app/src/main/res/color/sel_choice_chip_stroke.xml +++ b/app/src/main/res/color/sel_choice_chip_stroke.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/sel_quest_choice_chip_text.xml b/app/src/main/res/color/sel_quest_choice_chip_text.xml new file mode 100644 index 00000000..23c6cd2e --- /dev/null +++ b/app/src/main/res/color/sel_quest_choice_chip_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_qeust.xml b/app/src/main/res/drawable/progress_bar_qeust.xml similarity index 100% rename from app/src/main/res/drawable/progress_qeust.xml rename to app/src/main/res/drawable/progress_bar_qeust.xml diff --git a/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml b/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml deleted file mode 100644 index 75596d43..00000000 --- a/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_stroke_r8_rect.xml b/app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml similarity index 67% rename from app/src/main/res/drawable/shape_grey_stroke_r8_rect.xml rename to app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml index c90c449a..9c610b55 100644 --- a/app/src/main/res/drawable/shape_grey_stroke_r8_rect.xml +++ b/app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml @@ -2,5 +2,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index 331f4763..33966367 100644 --- a/app/src/main/res/layout/activity_input_info.xml +++ b/app/src/main/res/layout/activity_input_info.xml @@ -55,7 +55,7 @@ android:id="@+id/cl_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_grey_stroke_r8_rect" + android:background="@drawable/shape_gd4d4_stroke_r8_rect" app:layout_constraintTop_toTopOf="parent"> @@ -49,6 +48,7 @@ @@ -36,8 +35,9 @@ android:layout_margin="24dp" android:background="@drawable/shape_black_fill_r50_rect" android:text="@string/go_past" - android:textSize="16sp" android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index 153bb499..3643043a 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -18,14 +18,13 @@ @@ -36,7 +35,7 @@ android:layout_height="5dp" android:layout_marginHorizontal="24dp" android:layout_marginTop="12dp" - android:progressDrawable="@drawable/progress_qeust" + android:progressDrawable="@drawable/progress_bar_qeust" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" /> @@ -47,10 +46,10 @@ android:layout_height="335dp" android:layout_marginHorizontal="24dp" android:layout_marginTop="24dp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> - - - - - + android:layout_height="335dp" + android:background="@drawable/shape_gd4d4_stroke_r8_rect"> - + - + - - - + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_question"> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 26c3e075..20bf926c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,4 +43,19 @@ @color/sel_choice_chip_stroke @color/sel_choice_chip_color + + \ No newline at end of file From 88be54bbf73d77c13b1e872e8938bd9c2f211628 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Wed, 5 Jul 2023 18:36:12 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[Design/#4]=20next=20button=20drawable=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{sel_invite_code_btn_next.xml => sel_btn_next.xml} | 0 app/src/main/res/layout/activity_input_info.xml | 2 +- app/src/main/res/layout/activity_invite_code.xml | 9 ++++----- app/src/main/res/layout/activity_quest.xml | 2 +- app/src/main/res/layout/activity_select_family.xml | 2 +- app/src/main/res/values/styles.xml | 1 + 6 files changed, 8 insertions(+), 8 deletions(-) rename app/src/main/res/drawable/{sel_invite_code_btn_next.xml => sel_btn_next.xml} (100%) diff --git a/app/src/main/res/drawable/sel_invite_code_btn_next.xml b/app/src/main/res/drawable/sel_btn_next.xml similarity index 100% rename from app/src/main/res/drawable/sel_invite_code_btn_next.xml rename to app/src/main/res/drawable/sel_btn_next.xml diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index 33966367..c9b2d97f 100644 --- a/app/src/main/res/layout/activity_input_info.xml +++ b/app/src/main/res/layout/activity_input_info.xml @@ -207,7 +207,7 @@ android:layout_height="60dp" android:layout_marginHorizontal="24dp" android:layout_marginVertical="24dp" - android:background="@drawable/sel_invite_code_btn_next" + android:background="@drawable/sel_btn_next" android:enabled="false" android:text="@string/btn_next" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml index 71b4e1c8..da443f50 100644 --- a/app/src/main/res/layout/activity_invite_code.xml +++ b/app/src/main/res/layout/activity_invite_code.xml @@ -59,15 +59,14 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index 3643043a..abc1b0b0 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -55,7 +55,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_margin="24dp" - android:background="@drawable/sel_invite_code_btn_next" + android:background="@drawable/sel_btn_next" android:enabled="false" android:text="@string/btn_next" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml index 947a74aa..c941ed0b 100644 --- a/app/src/main/res/layout/activity_select_family.xml +++ b/app/src/main/res/layout/activity_select_family.xml @@ -149,7 +149,7 @@ android:layout_height="60dp" android:layout_marginHorizontal="24dp" android:layout_marginVertical="24dp" - android:background="@drawable/sel_invite_code_btn_next" + android:background="@drawable/sel_btn_next" android:enabled="false" android:text="@string/btn_next" android:textColor="@color/white" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 20bf926c..3a3f4696 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -58,4 +58,5 @@ 1dp @color/sel_choice_chip_color + \ No newline at end of file From 452521469057995933608cf31324eb7fc4d06848 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Wed, 5 Jul 2023 20:50:56 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[Design/#4]=20=EC=98=A4=ED=83=80=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/{progress_bar_qeust.xml => progress_bar_quest.xml} | 0 app/src/main/res/layout/activity_quest.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename app/src/main/res/drawable/{progress_bar_qeust.xml => progress_bar_quest.xml} (100%) diff --git a/app/src/main/res/drawable/progress_bar_qeust.xml b/app/src/main/res/drawable/progress_bar_quest.xml similarity index 100% rename from app/src/main/res/drawable/progress_bar_qeust.xml rename to app/src/main/res/drawable/progress_bar_quest.xml diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index abc1b0b0..1df9aa76 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -35,7 +35,7 @@ android:layout_height="5dp" android:layout_marginHorizontal="24dp" android:layout_marginTop="12dp" - android:progressDrawable="@drawable/progress_bar_qeust" + android:progressDrawable="@drawable/progress_bar_quest" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" />