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 edac08c3..ce2fad5b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,14 @@ 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..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,12 +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.InviteCodeActivity +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, InviteCodeActivity::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/NotifyTimeActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/NotifyTimeActivity.kt new file mode 100644 index 00000000..b83a4303 --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/NotifyTimeActivity.kt @@ -0,0 +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.ActivityNotifyTimeBinding +import com.sopt.umbba_android.util.binding.BindingActivity + +class NotifyTimeActivity : BindingActivity(R.layout.activity_notify_time) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setClickButton() + } + + private fun setClickButton() { + with(binding) { + btnGoPast.setOnClickListener { + startActivity(Intent(this@NotifyTimeActivity, 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 new file mode 100644 index 00000000..dea1501f --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt @@ -0,0 +1,20 @@ +package com.sopt.umbba_android.presentation.onboarding + +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..9eff34ca --- /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/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_bar_quest.xml b/app/src/main/res/drawable/progress_bar_quest.xml new file mode 100644 index 00000000..8dbcdcf4 --- /dev/null +++ b/app/src/main/res/drawable/progress_bar_quest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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/drawable/sel_quest_btn_answer.xml b/app/src/main/res/drawable/sel_quest_btn_answer.xml new file mode 100644 index 00000000..5814ef8d --- /dev/null +++ b/app/src/main/res/drawable/sel_quest_btn_answer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ 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_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 607a29cf..c9b2d97f 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 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_notify_time.xml b/app/src/main/res/layout/activity_notify_time.xml new file mode 100644 index 00000000..7a6c7e95 --- /dev/null +++ b/app/src/main/res/layout/activity_notify_time.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..1df9aa76 --- /dev/null +++ b/app/src/main/res/layout/activity_quest.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml index c6b035d5..c941ed0b 100644 --- a/app/src/main/res/layout/activity_select_family.xml +++ b/app/src/main/res/layout/activity_select_family.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="28dp" android:layout_marginTop="12dp" - android:background="@drawable/shape_grey_stroke_r8_rect" + android:background="@drawable/shape_gd4d4_stroke_r8_rect" app:layout_constraintTop_toBottomOf="@id/tv_travel_to_timemachine"> diff --git a/app/src/main/res/layout/basic_appbar.xml b/app/src/main/res/layout/basic_appbar.xml index e1c0a315..51637d5f 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" @@ -34,11 +34,11 @@ + + + + + + + + + + + + + + + + + + + \ 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 8c3df63f..da3720dd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,7 +7,16 @@ #F0EBE8 #E7E0DC + #D2D2D2 + #666666 + #999999 + #CFCFCF + #EAEAEA + #D4D4D4 + #747474 #E5E5E5 + + #FF3A1F #419277 #32211B diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6e07cad..ca8c34be 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ umbba-android 바인딩 에러 + 다음으로 - 다음으로 초대 코드를 입력해주세요. 초대코드를\n입력해주세요. @@ -27,4 +27,12 @@ 더 자세히 알려줄 수 있어? 엄마 아빠 + + + 과거로 떠나기 + 매일 밤 11시에\n타임머신을 보내줄게 + + + 거의 다 왔어! 조금만 힘내줘! + 간단한 질문에\n답해줘 \ 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 4bc74919..3a3f4696 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