Merge changes from main

Author: Divak2004

PennMobile/build.gradle

@@ -3,7 +3,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
-    alias(libs.plugins.compose.compiler)
+    // Removed problematic compose compiler alias for Kotlin 1.9.x compatibility
     id 'jacoco'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
@@ -12,9 +12,13 @@ plugins {
 
 android {
     namespace 'com.pennapps.labs.pennmobile'
+
     buildFeatures {
         buildConfig = true
+        viewBinding true
+        compose true
     }
+
     buildTypes {
         debug {
             matchingFallbacks = ['qa', 'release']
@@ -23,17 +27,18 @@ android {
         }
         release {}
     }
+
     compileSdk 35
-    buildFeatures {
-        viewBinding true
-        compose true
-    }
+
     composeOptions {
+        // Matches Kotlin 1.9.24 defined in your libs.versions.toml
         kotlinCompilerExtensionVersion = "1.5.14"
     }
+
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 35
@@ -42,6 +47,7 @@ android {
         buildConfigField ("String", "PLATFORM_REDIRECT_URI", getPlatformRedirectUri())
         buildConfigField ("String", "PLATFORM_CLIENT_ID", getPlatformClientID())
     }
+
     packagingOptions {
         resources {
             excludes += ['META-INF/rxjava.properties']
@@ -52,9 +58,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation libs.androidx.compose.foundation.layout
-    implementation libs.androidx.compose.material3
-    implementation libs.androidx.foundation.layout
+// If you want the foundation layout, use the bundle or the specific activity compose you have defined
+    implementation libs.androidx.activity.compose
+    implementation libs.androidx.material3.android
+//    implementation libs.androidx.foundation.layout
 
     androidTestImplementation libs.androidx.espresso.core
     androidTestImplementation libs.androidx.junit
@@ -117,69 +124,57 @@ dependencies {
     ksp libs.androidx.room.compiler
     ksp libs.androidx.hilt.compiler
 
-    implementation libs.androidx.constraintlayout.compose
+    implementation libs.androidx.constraintlayout
     implementation libs.androidx.hilt.navigation.compose
 
-    implementation libs.hilt.android
-    ksp libs.hilt.compiler
+    implementation libs.androidx.hilt.android
+    ksp libs.androidx.hilt.compiler
 }
 
 String getPlatformClientID() {
     def propFile = rootProject.file("./local.properties")
     def properties = new Properties()
-    properties.load(new FileInputStream(propFile))
-    System.out.println(properties.toString())
-    return properties['PLATFORM_CLIENT_ID']
+    if (propFile.exists()) {
+        properties.load(new FileInputStream(propFile))
+        return properties['PLATFORM_CLIENT_ID']
+    }
+    return ""
 }
 
 String getPlatformRedirectUri() {
     def propFile = rootProject.file("./local.properties")
     def properties = new Properties()
-    properties.load(new FileInputStream(propFile))
-    System.out.println(properties.toString())
-    return properties['PLATFORM_REDIRECT_URI']
+    if (propFile.exists()) {
+        properties.load(new FileInputStream(propFile))
+        return properties['PLATFORM_REDIRECT_URI']
+    }
+    return ""
 }
 
-// Code Coverage: https://www.raywenderlich.com/10562143-continuous-integration-for-android#toc-anchor-014
-
 jacoco {
     toolVersion = "0.8.11"
 }
 
-// https://stackoverflow.com/questions/68065743/cannot-run-gradle-test-tasks-because-of-java-lang-noclassdeffounderror-jdk-inte
 tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-// Files with such regex patterns are to be excluded
 def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*',
                   '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
 
-// Location of generated output classes
 def debugTree = fileTree(dir: "$project.layout.buildDirectory/tmp/kotlin-classes/debug",
         excludes: fileFilter)
 
-// Source code directory
 def mainSrc = "$project.projectDir/src/main/java"
 
-// Task declaration
-
 tasks.register('jacocoTestReport', JacocoReport) {
-    // Runs only after the dependencies are executed
     dependsOn = ['testDebugUnitTest', 'createDebugCoverageReport']
-    // Export formats
-    /*reports {
-      xml.enabled = true
-      html.enabled = true
-    }*/
 
     sourceDirectories.setFrom(files([mainSrc]))
     classDirectories.setFrom(files([debugTree]))
 
-    // Inform Gradle where the files generated by test cases - are located
     executionData.from = fileTree(dir: project.layout.buildDirectory, includes: [
             'jacoco/testDebugUnitTest.exec'
-//      'outputs/code_coverage/debugAndroidTest/connected/*.ec'
     ])
 }

PennMobile/src/main/java/com/pennapps/labs/pennmobile/di/CampusExpressModule.kt

@@ -8,13 +8,16 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object CampusExpressModule {
+
     @Provides
     @Singleton
+    @Named("CampusExpressRetrofit") // Tag this specific instance
     fun provideRetrofit(): Retrofit =
         Retrofit
             .Builder()
@@ -24,5 +27,7 @@ object CampusExpressModule {
 
     @Provides
     @Singleton
-    fun provideCampusExpress(retrofit: Retrofit): CampusExpress = retrofit.create(CampusExpress::class.java)
-}
+    fun provideCampusExpress(
+        @Named("CampusExpressRetrofit") retrofit: Retrofit // Tell Hilt to use the tagged instance
+    ): CampusExpress = retrofit.create(CampusExpress::class.java)
+}

PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningInsightsCardAdapter.kt

@@ -52,8 +52,8 @@ class DiningInsightsCardAdapter(
         private const val DINING_DOLLARS_PREDICTIONS = 2
         private const val DINING_SWIPES_PREDICTIONS = 3
 
-        const val START_DAY_OF_SEMESTER = "2026-01-14"
-        private const val DAYS_IN_SEMESTER = 117f
+        const val START_DAY_OF_SEMESTER = "2025-01-14"
+        const val DAYS_IN_SEMESTER = 117f
     }
 
     override fun onCreateViewHolder(

gradle/libs.versions.toml

@@ -64,7 +64,6 @@ rxJavaCoroutineConverter = "1.8.0"
 testng = "7.8.0"
 
 [libraries]
-
 adapter-rxjava = { module = "com.squareup.retrofit2:adapter-rxjava", version.ref = "adapterRxjava" }
 android-rss = { module = "com.github.ahorn:android-rss", version.ref = "androidRss" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
@@ -92,7 +91,6 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
 androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3-android = { module = "androidx.compose.material3:material3" }
-#androidx-material3-pullRefresh = { module = "androidx.compose.material3:material3-pull-refresh", version.ref = "pullRefresh"}
 androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteKtx" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
@@ -125,7 +123,6 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junitVersion" }
 kaspresso = { module = "com.kaspersky.android-components:kaspresso", version.ref = "kaspresso" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
-#kotlinx-coroutines-rxConverter = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx", version.ref ="rxJavaCoroutineConverter" }
 leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" }
 library = { module = "com.daimajia.swipelayout:library", version.ref = "library" }
 logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" }
@@ -148,9 +145,9 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "googleServices"}
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashalytics"}
 ksp = { id = "com.google.devtools.ksp", version.ref = "kotlinKSP"}
-
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }
-
+# Added this to match the accessor in build.gradle
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 
 [bundles]
@@ -167,7 +164,6 @@ material = [
     "androidx-glance-material3",
     "androidx-material-icons-core",
     "androidx-material-icons-extended",
-#    "androidx-material3-pullRefresh",
     "material"
 ]