Skip to content

Commit 8ba8ea3

Browse files
caleb-bitcaleb-bit
committed
Cleanup
1 parent c89f1bb commit 8ba8ea3

12 files changed

Lines changed: 42 additions & 56 deletions

File tree

‎app/src/main/java/com/cornellappdev/coursegrab/CourseDetailsActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class CourseDetailsActivity : AppCompatActivity() {
3535

3636
val courseDetails: SearchResult = intent.getParcelableExtra<SearchResult>("courseDetails") as SearchResult
3737

38-
binding.headerTextView.text = "${courseDetails.subject_code} ${courseDetails.course_num}"
38+
binding.headerTextView.text = "${courseDetails.subjectCode} ${courseDetails.courseNum}"
3939

4040
binding.courseTitle.text = courseDetails.title
4141
binding.courseDetails.text =
@@ -90,17 +90,17 @@ class CourseDetailsActivity : AppCompatActivity() {
9090
holder.sectionStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
9191

9292
//change tracking text
93-
holder.trackText.text = availableCourses[position].num_tracking.toString() + " Tracking"
93+
holder.trackText.text = availableCourses[position].numTracking.toString() + " Tracking"
9494

9595
//Change the track button to remove button
9696
holder.removeButton.visibility =
97-
if (availableCourses[position].is_tracking) View.VISIBLE else View.GONE
97+
if (availableCourses[position].isTracking) View.VISIBLE else View.GONE
9898
holder.trackButton.visibility =
99-
if (!availableCourses[position].is_tracking) View.VISIBLE else View.GONE
99+
if (!availableCourses[position].isTracking) View.VISIBLE else View.GONE
100100

101101
holder.removeButton.setOnClickListener {
102102
(context as CourseDetailsActivity).removeCourse(
103-
availableCourses[position].catalog_num
103+
availableCourses[position].catalogNum
104104
)
105105
holder.removeButton.visibility = View.GONE
106106
holder.trackButton.visibility = View.VISIBLE
@@ -114,7 +114,7 @@ class CourseDetailsActivity : AppCompatActivity() {
114114

115115
holder.trackButton.setOnClickListener {
116116
(context as CourseDetailsActivity).addCourse(
117-
availableCourses[position].catalog_num
117+
availableCourses[position].catalogNum
118118
)
119119
holder.trackButton.visibility = View.GONE
120120
holder.removeButton.visibility = View.VISIBLE

‎app/src/main/java/com/cornellappdev/coursegrab/LoginViewModel.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,19 @@ class LoginViewModel @Inject constructor(
217217
}
218218

219219
private suspend fun verifySession(userSession: UserSession) {
220-
if (userSession.session_token.isNullOrBlank() ||
221-
userSession.update_token.isNullOrBlank()
220+
if (userSession.sessionToken.isNullOrBlank() ||
221+
userSession.updateToken.isNullOrBlank()
222222
) return
223223

224-
val expiresAt = userSession.session_expiration
224+
val expiresAt = userSession.sessionExpiration
225225
if (expiresAt == null) {
226226
Log.e(TAG, "Session response had no expiration")
227227
emitError(SIGN_IN_FAILED)
228228
return
229229
}
230230

231-
preferencesHelper.sessionToken = userSession.session_token
232-
preferencesHelper.updateToken = userSession.update_token
231+
preferencesHelper.sessionToken = userSession.sessionToken
232+
preferencesHelper.updateToken = userSession.updateToken
233233
preferencesHelper.expiresAt = expiresAt
234234

235235
FirebaseMessaging.getInstance().token.addOnSuccessListener { token ->

‎app/src/main/java/com/cornellappdev/coursegrab/MainActivity.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ class MainActivity : AppCompatActivity() {
206206

207207
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
208208
holder.courseTitle.text =
209-
"${availableCourses[position].subject_code} ${availableCourses[position].course_num}: ${availableCourses[position].title}"
209+
"${availableCourses[position].subjectCode} ${availableCourses[position].courseNum}: ${availableCourses[position].title}"
210210
holder.courseTime.text = availableCourses[position].section.uppercase(getDefault())
211-
holder.coursePin.text = availableCourses[position].catalog_num.toString()
211+
holder.coursePin.text = availableCourses[position].catalogNum.toString()
212212
holder.courseStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
213213

214214
holder.removeButton.setOnClickListener {
215215
(context as MainActivity).removeCourse(
216-
availableCourses[position].catalog_num
216+
availableCourses[position].catalogNum
217217
)
218218
}
219219

@@ -224,7 +224,7 @@ class MainActivity : AppCompatActivity() {
224224

225225
holder.backgroundButton.setOnClickListener {
226226
(context as MainActivity).editCourse(
227-
availableCourses[position].catalog_num
227+
availableCourses[position].catalogNum
228228
)
229229
}
230230
}
@@ -257,19 +257,19 @@ class MainActivity : AppCompatActivity() {
257257

258258
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
259259
holder.courseTitle.text =
260-
"${awaitingCourses[position].subject_code} ${awaitingCourses[position].course_num}: ${awaitingCourses[position].title}"
260+
"${awaitingCourses[position].subjectCode} ${awaitingCourses[position].courseNum}: ${awaitingCourses[position].title}"
261261
holder.courseTime.text = awaitingCourses[position].section.uppercase(getDefault())
262-
holder.coursePin.text = awaitingCourses[position].catalog_num.toString()
262+
holder.coursePin.text = awaitingCourses[position].catalogNum.toString()
263263
holder.courseStatus.setImageResource(if (awaitingCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
264264

265265
holder.removeButton.setOnClickListener {
266266
(context as MainActivity).removeCourse(
267-
awaitingCourses[position].catalog_num
267+
awaitingCourses[position].catalogNum
268268
)
269269
}
270270
holder.backgroundButton.setOnClickListener {
271271
(context as MainActivity).editCourse(
272-
awaitingCourses[position].catalog_num
272+
awaitingCourses[position].catalogNum
273273
)
274274
}
275275
}

‎app/src/main/java/com/cornellappdev/coursegrab/NotificationModal.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class NotificationModal : AppCompatActivity() {
2121
val course: Course =
2222
(intent.getParcelableExtra<CourseNotification>("courseDetails") as CourseNotification).section
2323

24-
binding.courseTitle.text = "${course.subject_code} ${course.course_num}: ${course.title}"
24+
binding.courseTitle.text = "${course.subjectCode} ${course.courseNum}: ${course.title}"
2525
binding.courseSection.text = course.section
26-
binding.coursePin.text = course.catalog_num.toString()
26+
binding.coursePin.text = course.catalogNum.toString()
2727

2828
binding.buttonStudentCenter.setOnClickListener {
2929
val browserIntent =

‎app/src/main/java/com/cornellappdev/coursegrab/NotificationService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class NotificationService : FirebaseMessagingService() {
118118
notificationManager.createNotificationChannel(channel)
119119
}
120120

121-
notificationManager.notify(course.section.catalog_num, notificationBuilder.build())
121+
notificationManager.notify(course.section.catalogNum, notificationBuilder.build())
122122
}
123123

124124
private companion object {

‎app/src/main/java/com/cornellappdev/coursegrab/SearchActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class SearchActivity : AppCompatActivity() {
138138

139139
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
140140
holder.courseTitle.text =
141-
"${resultsCourses[position].subject_code} ${resultsCourses[position].course_num}: ${resultsCourses[position].title}"
141+
"${resultsCourses[position].subjectCode} ${resultsCourses[position].courseNum}: ${resultsCourses[position].title}"
142142

143143
holder.expandButton.setOnClickListener {
144144
val intent = Intent(context, CourseDetailsActivity::class.java).apply {

‎app/src/main/java/com/cornellappdev/coursegrab/models/Course.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,25 @@ package com.cornellappdev.coursegrab.models
22

33
import android.os.Parcelable
44
import kotlinx.parcelize.Parcelize
5+
import kotlinx.serialization.SerialName
56
import kotlinx.serialization.Serializable
67

7-
/**
8-
* Also carries failure payloads, where only [errors] is present — hence the defaults on
9-
* every other property.
10-
*/
118
@Serializable
129
@Parcelize
1310
data class Course(
14-
val catalog_num: Int = 0,
15-
val course_num: Int = 0,
11+
@SerialName("catalog_num") val catalogNum: Int = 0,
12+
@SerialName("course_num") val courseNum: Int = 0,
1613
val section: String = "",
1714
val instructors: List<String> = emptyList(),
18-
val is_tracking: Boolean = false,
15+
@SerialName("is_tracking") val isTracking: Boolean = false,
1916
val status: String = "",
20-
val subject_code: String = "",
17+
@SerialName("subject_code") val subjectCode: String = "",
2118
val title: String = "",
22-
val num_tracking: Int = 0,
19+
@SerialName("num_tracking") val numTracking: Int = 0,
2320
val mode: String = "",
2421
val errors: List<String>? = null
2522
) : Parcelable {
2623

27-
/** The backend reports section availability through [status] rather than a flag. */
2824
val isOpen: Boolean get() = status == STATUS_OPEN
2925

3026
private companion object {

‎app/src/main/java/com/cornellappdev/coursegrab/models/SearchResult.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package com.cornellappdev.coursegrab.models
22

33
import android.os.Parcelable
44
import kotlinx.parcelize.Parcelize
5+
import kotlinx.serialization.SerialName
56
import kotlinx.serialization.Serializable
67

78
@Serializable
89
@Parcelize
910
data class SearchResult(
10-
val subject_code: String,
11-
val course_num: Int,
11+
@SerialName("subject_code") val subjectCode: String,
12+
@SerialName("course_num") val courseNum: Int,
1213
val title: String,
1314
val sections: List<Course>
1415
) : Parcelable

‎app/src/main/java/com/cornellappdev/coursegrab/models/UserSession.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.cornellappdev.coursegrab.models
22

3+
import kotlinx.serialization.SerialName
34
import kotlinx.serialization.Serializable
45

56
@Serializable
67
class UserSession(
7-
val session_token: String? = null,
8-
val update_token: String? = null,
9-
val session_expiration: Long? = null
8+
@SerialName("session_token") val sessionToken: String? = null,
9+
@SerialName("update_token") val updateToken: String? = null,
10+
@SerialName("session_expiration") val sessionExpiration: Long? = null
1011
)

‎app/src/main/java/com/cornellappdev/coursegrab/networking/CourseGrabRepository.kt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CourseGrabRepository @Inject constructor(
2424
service.initializeSession(
2525
InitializeSessionRequest(
2626
googleToken,
27-
device_token = deviceToken
27+
deviceToken = deviceToken
2828
)
2929
)
3030
}
@@ -58,27 +58,19 @@ class CourseGrabRepository @Inject constructor(
5858
)
5959
}
6060

61-
/**
62-
* Unwraps the [ApiResponse] envelope. Retrofit dispatches off the caller's thread and
63-
* throws on transport, HTTP, and decoding failures, so all this adds is turning the
64-
* envelope's own `success` flag into a failure.
65-
*/
6661
private suspend fun <T : Any> call(request: suspend () -> ApiResponse<T>): Result<T> =
6762
try {
6863
val envelope = request()
6964
if (envelope.success) {
7065
Result.success(envelope.data)
7166
} else {
72-
// `errors` only exists on Course payloads; other endpoints report failure
73-
// through the flag alone.
7467
Result.failure(
7568
ApiException(
7669
(envelope.data as? Course)?.errors?.firstOrNull() ?: "Request failed"
7770
)
7871
)
7972
}
8073
} catch (e: CancellationException) {
81-
// Never swallow cancellation — the caller's scope is shutting down.
8274
throw e
8375
} catch (e: Exception) {
8476
Result.failure(e)

0 commit comments

Comments
 (0)