Made changes

Author: helenjb

app/src/main/java/com/cornellappdev/uplift/MainActivity.kt

@@ -2,15 +2,13 @@ package com.cornellappdev.uplift
 
 import android.content.pm.ActivityInfo
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.cornellappdev.uplift.data.repositories.DatastoreRepository
 import com.cornellappdev.uplift.ui.MainNavigationWrapper
 import com.cornellappdev.uplift.ui.theme.UpliftTheme
 import com.cornellappdev.uplift.util.LockScreenOrientation
-import com.google.firebase.messaging.FirebaseMessaging
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -34,19 +32,6 @@ class MainActivity : ComponentActivity() {
                 MainNavigationWrapper()
             }
         }
-
-        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
-            if (!task.isSuccessful) {
-                Log.w("FCM", "Fetching FCM registration token failed", task.exception)
-                return@addOnCompleteListener
-            }
-
-            // Get new FCM registration token
-            val token = task.result
-
-            // Log and handle your token
-            Log.d("FCM", "Current token: $token")
-        }
     }
 }
 

app/src/main/java/com/cornellappdev/uplift/ui/components/general/UpliftButton.kt

@@ -1,5 +1,6 @@
 package com.cornellappdev.uplift.ui.components.general
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -76,8 +77,9 @@ fun UpliftButton(
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Center
-        ) {
+            horizontalArrangement = Arrangement.Center,
+            modifier = Modifier.animateContentSize()
+            ) {
             leadingIcon?.let {
                 it()
             }