Merge branch 'develop' into feat/redesign-webview

Author: m6z1

app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Constants.kt

@@ -1,15 +1,14 @@
-
 object CODE {
     const val SCHOOL_CODE = 1
 
     const val MECHANICAL_ENGINE_CODE = 101
     const val MECHANICAL_DESIGN_CODE = 102
 
     const val AUTOMATION_ENGINE_CODE = 201
-    const val ROBOT_ENGINE_CODE = 202
+    const val ROBOT_SOFTWARE_CODE = 202
 
     const val COMPUTER_SOFTWARE_ENGINE_CODE = 301
-    const val COMPUTER_INFO_ENGINE_CODE = 302
+    const val WEB_APP_SOFTWARE_ENGINE_CODE = 302
     const val ARTIFICIAL_ENGINE_CODE = 303
 
     const val ELECTRICAL_ENGINE_CODE = 401
@@ -31,4 +30,6 @@ object CODE {
     const val HOTEL_TOURISM_CODE = 604
     const val MANAGEMENT_INFORMATION_CODE = 605
     const val BIG_DATA_MANAGEMENT_CODE = 606
+
+    const val LIBERAL_MAJOR_CODE = 701
 }

app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Department.kt

@@ -1,19 +1,18 @@
 package com.dongyang.android.youdongknowme.standard.util
 
 sealed class Department(
-    var name: String,
-    var code: Int
+    var name: String, var code: Int
 ) {
     object Mechanical : Department("기계공학과", CODE.MECHANICAL_ENGINE_CODE)
     object MechanicalDesign : Department("기계설계공학과", CODE.MECHANICAL_DESIGN_CODE)
     object Automation : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE)
-    object Robot : Department("로봇공학과", CODE.ROBOT_ENGINE_CODE)
+    object Robot : Department("로봇소프트웨어과", CODE.ROBOT_SOFTWARE_CODE)
     object Electrical : Department("전기공학과", CODE.ELECTRICAL_ENGINE_CODE)
     object InfoElectrical : Department("정보전자공학과", CODE.INFO_ELECTRONIC_ENGINE_CODE)
     object Semiconductor : Department("반도체전자공학과", CODE.SEMICONDUCTOR_ENGINE_CODE)
     object InfoCommunication : Department("정보통신공학과", CODE.INFO_COMMUNICATION_ENGINE_CODE)
     object FireManagement : Department("소방안전관리과", CODE.FIRE_MANAGEMENT_CODE)
-    object ComputerInfo : Department("컴퓨터정보공학과", CODE.COMPUTER_INFO_ENGINE_CODE)
+    object WebAppSoftware : Department("웹응용소프트웨어공학과", CODE.WEB_APP_SOFTWARE_ENGINE_CODE)
     object ComputerSoftware : Department("컴퓨터소프트웨어공학과", CODE.COMPUTER_SOFTWARE_ENGINE_CODE)
     object Artificial : Department("인공지능소프트웨어학과", CODE.ARTIFICIAL_ENGINE_CODE)
     object Biochemical : Department("생명화학공학과", CODE.BIOCHEMICAL_ENGINE_CODE)
@@ -28,20 +27,21 @@ sealed class Department(
     object HotelTourism : Department("호텔관광학과", CODE.HOTEL_TOURISM_CODE)
     object BusinessInfo : Department("경영정보학과", CODE.MANAGEMENT_INFORMATION_CODE)
     object BigDataManagement : Department("빅데이터경영과", CODE.BIG_DATA_MANAGEMENT_CODE)
+    object Liberal : Department("자유전공학과", CODE.LIBERAL_MAJOR_CODE)
 
     companion object {
         fun getDepartment(department: String): Department {
             return when (department) {
                 "기계공학과" -> Mechanical
                 "기계설계공학과" -> MechanicalDesign
-                "로봇공학과" -> Robot
+                "로봇소프트웨어과" -> Robot
                 "자동화공학과" -> Automation
                 "전기공학과" -> Electrical
                 "정보전자공학과" -> InfoElectrical
                 "반도체전자공학과" -> Semiconductor
                 "정보통신공학과" -> InfoCommunication
                 "소방안전관리과" -> FireManagement
-                "컴퓨터정보공학과" -> ComputerInfo
+                "웹응용소프트웨어공학과" -> WebAppSoftware
                 "컴퓨터소프트웨어공학과" -> ComputerSoftware
                 "인공지능소프트웨어학과" -> Artificial
                 "생명화학공학과" -> Biochemical
@@ -56,38 +56,9 @@ sealed class Department(
                 "호텔관광학과" -> HotelTourism
                 "경영정보학과" -> BusinessInfo
                 "빅데이터경영과" -> BigDataManagement
+                "자유전공학과" -> Liberal
                 else -> throw IllegalArgumentException("올바른 타입이 아닙니다.")
             }
         }
-
-        fun getDepartmentList(): ArrayList<Department> {
-            return arrayListOf(
-                Mechanical,
-                MechanicalDesign,
-                Automation,
-                Robot,
-                Electrical,
-                InfoElectrical,
-                Semiconductor,
-                InfoCommunication,
-                FireManagement,
-                ComputerInfo,
-                ComputerSoftware,
-                Artificial,
-                Biochemical,
-                BioConvergence,
-                Architecture,
-                InteriorDesign,
-                VisualDesign,
-                ArVrContents,
-                Business,
-                TaxAccounting,
-                DistributionMarketing,
-                HotelTourism,
-                BusinessInfo,
-                BigDataManagement
-            )
-        }
     }
-
 }

app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Mapping.kt

@@ -32,9 +32,9 @@ fun mapDepartmentKoreanToCode(department: String): Int {
         "기계공학과" -> CODE.MECHANICAL_ENGINE_CODE
         "기계설계공학과" -> CODE.MECHANICAL_DESIGN_CODE
         "자동화공학과" -> CODE.AUTOMATION_ENGINE_CODE
-        "로봇공학과" -> CODE.ROBOT_ENGINE_CODE
+        "로봇소프트웨어과" -> CODE.ROBOT_SOFTWARE_CODE
         "컴퓨터소프트웨어공학과" -> CODE.COMPUTER_SOFTWARE_ENGINE_CODE
-        "컴퓨터정보공학과" -> CODE.COMPUTER_INFO_ENGINE_CODE
+        "웹응용소프트웨어공학과" -> CODE.WEB_APP_SOFTWARE_ENGINE_CODE
         "인공지능소프트웨어공학과" -> CODE.ARTIFICIAL_ENGINE_CODE
         "전기공학과" -> CODE.ELECTRICAL_ENGINE_CODE
         "정보전자공학과" -> CODE.INFO_ELECTRONIC_ENGINE_CODE
@@ -51,6 +51,7 @@ fun mapDepartmentKoreanToCode(department: String): Int {
         "호텔관광학과" -> CODE.HOTEL_TOURISM_CODE
         "경영정보학과" -> CODE.MANAGEMENT_INFORMATION_CODE
         "빅데이터경영과" -> CODE.BIG_DATA_MANAGEMENT_CODE
+        "자유전공학과" -> CODE.LIBERAL_MAJOR_CODE
         else -> throw IllegalArgumentException("올바른 타입이 아닙니다.")
     }
 }

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

@@ -17,8 +17,7 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D
     override fun initStartView() {
         // 학과 리스트
         items =
-            resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList<String>())
-        items.sort()
+            resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList())
 
         adapter = DepartAdapter().apply {
             submitList(items)

app/src/main/res/values/arrays.xml

@@ -3,15 +3,15 @@
     <string-array name="dmu_department_list">
         <item>기계공학과</item>
         <item>기계설계공학과</item>
-        <item>로봇공학과</item>
+        <item>로봇소프트웨어과</item>
         <item>자동화공학과</item>
         <item>전기공학과</item>
         <item>정보전자공학과</item>
         <item>반도체전자공학과</item>
         <item>정보통신공학과</item>
         <item>소방안전관리과</item>
         <item>컴퓨터소프트웨어공학과</item>
-        <item>컴퓨터정보공학과</item>
+        <item>웹응용소프트웨어공학과</item>
         <item>인공지능소프트웨어학과</item>
         <item>생명화학공학과</item>
         <item>바이오융합공학과</item>
@@ -25,5 +25,6 @@
         <item>호텔관광학과</item>
         <item>경영정보학과</item>
         <item>빅데이터경영과</item>
+        <item>자유전공학과</item>
     </string-array>
 </resources>