update fix merge

pennlabs · Sep 29, 2023 · 63dc443 · 63dc443
1 parent 1ed671d
commit 63dc443
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -45,6 +45,7 @@ class AboutAdapter(private var members: ArrayList<String>)
  "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
  }