diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt index 8478cce6..40f66aa5 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt @@ -18,15 +18,16 @@ class HomeFragment : BindingFragment(R.layout.fragment_home setClickEvent() } - private fun setClickEvent(){ - with(binding){ + private fun setClickEvent() { + with(binding) { btnAnswer.setOnClickListener { startActivity(Intent(requireActivity(), QuestionAnswerActivity::class.java)) } } } - private fun setBackground(){ - with(binding){ + + private fun setBackground() { + with(binding) { ivBackground.load("https://i.ibb.co/sRV9Vr4/iv-maru.jpg") } } diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/invite/InviteCodeActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/invite/InviteCodeActivity.kt index 9ed20dd7..b4aae668 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/invite/InviteCodeActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/invite/InviteCodeActivity.kt @@ -1,10 +1,22 @@ package com.sopt.umbba_android.presentation.invite +import android.os.Bundle +import android.view.View import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivityInviteCodeBinding import com.sopt.umbba_android.util.binding.BindingActivity class InviteCodeActivity : - BindingActivity(R.layout.activity_invite_code) { + BindingActivity(R.layout.activity_invite_code), + View.OnClickListener { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding.clickListener = this + } + override fun onClick(view: View?) { + when (view?.id) { + R.id.iv_basic_back -> finish() + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt index a070bed0..6208d268 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt @@ -1,13 +1,20 @@ package com.sopt.umbba_android.presentation.onboarding import android.os.Bundle +import android.view.View import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivityInputInfoBinding import com.sopt.umbba_android.util.binding.BindingActivity -class InputInfoActivity : BindingActivity(R.layout.activity_input_info) { +class InputInfoActivity : BindingActivity(R.layout.activity_input_info), View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding.clickListener=this + } + override fun onClick(view: View?) { + when(view?.id){ + R.id.iv_basic_back->finish() + } } } \ 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 index b83a4303..153f5371 100644 --- 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 @@ -2,16 +2,26 @@ package com.sopt.umbba_android.presentation.onboarding import android.content.Intent import android.os.Bundle +import android.view.View 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) { +class NotifyTimeActivity : + BindingActivity(R.layout.activity_notify_time), + View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding.clickListener = this setClickButton() } + override fun onClick(view: View?) { + when (view?.id) { + R.id.iv_basic_back -> finish() + } + } + private fun setClickButton() { with(binding) { btnGoPast.setOnClickListener { 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 dea1501f..72cea71e 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,17 +1,24 @@ package com.sopt.umbba_android.presentation.onboarding import android.os.Bundle +import android.view.View 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) { +class QuestActivity : BindingActivity(R.layout.activity_quest), View.OnClickListener +{ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) changeFragment(QuestSubFragment()) } + override fun onClick(view: View?) { + when(view?.id){ + R.id.iv_basic_back->finish() + } + } private fun changeFragment(fragment: Fragment) { supportFragmentManager.beginTransaction() .add(R.id.fragment_question, fragment) diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt index 2d09b626..b70826cd 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt @@ -1,13 +1,22 @@ package com.sopt.umbba_android.presentation.onboarding import android.os.Bundle +import android.view.View import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivitySelectFamilyBinding import com.sopt.umbba_android.util.binding.BindingActivity -class SelectFamilyActivity : BindingActivity(R.layout.activity_select_family) { +class SelectFamilyActivity : + BindingActivity(R.layout.activity_select_family), + View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding.clickListener = this + } + override fun onClick(view: View?) { + when (view?.id) { + R.id.iv_basic_back -> finish() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SetTimeActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SetTimeActivity.kt index 6ca2a7dc..382b7590 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SetTimeActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SetTimeActivity.kt @@ -1,19 +1,27 @@ package com.sopt.umbba_android.presentation.onboarding import android.os.Bundle +import android.view.View import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivitySetTimeBinding import com.sopt.umbba_android.util.binding.BindingActivity import com.sopt.umbba_android.util.setTimeInterval -class SetTimeActivity : BindingActivity(R.layout.activity_set_time) { +class SetTimeActivity : BindingActivity(R.layout.activity_set_time), + View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + binding.clickListener = this customTimePickerInterval() setDefaultTime() } + override fun onClick(view: View?) { + when (view?.id) { + R.id.iv_basic_back -> finish() + } + } + private fun customTimePickerInterval() { binding.tpTime.setTimeInterval(30) } diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt index d6d06e3b..a490e30f 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt @@ -13,9 +13,8 @@ class AnswerActivity: BindingActivity(R.layout.activity_a } override fun onClick(view: View?) { when(view?.id){ - R.id.iv_qna_back->TODO("진짜 뒤로갈거냐는 Dialog 띄우기 ") + R.id.iv_qna_back-> TODO("진짜 뒤로갈거냐는 Dialog 띄우기 ") R.id.iv_check-> TODO("답변 이거 맞냐고 확인하는 Dialog 띄우기") } } - } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/qna/QuestionAnswerActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/qna/QuestionAnswerActivity.kt index b9522694..2924b0d1 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/qna/QuestionAnswerActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/qna/QuestionAnswerActivity.kt @@ -1,5 +1,6 @@ package com.sopt.umbba_android.presentation.qna +import android.content.Intent import android.graphics.BlurMaskFilter import android.os.Bundle import android.view.View @@ -9,24 +10,29 @@ import com.sopt.umbba_android.util.binding.BindingActivity class QuestionAnswerActivity : - BindingActivity(R.layout.activity_question_answer),View.OnClickListener { + BindingActivity(R.layout.activity_question_answer), + View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding.clickListener=this - setBlurText(true) + binding.clickListener = this + setBlurText(false) + setClickEvent() + } + + override fun onClick(view: View?) { + when (view?.id) { + R.id.iv_qna_back -> finish() + } + } + + private fun setClickEvent() { with(binding) { btnAnswer.setOnClickListener { - setBlurText(false) // 임시 블러 테스트 + startActivity(Intent(this@QuestionAnswerActivity, AnswerActivity::class.java)) } } } - override fun onClick(view: View?) { - when(view?.id){ - R.id.iv_qna_back->finish() - } - } - private fun setBlurText(isBlur: Boolean) { with(binding) { tvAnswerOther.setLayerType(View.LAYER_TYPE_SOFTWARE, null).apply { diff --git a/app/src/main/res/color/sel_btn_pri500_text.xml b/app/src/main/res/color/sel_btn_pri500_text.xml index 24904c6d..42ceda1f 100644 --- a/app/src/main/res/color/sel_btn_pri500_text.xml +++ b/app/src/main/res/color/sel_btn_pri500_text.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sel_btn_answer.xml b/app/src/main/res/drawable/sel_btn_answer.xml index cf8078c0..e0e90106 100644 --- a/app/src/main/res/drawable/sel_btn_answer.xml +++ b/app/src/main/res/drawable/sel_btn_answer.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_switch_thumb.xml b/app/src/main/res/drawable/shape_switch_thumb.xml index 5a93398d..3282e027 100644 --- a/app/src/main/res/drawable/shape_switch_thumb.xml +++ b/app/src/main/res/drawable/shape_switch_thumb.xml @@ -56,10 +56,10 @@ + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_answer.xml b/app/src/main/res/layout/activity_answer.xml index 9efb4d6a..cc9d53fe 100644 --- a/app/src/main/res/layout/activity_answer.xml +++ b/app/src/main/res/layout/activity_answer.xml @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginVertical="16dp" - app:boxStrokeWidth="0dp" + android:background="@color/white" app:hintAnimationEnabled="false" app:hintEnabled="false" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index 8fd46c98..6ca4e99d 100644 --- a/app/src/main/res/layout/activity_input_info.xml +++ b/app/src/main/res/layout/activity_input_info.xml @@ -8,6 +8,10 @@ + + + app:layout_constraintTop_toTopOf="parent" + app:clickListener="@{clickListener}"/> + + + app:titleText="@{`초대코드 입력`}" + app:clickListener="@{clickListener}"/> + + layout="@layout/basic_appbar" + app:clickListener="@{clickListener}"/> + + + layout="@layout/basic_appbar" + app:clickListener="@{clickListener}"/> + + + diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml index 9c3e56dc..7af13634 100644 --- a/app/src/main/res/layout/activity_set_time.xml +++ b/app/src/main/res/layout/activity_set_time.xml @@ -4,6 +4,9 @@ xmlns:tools="http://schemas.android.com/tools"> + @@ -16,6 +19,7 @@ diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 0bd74491..6adeeee9 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -91,7 +91,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="12dp" android:layout_marginBottom="8dp" - android:checked="false" + android:checked="true" android:paddingHorizontal="10dp" android:thumb="@drawable/shape_switch_thumb" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0ec0afaf..fff5cfec 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ -