Merge branch 'develop' into release/2.0.0

TeamDMU · Apr 24, 2024 · 485c8d0 · 485c8d0
2 parents 5d5052c + f12fc3a
commit 485c8d0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 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
@@ -10,8 +10,6 @@ class DepartRepository {
         SharedPreference.setCode(department.code)
     }
 
-    fun getIsFirstLaunch(): Boolean = SharedPreference.getIsFirstLaunch()
-
     fun getUserDepartment(): String {
         return SharedPreference.getDepartment()
     }

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt
@@ -6,8 +6,8 @@ sealed class Department(
 ) {
     object Mechanical : Department("기계공학과", CODE.MECHANICAL_ENGINE_CODE)
     object MechanicalDesign : Department("기계설계공학과", CODE.MECHANICAL_DESIGN_CODE)
-    object Automation : Department("로봇공학과", CODE.ROBOT_ENGINE_CODE)
-    object Robot : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE)
+    object Automation : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE)
+    object Robot : Department("로봇공학과", CODE.ROBOT_ENGINE_CODE)
     object Electrical : Department("전기공학과", CODE.ELECTRICAL_ENGINE_CODE)
     object InfoElectrical : Department("정보전자공학과", CODE.INFO_ELECTRONIC_ENGINE_CODE)
     object Semiconductor : Department("반도체전자공학과", CODE.SEMICONDUCTOR_ENGINE_CODE)

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
@@ -7,7 +7,6 @@ import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.adapter.DepartAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-
 class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), DepartClickListener {
 
     override val layoutResourceId: Int = R.layout.activity_depart
@@ -58,8 +57,7 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
     private fun getDepart(items: ArrayList<String>) {
         return binding.btnDepartComplete.setOnClickListener {
             viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0])
-            setResult(RESULT_OK)
             finish()
         }
     }
-}
+}