Feat : 학과 선택 진입시 이전 학과 활성화

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

@@ -10,4 +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/util/Department.kt

@@ -12,12 +12,14 @@ sealed class Department(
     object InfoCommunication : Department("정보통신공학과", CODE.INFO_COMMUNICATION_ENGINE_CODE)
     object ComputerSoftware : Department("컴퓨터소프트웨어공학과", CODE.COMPUTER_SOFTWARE_ENGINE_CODE)
     object ComputerInfo : Department("컴퓨터정보공학과", CODE.COMPUTER_INFO_ENGINE_CODE)
+    object FireManagement : Department("소방안전관리과", CODE.COMPUTER_INFO_ENGINE_CODE)
     object Artificial : Department("인공지능소프트웨어학과", CODE.ARTIFICIAL_ENGINE_CODE)
     object Biochemical : Department("생명화학공학과", CODE.BIOCHEMICAL_ENGINE_CODE)
     object BioConvergence : Department("바이오융합공학과", CODE.BIO_CONVERGENCE_ENGINE_CODE)
     object Architecture : Department("건축과", CODE.ARCHITECTURE_CODE)
     object InteriorDesign : Department("실내건축디자인과", CODE.INTERIOR_DESIGN_CODE)
     object VisualDesign : Department("시각디자인과", CODE.VISUAL_DESIGN_CODE)
+    object ArvrContents : Department("AR-VR콘텐츠디자인과", CODE.COMPUTER_INFO_ENGINE_CODE)
     object Business : Department("경영학과", CODE.BUSINESS_ADMINISTRATION_CODE)
     object TaxAccounting : Department("세무회계학과", CODE.TAX_ACCOUNTING_CODE)
     object DistributionMarketing : Department("유통마케팅학과", CODE.DISTRIBUTION_MARKETING_CODE)
@@ -38,6 +40,7 @@ sealed class Department(
                 "정보전자공학과" -> InfoElectrical
                 "반도체전자공학과" -> Semiconductor
                 "정보통신공학과" -> InfoCommunication
+                "소방안전관리과" -> FireManagement
                 "컴퓨터소프트웨어공학과" -> ComputerSoftware
                 "컴퓨터정보공학과" -> ComputerInfo
                 "인공지능소프트웨어학과" -> Artificial
@@ -46,6 +49,7 @@ sealed class Department(
                 "건축과" -> Architecture
                 "실내건축디자인과" -> InteriorDesign
                 "시각디자인과" -> VisualDesign
+                "AR-VR콘텐츠디자인과" -> ArvrContents
                 "세무회계학과" -> TaxAccounting
                 "유통마케팅학과" -> DistributionMarketing
                 "호텔관광학과" -> HotelTourism
@@ -66,12 +70,14 @@ sealed class Department(
                 InfoCommunication,
                 ComputerSoftware,
                 ComputerInfo,
+                FireManagement,
                 Artificial,
                 Biochemical,
                 BioConvergence,
                 Architecture,
                 InteriorDesign,
                 VisualDesign,
+                ArvrContents,
                 Business,
                 TaxAccounting,
                 DistributionMarketing,

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

@@ -2,19 +2,18 @@ package com.dongyang.android.youdongknowme.ui.adapter
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.graphics.Typeface
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.ItemDepartBinding
 import com.dongyang.android.youdongknowme.ui.view.depart.DepartClickListener
 
+
 class DepartAdapter : RecyclerView.Adapter<DepartAdapter.ViewHolder>() {
 
-    private val item = ArrayList<String>()
+    private var item = ArrayList<String>()
     private var itemClickListener: DepartClickListener? = null
     private var currentPosition = -1
     private var beforePosition = -1
@@ -49,6 +48,11 @@ class DepartAdapter : RecyclerView.Adapter<DepartAdapter.ViewHolder>() {
         }
     }
 
+    fun setItems(list: ArrayList<String>) {
+        this.item = list
+        notifyDataSetChanged()
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     fun submitList(item: ArrayList<String>) {
         this.item.addAll(item)

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

@@ -0,0 +1,63 @@
+package com.dongyang.android.youdongknowme.ui.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+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 var item = ArrayList<String>()
+    private var itemClickListener: DepartClickListener? = null
+    private var currentPosition = -1
+    private var beforePosition = -1
+
+    inner class ViewHolder(private val binding: ItemOnboardingDepartBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        @SuppressLint("UseCompatLoadingForColorStateLists")
+        fun bind(item: String, position: Int) {
+            binding.itemOnboardingDepartName.text = item
+            binding.itemClickListener = itemClickListener
+            binding.currentPosition = position
+        }
+    }
+
+    fun setItems(list: ArrayList<String>) {
+        this.item = list
+        notifyDataSetChanged()
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun submitList(item: ArrayList<String>) {
+        this.item.addAll(item)
+        notifyDataSetChanged()
+    }
+
+    fun submitPosition(currentPosition: Int) {
+        this.beforePosition = this.currentPosition
+        this.currentPosition = currentPosition
+        notifyItemChanged(beforePosition)
+        notifyItemChanged(this.currentPosition)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(
+            ItemOnboardingDepartBinding.inflate(
+                LayoutInflater.from(parent.context), parent, false
+            )
+        )
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(item[position], position)
+    }
+
+    override fun getItemCount(): Int = item.size
+
+    fun setItemClickListener(listener: DepartClickListener) {
+        itemClickListener = listener
+    }
+}

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

@@ -18,6 +18,7 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
     private lateinit var items: ArrayList<String>
 
     override fun initStartView() {
+        // 학과 리스트
         items =
             resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList<String>())
         items.sort()
@@ -36,16 +37,18 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
 
     }
 
-    override fun initDataBinding() = Unit
+    override fun initDataBinding() {
+        viewModel.myDepartment.observe(this) { department ->
+            viewModel.setSelectPosition(items.indexOf(department))
+        }
+    }
 
     override fun initAfterBinding() {
         viewModel.selectDepartPosition.observe(this) {
             adapter.submitPosition(it)
-
-            // 포지션 선택 시 스낵바를 통해 알림 표시
             if (it != -1) getDepart(items)
         }
-        
+
         binding.toolbarDepart.btnToolbarExit.setOnClickListener { finish() }
     }
 

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

@@ -8,11 +8,24 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 class DepartViewModel(private val departRepository: DepartRepository) : BaseViewModel() {
 
     private val _isFirstLaunch: MutableLiveData<Boolean> = MutableLiveData(false)
+
+    private val _myDepartment: MutableLiveData<String> = MutableLiveData()
+    val myDepartment: LiveData<String> get() = _myDepartment
+
     val isFirstLaunch: LiveData<Boolean> get() = _isFirstLaunch
 
     private val _selectDepartPosition = MutableLiveData(-1)
     val selectDepartPosition: LiveData<Int> get() = _selectDepartPosition
 
+    init {
+        getUserDepartment()
+    }
+
+    fun getUserDepartment() {
+        val myDepartment = departRepository.getUserDepartment()
+        _myDepartment.postValue(myDepartment)
+    }
+
     fun setDepartment(department: String) {
         departRepository.setDepartment(department)
     }

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

@@ -2,11 +2,13 @@ package com.dongyang.android.youdongknowme.ui.view.depart
 
 import android.content.Context
 import android.content.Intent
+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.ActivityOnboardingDepartBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
-import com.dongyang.android.youdongknowme.ui.adapter.DepartAdapter
+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
@@ -16,19 +18,21 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
 
     override val layoutResourceId: Int = R.layout.activity_onboarding_depart
     override val viewModel: DepartViewModel by viewModel()
-    private lateinit var adapter: DepartAdapter
+    private lateinit var adapter: OnboardingDepartAdapter
     private lateinit var items: ArrayList<String>
+    private var searchList = ArrayList<String>()
+    private var emptyList = arrayListOf<String>("")
 
     override fun initStartView() {
         viewModel.checkFirstLaunch()
 
+        // 학과 리스트
         items =
             resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList<String>())
         items.sort()
 
-        // 학과 리스트
-        adapter = DepartAdapter().apply {
-            submitList(items)
+        adapter = OnboardingDepartAdapter().apply {
+            submitList(emptyList)
             setItemClickListener(this@OnboardingDepartActivity)
         }
 
@@ -45,11 +49,43 @@ class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, D
     override fun initDataBinding() = Unit
 
     override fun initAfterBinding() {
+        binding.ibOnboardingDepartSearchClear.setOnClickListener {
+            binding.etOnboardingDepartSearch.setText("")
+        }
+
+        binding.etOnboardingDepartSearch.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence?, i: Int, i1: Int, i2: Int) = Unit
+
+            override fun onTextChanged(charSequence: CharSequence?, i: Int, i1: Int, i2: Int) = Unit
+
+            override fun afterTextChanged(editable: Editable?) {
+                val searchText = binding.etOnboardingDepartSearch.text.toString().replace("\\s".toRegex(), "")
+                searchList = ArrayList<String>()
+
+                if (searchText.isEmpty()) {
+                    adapter.setItems(emptyList)
+                } else {
+                    // 검색 단어를 포함하는지 확인
+                    for (item in items) {
+                        if (item.contains(searchText)) {
+                            searchList.add(item)
+                        }
+                    }
+                    adapter.setItems(searchList)
+                }
+            }
+        })
+
         viewModel.selectDepartPosition.observe(this) {
             adapter.submitPosition(it)
 
-            // 포지션 선택 시 스낵바를 통해 알림 표시
-            if (it != -1) getDepart(items)
+            if (it != -1) {
+                getDepart(searchList)
+                binding.etOnboardingDepartSearch.setText(
+                    searchList[viewModel.selectDepartPosition.value ?: 0]
+                )
+                binding.etOnboardingDepartSearch.setSelection(binding.etOnboardingDepartSearch.text.length)
+            }
         }
     }
 

app/src/main/res/layout/activity_depart.xml

@@ -35,7 +35,6 @@
             style="@style/PretendardRegular20"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="20dp"
             android:background="@drawable/btn_gray_to_blue_10dp_enabled"
             android:text="@string/department_complete"

app/src/main/res/layout/activity_onboarding_depart.xml

@@ -29,11 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:text="@string/department_title_sub"
-            android:textColor="@color/gray500"
-            app:layout_constraintBottom_toTopOf="@id/onboarding_depart_step"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_onboarding_depart_title_main" />
+            android:textColor="@color/gray500" />
 
         <include
             android:id="@+id/onboarding_depart_step"
@@ -75,9 +71,9 @@
                 android:hint="@string/department_search_message"
                 android:imeOptions="actionSearch"
                 android:inputType="text"
+                android:maxLines="1"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
-                android:maxLines="1"
                 android:textColorHint="@color/gray300" />
 
             <ImageButton
@@ -95,12 +91,13 @@
             android:id="@+id/rv_onboarding_depart"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_margin="16dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="0dp"
             app:layout_constraintBottom_toBottomOf="@id/btn_onboarding_depart_next"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/linearLayout_onboarding_depart_search"
-            tools:listitem="@layout/item_depart" />
+            tools:listitem="@layout/item_onboarding_depart" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_onboarding_depart_next"

app/src/main/res/layout/item_onboarding_depart.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/item_onboarding_depart_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"
+        android:onClick="@{() -> itemClickListener.containerClick(currentPosition)}"
+        android:outlineProvider="none"
+        app:cardCornerRadius="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/item_onboarding_depart_name"
+            style="@style/PretendardMedium16"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="left"
+            android:padding="16dp"
+            android:textColor="@color/gray300"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <data>
+
+        <variable
+            name="currentPosition"
+            type="int" />
+
+        <variable
+            name="itemClickListener"
+            type="com.dongyang.android.youdongknowme.ui.view.depart.DepartClickListener" />
+    </data>
+</layout>