Merge pull request #88 from cuappdev/andrew/remove-google-sign-in-temp

Comment out onboarding feature for Updated Gym Details Release

Author: AndrewCheung360

.DS_Store

@@ -0,0 +1,19 @@
+<!-- IF A SECTION IS NOT APPLICABLE TO YOU, PLEASE DELETE IT!! -->
+<!-- Your title should be able to summarize what changes you’ve made in one sentence. For example: “Exclude staff from the check for follows”. For stacked PRs, please indicate clearly in the title where in the stack you are. For example: “[Eatery Refactor][4/5] Converted all files to MVP model” -->
+## Overview
+<!-- Summarize your changes here. -->
+## Changes Made
+<!-- Include details of what your changes actually are and how it is intended to work. -->
+## Test Coverage
+<!-- Describe how you tested this feature. Manual testing and/or unit testing. Please include repro steps and/or how to turn the feature on if applicable. -->
+## Next Steps (delete if not applicable)
+<!-- If this is part of a multi-PR change, please describe what changes you plan on addressing in future PRs. -->
+## Related PRs or Issues (delete if not applicable)
+<!-- List related PRs against other branches/repositories. -->
+## Screenshots (delete if not applicable)
+<!-- This could include of screenshots of the new feature / proof that the changes work. -->
+<details>
+  <summary>Screen Shot Name</summary>
+  <!-- Insert file link here. Newlines above and below your link are necessary for this to work. -->
+</details>
+

.github/pull_request_template.md

@@ -86,3 +86,4 @@ lint/tmp/
 # lint/reports/
 
 secrets.properties
+google-services.json

.gitignore

@@ -3,3 +3,10 @@
 <p align="center"><img src=https://raw.githubusercontent.com/cuappdev/uplift-ios/master/Uplift/Assets.xcassets/AppIcon.appiconset/ItunesArtwork%402x.png width=210 /></p>
 
 Uplift is one of the latest apps by [Cornell AppDev](http://cornellappdev.com), an engineering project team at Cornell University focused on mobile app development. Uplift aims to be the go-to fitness and wellness tool that provides information and class times for gym resources at Cornell.
+
+## Getting Started
+1. Clone the repository.
+2. Add a file called secrets.properties into your root level directory with the variables which you can find pinned in `#uplift-android`.
+3. Go to the Firebase console for Uplift (you may need to contact a lead for access), and navigate to Project Settings -> Android, then add your SHA1 fingerprint, which you can find with the following command `./gradlew signingReport`.
+4. Download the google-services.json file which you can find pinned on `#uplift-android` and add it to the app directory.
+5. Build the project, and you should be good to go!

.idea/compiler.xml

@@ -1,9 +1,14 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id "com.apollographql.apollo3" version "3.8.2"
+    id("com.apollographql.apollo") version "4.1.1"
+    id 'com.google.gms.google-services'
+    id 'kotlin-kapt'
+    id("com.google.devtools.ksp") // Use KSP instead of kapt for now to avoid kapt stub build error
+    id("com.google.dagger.hilt.android")
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.20'
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.10"
 }
-
 def secretsPropertiesFile = rootProject.file('secrets.properties')
 def secretsProperties = new Properties()
 secretsProperties.load(new FileInputStream(secretsPropertiesFile))
@@ -16,24 +21,31 @@ android {
         applicationId "com.cornellappdev.uplift"
         minSdk 28
         targetSdk 35
-        versionCode 13
-        versionName "1.4-backend-fix"
-
+        versionCode 14
+        versionName "1.5-updated-gym-details"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
+
+
     }
 
     buildTypes {
-        debug {
-            buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])
-        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField("String", "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"])
             buildConfigField("String", "BACKEND_URL", secretsProperties['PROD_ENDPOINT'])
         }
+        debug {
+            buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])
+            buildConfigField(
+                    "String",
+                    "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"]
+            )
+            signingConfig signingConfigs.debug
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -45,10 +57,10 @@ android {
     }
     buildFeatures {
         compose true
-        buildConfig true
+        buildConfig = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.3'
+        kotlinCompilerExtensionVersion '1.5.14'
     }
     packagingOptions {
         resources {
@@ -58,31 +70,43 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.datastore:datastore-preferences:1.0.0-alpha08'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
+    implementation 'androidx.activity:activity-compose:1.10.1'
+    implementation "androidx.compose.ui:ui:$compose_ui_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
+    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
+    implementation 'androidx.activity:activity-compose:1.10.1'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
-    implementation 'androidx.compose.material:material:1.7.3'
-    implementation 'androidx.compose.material3:material3-android:1.3.0'
-    implementation 'androidx.core:core-ktx:+'
-    implementation 'androidx.compose.material3:material3-android:1.3.0'
+    implementation 'androidx.compose.material:material:1.7.8'
+    implementation('androidx.compose.material3:material3-android:1.3.1')
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.7.8"
     implementation "io.coil-kt:coil-compose:2.2.2"
-    def nav_version = "2.5.3"
-    implementation "androidx.navigation:navigation-compose:$nav_version"
+    implementation "androidx.navigation:navigation-compose:2.8.8"
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0"
-    implementation "com.google.accompanist:accompanist-permissions:0.28.0"
-    implementation "com.apollographql.apollo3:apollo-runtime:3.8.2"
+    implementation "com.google.accompanist:accompanist-permissions:0.34.0"
+    implementation("com.apollographql.apollo:apollo-runtime:4.1.1")
     implementation 'com.valentinilk.shimmer:compose-shimmer:1.0.5'
-    implementation 'com.google.android.gms:play-services-location:21.0.1'
+    implementation 'com.google.android.gms:play-services-location:21.3.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.datastore:datastore-preferences:1.1.3'
+    // Dagger Hilt
+    implementation("com.google.dagger:hilt-android:2.51.1")
+    ksp("com.google.dagger:hilt-compiler:2.51.1")
+    implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
+    // Serialization
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
+    // Authentication + Firebase
+    implementation "androidx.credentials:credentials:<latest version>"
+    implementation "androidx.credentials:credentials-play-services-auth:<latest version>"
+    implementation "com.google.android.libraries.identity.googleid:googleid:<latest version>"
+    implementation 'com.google.android.gms:play-services-auth:21.3.0'
+    implementation 'com.google.firebase:firebase-auth-ktx:23.2.0'
 }
 
 apollo {