Merge pull request #235 from TeamDMU/fix/permission-version-react

�Fix : QA 반영
TeamDMU · Apr 21, 2024 · 7221218 · 7221218
2 parents f59c933 + 5830f42
commit 7221218
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 91 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
@@ -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/...c/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt b/...c/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
@@ -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/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)
                 }
             }
         }

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
@@ -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
@@ -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()
@@ -33,44 +32,49 @@ 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()}")
                     mainRepository.setIsFirstLaunch(false)
                     _isFirstLaunch.postValue(false)
                     _isLoading.postValue(false)

diff --git a/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -3,58 +3,60 @@ 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
 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>() {
 
     override val layoutResourceId: Int = R.layout.activity_onboarding_permission
     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)
     }

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
@@ -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>,

diff --git 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">

diff --git 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) {