Merge pull request #222 from TeamDMU/design/qa-onboarding-steps

Design : 온보딩 화면 QA 적용

app/src/main/java/com/dongyang/android/youdongknowme/data/repository/DepartRepository.kt

@@ -10,6 +10,8 @@ class DepartRepository {
         SharedPreference.setCode(department.code)
     }
 
+    fun getIsFirstLaunch(): Boolean = SharedPreference.getIsFirstLaunch()
+
     fun getUserDepartment(): String {
         return SharedPreference.getDepartment()
     }

app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt

@@ -34,14 +34,13 @@ abstract class BaseActivity<T : ViewDataBinding, R : BaseViewModel> : AppCompatA
     }
 
     protected fun setSpanText(
-        baseContext: Context,
         spanTextView: TextView,
         startIdx: Int,
         endIdx: Int
     ) {
         SpannableStringBuilder(spanTextView.text).apply {
             setSpan(
-                ForegroundColorSpan(getColor(com.dongyang.android.youdongknowme.R.color.main)),
+                ForegroundColorSpan(getColor(com.dongyang.android.youdongknowme.R.color.blue300)),
                 startIdx,
                 endIdx,
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE

app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/OnboardingDepartAdapter.kt

@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.dongyang.android.youdongknowme.databinding.ItemOnboardingDepartBinding
 import com.dongyang.android.youdongknowme.ui.view.depart.DepartClickListener
 
-
 class OnboardingDepartAdapter : RecyclerView.Adapter<OnboardingDepartAdapter.ViewHolder>() {
 
     private val item = ArrayList<String>()

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt

@@ -11,6 +11,7 @@ class DepartViewModel(private val departRepository: DepartRepository) : BaseView
 
     private val _selectDepartPosition = MutableLiveData(-1)
     val selectDepartPosition: LiveData<Int> get() = _selectDepartPosition
+
     init {
         getUserDepartment()
     }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt

@@ -2,18 +2,19 @@ package com.dongyang.android.youdongknowme.ui.view.depart
 
 import android.content.Context
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.text.Editable
 import android.text.TextWatcher
+import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingDepartBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.adapter.OnboardingDepartAdapter
 import com.dongyang.android.youdongknowme.ui.view.keyword.OnboardingKeywordActivity
-import com.dongyang.android.youdongknowme.ui.view.main.MainActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-
 class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, DepartViewModel>(),
     DepartClickListener {
 
@@ -42,18 +43,20 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
         }
 
         // 부분 색상 지정
-        setSpanText(baseContext, binding.tvOnboardingDepartTitleMain, startIdx = 0, endIdx = 5)
+        setSpanText(binding.tvOnboardingDepartTitleMain, startIdx = 0, endIdx = 5)
     }
 
     override fun initDataBinding() = Unit
 
     override fun initAfterBinding() {
         binding.ibOnboardingDepartSearchClear.setOnClickListener {
             binding.etOnboardingDepartSearch.text.clear()
+            setSearchColor(false)
         }
 
         binding.etOnboardingDepartSearch.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(charSequence: CharSequence?, i: Int, i1: Int, i2: Int) = Unit
+            override fun beforeTextChanged(charSequence: CharSequence?, i: Int, i1: Int, i2: Int) =
+                Unit
 
             override fun onTextChanged(charSequence: CharSequence?, i: Int, i1: Int, i2: Int) = Unit
 
@@ -69,6 +72,12 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
                     for (item in items) {
                         if (item.contains(searchText)) {
                             searchList.add(item)
+
+                            if (item == searchText) {
+                                setSearchColor(true)
+                            } else {
+                                setSearchColor(false)
+                            }
                         }
                     }
                     adapter.submitList(searchList)
@@ -80,27 +89,75 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
             adapter.submitPosition(it)
 
             if (it != -1) {
-                getDepart(searchList)
                 binding.etOnboardingDepartSearch.setText(
                     searchList[viewModel.selectDepartPosition.value ?: 0]
                 )
                 binding.etOnboardingDepartSearch.setSelection(binding.etOnboardingDepartSearch.text.length)
             }
         }
+
+        binding.btnOnboardingDepartNext.setOnClickListener {
+            getDepart(searchList)
+        }
+    }
+
+    private fun setSearchColor(isContains: Boolean) {
+        if (isContains) {
+            binding.linearLayoutOnboardingDepartSearch.setBackgroundResource(R.drawable.bg_stroke_blue300_radius_2dp)
+            binding.etOnboardingDepartSearch.setTextColor(getColor(R.color.blue300))
+            binding.etOnboardingDepartSearch.compoundDrawableTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        this@OnboardingDepartActivity,
+                        R.color.blue300
+                    )
+                )
+            binding.btnOnboardingDepartNext.backgroundTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        this@OnboardingDepartActivity,
+                        R.color.blue300
+                    )
+                )
+        } else {
+            viewModel.setSelectPosition(-1)
+
+            binding.linearLayoutOnboardingDepartSearch.setBackgroundResource(R.drawable.bg_stroke_gray300_radius_2dp)
+            binding.etOnboardingDepartSearch.setTextColor(getColor(R.color.gray300))
+            binding.etOnboardingDepartSearch.compoundDrawableTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        this@OnboardingDepartActivity,
+                        R.color.gray300
+                    )
+                )
+            binding.btnOnboardingDepartNext.backgroundTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        this@OnboardingDepartActivity,
+                        R.color.gray300
+                    )
+                )
+        }
     }
 
     // 컨테이너 클릭 시 선택한 학과의 포지션 저장
     override fun containerClick(position: Int) {
+        if (searchList.isEmpty()) {
+            return
+        }
         viewModel.setSelectPosition(position)
     }
 
     // 확인 버튼을 누르면 내부 DB에 학과를 담고 메인 액티비티로 이동
     private fun getDepart(items: ArrayList<String>) {
-        return binding.btnOnboardingDepartNext.setOnClickListener {
+        if (viewModel.selectDepartPosition.value != -1) {
             viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0])
             val intent = Intent(this, OnboardingKeywordActivity::class.java)
             startActivity(intent)
             finish()
+        } else {
+            Toast.makeText(this, R.string.toast_msg_department, Toast.LENGTH_SHORT).show()
         }
     }
 

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt

@@ -1,10 +1,15 @@
 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
 import androidx.lifecycle.Observer
 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
@@ -32,6 +37,26 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
                 viewModel.localKeywordList.removeObserver(this)
             }
         })
+
+        viewModel.checkKeywordList.observe(this) { checkedKeywords ->
+            if (checkedKeywords.isEmpty()) {
+                binding.btnKeywordComplete.backgroundTintList =
+                    ColorStateList.valueOf(
+                        ContextCompat.getColor(
+                            this@KeywordActivity,
+                            R.color.gray300
+                        )
+                    )
+            } else {
+                binding.btnKeywordComplete.backgroundTintList =
+                    ColorStateList.valueOf(
+                        ContextCompat.getColor(
+                            this@KeywordActivity,
+                            R.color.blue300
+                        )
+                    )
+            }
+        }
     }
 
     override fun initAfterBinding() {
@@ -40,7 +65,19 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
         binding.btnKeywordComplete.setOnClickListener {
             viewModel.subscribeCheckedKeyword()
             setResult(RESULT_OK)
-            finish()
+
+            if (viewModel.checkKeywordList.value?.isNotEmpty() == true) {
+                viewModel.subscribeCheckedKeyword()
+
+                val intent = Intent(
+                    this@KeywordActivity,
+                    OnboardingPermissionActivity::class.java
+                )
+                startActivity(intent)
+                finish()
+            } else {
+                Toast.makeText(this, R.string.toast_msg_keyword, Toast.LENGTH_SHORT).show()
+            }
         }
 
         binding.toolbarKeyword.btnToolbarExit.setOnClickListener { finish() }
@@ -52,7 +89,7 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
                 val chip: Chip = chipGroup.getChildAt(index) as Chip
 
                 // 유저가 선택 및 설정한 키워드인 경우 체크한 것으로 설정
-                if (chip.text in viewModel.checkKeywordList) {
+                if (viewModel.checkKeywordList.value?.contains(chip.text) == true) {
                     chip.isChecked = true
                 }
 

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordViewModel.kt

@@ -18,8 +18,8 @@ class KeywordViewModel(
     private val _localKeywordList: MutableLiveData<List<KeywordEntity>> = MutableLiveData()
     val localKeywordList: LiveData<List<KeywordEntity>> get() = _localKeywordList
 
-    private val _checkKeywordList = mutableSetOf<String>()
-    val checkKeywordList get() = _checkKeywordList
+    private val _checkKeywordList = MutableLiveData<Set<String>>(mutableSetOf())
+    val checkKeywordList: LiveData<Set<String>> get() = _checkKeywordList
 
     fun getLocalKeywordList() {
         viewModelScope.launch {
@@ -31,7 +31,7 @@ class KeywordViewModel(
 
     fun subscribeCheckedKeyword() {
         for (localKeyword in localKeywordList.value ?: emptyList()) {
-            if (checkKeywordList.contains(localKeyword.name)) {
+            if (checkKeywordList.value?.contains(localKeyword.name) == true) {
                 // 선택했던 데이터를 중첩해서 바꾸면 효율성이 떨어지고, 파이어베이스 구독에 문제가 생길 수 있으므로 구독 여부도 함께 체크
                 if (!localKeyword.isSubscribe) {
                     viewModelScope.launch {
@@ -51,14 +51,14 @@ class KeywordViewModel(
     }
 
     fun setAllKeywords(keyword: List<String>) {
-        _checkKeywordList.addAll(keyword)
+        _checkKeywordList.value = keyword.toSet()
     }
 
     fun setCheckedKeywords(keyword: String) {
-        _checkKeywordList.add(keyword)
+        _checkKeywordList.value = _checkKeywordList.value?.plus(keyword) ?: setOf(keyword)
     }
 
     fun removeCheckedKeywords(keyword: String) {
-        _checkKeywordList.remove(keyword)
+        _checkKeywordList.value = _checkKeywordList.value?.minus(keyword) ?: setOf()
     }
 }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/OnboardingKeywordActivity.kt

@@ -1,6 +1,9 @@
 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
 import androidx.lifecycle.Observer
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.data.local.entity.KeywordEntity
@@ -19,7 +22,7 @@ class OnboardingKeywordActivity :
 
     override fun initStartView() {
         // 부분 색상 지정
-        setSpanText(this, binding.tvOnboardingKeywordTitleMain, startIdx = 0, endIdx = 3)
+        setSpanText(binding.tvOnboardingKeywordTitleMain, startIdx = 0, endIdx = 3)
     }
 
     override fun initDataBinding() {
@@ -38,18 +41,45 @@ class OnboardingKeywordActivity :
                 viewModel.localKeywordList.removeObserver(this)
             }
         })
+
+        viewModel.checkKeywordList.observe(this) { checkedKeywords ->
+            if (checkedKeywords.isEmpty()) {
+                binding.btnOnboardingKeywordNext.backgroundTintList =
+                    ColorStateList.valueOf(
+                        ContextCompat.getColor(
+                            this@OnboardingKeywordActivity,
+                            R.color.gray300
+                        )
+                    )
+            } else {
+                binding.btnOnboardingKeywordNext.backgroundTintList =
+                    ColorStateList.valueOf(
+                        ContextCompat.getColor(
+                            this@OnboardingKeywordActivity,
+                            R.color.blue300
+                        )
+                    )
+            }
+        }
     }
 
     override fun initAfterBinding() {
         viewModel.getLocalKeywordList()
 
         // TODO :: 안드로이드 데이터베이스에 유저별 설정한 키워드 저장 및 파이어베이스 키워드 구독 설정
         binding.btnOnboardingKeywordNext.setOnClickListener {
-            viewModel.subscribeCheckedKeyword()
-            val intent =
-                Intent(this@OnboardingKeywordActivity, OnboardingPermissionActivity::class.java)
-            startActivity(intent)
-            finish()
+            if (viewModel.checkKeywordList.value?.isNotEmpty() == true) {
+                viewModel.subscribeCheckedKeyword()
+                val intent = Intent(
+                    this@OnboardingKeywordActivity,
+                    OnboardingPermissionActivity::class.java
+                )
+                startActivity(intent)
+                finish()
+            } else {
+                Toast.makeText(this, R.string.toast_msg_keyword, Toast.LENGTH_SHORT).show()
+            }
+
         }
     }
 
@@ -60,7 +90,7 @@ class OnboardingKeywordActivity :
                 val chip: Chip = chipGroup.getChildAt(index) as Chip
 
                 // 유저가 선택 및 설정한 키워드인 경우 체크한 것으로 설정
-                if (chip.text in viewModel.checkKeywordList) {
+                if (viewModel.checkKeywordList.value?.contains(chip.text) == true) {
                     chip.isChecked = true
                 }
 

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt

@@ -25,7 +25,7 @@ class OnboardingPermissionActivity :
         viewModel.getUserDepartment()
         setPermissionSwitch(false)
 
-        setSpanText(this, binding.tvPermissionTitleMain, startIdx = 0, endIdx = 9)
+        setSpanText(binding.tvPermissionTitleMain, startIdx = 0, endIdx = 9)
     }
 
     override fun initDataBinding() = Unit
@@ -66,7 +66,7 @@ class OnboardingPermissionActivity :
         val resources = if (isChecked) {
             R.color.blue300
         } else {
-            R.color.gray300
+            R.color.gray400
         }
 
         binding.switchPermission.compoundDrawableTintList =

app/src/main/res/color/bg_chip_stroke_select.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+        android:color="@color/blue300" />
+    <item android:state_checked="false"
+        android:color="@color/gray400" />
+</selector>