Merge pull request #580 from pennlabs/main

merging main
pennlabs · Oct 1, 2023 · a0d46b5 · a0d46b5
2 parents 28cabc4 + 8c81627
commit a0d46b5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ out/
 .gradle/
 build/
 .idea/
+gradle/wrapper/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -71,4 +72,4 @@ fastlane/readme.md
 # Crashlytics and API keys
 src/main/assets/crashlytics-build.properties
 src/main/res/values/com_crashlytics_export_strings.xml
-crashlytics.properties
+crashlytics.properties
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
@@ -60,7 +60,9 @@ class AboutFragment : Fragment() {
         view.our_team_rv?.layoutManager = GridLayoutManager(context, 3)
         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", "Trini Feng")
+            "Belinda Xi", "Vishesh Patel", "Ali Krema", "Jenny Li", "Sruthi Kurada", "Charis Gao",
+            "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
@@ -46,6 +46,7 @@ class AboutAdapter(private var members: ArrayList<String>)
             "Sruthi Kurada" -> R.drawable.sruthi
             "Charis Gao" -> R.drawable.charis
             "Trini Feng" -> R.drawable.trini
+            "Vedha Avali" -> R.drawable.vedha
             else -> null
         }
         if (android.os.Build.VERSION.SDK_INT >=  android.os.Build.VERSION_CODES.M){

diff --git a/PennMobile/src/main/res/drawable/vedha.jpg b/PennMobile/src/main/res/drawable/vedha.jpg