Add UA logo

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

@@ -125,32 +125,24 @@ class MainActivity : AppCompatActivity() {
         mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
         mFirebaseAnalytics.logEvent("MainActivityStart", 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)
-        if (pennKey == null && !guestMode) {
-            startLoginFragment()
-        } else {
-            startHomeFragment()
+        if (savedInstanceState == null) {
+            val pennKey = mSharedPrefs.getString(getString(R.string.pennkey), null)
+            val guestMode = mSharedPrefs.getBoolean(getString(R.string.guest_mode), false)
+            if (pennKey == null && !guestMode) {
+                startLoginFragment()
+            } else {
+                startHomeFragment()
+            }
         }
 
         setUpAuthStateListener()
 
-        // Did diningWidgetIntentSetup not as separate function as for some reason when
-        // diningWidgetBroadcast out of onCreate setTab does not trigger.
-        var diningWidgetBroadCast = 0
-        if (intent != null) {
-            diningWidgetBroadCast = intent.getIntExtra("Widget_Tab_Switch", -1)
-        }
+        val diningWidgetBroadCast = intent?.getIntExtra("Widget_Tab_Switch", -1) ?: -1
         if (diningWidgetBroadCast != -1) {
             setTab(DINING_ID)
         }
 
-        var gsrReservationWidgetBroadCast = 0
-        if (intent != null) {
-            gsrReservationWidgetBroadCast =
-                intent.getIntExtra("Gsr_Tab_Switch", -1)
-        }
+        val gsrReservationWidgetBroadCast = intent?.getIntExtra("Gsr_Tab_Switch", -1) ?: -1
         if (gsrReservationWidgetBroadCast != -1) {
             setTab(GSR_ID)
         }
@@ -308,29 +300,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    fun fragmentTransact(
-        fragment: Fragment?,
-        popBackStack: Boolean,
-    ) {
-        if (fragment != null) {
-            runOnUiThread {
-                try {
-                    if (popBackStack) {
-                        fragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-                    }
-                    fragmentManager
-                        .beginTransaction()
-                        .replace(R.id.content_frame, fragment)
-                        .addToBackStack(null)
-                        .setTransition(FragmentTransaction.TRANSIT_NONE)
-                        .commit()
-                } catch (e: IllegalStateException) {
-                    // ignore because the onSaveInstanceState etc states are called when activity is going to background etc
-                }
-            }
-        }
-    }
-
     fun fragmentTransact(
         fragment: Fragment?,
         popBackStack: Boolean,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/studentresources/StudentResourcesEntryCard.kt

@@ -1,5 +1,6 @@
 package com.pennapps.labs.pennmobile.studentresources
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -22,9 +23,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.pennapps.labs.pennmobile.R
 
 @Composable
 fun StudentResourcesEntryCard(
@@ -48,21 +52,15 @@ fun StudentResourcesEntryCard(
             modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Box(
+            Image(
+                painter = painterResource(id = R.drawable.ua_logo),
+                contentDescription = "Undergraduate Assembly logo",
+                contentScale = ContentScale.Crop,
                 modifier =
                     Modifier
                         .size(44.dp)
-                        .clip(RoundedCornerShape(6.dp))
-                        .background(MaterialTheme.colorScheme.primary),
-                contentAlignment = Alignment.Center,
-            ) {
-                Text(
-                    text = "UA",
-                    color = MaterialTheme.colorScheme.onPrimary,
-                    fontWeight = FontWeight.Bold,
-                    fontSize = 18.sp,
-                )
-            }
+                        .clip(RoundedCornerShape(6.dp)),
+            )
             Spacer(Modifier.width(12.dp))
             Column(Modifier.weight(1f)) {
                 Text(

PennMobile/src/main/java/com/pennapps/labs/pennmobile/studentresources/StudentResourcesScreen.kt

@@ -48,6 +48,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -175,21 +176,15 @@ private fun HeaderCard(modifier: Modifier = Modifier) {
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                Box(
+                Image(
+                    painter = painterResource(id = R.drawable.ua_logo),
+                    contentDescription = "Undergraduate Assembly logo",
+                    contentScale = ContentScale.Crop,
                     modifier =
                         Modifier
                             .size(44.dp)
-                            .clip(RoundedCornerShape(6.dp))
-                            .background(MaterialTheme.colorScheme.primary),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Text(
-                        text = "UA",
-                        color = MaterialTheme.colorScheme.onPrimary,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 18.sp,
-                    )
-                }
+                            .clip(RoundedCornerShape(6.dp)),
+                )
                 Spacer(Modifier.width(12.dp))
                 Column(Modifier.weight(1f)) {
                     Text(