fix merge conflict

Author: cassieym

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.{kt,kts}]
+ktlint_function_naming_ignore_when_annotated_with = Composable

.github/workflows/android-workflow.yaml

@@ -141,7 +141,7 @@ jobs:
 
       # Run JaCoCo, generate Test Report
       - name: Check Code Coverage
-        run: ./gradlew jacocoTestReport --stacktrace
+        run: ./gradlew testDebugUnitTest jacocoTestReport --stacktrace
 
       # Upload reports to GitHub Actions
       - name: Upload Reports
@@ -163,20 +163,11 @@ jobs:
             java-version: '17'
             distribution: 'temurin'
 
-        - name: Install ktlint
-          run: |
-            curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.3.1/ktlint
-            chmod a+x ktlint
-            sudo mv ktlint /usr/local/bin/
+        - name: Grant execute permission for gradlew
+          run: chmod +x ./gradlew
 
         - name: Run ktlint
-          run: |
-            set -o pipefail
-            ktlint --reporter=plain > ktlint_errors.txt
-
-        - name: Check for ktlint errors
-          if: ${{ failure() || steps.run_ktlint.exitCode == 1 }}
-          run: cat ktlint_errors.txt
+          run: ./gradlew ktlintCheck
 
   # Publish to Firebase App Distribution
   # https://github.com/wzieba/Firebase-Distribution-Github-Action

PennMobile/build.gradle

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.ktlint)
     // Removed problematic compose compiler alias for Kotlin 1.9.x compatibility
     id 'jacoco'
     id 'kotlin-parcelize'
@@ -11,24 +12,24 @@ plugins {
 }
 
 android {
-    namespace 'com.pennapps.labs.pennmobile'
+    namespace = 'com.pennapps.labs.pennmobile'
 
     buildFeatures {
         buildConfig = true
-        viewBinding true
-        compose true
+        viewBinding = true
+        compose = true
     }
 
     buildTypes {
         debug {
             matchingFallbacks = ['qa', 'release']
-            enableUnitTestCoverage true
-            enableAndroidTestCoverage true
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
         }
         release {}
     }
 
-    compileSdk 35
+    compileSdk = 35
 
     composeOptions {
         // Matches Kotlin 1.9.24 defined in your libs.versions.toml
@@ -43,7 +44,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 35
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
+        multiDexEnabled = true
         buildConfigField ("String", "PLATFORM_REDIRECT_URI", getPlatformRedirectUri())
         buildConfigField ("String", "PLATFORM_CLIENT_ID", getPlatformClientID())
     }
@@ -56,6 +57,20 @@ android {
     }
 }
 
+ktlint {
+    version.set("1.8.0")
+    android.set(true)
+    ignoreFailures.set(false)
+    verbose.set(true)
+    outputToConsole.set(true)
+    coloredOutput.set(true)
+
+    filter {
+        exclude("**/build/**")
+        exclude("**/generated/**")
+    }
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 // If you want the foundation layout, use the bundle or the specific activity compose you have defined
@@ -64,6 +79,8 @@ dependencies {
     implementation libs.places
 //    implementation libs.androidx.foundation.layout
 
+    ktlintRuleset libs.ktlint
+
     androidTestImplementation libs.androidx.espresso.core
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.kaspresso

PennMobile/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="81"
-    android:versionName="3.3.1">
+    android:versionCode="83"
+    android:versionName="3.4.1">
 
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -93,4 +93,4 @@
             android:required="false" />
     </application>
 
-</manifest>
+</manifest>

PennMobile/src/main/java/com/pennapps/labs/pennmobile/NotificationsSettingsView.kt

@@ -1,5 +1,7 @@
 @file:Suppress("ktlint:standard:no-wildcard-imports")
 
+package com.pennapps.labs.pennmobile
+
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -20,11 +22,14 @@ import androidx.compose.ui.unit.dp
 @Suppress("ktlint:standard:function-naming")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun NotificationSettingsList(settingsList: List<Pair<String, Boolean>>) {
+fun NotificationSettingsList(
+    settingsList: List<Pair<String, Boolean>>,
+    modifier: Modifier = Modifier,
+) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
     Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             Column {
                 CenterAlignedTopAppBar(
@@ -102,12 +107,13 @@ fun NotificationSettingsList(settingsList: List<Pair<String, Boolean>>) {
 fun NotificationSettingRow(
     label: String,
     isEnabledInitial: Boolean,
+    modifier: Modifier = Modifier,
 ) {
     var isEnabled by remember { mutableStateOf(isEnabledInitial) }
 
     Row(
         modifier =
-            Modifier
+            modifier
                 .fillMaxWidth()
                 .padding(horizontal = 32.dp, vertical = 4.dp),
         verticalAlignment = Alignment.CenterVertically,
@@ -141,11 +147,10 @@ fun NotificationSettingRow(
 fun saveNotificationSettings() {
 }
 
-@Suppress("ktlint:standard:function-naming")
 @Preview(showBackground = true)
 @Composable
-fun AppWithListPreview() {
-    var settingsList =
+private fun AppWithListPreview() {
+    val settingsList =
         listOf(
             "Penn Course Alert" to false,
             "Laundry" to true,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java

@@ -153,6 +153,7 @@ public List<GSRLocation> deserialize(JsonElement je, Type type, JsonDeserializat
                 location.gid = jsonLocation.get("gid").getAsInt();
                 location.name = jsonLocation.get("name").getAsString();
                 location.kind = jsonLocation.get("kind").getAsString();
+                location.bookableDays = jsonLocation.get("bookable_days").getAsInt();
                 locations.add(location);
             }
             return locations;

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt

@@ -187,7 +187,12 @@ interface StudentLife {
     ): Observable<DiningHall?>
 
     @GET("gsr/locations")
-    fun location(): Observable<List<GSRLocation?>?>
+    fun locationUnfiltered(): Observable<List<GSRLocation?>?>
+
+    @GET("gsr/user-locations")
+    fun location(
+        @Header("Authorization") bearerToken: String?,
+    ): Observable<List<GSRLocation?>?>
 
     @GET("events/fling")
     fun getFlingEvents(): Observable<List<FlingEvent?>?>

PennMobile/src/main/java/com/pennapps/labs/pennmobile/components/floatingbottombar/behavior/ExpandableBottomBarBehavior.kt

@@ -1,5 +1,6 @@
 package com.pennapps.labs.pennmobile.components.floatingbottombar.behavior
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.Gravity
@@ -12,6 +13,7 @@ open class ExpandableBottomBarBehavior<V : View> : CoordinatorLayout.Behavior<V>
 
     constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
 
+    @SuppressLint("RestrictedApi")
     override fun layoutDependsOn(
         parent: CoordinatorLayout,
         child: V,
@@ -23,6 +25,7 @@ open class ExpandableBottomBarBehavior<V : View> : CoordinatorLayout.Behavior<V>
         return super.layoutDependsOn(parent, child, dependency)
     }
 
+    @SuppressLint("RestrictedApi")
     private fun updateSnackBar(
         child: View,
         snackBarLayout: Snackbar.SnackbarLayout,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/compose/presentation/components/error/ErrorCard.kt

@@ -0,0 +1,70 @@
+package com.pennapps.labs.pennmobile.compose.presentation.components.error
+
+import SFProDisplayMedium
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.pennapps.labs.pennmobile.compose.presentation.theme.AppTheme
+
+@Composable
+fun ErrorCard(
+    errorMessage: String,
+    modifier: Modifier = Modifier,
+) {
+    Card(
+        modifier = modifier,
+        shape = MaterialTheme.shapes.small,
+        colors =
+            CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surface,
+                contentColor = MaterialTheme.colorScheme.onBackground,
+            ),
+    ) {
+        Text(
+            text = errorMessage,
+            color = MaterialTheme.colorScheme.onBackground,
+            fontFamily = SFProDisplayMedium,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.CenterHorizontally)
+                    .padding(vertical = 24.dp, horizontal = 12.dp),
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Preview(
+    name = "Light Mode",
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_NO,
+)
+@Preview(
+    name = "Dark Mode",
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_YES,
+)
+@Composable
+private fun PreviewErrorCard() {
+    AppTheme {
+        Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
+            ErrorCard(
+                UserDisplayErrors.PAST_BALANCES_NOT_AVAILABLE,
+                Modifier
+                    .padding(vertical = 12.dp)
+                    .fillMaxWidth(0.95f),
+            )
+        }
+    }
+}

PennMobile/src/main/java/com/pennapps/labs/pennmobile/compose/presentation/components/error/UserDisplayErrors.kt

@@ -0,0 +1,11 @@
+package com.pennapps.labs.pennmobile.compose.presentation.components.error
+
+object UserDisplayErrors {
+    const val CAMPUS_EXPRESS_DOWN =
+        "Dining prediction graphs are down due to an error with Campus Express. " +
+            "We are working on a fix and will release it ASAP."
+
+    const val PAST_BALANCES_NOT_AVAILABLE =
+        "Dining prediction graphs are unavailable since you are either not on a dining plan " +
+            "or an RA on a special plan that we can't track."
+}