From 2d586bb375177c89a58f09c2395e07da76fa8b58 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 26 Jan 2024 01:47:06 +0900 Subject: [PATCH 01/18] =?UTF-8?q?#134=20[ui]=20sharedPreference=20?= =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EC=95=A1=ED=8B=B0=EB=B9=84?= =?UTF-8?q?=ED=8B=B0-=ED=94=84=EB=9E=98=EA=B7=B8=EB=A8=BC=ED=8A=B8=20?= =?UTF-8?q?=EA=B0=84=20=EC=97=B0=EA=B2=B0,=20=EC=B6=94=EA=B0=80=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=8A=A4=EB=82=B5=EB=B0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softie/ui/happyroutine/HappyMyRoutineFragment.kt | 10 ++++++++++ .../ui/happyroutine/detail/HappyDetailActivity.kt | 3 +++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 97734be5..dfda20de 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -1,5 +1,6 @@ package com.sopetit.softie.ui.happyroutine +import android.content.Context.MODE_PRIVATE import android.content.Intent import android.os.Bundle import android.view.View @@ -15,6 +16,7 @@ import com.sopetit.softie.util.binding.BindingBottomSheet import com.sopetit.softie.util.binding.BindingFragment import com.sopetit.softie.util.setSingleOnClickListener import com.sopetit.softie.util.setStatusBarColor +import com.sopetit.softie.util.snackBar import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -33,11 +35,19 @@ class HappyMyRoutineFragment : setCardEnter() setEditEnter() setClearEnter() + } override fun onResume() { super.onResume() viewModel.getHappyProgress() + + val sharedPreferences = + requireActivity().getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) + if (sharedPreferences.getBoolean("isFirstAdded", false)) { + snackBar(binding.root.rootView, getString(R.string.happy_routine_add_snack_bar)) + sharedPreferences.edit().remove("isFirstAdded").apply() + } } private fun initSetBearFace() { diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index 5c4382cf..b5d4e1e6 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -122,6 +122,9 @@ class HappyDetailActivity : } private fun moveToProgress() { + val sharedPreferences = getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) + sharedPreferences.edit().putBoolean("isFirstAdded", true).apply() + val intentToHappinessAddRoutine = Intent().putExtra("isAdded", true) setResult(RESULT_OK, intentToHappinessAddRoutine) finish() From dde60580a0a3cdd6876394e57dea7d6dd2c8367a Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 26 Jan 2024 02:18:58 +0900 Subject: [PATCH 02/18] =?UTF-8?q?#134=20[ui]=20=EC=8A=A4=EB=82=B5=EB=B0=94?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 16 +++++++++++++--- .../happyroutine/delete/HappyDeleteFragment.kt | 11 +++++++++-- .../com/sopetit/softie/util/CustomSnackbar.kt | 9 +++++++++ app/src/main/res/values/dimens.xml | 2 ++ 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index dfda20de..3f279b41 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -11,12 +11,12 @@ import com.sopetit.softie.databinding.FragmentHappyMyRoutineBinding import com.sopetit.softie.ui.happyroutine.complete.HappyRoutineCompleteActivity import com.sopetit.softie.ui.happyroutine.delete.HappyDeleteFragment import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity +import com.sopetit.softie.util.CustomSnackbar import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingBottomSheet import com.sopetit.softie.util.binding.BindingFragment import com.sopetit.softie.util.setSingleOnClickListener import com.sopetit.softie.util.setStatusBarColor -import com.sopetit.softie.util.snackBar import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -45,7 +45,17 @@ class HappyMyRoutineFragment : val sharedPreferences = requireActivity().getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) if (sharedPreferences.getBoolean("isFirstAdded", false)) { - snackBar(binding.root.rootView, getString(R.string.happy_routine_add_snack_bar)) + val customSnackbar = CustomSnackbar.make( + binding.root.rootView, + getString(R.string.happy_routine_add_snack_bar) + ) + customSnackbar.setMargin( + 0, + 0, + 0, + resources.getDimensionPixelSize(R.dimen.snackbar_add_margin_bottom) + ) + customSnackbar.show() sharedPreferences.edit().remove("isFirstAdded").apply() } } @@ -137,6 +147,6 @@ class HappyMyRoutineFragment : } companion object { - private const val REQUEST_CODE_HAPPY_DETAIL = 990320 + private const val REQUEST_CODE_HAPPY_DETAIL = 231217 } } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt index eb17dcbf..694ddb7f 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt @@ -8,11 +8,11 @@ import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyDeleteBinding import com.sopetit.softie.ui.happyroutine.HappyMyRoutineFragment import com.sopetit.softie.ui.happyroutine.HappyMyRoutineViewModel +import com.sopetit.softie.util.CustomSnackbar import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingBottomSheet import com.sopetit.softie.util.binding.BindingFragment import com.sopetit.softie.util.setSingleOnClickListener -import com.sopetit.softie.util.snackBar import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -93,10 +93,17 @@ class HappyDeleteFragment : happyProgress?.let { viewModel.deleteHappyProgress(happyProgress.routineId) } - snackBar( + val customSnackbar = CustomSnackbar.make( binding.root.rootView, getString(R.string.happy_routine_delete_snack_bar) ) + customSnackbar.setMargin( + 0, + 0, + 0, + resources.getDimensionPixelSize(R.dimen.snackbar_delete_margin_bottom) + ) + customSnackbar.show() requireActivity().supportFragmentManager.beginTransaction() .replace(R.id.fcv_main, HappyMyRoutineFragment()) .commit() diff --git a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt index 14d20682..ce9b8189 100644 --- a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt +++ b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt @@ -1,7 +1,9 @@ package com.sopetit.softie.util +import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.View +import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import com.google.android.material.snackbar.Snackbar @@ -38,6 +40,13 @@ class CustomSnackbar(view: View, private val message: String) { snackbar.show() } + @SuppressLint("RestrictedApi") + fun setMargin(left: Int, top: Int, right: Int, bottom: Int) { + val params = snackbarLayout.layoutParams as ViewGroup.MarginLayoutParams + params.setMargins(left, top, right, bottom) + snackbarLayout.layoutParams = params + } + companion object { fun make(view: View, message: String) = CustomSnackbar(view, message) } diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 58b648ac..4d3990e5 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,6 @@ 30dp + 47dp + 147dp From 079cef248de4e29486aee68b254520e0da116951 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 26 Jan 2024 02:27:07 +0900 Subject: [PATCH 03/18] =?UTF-8?q?#134=20[chore]=20=EC=8A=A4=EB=82=B5?= =?UTF-8?q?=EB=B0=94=20=EA=B0=80=EB=A1=9C=20=EA=B8=B8=EC=9D=B4=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt | 4 ++-- .../softie/ui/happyroutine/delete/HappyDeleteFragment.kt | 4 ++-- app/src/main/res/values/dimens.xml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 3f279b41..55ce23a5 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -50,9 +50,9 @@ class HappyMyRoutineFragment : getString(R.string.happy_routine_add_snack_bar) ) customSnackbar.setMargin( + resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), 0, - 0, - 0, + resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), resources.getDimensionPixelSize(R.dimen.snackbar_add_margin_bottom) ) customSnackbar.show() diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt index 694ddb7f..baedd4f8 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt @@ -98,9 +98,9 @@ class HappyDeleteFragment : getString(R.string.happy_routine_delete_snack_bar) ) customSnackbar.setMargin( + resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), 0, - 0, - 0, + resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), resources.getDimensionPixelSize(R.dimen.snackbar_delete_margin_bottom) ) customSnackbar.show() diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4d3990e5..09c0a28e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,4 +3,6 @@ 30dp 47dp 147dp + 12dp + 12dp From c7a12579a48933fc26d536de494c53b1e1329a04 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 26 Jan 2024 02:43:12 +0900 Subject: [PATCH 04/18] =?UTF-8?q?#134=20[chore]=20CI=20=EA=B3=B5=EB=B0=B1?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt | 1 - app/src/main/res/layout/item_happy_add_detail_card.xml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 55ce23a5..64f004b4 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -35,7 +35,6 @@ class HappyMyRoutineFragment : setCardEnter() setEditEnter() setClearEnter() - } override fun onResume() { diff --git a/app/src/main/res/layout/item_happy_add_detail_card.xml b/app/src/main/res/layout/item_happy_add_detail_card.xml index 67651e13..da524d46 100644 --- a/app/src/main/res/layout/item_happy_add_detail_card.xml +++ b/app/src/main/res/layout/item_happy_add_detail_card.xml @@ -29,8 +29,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/ic_happycard" /> + app:layout_constraintTop_toTopOf="parent" /> Date: Sat, 27 Jan 2024 00:46:46 +0900 Subject: [PATCH 05/18] =?UTF-8?q?#134=20[chore]=20=EC=8A=A4=EB=82=B5?= =?UTF-8?q?=EB=B0=94=20=ED=95=A8=EC=88=98=ED=99=94=20=EB=B0=8F=20=EC=8A=A4?= =?UTF-8?q?=EB=82=B5=EB=B0=94=20=EC=A7=80=EC=86=8D=EC=8B=9C=EA=B0=84=201?= =?UTF-8?q?=EC=B4=88=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 27 +++++++++++-------- .../delete/HappyDeleteFragment.kt | 27 +++++++++++-------- .../com/sopetit/softie/util/CustomSnackbar.kt | 5 ++++ 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 64f004b4..e88ecd42 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -44,21 +44,26 @@ class HappyMyRoutineFragment : val sharedPreferences = requireActivity().getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) if (sharedPreferences.getBoolean("isFirstAdded", false)) { - val customSnackbar = CustomSnackbar.make( - binding.root.rootView, - getString(R.string.happy_routine_add_snack_bar) - ) - customSnackbar.setMargin( - resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), - 0, - resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), - resources.getDimensionPixelSize(R.dimen.snackbar_add_margin_bottom) - ) - customSnackbar.show() + customHappyRoutineAddSnackBar() sharedPreferences.edit().remove("isFirstAdded").apply() } } + private fun customHappyRoutineAddSnackBar() { + val customSnackbar = CustomSnackbar.make( + binding.root.rootView, + getString(R.string.happy_routine_add_snack_bar) + ) + customSnackbar.setDuration(1000) + customSnackbar.setMargin( + resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), + 0, + resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), + resources.getDimensionPixelSize(R.dimen.snackbar_add_margin_bottom) + ) + customSnackbar.show() + } + private fun initSetBearFace() { viewModel.setDollFace() viewModel.bearFace.observe(viewLifecycleOwner) { bearFace -> diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt index baedd4f8..a584de98 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt @@ -93,17 +93,7 @@ class HappyDeleteFragment : happyProgress?.let { viewModel.deleteHappyProgress(happyProgress.routineId) } - val customSnackbar = CustomSnackbar.make( - binding.root.rootView, - getString(R.string.happy_routine_delete_snack_bar) - ) - customSnackbar.setMargin( - resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), - 0, - resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), - resources.getDimensionPixelSize(R.dimen.snackbar_delete_margin_bottom) - ) - customSnackbar.show() + customHappyDeleteSnackBar() requireActivity().supportFragmentManager.beginTransaction() .replace(R.id.fcv_main, HappyMyRoutineFragment()) .commit() @@ -112,4 +102,19 @@ class HappyDeleteFragment : ).show(parentFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } } + + private fun customHappyDeleteSnackBar() { + val customSnackbar = CustomSnackbar.make( + binding.root.rootView, + getString(R.string.happy_routine_delete_snack_bar) + ) + customSnackbar.setDuration(1000) + customSnackbar.setMargin( + resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), + 0, + resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), + resources.getDimensionPixelSize(R.dimen.snackbar_delete_margin_bottom) + ) + customSnackbar.show() + } } diff --git a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt index ce9b8189..e5b128d9 100644 --- a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt +++ b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt @@ -40,6 +40,11 @@ class CustomSnackbar(view: View, private val message: String) { snackbar.show() } + fun setDuration(duration: Int): CustomSnackbar { + snackbar.duration = duration + return this + } + @SuppressLint("RestrictedApi") fun setMargin(left: Int, top: Int, right: Int, bottom: Int) { val params = snackbarLayout.layoutParams as ViewGroup.MarginLayoutParams From 75ece35633f5ad805e08cc0e5e21f21d7bfa47c0 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 00:31:51 +0900 Subject: [PATCH 06/18] =?UTF-8?q?#138=20[fix]=20=EC=8A=A4=EB=82=B5?= =?UTF-8?q?=EB=B0=94=20Fragment=20=EC=9C=84=20anchor=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 19 ++++++++----------- .../delete/HappyDeleteFragment.kt | 15 +++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index e88ecd42..9bb1f76f 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -40,28 +40,25 @@ class HappyMyRoutineFragment : override fun onResume() { super.onResume() viewModel.getHappyProgress() + customHappyRoutineAddSnackBar() val sharedPreferences = requireActivity().getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) if (sharedPreferences.getBoolean("isFirstAdded", false)) { - customHappyRoutineAddSnackBar() + requireActivity().supportFragmentManager.beginTransaction() + .replace(R.id.fcv_main, HappyMyRoutineFragment()) + .commit() sharedPreferences.edit().remove("isFirstAdded").apply() } } private fun customHappyRoutineAddSnackBar() { val customSnackbar = CustomSnackbar.make( - binding.root.rootView, - getString(R.string.happy_routine_add_snack_bar) - ) - customSnackbar.setDuration(1000) - customSnackbar.setMargin( - resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), - 0, - resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), - resources.getDimensionPixelSize(R.dimen.snackbar_add_margin_bottom) + (binding.root.rootView), + getString(R.string.happy_routine_add_snack_bar), + binding.btnHappyProgressClear ) - customSnackbar.show() + customSnackbar.show(1000) } private fun initSetBearFace() { diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt index a584de98..e7ef6fe5 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt @@ -8,6 +8,7 @@ import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyDeleteBinding import com.sopetit.softie.ui.happyroutine.HappyMyRoutineFragment import com.sopetit.softie.ui.happyroutine.HappyMyRoutineViewModel +import com.sopetit.softie.ui.main.MainActivity import com.sopetit.softie.util.CustomSnackbar import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingBottomSheet @@ -105,16 +106,10 @@ class HappyDeleteFragment : private fun customHappyDeleteSnackBar() { val customSnackbar = CustomSnackbar.make( - binding.root.rootView, - getString(R.string.happy_routine_delete_snack_bar) + (binding.root.rootView), + getString(R.string.happy_routine_delete_snack_bar), + (requireActivity() as MainActivity).findViewById(R.id.bottom_navigation_home) ) - customSnackbar.setDuration(1000) - customSnackbar.setMargin( - resources.getDimensionPixelSize(R.dimen.snackbar_margin_start), - 0, - resources.getDimensionPixelSize(R.dimen.snackbar_margin_end), - resources.getDimensionPixelSize(R.dimen.snackbar_delete_margin_bottom) - ) - customSnackbar.show() + customSnackbar.show(1000) } } From dbfc269e97f437d91a8911e65234e762895004ad Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 12:42:55 +0900 Subject: [PATCH 07/18] =?UTF-8?q?#134=20[fix]=20companion=20bool=20?= =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=ED=96=89=EB=B3=B5=EB=A3=A8?= =?UTF-8?q?=ED=8B=B4=20=EC=B6=94=EA=B0=80=ED=95=98=EA=B8=B0=20=EC=A7=84?= =?UTF-8?q?=EC=9E=85=EC=83=81=ED=99=A9=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20?= =?UTF-8?q?=EC=8A=A4=EB=82=B5=EB=B0=94=20=EB=9D=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 18 +++++++++--------- .../happyroutine/detail/HappyDetailActivity.kt | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 9bb1f76f..2edb5739 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -1,6 +1,5 @@ package com.sopetit.softie.ui.happyroutine -import android.content.Context.MODE_PRIVATE import android.content.Intent import android.os.Bundle import android.view.View @@ -10,6 +9,7 @@ import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyMyRoutineBinding import com.sopetit.softie.ui.happyroutine.complete.HappyRoutineCompleteActivity import com.sopetit.softie.ui.happyroutine.delete.HappyDeleteFragment +import com.sopetit.softie.ui.happyroutine.detail.HappyDetailActivity.Companion.HappyFirstAdd import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity import com.sopetit.softie.util.CustomSnackbar import com.sopetit.softie.util.OriginalBottomSheet @@ -35,20 +35,20 @@ class HappyMyRoutineFragment : setCardEnter() setEditEnter() setClearEnter() + observeHappyProgress() } override fun onResume() { super.onResume() viewModel.getHappyProgress() - customHappyRoutineAddSnackBar() + } - val sharedPreferences = - requireActivity().getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) - if (sharedPreferences.getBoolean("isFirstAdded", false)) { - requireActivity().supportFragmentManager.beginTransaction() - .replace(R.id.fcv_main, HappyMyRoutineFragment()) - .commit() - sharedPreferences.edit().remove("isFirstAdded").apply() + private fun observeHappyProgress() { + viewModel.isHappinessRoutineProgress.observe(viewLifecycleOwner) { isProgress -> + if (isProgress && HappyFirstAdd) { + customHappyRoutineAddSnackBar() + HappyFirstAdd = false + } } } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index b5d4e1e6..dbb3f3b3 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -115,18 +115,16 @@ class HappyDetailActivity : doBtnColor = R.drawable.shape_main1_fill_12_rect, backBtnAction = {}, doBtnAction = { - moveToProgress() viewModel.postAddRoutine(subRoutineId) + moveToProgress() + HappyFirstAdd = true } ).show(this.supportFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } private fun moveToProgress() { - val sharedPreferences = getSharedPreferences("HappyFirstAdd", MODE_PRIVATE) - sharedPreferences.edit().putBoolean("isFirstAdded", true).apply() - - val intentToHappinessAddRoutine = Intent().putExtra("isAdded", true) - setResult(RESULT_OK, intentToHappinessAddRoutine) + val intentToHappinessAddList = Intent().putExtra("isAdded", true) + setResult(RESULT_OK, intentToHappinessAddList) finish() } @@ -192,4 +190,8 @@ class HappyDetailActivity : outRect.right = margin } } + + companion object { + var HappyFirstAdd: Boolean = false + } } From c225fe9ab95409ed74cad51824ec1172a89f373b Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 12:43:32 +0900 Subject: [PATCH 08/18] =?UTF-8?q?#134=20[chore]=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=8A=A4=EB=82=B5=EB=B0=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sopetit/softie/util/CustomSnackbar.kt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt index 35d422fe..dbeb56ee 100644 --- a/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt +++ b/app/src/main/java/com/sopetit/softie/util/CustomSnackbar.kt @@ -1,9 +1,7 @@ package com.sopetit.softie.util -import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import com.google.android.material.snackbar.Snackbar @@ -47,18 +45,6 @@ class CustomSnackbar(view: View, private val message: String, anchor: View) { snackbar.show() } - fun setDuration(duration: Int): CustomSnackbar { - snackbar.duration = duration - return this - } - - @SuppressLint("RestrictedApi") - fun setMargin(left: Int, top: Int, right: Int, bottom: Int) { - val params = snackbarLayout.layoutParams as ViewGroup.MarginLayoutParams - params.setMargins(left, top, right, bottom) - snackbarLayout.layoutParams = params - } - companion object { fun make(view: View, message: String, anchor: View) = CustomSnackbar(view, message, anchor) } From 04f36c70c5d5c378c21d3776b5a1165ae79e46f2 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 12:45:58 +0900 Subject: [PATCH 09/18] =?UTF-8?q?#134=20[chore]=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20dimen=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/dimens.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 09c0a28e..58b648ac 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,8 +1,4 @@ 30dp - 47dp - 147dp - 12dp - 12dp From b760146c2f59f73389675088012577cc6a4d78b6 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 17:19:22 +0900 Subject: [PATCH 10/18] =?UTF-8?q?#134=20[chore]=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=84=A0=EC=9D=84=EC=9D=84=20=EC=9C=84=ED=95=B4=20companion=20?= =?UTF-8?q?object=20->=20object=20=EC=A0=84=EC=97=AD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softie/ui/happyroutine/HappyMyRoutineFragment.kt | 6 +++--- .../softie/ui/happyroutine/detail/HappyDetailActivity.kt | 7 ++----- .../java/com/sopetit/softie/util/HappyFirstAddCheck.kt | 5 +++++ 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 2edb5739..7475c7d7 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -9,9 +9,9 @@ import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyMyRoutineBinding import com.sopetit.softie.ui.happyroutine.complete.HappyRoutineCompleteActivity import com.sopetit.softie.ui.happyroutine.delete.HappyDeleteFragment -import com.sopetit.softie.ui.happyroutine.detail.HappyDetailActivity.Companion.HappyFirstAdd import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity import com.sopetit.softie.util.CustomSnackbar +import com.sopetit.softie.util.HappyFirstAddCheck.happyFirstAdd import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingBottomSheet import com.sopetit.softie.util.binding.BindingFragment @@ -45,9 +45,9 @@ class HappyMyRoutineFragment : private fun observeHappyProgress() { viewModel.isHappinessRoutineProgress.observe(viewLifecycleOwner) { isProgress -> - if (isProgress && HappyFirstAdd) { + if (isProgress && happyFirstAdd) { customHappyRoutineAddSnackBar() - HappyFirstAdd = false + happyFirstAdd = false } } } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index dbb3f3b3..b0e1f2bb 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -15,6 +15,7 @@ import com.sopetit.softie.ui.LoadingIndicator import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity.Companion.ICON_IMAGE_URL import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity.Companion.ID import com.sopetit.softie.ui.onboarding.OnboardingActivity.Companion.LOADING_DELAY +import com.sopetit.softie.util.HappyFirstAddCheck.happyFirstAdd import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingActivity import com.sopetit.softie.util.binding.BindingBottomSheet @@ -117,7 +118,7 @@ class HappyDetailActivity : doBtnAction = { viewModel.postAddRoutine(subRoutineId) moveToProgress() - HappyFirstAdd = true + happyFirstAdd = true } ).show(this.supportFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } @@ -190,8 +191,4 @@ class HappyDetailActivity : outRect.right = margin } } - - companion object { - var HappyFirstAdd: Boolean = false - } } diff --git a/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt b/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt new file mode 100644 index 00000000..417f0b40 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt @@ -0,0 +1,5 @@ +package com.sopetit.softie.util + +object HappyFirstAddCheck { + var happyFirstAdd: Boolean = false +} From 2f00c237aa2cce7f8c98c906e34e67b04b834ceb Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 17:33:20 +0900 Subject: [PATCH 11/18] =?UTF-8?q?#134=20[chore]=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 7475c7d7..0c6c22ec 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -146,8 +146,4 @@ class HappyMyRoutineFragment : } } } - - companion object { - private const val REQUEST_CODE_HAPPY_DETAIL = 231217 - } } From c24e54d1b7ea88b9bcc1f5038ea69b47ce360db7 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 21:55:23 +0900 Subject: [PATCH 12/18] =?UTF-8?q?#134=20[fix]=20registerForActivityResult?= =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=EC=BD=94=EB=93=9C=20PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 37 ++++++++++--------- .../detail/HappyDetailActivity.kt | 8 ++-- .../happyroutine/list/HappyAddListActivity.kt | 24 ++++++------ .../sopetit/softie/ui/main/MainActivity.kt | 24 ------------ 4 files changed, 35 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 0c6c22ec..552de30a 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -1,17 +1,19 @@ package com.sopetit.softie.ui.happyroutine +import android.app.Activity import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.View +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.viewModels import coil.load import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyMyRoutineBinding -import com.sopetit.softie.ui.happyroutine.complete.HappyRoutineCompleteActivity import com.sopetit.softie.ui.happyroutine.delete.HappyDeleteFragment import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity import com.sopetit.softie.util.CustomSnackbar -import com.sopetit.softie.util.HappyFirstAddCheck.happyFirstAdd import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingBottomSheet import com.sopetit.softie.util.binding.BindingFragment @@ -24,6 +26,7 @@ class HappyMyRoutineFragment : BindingFragment(R.layout.fragment_happy_my_routine) { private val viewModel by viewModels() + private lateinit var resultLauncher: ActivityResultLauncher override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -35,7 +38,16 @@ class HappyMyRoutineFragment : setCardEnter() setEditEnter() setClearEnter() - observeHappyProgress() + + resultLauncher = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + Log.d("실행되었다", "실행, showing snackbar") + if (result.resultCode == Activity.RESULT_OK) { + Log.d("HappyMyRoutineFragment", "Received RESULT_OK, showing snackbar") + // 스낵바를 띄우는 로직 + customHappyRoutineAddSnackBar() + } + } } override fun onResume() { @@ -43,15 +55,6 @@ class HappyMyRoutineFragment : viewModel.getHappyProgress() } - private fun observeHappyProgress() { - viewModel.isHappinessRoutineProgress.observe(viewLifecycleOwner) { isProgress -> - if (isProgress && happyFirstAdd) { - customHappyRoutineAddSnackBar() - happyFirstAdd = false - } - } - } - private fun customHappyRoutineAddSnackBar() { val customSnackbar = CustomSnackbar.make( (binding.root.rootView), @@ -124,17 +127,15 @@ class HappyMyRoutineFragment : doBtnColor = R.drawable.shape_main1_fill_12_rect, backBtnAction = {}, doBtnAction = { - startHappyRoutineCompleteActivity() viewModel.happyProgressResponse.value?.let { viewModel.patchAchieveHappyRoutine(it.routineId) } - startHappyRoutineCompleteActivity() + startAddListActivity() } ).show(parentFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } - private fun startHappyRoutineCompleteActivity() { - val intentToCompleteActivity = - Intent(requireActivity(), HappyRoutineCompleteActivity::class.java) - startActivity(intentToCompleteActivity) + private fun startAddListActivity() { + val intent = Intent(context, HappyAddListActivity::class.java) + resultLauncher.launch(intent) } private fun setClearEnter() { diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index b0e1f2bb..bbf7765c 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -1,9 +1,9 @@ package com.sopetit.softie.ui.happyroutine.detail -import android.content.Intent import android.graphics.Color import android.graphics.Rect import android.os.Bundle +import android.util.Log import android.view.View import androidx.activity.viewModels import androidx.recyclerview.widget.RecyclerView @@ -15,7 +15,6 @@ import com.sopetit.softie.ui.LoadingIndicator import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity.Companion.ICON_IMAGE_URL import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity.Companion.ID import com.sopetit.softie.ui.onboarding.OnboardingActivity.Companion.LOADING_DELAY -import com.sopetit.softie.util.HappyFirstAddCheck.happyFirstAdd import com.sopetit.softie.util.OriginalBottomSheet import com.sopetit.softie.util.binding.BindingActivity import com.sopetit.softie.util.binding.BindingBottomSheet @@ -118,14 +117,13 @@ class HappyDetailActivity : doBtnAction = { viewModel.postAddRoutine(subRoutineId) moveToProgress() - happyFirstAdd = true } ).show(this.supportFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } private fun moveToProgress() { - val intentToHappinessAddList = Intent().putExtra("isAdded", true) - setResult(RESULT_OK, intentToHappinessAddList) + Log.d("HappyDetailActivity", "Setting RESULT_OK") + setResult(RESULT_OK) // 기본적으로 성공을 나타내는 RESULT_OK 사용 finish() } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt index 7e3f1b41..fa9d71b3 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt @@ -2,6 +2,7 @@ package com.sopetit.softie.ui.happyroutine.list import android.content.Intent import android.os.Bundle +import android.util.Log import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.recyclerview.widget.RecyclerView @@ -26,14 +27,14 @@ class HappyAddListActivity : private var happyAddListChipContentAdapter: HappyAddListChipContentAdapter? = null private var happyAddListContentAdapter: HappyAddListContentAdapter? = null - private val addHappinessRoutineResult = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() - ) { result -> - val isHappinessRoutineAdd = result.data?.getBooleanExtra("isAdded", false) ?: false - if (result.resultCode == RESULT_OK && isHappinessRoutineAdd) { - finish() + private val startForDetailResult = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == RESULT_OK) { + Log.d("HappyAddListActivity", "Setting RESULT_OK") + setResult(RESULT_OK) + finish() + } } - } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -51,7 +52,7 @@ class HappyAddListActivity : private fun setChipAdapters() { happyAddListChipContentAdapter = HappyAddListChipContentAdapter() - happyAddListContentAdapter = HappyAddListContentAdapter(::moveToDetail) + happyAddListContentAdapter = HappyAddListContentAdapter(::startDetailActivity) } private fun setBackEnter() { @@ -84,12 +85,13 @@ class HappyAddListActivity : } } - private fun moveToDetail(id: Int, iconImageUrl: String) { - val intentToDetail = Intent(this, HappyDetailActivity::class.java).apply { + private fun startDetailActivity(id: Int, iconImageUrl: String) { + val intent = Intent(this, HappyDetailActivity::class.java).apply { putExtra(ID, id) putExtra(ICON_IMAGE_URL, iconImageUrl) } - addHappinessRoutineResult.launch(intentToDetail) + // 필요한 데이터를 인텐트에 추가 + startForDetailResult.launch(intent) } companion object { diff --git a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt index 3dc9ec5b..33905e89 100644 --- a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt @@ -2,23 +2,19 @@ package com.sopetit.softie.ui.main import android.content.res.ColorStateList import android.os.Bundle -import androidx.activity.viewModels import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.sopetit.softie.R import com.sopetit.softie.databinding.ActivityMainBinding import com.sopetit.softie.ui.dailyroutine.DailyRoutineFragment import com.sopetit.softie.ui.happyroutine.HappyMyRoutineFragment -import com.sopetit.softie.ui.happyroutine.HappyMyRoutineViewModel import com.sopetit.softie.ui.main.home.HomeFragment import com.sopetit.softie.util.binding.BindingActivity import com.sopetit.softie.util.setStatusBarColorFromResource -import com.sopetit.softie.util.snackBar import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class MainActivity : BindingActivity(R.layout.activity_main) { - private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -27,14 +23,6 @@ class MainActivity : BindingActivity(R.layout.activity_main initFragment() initBottomNavigation() setBottomNavigationClickListener() - changeToHappyProgressFragment() - } - - private fun changeToHappyProgressFragment() { - val fragmentToLoad = intent.getStringExtra("happy_progress_fragment") - if (fragmentToLoad == "happy_progress") { - loadHappyProgressFragment() - } } private fun setBottomNavigationClickListener() { @@ -83,16 +71,4 @@ class MainActivity : BindingActivity(R.layout.activity_main intArrayOf(selectedTextColor, unselectedTextColor) ) } - - private fun loadHappyProgressFragment() { - val fragmentTransaction = supportFragmentManager.beginTransaction() - snackBar( - binding.btnMainAnchor, - getString(R.string.happy_routine_add_snack_bar) - ) - setStatusBarColorFromResource(R.color.background) - binding.bnvMain.selectedItemId = R.id.bottom_navigation_happiness_routine - fragmentTransaction.replace(R.id.fcv_main, HappyMyRoutineFragment()) - fragmentTransaction.commit() - } } From 22d50e9fe3526802f87c58cc99a60507bb598ecb Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 22:23:23 +0900 Subject: [PATCH 13/18] =?UTF-8?q?#134=20[ui]=20registerForActivityResult?= =?UTF-8?q?=20=EC=9D=B4=EC=9A=A9=ED=95=9C=20snackbar=20=EB=9D=84=EC=9A=B0?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 35 ++++++++++--------- .../detail/HappyDetailActivity.kt | 4 +-- .../happyroutine/list/HappyAddListActivity.kt | 3 -- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 552de30a..ea37e540 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -1,16 +1,16 @@ package com.sopetit.softie.ui.happyroutine -import android.app.Activity import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.View import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.viewModels import coil.load import com.sopetit.softie.R import com.sopetit.softie.databinding.FragmentHappyMyRoutineBinding +import com.sopetit.softie.ui.happyroutine.complete.HappyRoutineCompleteActivity import com.sopetit.softie.ui.happyroutine.delete.HappyDeleteFragment import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity import com.sopetit.softie.util.CustomSnackbar @@ -38,23 +38,23 @@ class HappyMyRoutineFragment : setCardEnter() setEditEnter() setClearEnter() + startProgressSnackbar() + } + + override fun onResume() { + super.onResume() + viewModel.getHappyProgress() + } + private fun startProgressSnackbar() { resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - Log.d("실행되었다", "실행, showing snackbar") - if (result.resultCode == Activity.RESULT_OK) { - Log.d("HappyMyRoutineFragment", "Received RESULT_OK, showing snackbar") - // 스낵바를 띄우는 로직 + if (result.resultCode == AppCompatActivity.RESULT_OK) { customHappyRoutineAddSnackBar() } } } - override fun onResume() { - super.onResume() - viewModel.getHappyProgress() - } - private fun customHappyRoutineAddSnackBar() { val customSnackbar = CustomSnackbar.make( (binding.root.rootView), @@ -76,8 +76,8 @@ class HappyMyRoutineFragment : private fun setMyCardEnter() { binding.ivHappyRoutineEmptyCard.setOnClickListener { - val intent = Intent(requireContext(), HappyAddListActivity::class.java) - startActivity(intent) + val intent = Intent(context, HappyAddListActivity::class.java) + resultLauncher.launch(intent) } } @@ -128,14 +128,15 @@ class HappyMyRoutineFragment : backBtnAction = {}, doBtnAction = { viewModel.happyProgressResponse.value?.let { viewModel.patchAchieveHappyRoutine(it.routineId) } - startAddListActivity() + startHappyRoutineCompleteActivity() } ).show(parentFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG) } - private fun startAddListActivity() { - val intent = Intent(context, HappyAddListActivity::class.java) - resultLauncher.launch(intent) + private fun startHappyRoutineCompleteActivity() { + val intentToCompleteActivity = + Intent(requireActivity(), HappyRoutineCompleteActivity::class.java) + startActivity(intentToCompleteActivity) } private fun setClearEnter() { diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index bbf7765c..f7541850 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -3,7 +3,6 @@ package com.sopetit.softie.ui.happyroutine.detail import android.graphics.Color import android.graphics.Rect import android.os.Bundle -import android.util.Log import android.view.View import androidx.activity.viewModels import androidx.recyclerview.widget.RecyclerView @@ -122,8 +121,7 @@ class HappyDetailActivity : } private fun moveToProgress() { - Log.d("HappyDetailActivity", "Setting RESULT_OK") - setResult(RESULT_OK) // 기본적으로 성공을 나타내는 RESULT_OK 사용 + setResult(RESULT_OK) finish() } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt index fa9d71b3..914b5475 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt @@ -2,7 +2,6 @@ package com.sopetit.softie.ui.happyroutine.list import android.content.Intent import android.os.Bundle -import android.util.Log import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.recyclerview.widget.RecyclerView @@ -30,7 +29,6 @@ class HappyAddListActivity : private val startForDetailResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> if (result.resultCode == RESULT_OK) { - Log.d("HappyAddListActivity", "Setting RESULT_OK") setResult(RESULT_OK) finish() } @@ -90,7 +88,6 @@ class HappyAddListActivity : putExtra(ID, id) putExtra(ICON_IMAGE_URL, iconImageUrl) } - // 필요한 데이터를 인텐트에 추가 startForDetailResult.launch(intent) } From 90ff6ae918f51c8face7f76fc8820737d7c9f754 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 22:35:14 +0900 Subject: [PATCH 14/18] =?UTF-8?q?#134=20[chore]=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softie/ui/happyroutine/HappyMyRoutineFragment.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index ea37e540..7b4ff781 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -33,12 +33,12 @@ class HappyMyRoutineFragment : binding.viewModel = viewModel setStatusBarColor(R.color.background) + startProgressSnackbar() initSetBearFace() - setMyCardEnter() + setNewCardEnter() setCardEnter() setEditEnter() setClearEnter() - startProgressSnackbar() } override fun onResume() { @@ -74,7 +74,7 @@ class HappyMyRoutineFragment : } } - private fun setMyCardEnter() { + private fun setNewCardEnter() { binding.ivHappyRoutineEmptyCard.setOnClickListener { val intent = Intent(context, HappyAddListActivity::class.java) resultLauncher.launch(intent) From 5e20a01b731ecbf16de6453ee2b7ed41eaa2d683 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 23:18:39 +0900 Subject: [PATCH 15/18] =?UTF-8?q?#134=20[chore]=20registerForActivityResul?= =?UTF-8?q?t=20=EB=B3=80=EC=88=98=20=EC=9C=84=EC=B9=98=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 --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 7b4ff781..557619c3 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -3,7 +3,6 @@ package com.sopetit.softie.ui.happyroutine import android.content.Intent import android.os.Bundle import android.view.View -import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.viewModels @@ -26,14 +25,18 @@ class HappyMyRoutineFragment : BindingFragment(R.layout.fragment_happy_my_routine) { private val viewModel by viewModels() - private lateinit var resultLauncher: ActivityResultLauncher + private var resultLauncher = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == AppCompatActivity.RESULT_OK) { + customHappyRoutineAddSnackBar() + } + } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.viewModel = viewModel setStatusBarColor(R.color.background) - startProgressSnackbar() initSetBearFace() setNewCardEnter() setCardEnter() @@ -46,15 +49,6 @@ class HappyMyRoutineFragment : viewModel.getHappyProgress() } - private fun startProgressSnackbar() { - resultLauncher = - registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode == AppCompatActivity.RESULT_OK) { - customHappyRoutineAddSnackBar() - } - } - } - private fun customHappyRoutineAddSnackBar() { val customSnackbar = CustomSnackbar.make( (binding.root.rootView), From a297cabe12921ffc7246cab21952a34041328102 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Fri, 2 Feb 2024 23:25:58 +0900 Subject: [PATCH 16/18] =?UTF-8?q?#134=20[chore]=20=EC=95=88=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20=EC=A0=84=EC=97=AD=EB=B3=80=EC=88=98=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt diff --git a/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt b/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt deleted file mode 100644 index 417f0b40..00000000 --- a/app/src/main/java/com/sopetit/softie/util/HappyFirstAddCheck.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.sopetit.softie.util - -object HappyFirstAddCheck { - var happyFirstAdd: Boolean = false -} From 936da72ad77154be6a89d5bc063d0a75c2a11e53 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Sat, 3 Feb 2024 00:29:01 +0900 Subject: [PATCH 17/18] =?UTF-8?q?#134=20[chore]=20=ED=96=89=EB=B3=B5?= =?UTF-8?q?=EB=A3=A8=ED=8B=B4=20=ED=95=A8=EC=88=98=EB=AA=85=20=EB=AA=85?= =?UTF-8?q?=EC=8B=9C=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/happyroutine/HappyMyRoutineFragment.kt | 22 +++++++++---------- .../delete/HappyDeleteFragment.kt | 14 ++++++------ .../detail/HappyDetailActivity.kt | 8 +++---- .../happyroutine/list/HappyAddListActivity.kt | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 883a8fba..84a7cf25 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -38,10 +38,10 @@ class HappyMyRoutineFragment : setStatusBarColor(R.color.background) initSetBearFace() - setNewCardEnter() - setCardEnter() - setEditEnter() - setClearEnter() + startHappyAddListActivity() + setCardImageClickListener() + startHappyDeleteActivity() + startHappyRoutineCompleteBottomSheet() } override fun onResume() { @@ -69,25 +69,25 @@ class HappyMyRoutineFragment : } } - private fun setNewCardEnter() { + private fun startHappyAddListActivity() { binding.ivHappyRoutineEmptyCard.setOnClickListener { val intent = Intent(context, HappyAddListActivity::class.java) resultLauncher.launch(intent) } } - private fun setCardEnter() { + private fun setCardImageClickListener() { with(binding) { clHappyProgressCardFront.setSingleOnClickListener { - setCardFlip(clHappyProgressCardFront, clHappyProgressCardBack) + setCardImageFlip(clHappyProgressCardFront, clHappyProgressCardBack) } clHappyProgressCardBack.setSingleOnClickListener { - setCardFlip(clHappyProgressCardBack, clHappyProgressCardFront) + setCardImageFlip(clHappyProgressCardBack, clHappyProgressCardFront) } } } - private fun setEditEnter() { + private fun startHappyDeleteActivity() { binding.tvHappyProgressEdit.setSingleOnClickListener { val happyDeleteFragment = HappyDeleteFragment() requireActivity().supportFragmentManager.beginTransaction() @@ -97,7 +97,7 @@ class HappyMyRoutineFragment : } } - private fun setCardFlip(viewFront: View, viewToBack: View) { + private fun setCardImageFlip(viewFront: View, viewToBack: View) { val isVisible = viewFront.visibility == View.VISIBLE if (isVisible) { viewFront.visibility = View.INVISIBLE @@ -135,7 +135,7 @@ class HappyMyRoutineFragment : startActivity(intentToCompleteActivity) } - private fun setClearEnter() { + private fun startHappyRoutineCompleteBottomSheet() { binding.btnHappyProgressClear.setOnClickListener { viewModel.happyProgressResponse.value?.iconImageUrl?.let { url -> initHappyRoutineCompleteBottomSheet( diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt index dc667bee..c781222b 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/delete/HappyDeleteFragment.kt @@ -26,9 +26,9 @@ class HappyDeleteFragment : val happyProgress = viewModel.getHappyProgress() setCardBinding(happyProgress) - setCardEnter() + setCardImageClickListener() setCancelEnter() - setClearEnter() + startHappyDeleteBottomSheet() } private fun setCardBinding(happyProgress: Unit) { @@ -50,13 +50,13 @@ class HappyDeleteFragment : } } - private fun setCardEnter() { + private fun setCardImageClickListener() { with(binding) { clHappyDeleteCardFront.setSingleOnClickListener { - setCardFlip(clHappyDeleteCardFront, clHappyDeleteCardBack) + setCardImageFlip(clHappyDeleteCardFront, clHappyDeleteCardBack) } clHappyDeleteCardBack.setSingleOnClickListener { - setCardFlip(clHappyDeleteCardBack, clHappyDeleteCardFront) + setCardImageFlip(clHappyDeleteCardBack, clHappyDeleteCardFront) } } } @@ -67,7 +67,7 @@ class HappyDeleteFragment : } } - private fun setCardFlip(viewFront: View, viewToBack: View) { + private fun setCardImageFlip(viewFront: View, viewToBack: View) { val isVisible = viewFront.visibility == View.VISIBLE if (isVisible) { viewFront.visibility = View.INVISIBLE @@ -78,7 +78,7 @@ class HappyDeleteFragment : } } - private fun setClearEnter() { + private fun startHappyDeleteBottomSheet() { binding.btnHappyDeleteClear.setSingleOnClickListener { BindingBottomSheet.Builder().build( isDrawable = true, diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt index 8f796080..b486a945 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/detail/HappyDetailActivity.kt @@ -35,7 +35,7 @@ class HappyDetailActivity : setInitBinding(routineId, imageUrl) setCurrentCard() setBackEnter() - setupAdapter(routineId) + setHappyDetailCardPagerAdapter(routineId) setIndicator() } @@ -55,7 +55,7 @@ class HappyDetailActivity : viewModel.mySubroutineId.observe(this) { mySubRoutineId -> mySubRoutineId?.let { imageUrl?.let { - setBottomSheetEnter(it, mySubRoutineId) + startHappyRoutineAddBottomSheet(it, mySubRoutineId) } } } @@ -85,7 +85,7 @@ class HappyDetailActivity : } } - private fun setBottomSheetEnter(icon: String, subRoutineId: Int) { + private fun startHappyRoutineAddBottomSheet(icon: String, subRoutineId: Int) { binding.btnHappyDetailAdd.setSingleOnClickListener { initHappyRoutineAddBottomSheet(icon, subRoutineId) } @@ -116,7 +116,7 @@ class HappyDetailActivity : finish() } - private fun setupAdapter(routineId: String) { + private fun setHappyDetailCardPagerAdapter(routineId: String) { with(binding) { vpHappyAddDetailCard.adapter = happyRoutineAddCardPagerAdapter } diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt index 914b5475..c31f7ec8 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/list/HappyAddListActivity.kt @@ -45,7 +45,7 @@ class HappyAddListActivity : setChipAdapters() setBackEnter() setItemDeco() - setupAdapter() + setHappyAddListAdapter() } private fun setChipAdapters() { @@ -66,7 +66,7 @@ class HappyAddListActivity : binding.rvHappyAddListChip.addItemDecoration(chipDeco) } - private fun setupAdapter() { + private fun setHappyAddListAdapter() { with(binding) { rvHappyAddListChip.adapter = happyAddListChipContentAdapter rvHappyAddList.adapter = happyAddListContentAdapter From 3eddd4a7346646c1846750ae2a52cc3e530d57b4 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Sat, 3 Feb 2024 00:34:00 +0900 Subject: [PATCH 18/18] =?UTF-8?q?#134=20[chore]=20requireContext()?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=3D>=20NonNull=20=EB=B3=B4?= =?UTF-8?q?=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt index 84a7cf25..d8755304 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyMyRoutineFragment.kt @@ -71,7 +71,7 @@ class HappyMyRoutineFragment : private fun startHappyAddListActivity() { binding.ivHappyRoutineEmptyCard.setOnClickListener { - val intent = Intent(context, HappyAddListActivity::class.java) + val intent = Intent(requireContext(), HappyAddListActivity::class.java) resultLauncher.launch(intent) } }