Merge branch 'main' into cassieym

DaChelimo · web-flow · commit 9b3e3a0ace43 · 2026-02-08T19:10:07.000-05:00
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/AboutAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/AboutAdapter.kt
@@ -52,6 +52,7 @@ class AboutAdapter(
                 "David Fu" -> R.drawable.david
                 "Kaushik Akula" -> R.drawable.kaushik
                 "Cassie Mai" -> R.drawable.cassieym
+                "Ronnie Wang" -> R.drawable.ronwang
                 else -> null
             }
         if (imageId != null) holder.personIv.setImageResource(imageId)
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/AboutFragment.kt
@@ -91,6 +91,7 @@ class AboutFragment : Fragment() {
                 "David Fu",
                 "Kaushik Akula",
                 "Cassie Mai",
+                "Ronnie Wang",
             )
         val alumni =
             arrayListOf(
diff --git a/PennMobile/src/main/res/drawable/ronwang.png b/PennMobile/src/main/res/drawable/ronwang.png

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ class AboutAdapter(`
`52`	`52`	`"David Fu" -> R.drawable.david`
`53`	`53`	`"Kaushik Akula" -> R.drawable.kaushik`
`54`	`54`	`"Cassie Mai" -> R.drawable.cassieym`
	`55`	`+ "Ronnie Wang" -> R.drawable.ronwang`
`55`	`56`	`else -> null`
`56`	`57`	`}`
`57`	`58`	`if (imageId != null) holder.personIv.setImageResource(imageId)`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ class AboutFragment : Fragment() {`
`91`	`91`	`"David Fu",`
`92`	`92`	`"Kaushik Akula",`
`93`	`93`	`"Cassie Mai",`
	`94`	`+ "Ronnie Wang",`
`94`	`95`	`)`
`95`	`96`	`val alumni =`
`96`	`97`	`arrayListOf(`