Merge pull request #194 from TeamDMU/feature/setting-ui

Feat : 설정 화면 뷰 구현
TeamDMU · Mar 26, 2024 · af8c2fc · af8c2fc
2 parents 01dd2bf + d06cec3
commit af8c2fc
Show file tree

Hide file tree

Showing 6 changed files with 252 additions and 177 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
@@ -1,6 +1,7 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
 import android.content.Intent
+import android.net.Uri
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseFragment
@@ -16,53 +17,71 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override val viewModel: SettingViewModel by viewModel()
 
     override fun initStartView() {
-        binding.settingVersion.text = getAppVersion()
+        binding.tvSettingAppVersion.text = getAppVersion()
     }
 
-    override fun initDataBinding() { }
+    override fun initDataBinding() {
+        viewModel.myDepartment.observe(viewLifecycleOwner) { department ->
+            binding.tvSettingDepartment.text = department
+        }
 
-    override fun initAfterBinding() {
-        binding.vm = viewModel
+        viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
+            binding.switchSettingUniversityAlarm.isChecked = isChecked
+        }
 
+        viewModel.isAccessDepartAlarm.observe(viewLifecycleOwner) { isChecked ->
+            binding.switchSettingDepartmentAlarm.isChecked = isChecked
+        }
+    }
+
+    override fun initAfterBinding() {
         viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
 
-        binding.settingSchoolAlarmSwitch.setOnCheckedChangeListener { compoundButton, _ ->
+        binding.switchSettingUniversityAlarm.setOnCheckedChangeListener { compoundButton, _ ->
             if (compoundButton.isChecked) {
                 viewModel.setIsAccessSchoolAlarm(true)
             } else {
                 viewModel.setIsAccessSchoolAlarm(false)
             }
         }
 
-        binding.settingDepartmentAlarmSwitch.setOnCheckedChangeListener { compoundButton, _ ->
+        binding.switchSettingDepartmentAlarm.setOnCheckedChangeListener { compoundButton, _ ->
             if (compoundButton.isChecked) {
                 viewModel.setIsAccessDepartAlarm(true)
             } else {
                 viewModel.setIsAccessDepartAlarm(false)
             }
         }
 
-        // 이메일 연동
-        binding.settingAsk.setOnClickListener {
-            val intent = Intent(Intent.ACTION_SEND)
-            intent.type = "plain/text"
-            val address = arrayOf("[email protected]")
-            intent.putExtra(Intent.EXTRA_EMAIL, address)
+        binding.btnSettingEditKeyword.setOnClickListener {
+            val intent = Intent(requireActivity(), KeywordActivity::class.java)
             startActivity(intent)
         }
 
-        binding.settingDepartmentChoice.setOnClickListener {
+        binding.btnSettingEditDepartment.setOnClickListener {
             val intent = Intent(requireActivity(), DepartActivity::class.java)
             startActivity(intent)
         }
 
-        binding.settingKeyword.setOnClickListener {
-            val intent = Intent(requireActivity(), KeywordActivity::class.java)
+        binding.btnSettingAppHelp.setOnClickListener {
+            val intent =
+                Intent(
+                    Intent.ACTION_VIEW,
+                    Uri.parse("https://docs.google.com/forms/d/e/1FAIpQLSeRTKalenelmffTbCZeK4mqmQg0palobghkXSoie1FlmV22ZQ/viewform")
+                )
+            startActivity(intent)
+        }
+
+        binding.btnSettingAppPersonalPolicy.setOnClickListener {
+            val intent = Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://sites.google.com/view/dmforu-privacy-policy/%ED%99%88")
+            )
             startActivity(intent)
         }
 
-        binding.settingAppLicense.setOnClickListener {
+        binding.btnSettingAppOpensource.setOnClickListener {
             val intent = Intent(requireActivity(), LicenseActivity::class.java)
             startActivity(intent)
         }
@@ -73,5 +92,4 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
         return packageManager.versionName
     }
-
 }
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
@@ -8,8 +8,8 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 /* 설정 뷰모델 */
 class SettingViewModel(private val settingRepository: SettingRepository) : BaseViewModel() {
 
-    private val _isAccessSchoolAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
-    val isAccessSchoolAlarm: LiveData<Boolean> get() = _isAccessSchoolAlarm
+    private val _isAccessUniversityAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isAccessUniversityAlarm: LiveData<Boolean> get() = _isAccessUniversityAlarm
 
     private val _isAccessDepartAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
     val isAccessDepartAlarm: LiveData<Boolean> get() = _isAccessDepartAlarm
@@ -19,7 +19,7 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
 
     fun checkAccessAlarm() {
         val isAccessSchoolAlarm = settingRepository.getIsAccessSchoolAlarm()
-        _isAccessSchoolAlarm.postValue(isAccessSchoolAlarm)
+        _isAccessUniversityAlarm.postValue(isAccessSchoolAlarm)
 
         val isAccessDepartAlarm = settingRepository.getIsAccessDepartAlarm()
         _isAccessDepartAlarm.postValue(isAccessDepartAlarm)

diff --git a/app/src/main/res/drawable/ic_setting_right.xml b/app/src/main/res/drawable/ic_setting_right.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.529,19.392C7.319,19.181 7.2,18.895 7.2,18.597C7.2,18.299 7.319,18.013 7.529,17.802L13.484,11.847L7.529,5.892C7.33,5.679 7.222,5.397 7.227,5.105C7.233,4.814 7.351,4.536 7.557,4.33C7.763,4.123 8.041,4.005 8.332,4C8.624,3.995 8.906,4.103 9.119,4.302L15.869,11.052C16.08,11.263 16.198,11.549 16.198,11.847C16.198,12.145 16.08,12.431 15.869,12.642L9.119,19.392C8.908,19.603 8.622,19.721 8.324,19.721C8.026,19.721 7.74,19.603 7.529,19.392Z"
+      android:fillColor="#50525F"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.529,19.392C7.319,19.181 7.2,18.895 7.2,18.597C7.2,18.299 7.319,18.013 7.529,17.802L13.484,11.847L7.529,5.892C7.33,5.679 7.222,5.397 7.227,5.105C7.233,4.814 7.351,4.536 7.557,4.33C7.763,4.123 8.041,4.005 8.332,4C8.624,3.995 8.906,4.103 9.119,4.302L15.869,11.052C16.08,11.263 16.198,11.549 16.198,11.847C16.198,12.145 16.08,12.431 15.869,12.642L9.119,19.392C8.908,19.603 8.622,19.721 8.324,19.721C8.026,19.721 7.74,19.603 7.529,19.392Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.2"
+      android:fillType="evenOdd"/>
+</vector>