more changes, now properly supports course letters

prapooskur · Feb 28, 2024 · 493e226 · 493e226
1 parent 71286cd
commit 493e226
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.01"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")

diff --git a/android/app/src/main/java/com/pras/slugcourses/DetailedResultsScreen.kt b/android/app/src/main/java/com/pras/slugcourses/DetailedResultsScreen.kt
@@ -15,8 +15,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -163,7 +163,7 @@ fun CourseDetailBox(
                         modifier = Modifier.padding(start = 4.dp, end = 4.dp),
                     )
                 }
-                Divider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
+                HorizontalDivider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
                 Row(Modifier.fillMaxWidth()) {
                     Column(modifier = Modifier
                         .weight(1f)
@@ -234,7 +234,7 @@ fun CourseDescriptionBox(
                         }
                     )
                 }
-                Divider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
+                HorizontalDivider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
                 Row(Modifier.fillMaxWidth()) {
                     Text(
                         courseInfo.primary_section.description,
@@ -271,7 +271,7 @@ fun CourseMeetingsBox(courseInfo: CourseInfo) {
                         modifier = Modifier.padding(start = 4.dp, end = 4.dp)
                     )
                 }
-                Divider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
+                HorizontalDivider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
                 courseInfo.meetings.forEachIndexed { index, meeting ->
                     Spacer(Modifier.height(4.dp))
                     Row(Modifier.fillMaxWidth()) {
@@ -298,7 +298,7 @@ fun CourseMeetingsBox(courseInfo: CourseInfo) {
                     }
                     Spacer(Modifier.height(4.dp))
                     if (index != courseInfo.meetings.lastIndex) {
-                        Divider()
+                        HorizontalDivider()
                     }
                 }
             }
@@ -331,7 +331,7 @@ fun CourseSectionsBox(courseInfo: CourseInfo) {
                         modifier = Modifier.padding(start = 4.dp, end = 4.dp)
                     )
                 }
-                Divider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
+                HorizontalDivider(modifier = Modifier.padding(top = 4.dp, bottom = 4.dp))
                 courseInfo.secondary_sections.forEachIndexed { index, section ->
                     val emoji = when (section.enrl_status) {
                         "Open" -> "\uD83D\uDFE2"
@@ -373,7 +373,7 @@ fun CourseSectionsBox(courseInfo: CourseInfo) {
 
                     }
                     if (index != courseInfo.secondary_sections.lastIndex) {
-                        Divider()
+                        HorizontalDivider()
                     }
                 }
             }

diff --git a/android/app/src/main/java/com/pras/slugcourses/HomeScreen.kt b/android/app/src/main/java/com/pras/slugcourses/HomeScreen.kt
@@ -108,6 +108,10 @@ fun HomeScreen(navController: NavController = rememberNavController()) {
                     searchText = " "
                 }
 
+                Log.d("SEARCH", termMap.getOrDefault(termChosen.value, "lol no"))
+                val term = termMap.getOrDefault(termChosen.value, "2242")
+
+
                 //val snapshotListSerializer = SnapshotListSerializer(String.serializer())
                 val status = Json.encodeToString(Status.ALL)
                 val classType: List<Type> = selectedTimeList.map { Type.valueOf(it.replace(" ","_").uppercase()) }
@@ -118,7 +122,7 @@ fun HomeScreen(navController: NavController = rememberNavController()) {
                     else -> "All"
                 }
                 navController.navigate(
-                    "results/${termMap[termChosen.value]}/${searchText}/${status}/${encodedType}/${geList}/${searchType}"
+                    "results/${term}/${searchText}/${status}/${encodedType}/${geList}/${searchType}"
                 )
             }) },
             onSearch = {

diff --git a/android/app/src/main/java/com/pras/slugcourses/ResultsScreen.kt b/android/app/src/main/java/com/pras/slugcourses/ResultsScreen.kt
@@ -125,7 +125,8 @@ fun ResultsScreen(
                     term = term,
                     status = status,
                     department = if (useDepartment) department.uppercase() else "",
-                    courseNumber = if (useCourseNumber) courseNumber.toInt() else -1,
+                    courseNumber = if (useCourseNumber) courseNumber.filter{it.isDigit()}.toInt() else -1,
+                    courseLetter = if (useCourseNumber) courseNumber.filter{it.isLetter()} else "",
                     query = if (!useDepartment && !useCourseNumber) query else "",
                     ge = genEd,
                     asynchronous = type.contains(Type.ASYNC_ONLINE),

diff --git a/android/app/src/main/java/com/pras/slugcourses/ui/elements/BetterDropdown.kt b/android/app/src/main/java/com/pras/slugcourses/ui/elements/BetterDropdown.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -124,7 +124,7 @@ fun <T> LargeDropdownMenu(
                         }
 
                         if (index < items.lastIndex) {
-                            Divider(modifier = Modifier.padding(horizontal = 16.dp))
+                            HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
                         }
                     }
                 }

diff --git a/android/app/src/main/java/com/pras/slugcourses/ui/elements/BetterDropdownMultiSelect.kt b/android/app/src/main/java/com/pras/slugcourses/ui/elements/BetterDropdownMultiSelect.kt
@@ -20,7 +20,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.Button
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -132,7 +132,7 @@ fun <T> LargeDropdownMenuMultiSelect(
                             }
 
                             if (index < items.lastIndex) {
-                                Divider(modifier = Modifier.padding(horizontal = 16.dp))
+                                HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
                             }
                         }
                     }