From c0c8790bb1f9d9179541b6d88979789298962094 Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Thu, 28 Mar 2024 11:58:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=EA=B8=B0=EC=A1=B4=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=ED=95=9C=20=ED=95=99=EA=B3=BC=20=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youdongknowme/data/repository/DepartRepository.kt | 4 ++++ .../android/youdongknowme/ui/adapter/DepartAdapter.kt | 7 ++++++- .../youdongknowme/ui/view/depart/DepartActivity.kt | 6 +++++- .../youdongknowme/ui/view/depart/DepartViewModel.kt | 11 +++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/data/repository/DepartRepository.kt b/app/src/main/java/com/dongyang/android/youdongknowme/data/repository/DepartRepository.kt index 2403f3c9..8b2e8361 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/data/repository/DepartRepository.kt +++ b/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() + } } \ No newline at end of file diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt index 6f55c0a9..9ee464ff 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt @@ -14,7 +14,7 @@ import com.dongyang.android.youdongknowme.ui.view.depart.DepartClickListener class DepartAdapter : RecyclerView.Adapter() { - private val item = ArrayList() + private var item = ArrayList() private var itemClickListener: DepartClickListener? = null private var currentPosition = -1 private var beforePosition = -1 @@ -49,6 +49,11 @@ class DepartAdapter : RecyclerView.Adapter() { } } + fun setItems(list: ArrayList) { + this.item = list + notifyDataSetChanged() + } + @SuppressLint("NotifyDataSetChanged") fun submitList(item: ArrayList) { this.item.addAll(item) 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 3f7e1438..8ee68635 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 @@ -36,7 +36,11 @@ class DepartActivity : BaseActivity(), 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) { diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt index 29fb1fea..1afa98b2 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt @@ -10,8 +10,19 @@ class DepartViewModel(private val departRepository: DepartRepository) : BaseView private val _isFirstLaunch: MutableLiveData = MutableLiveData(false) val isFirstLaunch: LiveData get() = _isFirstLaunch + private val _myDepartment: MutableLiveData = MutableLiveData() + val myDepartment: LiveData get() = _myDepartment + private val _selectDepartPosition = MutableLiveData(-1) val selectDepartPosition: LiveData get() = _selectDepartPosition + init { + getUserDepartment() + } + + fun getUserDepartment() { + val myDepartment = departRepository.getUserDepartment() + _myDepartment.postValue(myDepartment) + } fun setDepartment(department: String) { departRepository.setDepartment(department) From 33e2306bbbbb7b52fa83c1b3990e3df5275c0491 Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:49:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor=20:=20setItems=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/adapter/DepartAdapter.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt index 9ee464ff..6f55c0a9 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/DepartAdapter.kt @@ -14,7 +14,7 @@ import com.dongyang.android.youdongknowme.ui.view.depart.DepartClickListener class DepartAdapter : RecyclerView.Adapter() { - private var item = ArrayList() + private val item = ArrayList() private var itemClickListener: DepartClickListener? = null private var currentPosition = -1 private var beforePosition = -1 @@ -49,11 +49,6 @@ class DepartAdapter : RecyclerView.Adapter() { } } - fun setItems(list: ArrayList) { - this.item = list - notifyDataSetChanged() - } - @SuppressLint("NotifyDataSetChanged") fun submitList(item: ArrayList) { this.item.addAll(item) From 85a71ea4cbb2ff2a4092c9394b1186bf4a15d570 Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:55:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor=20:=20getUserDepartment()=20privat?= =?UTF-8?q?e=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/view/depart/DepartViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt index 1afa98b2..fda685f6 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartViewModel.kt @@ -19,7 +19,7 @@ class DepartViewModel(private val departRepository: DepartRepository) : BaseView getUserDepartment() } - fun getUserDepartment() { + private fun getUserDepartment() { val myDepartment = departRepository.getUserDepartment() _myDepartment.postValue(myDepartment) }