From eafb92de4a64956e5ee89c0ee1683f0b2e0848bb Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Fri, 5 Apr 2024 15:18:40 +0900
Subject: [PATCH 01/15] =?UTF-8?q?feat=20:=2033=20=EB=B2=84=EC=A0=84=20?=
 =?UTF-8?q?=EB=AF=B8=EB=A7=8C=20=EC=8A=A4=ED=94=8C=EB=9E=98=EC=8B=9C=20?=
 =?UTF-8?q?=EC=95=88=20=EB=9C=A8=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/splash/SplashActivity.kt    | 11 +++--------
 app/src/main/res/values/themes.xml                    |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
index 63f27b95..a5a2b78a 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
@@ -2,10 +2,9 @@ package com.dongyang.android.youdongknowme.ui.view.splash
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
-import android.view.View
+import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
@@ -28,11 +27,6 @@ class SplashActivity : BaseActivity<ActivitySplashBinding, SplashViewModel>() {
     private var intentJob: Job? = null
 
     override fun initStartView() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val content: View = findViewById(android.R.id.content)
-            content.viewTreeObserver.addOnPreDrawListener { false }
-        }
-
         viewModel.checkFirstLaunch()
     }
 
@@ -52,6 +46,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding, SplashViewModel>() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<String>,
@@ -100,7 +95,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding, SplashViewModel>() {
     }
 
     companion object {
-        private const val SPLASH_TIME_MILLIS = 1_500L
+        private const val SPLASH_TIME_MILLIS = 3_000L
         private const val REQUEST_PERMISSION_CODE = 100
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 20afd528..8bdea4af 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,7 +18,7 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.YouDongKnowMe.Splash" parent="Theme.YouDongKnowMe"></style>
+    <style name="Theme.YouDongKnowMe.Splash" parent="Theme.YouDongKnowMe" />
 
     <!-- 달력 연, 월 스타일 지정 -->
     <style name="CalendarHeader">

From a98112fb9da9d92da49ad00f7b353aa77612a468 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Fri, 5 Apr 2024 15:42:32 +0900
Subject: [PATCH 02/15] =?UTF-8?q?fix=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=ED=99=94=EB=A9=B4=20=EB=B2=84=EC=A0=84=2033?=
 =?UTF-8?q?=20=EB=AF=B8=EB=A7=8C=20=EC=8A=A4=EC=9C=84=EC=B9=98=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/OnboardingPermissionActivity.kt   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
index 39b608e5..1d1fd15f 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -3,6 +3,7 @@ package com.dongyang.android.youdongknowme.ui.view.setting
 import android.Manifest
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
+import android.os.Build
 import androidx.core.content.ContextCompat
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingPermissionBinding
@@ -10,7 +11,6 @@ import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.view.main.MainActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-
 class OnboardingPermissionActivity :
     BaseActivity<ActivityOnboardingPermissionBinding, SettingViewModel>() {
 
@@ -18,43 +18,45 @@ class OnboardingPermissionActivity :
     override val viewModel: SettingViewModel by viewModel()
 
     override fun initStartView() {
-        viewModel.checkAccessAlarm()
-        viewModel.getUserDepartment()
-        setPermissionSwitch(false)
 
+        setPermissionSwitch(false)
         setSpanText(binding.tvPermissionTitleMain, startIdx = 0, endIdx = 9)
-    }
 
-    override fun initDataBinding() = Unit
-
-    override fun initAfterBinding() {
         binding.btnPermissionComplete.setOnClickListener {
             val intent = MainActivity.createIntent(this@OnboardingPermissionActivity)
             startActivity(intent)
             finish()
         }
+    }
 
-        binding.switchPermission.setOnCheckedChangeListener { compoundButton, _ ->
-            if (compoundButton.isChecked) {
-                // 권환 확인 전 스위치 초기화
-                binding.switchPermission.isChecked = false
+    override fun initDataBinding() = Unit
 
-                // 온보딩 알림 스위치를  활성화
-                if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(
-                        this, Manifest.permission.POST_NOTIFICATIONS
-                    )
-                ) {
-                    // 알림 권한이 허용 상태
-                    setPermissionSwitch(true)
+    override fun initAfterBinding() {
+        binding.switchPermission.setOnCheckedChangeListener { compoundButton, _ ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                if (compoundButton.isChecked) {
+                    if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(
+                            this, Manifest.permission.POST_NOTIFICATIONS
+                        )
+                    ) {
+                        setPermissionSwitch(true)
+                    } else {
+                        val dialog = PermissionDialog(
+                            getString(R.string.dialog_permission_title),
+                            getString(R.string.dialog_permission_content),
+                            this.packageName
+                        )
+                        dialog.show(supportFragmentManager, "CustomDialog")
+                    }
                 } else {
-
-                    // 알림 권한이 미허용 상태
-                    val dialog = PermissionDialog(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), this.packageName)
-                    dialog.show(supportFragmentManager, "CustomDialog")
+                    setPermissionSwitch(false)
                 }
             } else {
-                // 온보딩 알림 스위치 비활성화
-                setPermissionSwitch(false)
+                if (compoundButton.isChecked) {
+                    setPermissionSwitch(true)
+                } else {
+                    setPermissionSwitch(false)
+                }
             }
         }
     }
@@ -70,8 +72,6 @@ class OnboardingPermissionActivity :
             ColorStateList.valueOf(ContextCompat.getColor(this, resources))
         binding.switchPermission.setTextColor(getColor(resources))
         binding.mvSwitchPermission.strokeColor = getColor(resources)
-
-        binding.switchPermission.isChecked = isChecked
         viewModel.setIsAccessUniversityAlarm(isChecked)
         viewModel.setIsAccessDepartAlarm(isChecked)
     }

From e8e08d6f2315e9347b4d97cac4f9228a058001ea Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 14:41:12 +0900
Subject: [PATCH 03/15] =?UTF-8?q?fix=20:=20=ED=95=99=EA=B3=BC=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EB=B0=B0=EC=97=B4=20=EB=B0=96=20=EC=9D=B8=EB=8D=B1?=
 =?UTF-8?q?=EC=8A=A4=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/depart/OnboardingDepartActivity.kt   | 31 ++++++++---------
 .../ui/view/keyword/KeywordActivity.kt        |  2 --
 .../ui/view/main/MainActivity.kt              | 11 ++----
 .../ui/view/main/MainViewModel.kt             | 34 +++++++++++--------
 4 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt
index e348b15d..17c12afa 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt
@@ -47,7 +47,16 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
         setSpanText(binding.tvOnboardingDepartTitleMain, startIdx = 0, endIdx = 5)
     }
 
-    override fun initDataBinding() = Unit
+    override fun initDataBinding() {
+
+        viewModel.selectDepartPosition.observe(this) { position ->
+            if (position != -1 && position < searchList.size) {
+                adapter.submitPosition(position)
+                binding.etOnboardingDepartSearch.setText(searchList[position])
+                binding.etOnboardingDepartSearch.setSelection(binding.etOnboardingDepartSearch.text.length)
+            }
+        }
+    }
 
     override fun initAfterBinding() {
         binding.ibOnboardingDepartSearchClear.setOnClickListener {
@@ -64,14 +73,13 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
             override fun afterTextChanged(editable: Editable?) {
                 val searchText =
                     binding.etOnboardingDepartSearch.text.toString().replace("\\s".toRegex(), "")
-                searchList = ArrayList<String>()
+                searchList.clear()
 
                 if (searchText.isEmpty()) {
                     adapter.submitList(emptyList)
-                    binding.ibOnboardingDepartSearchClear.isVisible=false
+                    binding.ibOnboardingDepartSearchClear.isVisible = false
                 } else {
-                    // 검색 단어를 포함하는지 확인
-                    binding.ibOnboardingDepartSearchClear.isVisible=true
+                    binding.ibOnboardingDepartSearchClear.isVisible = true
                     for (item in items) {
                         if (item.contains(searchText)) {
                             searchList.add(item)
@@ -88,17 +96,6 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
             }
         })
 
-        viewModel.selectDepartPosition.observe(this) {
-            adapter.submitPosition(it)
-
-            if (it != -1) {
-                binding.etOnboardingDepartSearch.setText(
-                    searchList[viewModel.selectDepartPosition.value ?: 0]
-                )
-                binding.etOnboardingDepartSearch.setSelection(binding.etOnboardingDepartSearch.text.length)
-            }
-        }
-
         binding.btnOnboardingDepartNext.setOnClickListener {
             getDepart(searchList)
         }
@@ -155,7 +152,7 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
     // 확인 버튼을 누르면 내부 DB에 학과를 담고 메인 액티비티로 이동
     private fun getDepart(items: ArrayList<String>) {
         if (viewModel.selectDepartPosition.value != -1) {
-            viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0])
+            viewModel.setDepartment(items[0])
             val intent = Intent(this, OnboardingKeywordActivity::class.java)
             startActivity(intent)
             finish()
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
index f59e8b94..3f52a1c8 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
@@ -1,6 +1,5 @@
 package com.dongyang.android.youdongknowme.ui.view.keyword
 
-import android.content.Intent
 import android.content.res.ColorStateList
 import android.widget.Toast
 import androidx.core.content.ContextCompat
@@ -9,7 +8,6 @@ import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.data.local.entity.KeywordEntity
 import com.dongyang.android.youdongknowme.databinding.ActivityKeywordBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
-import com.dongyang.android.youdongknowme.ui.view.setting.OnboardingPermissionActivity
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainActivity.kt
index a25da2a4..840a97ea 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainActivity.kt
@@ -6,7 +6,6 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.plusAssign
 import androidx.navigation.ui.setupWithNavController
 import com.dongyang.android.youdongknowme.R
-import com.dongyang.android.youdongknowme.data.local.SharedPreference
 import com.dongyang.android.youdongknowme.databinding.ActivityMainBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.view.util.KeepStateNavigator
@@ -34,8 +33,6 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         navController.navigatorProvider += navigator
         navController.setGraph(R.navigation.dmu_navigation)
         binding.mainNvBottom.setupWithNavController(navController)
-
-        viewModel.checkFirstLaunch()
     }
 
     override fun initDataBinding() {
@@ -47,21 +44,19 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     override fun initAfterBinding() = Unit
 
     private fun getFcmToken() {
+        viewModel.setIsFirstLaunch(false)
         FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
             if (task.isSuccessful) {
                 viewModel.setFCMToken(task.result).run { viewModel.setInitToken() }
-                Timber.d("first ${task.result}")
+                Timber.d("token ${task.result}")
             } else {
                 return@addOnCompleteListener
             }
-            val token = task.result
-            SharedPreference.setFcmToken(token)
-
-            Timber.d("token : ${token}")
         }
     }
 
     companion object {
+
         fun createIntent(context: Context): Intent {
             return Intent(context, MainActivity::class.java)
         }
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
index 119f2bd7..2995981d 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
@@ -33,41 +33,47 @@ class MainViewModel(private val mainRepository: MainRepository) : BaseViewModel(
     private val _isFirstLaunch: MutableLiveData<Boolean> = MutableLiveData(false)
     val isFirstLaunch: LiveData<Boolean> get() = _isFirstLaunch
 
-    init{
+    init {
+        checkFirstLaunch()
         getUserDepart()
         getUserTopic()
     }
 
-    fun checkFirstLaunch() {
+    private fun checkFirstLaunch() {
         if (mainRepository.getIsFirstLaunch()) {
             _isFirstLaunch.value = true
         }
     }
 
-    fun setFCMToken(token: String){
-        mainRepository.setFCMToken(token)
-        _FCMToken.value = token
-    }
-
-    private fun getUserDepart(){
+    private fun getUserDepart() {
         _myDepartment.value = mainRepository.getUserDepartment()
     }
 
-    private fun getUserTopic(){
+    private fun getUserTopic() {
         viewModelScope.launch {
             _myTopics.value = mainRepository.getUserTopic()
         }
     }
 
+    fun setFCMToken(token: String) {
+        mainRepository.setFCMToken(token)
+        _FCMToken.value = token
+    }
+
+    fun setIsFirstLaunch(boolean: Boolean) {
+        mainRepository.setIsFirstLaunch(boolean)
+    }
+
     fun setInitToken() {
         _isLoading.postValue(true)
 
         viewModelScope.launch {
-            when (val result = mainRepository.setUserToken(Token(
-                token = FCMToken.value.toString(),
-                department = myDepartment.value ?: "",
-                topics = myTopics.value ?: emptyList()
-            )
+            when (val result = mainRepository.setUserToken(
+                Token(
+                    token = FCMToken.value.toString(),
+                    department = myDepartment.value ?: "",
+                    topics = myTopics.value ?: emptyList()
+                )
             )) {
                 is NetworkResult.Success -> {
                     Timber.d("first ${FCMToken.value.toString()}")

From 2fca02c6ba452b5526287448ba5f636255f041ea Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 16:51:05 +0900
Subject: [PATCH 04/15] =?UTF-8?q?feat=20:=2033=20=EC=9D=B4=EC=83=81=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EA=B6=8C=ED=95=9C=20=EB=A1=9C=EC=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

---
 .../setting/OnboardingPermissionActivity.kt   | 17 +++-
 .../ui/view/setting/PermissionDialog.kt       | 15 ++-
 .../ui/view/setting/SettingFragment.kt        | 92 +++++++++++--------
 .../ui/view/setting/SettingViewModel.kt       |  3 +-
 4 files changed, 85 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
index 1d1fd15f..67ebf4f0 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -44,7 +44,8 @@ class OnboardingPermissionActivity :
                         val dialog = PermissionDialog(
                             getString(R.string.dialog_permission_title),
                             getString(R.string.dialog_permission_content),
-                            this.packageName
+                            this.packageName,
+                            cancelListener = { setPermissionSwitch(false) }
                         )
                         dialog.show(supportFragmentManager, "CustomDialog")
                     }
@@ -68,6 +69,7 @@ class OnboardingPermissionActivity :
             R.color.gray400
         }
 
+        binding.switchPermission.isChecked = isChecked
         binding.switchPermission.compoundDrawableTintList =
             ColorStateList.valueOf(ContextCompat.getColor(this, resources))
         binding.switchPermission.setTextColor(getColor(resources))
@@ -75,4 +77,17 @@ class OnboardingPermissionActivity :
         viewModel.setIsAccessUniversityAlarm(isChecked)
         viewModel.setIsAccessDepartAlarm(isChecked)
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(
+                    this, Manifest.permission.POST_NOTIFICATIONS
+                )
+            ) {
+                setPermissionSwitch(true)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
index dc0dc142..1ed24035 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
@@ -12,11 +12,20 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import com.dongyang.android.youdongknowme.databinding.DialogPermissionBinding
 
-class PermissionDialog(val title: String, val content: String, val pacakageName: String) : DialogFragment() {
+class PermissionDialog(
+    val title: String,
+    val content: String,
+    val pacakageName: String,
+    val cancelListener: () -> Unit
+) : DialogFragment() {
     private var _binding: DialogPermissionBinding? = null
     private val binding get() = _binding!!
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         _binding = DialogPermissionBinding.inflate(inflater, container, false)
         val view = binding.root
 
@@ -29,8 +38,10 @@ class PermissionDialog(val title: String, val content: String, val pacakageName:
 
         // 취소 버튼
         binding.customTvBtn1.setOnClickListener {
+            cancelListener()
             dismiss()
         }
+
         // 확인 버튼
         binding.customTvBtn2.setOnClickListener {
             val intent =
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index db6cc300..06c09035 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -1,17 +1,13 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
-import android.app.Activity
 import android.Manifest
+import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.content.res.ColorStateList
 import android.net.Uri
+import android.os.Build
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import android.os.Build
-import android.view.View
-import android.widget.Switch
-import androidx.appcompat.widget.SwitchCompat
 import androidx.core.content.ContextCompat
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
@@ -37,21 +33,22 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         binding.tvSettingAppVersion.text = getAppVersion()
         setResultKeyword()
         setResultDepartment()
+        checkNotificationPermission()
     }
 
     override fun initDataBinding() {
 
+        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
+            topics = myTopics
+            viewModel.updateUserTopic(topics)
+        }
+
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
             viewModel.updateUserDepartment(department)
         }
 
-        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
-            topics = myTopics
-            viewModel.updateUserTopic(topics)
-        }
-
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingUniversityAlarm.isChecked = isChecked
         }
@@ -63,14 +60,15 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
     override fun initAfterBinding() {
 
-        viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
         viewModel.getUserTopic()
 
-        binding.switchSettingUniversityAlarm.setOnCheckedChangeListener { compoundButton, _ ->
-            checkPermission(binding.switchSettingUniversityAlarm)
-            if (compoundButton.isChecked) {
-                if (topics.isNotEmpty()) {
+        binding.switchSettingUniversityAlarm.setOnClickListener {
+            if (binding.switchSettingUniversityAlarm.isChecked) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    checkPermissionForTIRAMISU()
+                }
+                if (department.isNotEmpty()) {
                     viewModel.updateUserTopic(topics)
                 }
             } else {
@@ -78,9 +76,11 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
         }
 
-        binding.switchSettingDepartmentAlarm.setOnCheckedChangeListener { compoundButton, _ ->
-            checkPermission(binding.switchSettingDepartmentAlarm)
-            if (compoundButton.isChecked) {
+        binding.switchSettingDepartmentAlarm.setOnClickListener {
+            if (binding.switchSettingDepartmentAlarm.isChecked) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    checkPermissionForTIRAMISU()
+                }
                 if (department.isNotEmpty()) {
                     viewModel.updateUserDepartment(department)
                 }
@@ -121,25 +121,18 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         }
     }
 
-    private fun checkPermission(switch: SwitchCompat){
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
-                    requireContext(), Manifest.permission.POST_NOTIFICATIONS
-                )
-            ) {
-                // 알림 권한 설정 미허용
-                viewModel.setIsAccessDepartAlarm(false)
-                viewModel.setIsAccessUniversityAlarm(false)
-                binding.switchSettingUniversityAlarm.isChecked = false
-                binding.switchSettingDepartmentAlarm.isChecked = false
-
-                val dialog = PermissionDialog(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), requireContext().packageName)
-                dialog.show(parentFragmentManager, "CustomDialog")
-            } else {
-                switch.isChecked = !switch.isChecked
-            }
-        } else {
-            switch.isChecked = !switch.isChecked
+    private fun checkPermissionForTIRAMISU() {
+        if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
+                requireContext(), Manifest.permission.POST_NOTIFICATIONS
+            )
+        ) {
+            val dialog = PermissionDialog(
+                getString(R.string.dialog_permission_title),
+                getString(R.string.dialog_permission_content),
+                requireContext().packageName,
+                cancelListener = { alarmOffToTIRAMISU() }
+            )
+            dialog.show(parentFragmentManager, "CustomDialog")
         }
     }
 
@@ -168,4 +161,27 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 }
             }
     }
+
+    private fun alarmOffToTIRAMISU() {
+        binding.switchSettingUniversityAlarm.isChecked = false
+        binding.switchSettingDepartmentAlarm.isChecked = false
+    }
+
+    private fun checkNotificationPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
+                    requireContext(), Manifest.permission.POST_NOTIFICATIONS
+                )
+            ) {
+                viewModel.setIsAccessDepartAlarm(false)
+                viewModel.setIsAccessUniversityAlarm(false)
+                alarmOffToTIRAMISU()
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        checkNotificationPermission()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 85779b9e..293f9e27 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -40,11 +40,12 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
     val FCMToken: LiveData<String> get() = _FCMToken
 
     init {
+        checkAccessAlarm()
         getUserFCMToken()
         getUserDepartment()
     }
 
-    fun checkAccessAlarm() {
+    private fun checkAccessAlarm() {
         val isAccessUniversityAlarm = settingRepository.getIsAccessUniversityAlarm()
         _isAccessUniversityAlarm.postValue(isAccessUniversityAlarm)
 

From 82755d4c29650bc9f1c46e24d74c6196011edc6d Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 16:52:35 +0900
Subject: [PATCH 05/15] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=ED=8F=AC=EB=A7=B7=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/youdongknowme/ui/view/depart/DepartActivity.kt | 7 -------
 .../android/youdongknowme/ui/view/main/MainViewModel.kt    | 2 --
 2 files changed, 9 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
index ea557982..af772a9e 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
@@ -1,22 +1,15 @@
 package com.dongyang.android.youdongknowme.ui.view.depart
 
-import android.content.Intent
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.ActivityDepartBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.adapter.DepartAdapter
-import com.dongyang.android.youdongknowme.ui.view.main.MainActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import timber.log.Timber
 
 
 class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), DepartClickListener {
 
-
     override val layoutResourceId: Int = R.layout.activity_depart
     override val viewModel: DepartViewModel by viewModel()
     private lateinit var adapter: DepartAdapter
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
index 2995981d..312d5149 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/main/MainViewModel.kt
@@ -9,7 +9,6 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 import com.dongyang.android.youdongknowme.standard.network.NetworkResult
 import com.dongyang.android.youdongknowme.ui.view.util.Event
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 class MainViewModel(private val mainRepository: MainRepository) : BaseViewModel() {
     private val _errorState: MutableLiveData<Event<Int>> = MutableLiveData()
@@ -76,7 +75,6 @@ class MainViewModel(private val mainRepository: MainRepository) : BaseViewModel(
                 )
             )) {
                 is NetworkResult.Success -> {
-                    Timber.d("first ${FCMToken.value.toString()}")
                     mainRepository.setIsFirstLaunch(false)
                     _isFirstLaunch.postValue(false)
                     _isLoading.postValue(false)

From ed686685155c8667e1296675a1ff250cbb5f6d30 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 20:04:38 +0900
Subject: [PATCH 06/15] =?UTF-8?q?fix=20:=20=EC=95=8C=EB=9E=8C=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/youdongknowme/ui/view/setting/SettingFragment.kt   | 1 +
 .../android/youdongknowme/ui/view/setting/SettingViewModel.kt  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 06c09035..f22a7522 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -60,6 +60,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
     override fun initAfterBinding() {
 
+        viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
         viewModel.getUserTopic()
 
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 293f9e27..2731742a 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -45,10 +45,9 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
         getUserDepartment()
     }
 
-    private fun checkAccessAlarm() {
+    fun checkAccessAlarm() {
         val isAccessUniversityAlarm = settingRepository.getIsAccessUniversityAlarm()
         _isAccessUniversityAlarm.postValue(isAccessUniversityAlarm)
-
         val isAccessDepartAlarm = settingRepository.getIsAccessDepartAlarm()
         _isAccessDepartAlarm.postValue(isAccessDepartAlarm)
     }

From b81171f5f0c8c2c062a9e03a9136c0cfc411a41f Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 20:26:32 +0900
Subject: [PATCH 07/15] =?UTF-8?q?build=20:=20google-service=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d097a98a..ed4394f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'com.android.application' version '7.4.2' apply false
     id 'com.android.library' version '7.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
-    id "com.google.gms.google-services" version "4.3.10" apply false
+    id "com.google.gms.google-services" version "4.3.14" apply false
 }
 
 task clean(type: Delete) {

From bd510b34d1d8a35ad66f47404f521843400156f0 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 20:29:41 +0900
Subject: [PATCH 08/15] =?UTF-8?q?fix=20:=20=ED=8C=8C=EC=9D=B4=EC=96=B4?=
 =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=8A=A4=20=EC=9D=B8=EC=8A=A4=ED=84=B4?=
 =?UTF-8?q?=EC=8A=A4=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/keyword/KeywordViewModel.kt        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordViewModel.kt
index bd42bb8d..8bf58649 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordViewModel.kt
@@ -6,15 +6,12 @@ import androidx.lifecycle.viewModelScope
 import com.dongyang.android.youdongknowme.data.local.entity.KeywordEntity
 import com.dongyang.android.youdongknowme.data.repository.KeywordRepository
 import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
-import com.google.firebase.messaging.FirebaseMessaging
 import kotlinx.coroutines.launch
 
 class KeywordViewModel(
     private val keywordRepository: KeywordRepository
 ) : BaseViewModel() {
 
-    private val firebaseMessaging = FirebaseMessaging.getInstance()
-
     private val _localKeywordList: MutableLiveData<List<KeywordEntity>> = MutableLiveData()
     val localKeywordList: LiveData<List<KeywordEntity>> get() = _localKeywordList
 
@@ -37,14 +34,12 @@ class KeywordViewModel(
                     viewModelScope.launch {
                         keywordRepository.updateUserKeywords(true, localKeyword.name)
                     }
-                    firebaseMessaging.subscribeToTopic(localKeyword.englishName)
                 }
             } else {
                 if (localKeyword.isSubscribe) {
                     viewModelScope.launch {
                         keywordRepository.updateUserKeywords(false, localKeyword.name)
                     }
-                    firebaseMessaging.unsubscribeFromTopic(localKeyword.englishName)
                 }
             }
         }

From 4a5afbfab9a64fe3eb4c1e93662091179fd8f381 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 8 Apr 2024 20:34:13 +0900
Subject: [PATCH 09/15] =?UTF-8?q?fix=20:=20SharedPreference=20true?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95=EB=90=98=EB=8A=94=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/view/setting/SettingFragment.kt              | 13 ++++---------
 .../ui/view/setting/SettingViewModel.kt             |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index f22a7522..d1677ba5 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -40,13 +40,11 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
             topics = myTopics
-            viewModel.updateUserTopic(topics)
         }
 
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
-            viewModel.updateUserDepartment(department)
         }
 
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
@@ -131,7 +129,10 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 getString(R.string.dialog_permission_title),
                 getString(R.string.dialog_permission_content),
                 requireContext().packageName,
-                cancelListener = { alarmOffToTIRAMISU() }
+                cancelListener = {
+                    binding.switchSettingDepartmentAlarm.isChecked = false
+                    binding.switchSettingUniversityAlarm.isChecked = false
+                }
             )
             dialog.show(parentFragmentManager, "CustomDialog")
         }
@@ -163,11 +164,6 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
     }
 
-    private fun alarmOffToTIRAMISU() {
-        binding.switchSettingUniversityAlarm.isChecked = false
-        binding.switchSettingDepartmentAlarm.isChecked = false
-    }
-
     private fun checkNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
@@ -176,7 +172,6 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             ) {
                 viewModel.setIsAccessDepartAlarm(false)
                 viewModel.setIsAccessUniversityAlarm(false)
-                alarmOffToTIRAMISU()
             }
         }
     }
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 2731742a..6d7f1ed3 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -37,7 +37,7 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
     val myTopics: LiveData<List<String>> get() = _myTopics
 
     private val _FCMToken: MutableLiveData<String> = MutableLiveData()
-    val FCMToken: LiveData<String> get() = _FCMToken
+    private val FCMToken: LiveData<String> get() = _FCMToken
 
     init {
         checkAccessAlarm()

From dd2b3f6824d2b9b55570dc9afd24098bea282e21 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Tue, 9 Apr 2024 21:48:55 +0900
Subject: [PATCH 10/15] =?UTF-8?q?refactor=20:=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/view/depart/DepartActivity.kt          |  1 -
 .../ui/view/keyword/KeywordActivity.kt        |  1 -
 .../ui/view/setting/SettingFragment.kt        | 56 ++++++-------------
 .../ui/view/setting/SettingViewModel.kt       |  7 ++-
 4 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
index af772a9e..cee3fcb2 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
@@ -58,7 +58,6 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
     private fun getDepart(items: ArrayList<String>) {
         return binding.btnDepartComplete.setOnClickListener {
             viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0])
-            setResult(RESULT_OK)
             finish()
         }
     }
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
index 3f52a1c8..78ecad76 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
@@ -62,7 +62,6 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
 
         binding.btnKeywordComplete.setOnClickListener {
             viewModel.subscribeCheckedKeyword()
-            setResult(RESULT_OK)
 
             if (viewModel.checkKeywordList.value?.isNotEmpty() == true) {
                 viewModel.subscribeCheckedKeyword()
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index d1677ba5..847eea88 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -1,13 +1,10 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
 import android.Manifest
-import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
@@ -23,25 +20,15 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override val layoutResourceId: Int = R.layout.fragment_setting
     override val viewModel: SettingViewModel by viewModel()
 
-    private lateinit var resultLauncherKeyword: ActivityResultLauncher<Intent>
-    private lateinit var resultResultDepartment: ActivityResultLauncher<Intent>
-
-    private var topics: List<String> = emptyList()
     private var department: String = ""
 
     override fun initStartView() {
         binding.tvSettingAppVersion.text = getAppVersion()
-        setResultKeyword()
-        setResultDepartment()
         checkNotificationPermission()
     }
 
     override fun initDataBinding() {
 
-        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
-            topics = myTopics
-        }
-
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
@@ -49,10 +36,18 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingUniversityAlarm.isChecked = isChecked
+
+            if (isChecked) {
+                viewModel.updateUserTopic()
+            }
         }
 
         viewModel.isAccessDepartAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingDepartmentAlarm.isChecked = isChecked
+
+            if (isChecked) {
+                viewModel.updateUserDepartment(department)
+            }
         }
     }
 
@@ -68,7 +63,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                     checkPermissionForTIRAMISU()
                 }
                 if (department.isNotEmpty()) {
-                    viewModel.updateUserTopic(topics)
+                    viewModel.updateUserTopic()
                 }
             } else {
                 viewModel.removeUserTopic()
@@ -90,12 +85,12 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         binding.btnSettingEditKeyword.setOnClickListener {
             val intent = Intent(requireActivity(), KeywordActivity::class.java)
-            resultLauncherKeyword.launch(intent)
+            startActivity(intent)
         }
 
         binding.btnSettingEditDepartment.setOnClickListener {
             val intent = Intent(requireActivity(), DepartActivity::class.java)
-            resultResultDepartment.launch(intent)
+            startActivity(intent)
         }
 
         binding.btnSettingAppHelp.setOnClickListener {
@@ -125,15 +120,13 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 requireContext(), Manifest.permission.POST_NOTIFICATIONS
             )
         ) {
-            val dialog = PermissionDialog(
-                getString(R.string.dialog_permission_title),
+            val dialog = PermissionDialog(getString(R.string.dialog_permission_title),
                 getString(R.string.dialog_permission_content),
                 requireContext().packageName,
                 cancelListener = {
                     binding.switchSettingDepartmentAlarm.isChecked = false
                     binding.switchSettingUniversityAlarm.isChecked = false
-                }
-            )
+                })
             dialog.show(parentFragmentManager, "CustomDialog")
         }
     }
@@ -144,26 +137,6 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         return packageManager.versionName
     }
 
-    private fun setResultKeyword() {
-        resultLauncherKeyword =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    viewModel.getUserTopic().run { viewModel.updateUserTopic(topics) }
-                    binding.switchSettingUniversityAlarm.isChecked = true
-                }
-            }
-    }
-
-    private fun setResultDepartment() {
-        resultResultDepartment =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    viewModel.getUserDepartment()
-                    binding.switchSettingDepartmentAlarm.isChecked = true
-                }
-            }
-    }
-
     private fun checkNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
@@ -179,5 +152,8 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override fun onResume() {
         super.onResume()
         checkNotificationPermission()
+        viewModel.checkAccessAlarm()
+        viewModel.getUserDepartment()
+        viewModel.getUserTopic()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 6d7f1ed3..9aa9dbf6 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -11,6 +11,7 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 import com.dongyang.android.youdongknowme.standard.network.NetworkResult
 import com.dongyang.android.youdongknowme.ui.view.util.Event
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 /* 설정 뷰모델 */
 class SettingViewModel(private val settingRepository: SettingRepository) : BaseViewModel() {
@@ -86,6 +87,7 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
                 )
             )) {
                 is NetworkResult.Success -> {
+                    Timber.d(department)
                     setIsAccessDepartAlarm(true)
                     _isLoading.postValue(false)
                     _isError.postValue(false)
@@ -124,17 +126,18 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
         }
     }
 
-    fun updateUserTopic(topic: List<String>) {
+    fun updateUserTopic() {
         _isLoading.postValue(true)
 
         viewModelScope.launch {
             when (val result = settingRepository.updateUserTopic(
                 UpdateTopic(
                     token = FCMToken.value.toString(),
-                    topics = topic
+                    topics = myTopics.value ?: emptyList()
                 )
             )) {
                 is NetworkResult.Success -> {
+                    Timber.d("${myTopics.value}")
                     setIsAccessUniversityAlarm(true)
                     _isLoading.postValue(false)
                     _isError.postValue(false)

From 29885f65e4d30e2e54e6bcc9620de37068bd04f3 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Sun, 21 Apr 2024 22:33:07 +0900
Subject: [PATCH 11/15] =?UTF-8?q?Revert=20"fix=20:=20=EC=95=8C=EB=9E=8C=20?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=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

This reverts commit ed686685155c8667e1296675a1ff250cbb5f6d30.
---
 .../android/youdongknowme/ui/view/setting/SettingFragment.kt   | 1 -
 .../android/youdongknowme/ui/view/setting/SettingViewModel.kt  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 847eea88..ecf9752f 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -53,7 +53,6 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
     override fun initAfterBinding() {
 
-        viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
         viewModel.getUserTopic()
 
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 9aa9dbf6..ef6bbc99 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -46,9 +46,10 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
         getUserDepartment()
     }
 
-    fun checkAccessAlarm() {
+    private fun checkAccessAlarm() {
         val isAccessUniversityAlarm = settingRepository.getIsAccessUniversityAlarm()
         _isAccessUniversityAlarm.postValue(isAccessUniversityAlarm)
+
         val isAccessDepartAlarm = settingRepository.getIsAccessDepartAlarm()
         _isAccessDepartAlarm.postValue(isAccessDepartAlarm)
     }

From 178bc0a6e9667cfdaefdcee525ca5d741e1940bd Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Sun, 21 Apr 2024 22:34:40 +0900
Subject: [PATCH 12/15] =?UTF-8?q?Revert=20"refactor=20:=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EA=B6=8C=ED=95=9C=20=EB=A1=9C=EC=A7=81=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

This reverts commit dd2b3f6824d2b9b55570dc9afd24098bea282e21.
---
 .../ui/view/depart/DepartActivity.kt          |  1 +
 .../ui/view/keyword/KeywordActivity.kt        |  1 +
 .../ui/view/setting/SettingFragment.kt        | 56 +++++++++++++------
 .../ui/view/setting/SettingViewModel.kt       |  7 +--
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
index cee3fcb2..af772a9e 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
@@ -58,6 +58,7 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
     private fun getDepart(items: ArrayList<String>) {
         return binding.btnDepartComplete.setOnClickListener {
             viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0])
+            setResult(RESULT_OK)
             finish()
         }
     }
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
index 78ecad76..3f52a1c8 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
@@ -62,6 +62,7 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
 
         binding.btnKeywordComplete.setOnClickListener {
             viewModel.subscribeCheckedKeyword()
+            setResult(RESULT_OK)
 
             if (viewModel.checkKeywordList.value?.isNotEmpty() == true) {
                 viewModel.subscribeCheckedKeyword()
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index ecf9752f..8f83b2c0 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -1,10 +1,13 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
 import android.Manifest
+import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
@@ -20,15 +23,25 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override val layoutResourceId: Int = R.layout.fragment_setting
     override val viewModel: SettingViewModel by viewModel()
 
+    private lateinit var resultLauncherKeyword: ActivityResultLauncher<Intent>
+    private lateinit var resultResultDepartment: ActivityResultLauncher<Intent>
+
+    private var topics: List<String> = emptyList()
     private var department: String = ""
 
     override fun initStartView() {
         binding.tvSettingAppVersion.text = getAppVersion()
+        setResultKeyword()
+        setResultDepartment()
         checkNotificationPermission()
     }
 
     override fun initDataBinding() {
 
+        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
+            topics = myTopics
+        }
+
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
@@ -36,18 +49,10 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingUniversityAlarm.isChecked = isChecked
-
-            if (isChecked) {
-                viewModel.updateUserTopic()
-            }
         }
 
         viewModel.isAccessDepartAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingDepartmentAlarm.isChecked = isChecked
-
-            if (isChecked) {
-                viewModel.updateUserDepartment(department)
-            }
         }
     }
 
@@ -62,7 +67,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                     checkPermissionForTIRAMISU()
                 }
                 if (department.isNotEmpty()) {
-                    viewModel.updateUserTopic()
+                    viewModel.updateUserTopic(topics)
                 }
             } else {
                 viewModel.removeUserTopic()
@@ -84,12 +89,12 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         binding.btnSettingEditKeyword.setOnClickListener {
             val intent = Intent(requireActivity(), KeywordActivity::class.java)
-            startActivity(intent)
+            resultLauncherKeyword.launch(intent)
         }
 
         binding.btnSettingEditDepartment.setOnClickListener {
             val intent = Intent(requireActivity(), DepartActivity::class.java)
-            startActivity(intent)
+            resultResultDepartment.launch(intent)
         }
 
         binding.btnSettingAppHelp.setOnClickListener {
@@ -119,13 +124,15 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 requireContext(), Manifest.permission.POST_NOTIFICATIONS
             )
         ) {
-            val dialog = PermissionDialog(getString(R.string.dialog_permission_title),
+            val dialog = PermissionDialog(
+                getString(R.string.dialog_permission_title),
                 getString(R.string.dialog_permission_content),
                 requireContext().packageName,
                 cancelListener = {
                     binding.switchSettingDepartmentAlarm.isChecked = false
                     binding.switchSettingUniversityAlarm.isChecked = false
-                })
+                }
+            )
             dialog.show(parentFragmentManager, "CustomDialog")
         }
     }
@@ -136,6 +143,26 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         return packageManager.versionName
     }
 
+    private fun setResultKeyword() {
+        resultLauncherKeyword =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    viewModel.getUserTopic().run { viewModel.updateUserTopic(topics) }
+                    binding.switchSettingUniversityAlarm.isChecked = true
+                }
+            }
+    }
+
+    private fun setResultDepartment() {
+        resultResultDepartment =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    viewModel.getUserDepartment()
+                    binding.switchSettingDepartmentAlarm.isChecked = true
+                }
+            }
+    }
+
     private fun checkNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
@@ -151,8 +178,5 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override fun onResume() {
         super.onResume()
         checkNotificationPermission()
-        viewModel.checkAccessAlarm()
-        viewModel.getUserDepartment()
-        viewModel.getUserTopic()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index ef6bbc99..f4d1576c 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -11,7 +11,6 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 import com.dongyang.android.youdongknowme.standard.network.NetworkResult
 import com.dongyang.android.youdongknowme.ui.view.util.Event
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 /* 설정 뷰모델 */
 class SettingViewModel(private val settingRepository: SettingRepository) : BaseViewModel() {
@@ -88,7 +87,6 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
                 )
             )) {
                 is NetworkResult.Success -> {
-                    Timber.d(department)
                     setIsAccessDepartAlarm(true)
                     _isLoading.postValue(false)
                     _isError.postValue(false)
@@ -127,18 +125,17 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
         }
     }
 
-    fun updateUserTopic() {
+    fun updateUserTopic(topic: List<String>) {
         _isLoading.postValue(true)
 
         viewModelScope.launch {
             when (val result = settingRepository.updateUserTopic(
                 UpdateTopic(
                     token = FCMToken.value.toString(),
-                    topics = myTopics.value ?: emptyList()
+                    topics = topic
                 )
             )) {
                 is NetworkResult.Success -> {
-                    Timber.d("${myTopics.value}")
                     setIsAccessUniversityAlarm(true)
                     _isLoading.postValue(false)
                     _isError.postValue(false)

From b0f6069228f981ef7b4dd1d3ccd578e7621519b0 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Sun, 21 Apr 2024 22:34:58 +0900
Subject: [PATCH 13/15] =?UTF-8?q?Revert=20"fix=20:=20SharedPreference=20tr?=
 =?UTF-8?q?ue=EB=A1=9C=20=EC=88=98=EC=A0=95=EB=90=98=EB=8A=94=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=ED=95=B4=EA=B2=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4a5afbfab9a64fe3eb4c1e93662091179fd8f381.
---
 .../ui/view/setting/SettingFragment.kt              | 13 +++++++++----
 .../ui/view/setting/SettingViewModel.kt             |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 8f83b2c0..06c09035 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -40,11 +40,13 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
             topics = myTopics
+            viewModel.updateUserTopic(topics)
         }
 
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
+            viewModel.updateUserDepartment(department)
         }
 
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
@@ -128,10 +130,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 getString(R.string.dialog_permission_title),
                 getString(R.string.dialog_permission_content),
                 requireContext().packageName,
-                cancelListener = {
-                    binding.switchSettingDepartmentAlarm.isChecked = false
-                    binding.switchSettingUniversityAlarm.isChecked = false
-                }
+                cancelListener = { alarmOffToTIRAMISU() }
             )
             dialog.show(parentFragmentManager, "CustomDialog")
         }
@@ -163,6 +162,11 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
     }
 
+    private fun alarmOffToTIRAMISU() {
+        binding.switchSettingUniversityAlarm.isChecked = false
+        binding.switchSettingDepartmentAlarm.isChecked = false
+    }
+
     private fun checkNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
@@ -171,6 +175,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             ) {
                 viewModel.setIsAccessDepartAlarm(false)
                 viewModel.setIsAccessUniversityAlarm(false)
+                alarmOffToTIRAMISU()
             }
         }
     }
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index f4d1576c..293f9e27 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -37,7 +37,7 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
     val myTopics: LiveData<List<String>> get() = _myTopics
 
     private val _FCMToken: MutableLiveData<String> = MutableLiveData()
-    private val FCMToken: LiveData<String> get() = _FCMToken
+    val FCMToken: LiveData<String> get() = _FCMToken
 
     init {
         checkAccessAlarm()

From 4fb78a67fd52db79709b7b0f61db47e6e09a48b2 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Sun, 21 Apr 2024 22:35:26 +0900
Subject: [PATCH 14/15] =?UTF-8?q?Revert=20"feat=20:=2033=20=EC=9D=B4?=
 =?UTF-8?q?=EC=83=81=20=EC=95=8C=EB=A6=BC=20=EA=B6=8C=ED=95=9C=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2fca02c6ba452b5526287448ba5f636255f041ea.
---
 .../setting/OnboardingPermissionActivity.kt   | 17 +---
 .../ui/view/setting/PermissionDialog.kt       | 15 +--
 .../ui/view/setting/SettingFragment.kt        | 92 ++++++++-----------
 .../ui/view/setting/SettingViewModel.kt       |  3 +-
 4 files changed, 42 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
index 67ebf4f0..1d1fd15f 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -44,8 +44,7 @@ class OnboardingPermissionActivity :
                         val dialog = PermissionDialog(
                             getString(R.string.dialog_permission_title),
                             getString(R.string.dialog_permission_content),
-                            this.packageName,
-                            cancelListener = { setPermissionSwitch(false) }
+                            this.packageName
                         )
                         dialog.show(supportFragmentManager, "CustomDialog")
                     }
@@ -69,7 +68,6 @@ class OnboardingPermissionActivity :
             R.color.gray400
         }
 
-        binding.switchPermission.isChecked = isChecked
         binding.switchPermission.compoundDrawableTintList =
             ColorStateList.valueOf(ContextCompat.getColor(this, resources))
         binding.switchPermission.setTextColor(getColor(resources))
@@ -77,17 +75,4 @@ class OnboardingPermissionActivity :
         viewModel.setIsAccessUniversityAlarm(isChecked)
         viewModel.setIsAccessDepartAlarm(isChecked)
     }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(
-                    this, Manifest.permission.POST_NOTIFICATIONS
-                )
-            ) {
-                setPermissionSwitch(true)
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
index 1ed24035..dc0dc142 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt
@@ -12,20 +12,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import com.dongyang.android.youdongknowme.databinding.DialogPermissionBinding
 
-class PermissionDialog(
-    val title: String,
-    val content: String,
-    val pacakageName: String,
-    val cancelListener: () -> Unit
-) : DialogFragment() {
+class PermissionDialog(val title: String, val content: String, val pacakageName: String) : DialogFragment() {
     private var _binding: DialogPermissionBinding? = null
     private val binding get() = _binding!!
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = DialogPermissionBinding.inflate(inflater, container, false)
         val view = binding.root
 
@@ -38,10 +29,8 @@ class PermissionDialog(
 
         // 취소 버튼
         binding.customTvBtn1.setOnClickListener {
-            cancelListener()
             dismiss()
         }
-
         // 확인 버튼
         binding.customTvBtn2.setOnClickListener {
             val intent =
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 06c09035..db6cc300 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -1,13 +1,17 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
-import android.Manifest
 import android.app.Activity
+import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.ColorStateList
 import android.net.Uri
-import android.os.Build
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import android.os.Build
+import android.view.View
+import android.widget.Switch
+import androidx.appcompat.widget.SwitchCompat
 import androidx.core.content.ContextCompat
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
@@ -33,22 +37,21 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         binding.tvSettingAppVersion.text = getAppVersion()
         setResultKeyword()
         setResultDepartment()
-        checkNotificationPermission()
     }
 
     override fun initDataBinding() {
 
-        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
-            topics = myTopics
-            viewModel.updateUserTopic(topics)
-        }
-
         viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
             binding.tvSettingDepartment.text = myDepartment
             department = myDepartment
             viewModel.updateUserDepartment(department)
         }
 
+        viewModel.myTopics.observe(viewLifecycleOwner) { myTopics ->
+            topics = myTopics
+            viewModel.updateUserTopic(topics)
+        }
+
         viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
             binding.switchSettingUniversityAlarm.isChecked = isChecked
         }
@@ -60,15 +63,14 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
     override fun initAfterBinding() {
 
+        viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
         viewModel.getUserTopic()
 
-        binding.switchSettingUniversityAlarm.setOnClickListener {
-            if (binding.switchSettingUniversityAlarm.isChecked) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    checkPermissionForTIRAMISU()
-                }
-                if (department.isNotEmpty()) {
+        binding.switchSettingUniversityAlarm.setOnCheckedChangeListener { compoundButton, _ ->
+            checkPermission(binding.switchSettingUniversityAlarm)
+            if (compoundButton.isChecked) {
+                if (topics.isNotEmpty()) {
                     viewModel.updateUserTopic(topics)
                 }
             } else {
@@ -76,11 +78,9 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
         }
 
-        binding.switchSettingDepartmentAlarm.setOnClickListener {
-            if (binding.switchSettingDepartmentAlarm.isChecked) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    checkPermissionForTIRAMISU()
-                }
+        binding.switchSettingDepartmentAlarm.setOnCheckedChangeListener { compoundButton, _ ->
+            checkPermission(binding.switchSettingDepartmentAlarm)
+            if (compoundButton.isChecked) {
                 if (department.isNotEmpty()) {
                     viewModel.updateUserDepartment(department)
                 }
@@ -121,18 +121,25 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         }
     }
 
-    private fun checkPermissionForTIRAMISU() {
-        if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
-                requireContext(), Manifest.permission.POST_NOTIFICATIONS
-            )
-        ) {
-            val dialog = PermissionDialog(
-                getString(R.string.dialog_permission_title),
-                getString(R.string.dialog_permission_content),
-                requireContext().packageName,
-                cancelListener = { alarmOffToTIRAMISU() }
-            )
-            dialog.show(parentFragmentManager, "CustomDialog")
+    private fun checkPermission(switch: SwitchCompat){
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
+                    requireContext(), Manifest.permission.POST_NOTIFICATIONS
+                )
+            ) {
+                // 알림 권한 설정 미허용
+                viewModel.setIsAccessDepartAlarm(false)
+                viewModel.setIsAccessUniversityAlarm(false)
+                binding.switchSettingUniversityAlarm.isChecked = false
+                binding.switchSettingDepartmentAlarm.isChecked = false
+
+                val dialog = PermissionDialog(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), requireContext().packageName)
+                dialog.show(parentFragmentManager, "CustomDialog")
+            } else {
+                switch.isChecked = !switch.isChecked
+            }
+        } else {
+            switch.isChecked = !switch.isChecked
         }
     }
 
@@ -161,27 +168,4 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 }
             }
     }
-
-    private fun alarmOffToTIRAMISU() {
-        binding.switchSettingUniversityAlarm.isChecked = false
-        binding.switchSettingDepartmentAlarm.isChecked = false
-    }
-
-    private fun checkNotificationPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (PackageManager.PERMISSION_DENIED == ContextCompat.checkSelfPermission(
-                    requireContext(), Manifest.permission.POST_NOTIFICATIONS
-                )
-            ) {
-                viewModel.setIsAccessDepartAlarm(false)
-                viewModel.setIsAccessUniversityAlarm(false)
-                alarmOffToTIRAMISU()
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        checkNotificationPermission()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 293f9e27..85779b9e 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -40,12 +40,11 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
     val FCMToken: LiveData<String> get() = _FCMToken
 
     init {
-        checkAccessAlarm()
         getUserFCMToken()
         getUserDepartment()
     }
 
-    private fun checkAccessAlarm() {
+    fun checkAccessAlarm() {
         val isAccessUniversityAlarm = settingRepository.getIsAccessUniversityAlarm()
         _isAccessUniversityAlarm.postValue(isAccessUniversityAlarm)
 

From 6f493226fc6331603662d275d341382fb2d09fb6 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Sun, 21 Apr 2024 22:42:05 +0900
Subject: [PATCH 15/15] =?UTF-8?q?fix=20:=20=EC=8A=A4=ED=94=8C=EB=9E=98?=
 =?UTF-8?q?=EC=8B=9C=20=EC=8B=9C=EA=B0=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/youdongknowme/ui/view/splash/SplashActivity.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
index a5a2b78a..259eb734 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/splash/SplashActivity.kt
@@ -95,7 +95,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding, SplashViewModel>() {
     }
 
     companion object {
-        private const val SPLASH_TIME_MILLIS = 3_000L
+        private const val SPLASH_TIME_MILLIS = 1_500L
         private const val REQUEST_PERMISSION_CODE = 100
     }
 }
\ No newline at end of file