From 63dc44333464210b477be7900c216cf04641ff27 Mon Sep 17 00:00:00 2001 From: vavali08 Date: Fri, 29 Sep 2023 17:43:28 -0400 Subject: [PATCH] update fix merge --- .../src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt | 2 +- .../java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt index af17d164..73757a93 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt @@ -61,7 +61,7 @@ class AboutFragment : Fragment() { view.alumni_rv?.layoutManager = GridLayoutManager(context, 3) val members = arrayListOf("Rohan Chhaya", "Anna Jiang", "Julius Snipes", "Zhiyan Lu", "Belinda Xi", "Vishesh Patel", "Ali Krema", "Jenny Li", "Sruthi Kurada", "Charis Gao", - "Vedha Avali") + "Trini Feng", "Vedha Avali") val alumni = arrayListOf("Marta García Ferreiro", "Varun Ramakrishnan", "Sahit Penmatcha", "Anna Wang", "Sophia Ye", "Awad Irfan", "Liz Powell", "Davies Lumumba") view.our_team_rv?.adapter = AboutAdapter(members) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt index ad3e44ae..a016382a 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt @@ -45,6 +45,7 @@ class AboutAdapter(private var members: ArrayList) "Jenny Li" -> R.drawable.jenny "Sruthi Kurada" -> R.drawable.sruthi "Charis Gao" -> R.drawable.charis + "Trini Feng" -> R.drawable.trini "Vedha Avali" -> R.drawable.vedha else -> null }