From 72ce85651feb87b0b953038702af5ccd94e4cbbd Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Mon, 17 Feb 2025 15:55:51 +0900 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=EC=95=BD=EA=B4=80=EB=8F=99?= =?UTF-8?q?=EC=9D=98=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EB=8F=99=EC=9D=98=20=ED=86=A0=EA=B8=80=20=ED=84=B0?= =?UTF-8?q?=EC=B9=98=20=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/dialog_terms_agreement.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/dialog_terms_agreement.xml b/app/src/main/res/layout/dialog_terms_agreement.xml index 62495d70c..a824c89dc 100644 --- a/app/src/main/res/layout/dialog_terms_agreement.xml +++ b/app/src/main/res/layout/dialog_terms_agreement.xml @@ -40,7 +40,6 @@ android:background="@drawable/btn_feed_novel_info" android:orientation="horizontal" android:gravity="center_vertical" - android:padding="16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_terms_agreement_sub_title"> @@ -50,6 +49,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" android:text="@string/string_terms_agreement_all" android:textAppearance="@style/title2" android:textColor="@color/primary_100_6A5DFD" /> @@ -58,6 +59,8 @@ android:id="@+id/iv_terms_agreement_All" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp" android:src="@drawable/ic_terms_agreement_unselected" /> From 72bc595468a12dcd99bc4adc6d6935c973e804ac Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Mon, 17 Feb 2025 15:59:46 +0900 Subject: [PATCH 02/13] =?UTF-8?q?fix:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/deepLinks.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/deepLinks.xml b/app/src/main/res/values/deepLinks.xml index 81b542356..6fbb91f18 100644 --- a/app/src/main/res/values/deepLinks.xml +++ b/app/src/main/res/values/deepLinks.xml @@ -6,6 +6,6 @@ https://websoso.notion.site/143600bd746880668556fb005fcef491?pvs=4 https://play.google.com/store/apps/details?id=com.into.websoso https://www.notion.so/websoso/143600bd74688050be18f4da31d9403e?pvs=4 - https://www.notion.so/kimmjabc/18e9e64a45328048842ed4dd7b17e5b3?pvs=25 + https://websoso.notion.site/198600bd746880699fd6f22dd42a7215?pvs=4 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cad0992cf..6758a6478 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -421,7 +421,7 @@ 서비스 이용약관 동의 (필수) - 개인정보 수집 및 이용 안내 (필수) + 개인정보 수집 및 이용 동의 (필수) 마켓팅 정보 수신 동의 (선택) 다음으로 완료 From ce172cc0ae5483fdcc255a4f0ed94f5de465292c Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Mon, 17 Feb 2025 16:47:50 +0900 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=8B=9C=20=EC=95=BD=EA=B4=80=EB=8F=99=EC=9D=98=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=83=81=ED=83=9C=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/into/websoso/data/repository/UserRepository.kt | 6 ++++++ .../websoso/ui/withdraw/second/WithdrawSecondViewModel.kt | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/into/websoso/data/repository/UserRepository.kt b/app/src/main/java/com/into/websoso/data/repository/UserRepository.kt index e7ea0fac9..fec22e6f1 100644 --- a/app/src/main/java/com/into/websoso/data/repository/UserRepository.kt +++ b/app/src/main/java/com/into/websoso/data/repository/UserRepository.kt @@ -197,6 +197,12 @@ class UserRepository } } + suspend fun removeTermsAgreementChecked() { + userStorage.edit { preferences -> + preferences.remove(TERMS_AGREEMENT_CHECKED_KEY) + } + } + companion object { val NOVEL_DETAIL_FIRST_LAUNCHED_KEY = booleanPreferencesKey("NOVEL_DETAIL_FIRST_LAUNCHED") val TERMS_AGREEMENT_CHECKED_KEY = booleanPreferencesKey("terms_agreement_checked") diff --git a/app/src/main/java/com/into/websoso/ui/withdraw/second/WithdrawSecondViewModel.kt b/app/src/main/java/com/into/websoso/ui/withdraw/second/WithdrawSecondViewModel.kt index 9ae9d043c..e1bd03075 100644 --- a/app/src/main/java/com/into/websoso/ui/withdraw/second/WithdrawSecondViewModel.kt +++ b/app/src/main/java/com/into/websoso/ui/withdraw/second/WithdrawSecondViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.into.websoso.data.repository.AuthRepository +import com.into.websoso.data.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject @@ -13,6 +14,7 @@ import javax.inject.Inject @HiltViewModel class WithdrawSecondViewModel @Inject constructor( private val authRepository: AuthRepository, + private val userRepository: UserRepository, ) : ViewModel() { private val _withdrawReason: MutableLiveData = MutableLiveData("") val withdrawReason: LiveData get() = _withdrawReason @@ -77,6 +79,7 @@ class WithdrawSecondViewModel @Inject constructor( authRepository.withdraw(withdrawReason) }.onSuccess { _isWithDrawSuccess.value = true + userRepository.removeTermsAgreementChecked() authRepository.updateIsAutoLogin(false) }.onFailure { _isWithDrawSuccess.value = false @@ -87,4 +90,4 @@ class WithdrawSecondViewModel @Inject constructor( companion object { private const val ETC_INPUT_REASON = "직접입력" } -} \ No newline at end of file +} From 9fb4846fdf8fabd7017523ae91c2388a7decd719 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 14:41:59 +0900 Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=EC=95=BD=EA=B4=80=20=EB=8F=99?= =?UTF-8?q?=EC=9D=98=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/into/websoso/ui/main/home/HomeFragment.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt index 8f601c7fb..1b13ea0fd 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt @@ -4,6 +4,7 @@ import android.Manifest import android.content.Intent import android.os.Build import android.os.Bundle +import android.util.Log import android.view.View import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts @@ -175,9 +176,14 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { } homeViewModel.showTermsAgreementDialog.collectWithLifecycle(viewLifecycleOwner) { shouldShow -> - if (shouldShow) { - showTermsAgreementDialog() - } + if (!shouldShow) return@collectWithLifecycle + + val existingDialog = parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG) + val existingBottomSheet = parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") + + if (existingDialog != null || existingBottomSheet != null) return@collectWithLifecycle + + showTermsAgreementDialog() } } From 6bed0220e536e592a285c0de43f77f793b9729e4 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 14:42:24 +0900 Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=EB=B0=94=ED=85=80=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=EA=B0=80=20=EC=97=B4=EB=A0=A4=20=EC=9E=88=EC=9D=84=20?= =?UTF-8?q?=EB=95=8C=20=EC=95=BD=EA=B4=80=20=EB=8F=99=EC=9D=98=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/termsAgreement/TermsAgreementDialogBottomSheet.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt index 675dba6cd..d9aadf23c 100644 --- a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt +++ b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt @@ -1,5 +1,6 @@ package com.into.websoso.ui.termsAgreement +import android.content.DialogInterface import android.content.Intent import android.net.Uri import android.os.Bundle @@ -24,6 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class TermsAgreementDialogBottomSheet : BaseBottomSheetDialog(R.layout.dialog_terms_agreement) { private val termsAgreementViewModel: TermsAgreementViewModel by viewModels() + var onDismissListener: (() -> Unit)? = null override fun onViewCreated( view: View, @@ -95,7 +97,7 @@ class TermsAgreementDialogBottomSheet : BaseBottomSheetDialog Date: Fri, 21 Feb 2025 14:42:37 +0900 Subject: [PATCH 06/13] =?UTF-8?q?refactor:=20=EC=95=BD=EA=B4=80=20?= =?UTF-8?q?=EB=8F=99=EC=9D=98=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EB=8B=AB=ED=9E=90=20=EB=95=8C=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog/TermsAgreementDialogFragment.kt | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt index 35893d6bd..d4bacd204 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt @@ -1,5 +1,6 @@ package com.into.websoso.ui.main.home.dialog +import android.content.DialogInterface import android.os.Bundle import android.view.View import com.into.websoso.R @@ -9,6 +10,8 @@ import com.into.websoso.ui.termsAgreement.TermsAgreementDialogBottomSheet class TermsAgreementDialogFragment : BaseDialogFragment(R.layout.dialog_terms_agreement_popup_menu) { + private var isBottomSheetShown = false + override fun onViewCreated( view: View, savedInstanceState: Bundle?, @@ -26,9 +29,20 @@ class TermsAgreementDialogFragment : } private fun showTermsAgreementBottomSheet() { - TermsAgreementDialogBottomSheet - .newInstance(isFromHome = true) - .show(parentFragmentManager, "TermsAgreementDialogBottomSheet") + isBottomSheetShown = true + + val bottomSheet = TermsAgreementDialogBottomSheet.newInstance(isFromHome = true) + bottomSheet.show(parentFragmentManager, "TermsAgreementDialogBottomSheet") + + bottomSheet.onDismissListener = { + isBottomSheetShown = false + } + dismiss() + } + + override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) + isBottomSheetShown = false } companion object { From 8a0445ccc70a92f4bd0866fa3bb8964e3b27e0c3 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 14:48:01 +0900 Subject: [PATCH 07/13] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/into/websoso/ui/main/home/HomeFragment.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt index 1b13ea0fd..38cedaf4c 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt @@ -4,7 +4,6 @@ import android.Manifest import android.content.Intent import android.os.Build import android.os.Bundle -import android.util.Log import android.view.View import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts @@ -178,8 +177,10 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { homeViewModel.showTermsAgreementDialog.collectWithLifecycle(viewLifecycleOwner) { shouldShow -> if (!shouldShow) return@collectWithLifecycle - val existingDialog = parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG) - val existingBottomSheet = parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") + val existingDialog = + parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG) + val existingBottomSheet = + parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") if (existingDialog != null || existingBottomSheet != null) return@collectWithLifecycle From d02254f1deacc80b17471c8b5d0f2965c2d561d5 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 15:18:36 +0900 Subject: [PATCH 08/13] =?UTF-8?q?refactor:=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 --- .../into/websoso/ui/main/home/HomeFragment.kt | 4 ++-- .../dialog/TermsAgreementDialogFragment.kt | 19 ++++++------------- .../TermsAgreementDialogBottomSheet.kt | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt index 38cedaf4c..6c56a375d 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt @@ -174,8 +174,8 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { updateFCMToken(isFirstLaunch = false) } - homeViewModel.showTermsAgreementDialog.collectWithLifecycle(viewLifecycleOwner) { shouldShow -> - if (!shouldShow) return@collectWithLifecycle + homeViewModel.showTermsAgreementDialog.collectWithLifecycle(viewLifecycleOwner) { isShown -> + if (!isShown) return@collectWithLifecycle val existingDialog = parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt index d4bacd204..19d1eb976 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt @@ -10,8 +10,6 @@ import com.into.websoso.ui.termsAgreement.TermsAgreementDialogBottomSheet class TermsAgreementDialogFragment : BaseDialogFragment(R.layout.dialog_terms_agreement_popup_menu) { - private var isBottomSheetShown = false - override fun onViewCreated( view: View, savedInstanceState: Bundle?, @@ -29,22 +27,17 @@ class TermsAgreementDialogFragment : } private fun showTermsAgreementBottomSheet() { - isBottomSheetShown = true - - val bottomSheet = TermsAgreementDialogBottomSheet.newInstance(isFromHome = true) - bottomSheet.show(parentFragmentManager, "TermsAgreementDialogBottomSheet") + val isBottomSheetShown = + parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") - bottomSheet.onDismissListener = { - isBottomSheetShown = false + if (isBottomSheetShown == null) { + TermsAgreementDialogBottomSheet + .newInstance(isFromHome = true) + .show(parentFragmentManager, "TermsAgreementDialogBottomSheet") } dismiss() } - override fun onDismiss(dialog: DialogInterface) { - super.onDismiss(dialog) - isBottomSheetShown = false - } - companion object { const val TERMS_AGREEMENT_TAG = "TermsAgreementDialog" diff --git a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt index d9aadf23c..846ca8f5f 100644 --- a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt +++ b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt @@ -25,7 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class TermsAgreementDialogBottomSheet : BaseBottomSheetDialog(R.layout.dialog_terms_agreement) { private val termsAgreementViewModel: TermsAgreementViewModel by viewModels() - var onDismissListener: (() -> Unit)? = null + private var onDismissListener: (() -> Unit)? = null override fun onViewCreated( view: View, From cfab47bdf8d6c9bda019bf8c9d15bb7ba65b5ef0 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 15:20:17 +0900 Subject: [PATCH 09/13] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt index 19d1eb976..95b46104e 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt @@ -1,6 +1,5 @@ package com.into.websoso.ui.main.home.dialog -import android.content.DialogInterface import android.os.Bundle import android.view.View import com.into.websoso.R From 6b871bce01f1502bbfc442a35315a826dc69f613 Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 15:58:09 +0900 Subject: [PATCH 10/13] =?UTF-8?q?refactor:=20=ED=84=B0=EC=B9=98=EC=98=81?= =?UTF-8?q?=EC=97=AD=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/termsAgreement/TermsAgreementDialogBottomSheet.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt index 846ca8f5f..be28e407a 100644 --- a/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt +++ b/app/src/main/java/com/into/websoso/ui/termsAgreement/TermsAgreementDialogBottomSheet.kt @@ -71,7 +71,7 @@ class TermsAgreementDialogBottomSheet : BaseBottomSheetDialog Date: Fri, 21 Feb 2025 16:01:09 +0900 Subject: [PATCH 11/13] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/into/websoso/ui/main/home/HomeFragment.kt | 2 +- .../ui/main/home/dialog/TermsAgreementDialogFragment.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt index 6c56a375d..9c084c1b3 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt @@ -180,7 +180,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { val existingDialog = parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG) val existingBottomSheet = - parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") + parentFragmentManager.findFragmentByTag(TermsAgreementDialogFragment.TERMS_AGREEMENT_BOTTOM_SHEET_TAG) if (existingDialog != null || existingBottomSheet != null) return@collectWithLifecycle diff --git a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt index 95b46104e..704a22edb 100644 --- a/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt +++ b/app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt @@ -27,18 +27,19 @@ class TermsAgreementDialogFragment : private fun showTermsAgreementBottomSheet() { val isBottomSheetShown = - parentFragmentManager.findFragmentByTag("TermsAgreementDialogBottomSheet") + parentFragmentManager.findFragmentByTag(TERMS_AGREEMENT_BOTTOM_SHEET_TAG) if (isBottomSheetShown == null) { TermsAgreementDialogBottomSheet .newInstance(isFromHome = true) - .show(parentFragmentManager, "TermsAgreementDialogBottomSheet") + .show(parentFragmentManager, TERMS_AGREEMENT_BOTTOM_SHEET_TAG) } dismiss() } companion object { const val TERMS_AGREEMENT_TAG = "TermsAgreementDialog" + const val TERMS_AGREEMENT_BOTTOM_SHEET_TAG = "TermsAgreementDialogBottomSheet" fun newInstance(): TermsAgreementDialogFragment = TermsAgreementDialogFragment() } From ed2a56c1b50a342b1371f6b817b202751e23856f Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 16:01:09 +0900 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6758a6478..072b8c8f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -430,7 +430,7 @@ 전체 동의 - 동의하러 가기 + 의하러 가기 더 안전하고 원활한 웹소소를 위해\n업데이트된 약관에 동의해주세요. 약관 동의가 필요해요! From aa85cfd5dfc7a392136579430b7b4945bccf2a4a Mon Sep 17 00:00:00 2001 From: yeonjeen Date: Fri, 21 Feb 2025 21:46:58 +0900 Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 072b8c8f2..6758a6478 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -430,7 +430,7 @@ 전체 동의 - 의하러 가기 + 동의하러 가기 더 안전하고 원활한 웹소소를 위해\n업데이트된 약관에 동의해주세요. 약관 동의가 필요해요!