Change google-services.json

pennlabs · Dec 1, 2023 · 501604f · 501604f
1 parent 2f6ccd8
commit 501604f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/PennMobile/google-services.json b/PennMobile/google-services.json
@@ -1,37 +1,26 @@
 {
   "project_info": {
-    "project_number": "838434873871",
-    "firebase_url": "https://penn-mobile-release.firebaseio.com",
-    "project_id": "penn-mobile-release",
-    "storage_bucket": "penn-mobile-release.appspot.com"
+    "project_number": "86950866683",
+    "project_id": "pennmobilefbtest",
+    "storage_bucket": "pennmobilefbtest.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:838434873871:android:f03e90e8574403ad",
+        "mobilesdk_app_id": "1:86950866683:android:0b66c19f0e9f40617a4a5e",
         "android_client_info": {
           "package_name": "com.pennapps.labs.pennmobile"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "838434873871-amrfbe7ekhppak30c64u9a2g7dbe5mif.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyCFZeo23H-LKCGD4FUDIIbzpdQPIeRgM9k"
+          "current_key": "AIzaSyDPyjYP8lTQFHt-uy8UBLdKGrGAmHzyhuA"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "838434873871-amrfbe7ekhppak30c64u9a2g7dbe5mif.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
@@ -30,6 +30,7 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayout
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.pennapps.labs.pennmobile.adapters.MainPagerAdapter
@@ -52,13 +53,16 @@ import retrofit.client.OkClient
 import retrofit.converter.GsonConverter
 import java.util.concurrent.TimeUnit
 
+
 class MainActivity : AppCompatActivity() {
     private var tabShowed = false
     private lateinit var fragmentManager: FragmentManager
     private lateinit var mSharedPrefs: SharedPreferences
 
     val tokenMutex = Mutex()
 
+    private lateinit var firebaseAnalytics: FirebaseAnalytics
+
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(R.style.AppTheme)
         if (Build.VERSION.SDK_INT > 28) {
@@ -88,6 +92,14 @@ class MainActivity : AppCompatActivity() {
         showBottomBar()
         supportActionBar?.setDisplayShowTitleEnabled(false)
 
+        // firebase test
+        //Firebase.analytics.logEvent("log_thing", null)
+        //firebaseAnalytics.logEvent
+
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this);
+        firebaseAnalytics.logEvent("log_thing", null)
+
+
         // Show HomeFragment if logged in, otherwise show LoginFragment
         val pennKey = mSharedPrefs.getString(getString(R.string.pennkey), null)
         val guestMode = mSharedPrefs.getBoolean(getString(R.string.guest_mode), false)
@@ -100,7 +112,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        showBottomBar()
+        //showBottomBar()
     }
 
     private fun onExpandableBottomNavigationItemSelected() {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 01 14:54:54 EDT 2023
+#Fri Dec 01 16:55:01 EST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists