Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix : 자동화, 로봇 학과 바껴서 출력되는 이슈 해결 #249

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Hotfix : 자동화, 로봇 학과 바껴서 출력되는 이슈 해결 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/dongyang/android/youdongknowme/data/repository/DepartRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ class DepartRepository {
SharedPreference.setCode(department.code)
}

fun getIsFirstLaunch(): Boolean = SharedPreference.getIsFirstLaunch()

fun getUserDepartment(): String {
return SharedPreference.getDepartment()
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/dongyang/android/youdongknowme/ui/view/depart/DepartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
}
}
}
}
Loading