Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,18 @@ dependencies {
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-messaging'
implementation 'com.google.firebase:firebase-auth'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.firebaseui:firebase-ui-auth:9.1.1'
// Pinned: play-services-auth 22.0.0 removed GoogleSignIn/GoogleSignInClient.
// Unpin once LoginActivity/SettingsActivity move to Credential Manager.
implementation 'com.google.android.gms:play-services-auth:21.3.0'
implementation 'com.google.android.gms:play-services-auth:22.0.0'
implementation 'androidx.credentials:credentials:1.6.0'
implementation 'androidx.credentials:credentials-play-services-auth:1.6.0'
implementation 'com.google.android.libraries.identity.googleid:googleid:1.2.0'
implementation 'com.squareup.okhttp3:okhttp:5.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0'
implementation 'com.google.code.gson:gson:2.14.0'
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
testImplementation 'junit:junit:4.13.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.cornellappdev.coursegrab.databinding.ActivityCourseDetailsBinding
Expand All @@ -21,7 +22,6 @@ import com.cornellappdev.coursegrab.networking.Request
import com.cornellappdev.coursegrab.networking.addTracking
import com.cornellappdev.coursegrab.networking.removeTracking
import com.google.gson.reflect.TypeToken
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -65,7 +65,7 @@ class CourseDetailsActivity : AppCompatActivity() {
fun addCourse(courseId: Int, context: Context) {
val addTracking = Endpoint.addTracking(preferencesHelper.sessionToken.toString(), courseId)

CoroutineScope(Dispatchers.Main).launch {
lifecycleScope.launch {
val typeToken = object : TypeToken<ApiResponse<Course>>() {}.type
val response = withContext(Dispatchers.IO) {
Request.makeRequest<ApiResponse<Course>>(
Expand All @@ -87,7 +87,7 @@ class CourseDetailsActivity : AppCompatActivity() {
val removeTracking =
Endpoint.removeTracking(preferencesHelper.sessionToken.toString(), courseId)

CoroutineScope(Dispatchers.Main).launch {
lifecycleScope.launch {
val typeToken = object : TypeToken<ApiResponse<Course>>() {}.type
val response = withContext(Dispatchers.IO) {
Request.makeRequest<ApiResponse<Course>>(
Expand Down
Loading