Merge pull request #417 from IvanIFChen/tma857-new-badges

[TMA-857] Added 17 new badges

19 files changed, 123 insertions, 20 deletions

diff --git a/src/assets/badges/aap.png b/src/assets/badges/aap.png
new file mode 100644
index 00000000..dd150b8f
--- /dev/null
+++ b/src/assets/badges/aap.png
diff --git a/src/assets/badges/cals.png b/src/assets/badges/cals.png
new file mode 100644
index 00000000..fbf0717b
--- /dev/null
+++ b/src/assets/badges/cals.png
diff --git a/src/assets/badges/college_of_arts_and_sciences.png b/src/assets/badges/college_of_arts_and_sciences.png
new file mode 100644
index 00000000..146a06ed
--- /dev/null
+++ b/src/assets/badges/college_of_arts_and_sciences.png
diff --git a/src/assets/badges/college_of_engineering.png b/src/assets/badges/college_of_engineering.png
new file mode 100644
index 00000000..c3f9e889
--- /dev/null
+++ b/src/assets/badges/college_of_engineering.png
diff --git a/src/assets/badges/college_of_human_ecology.png b/src/assets/badges/college_of_human_ecology.png
new file mode 100644
index 00000000..14a9fd80
--- /dev/null
+++ b/src/assets/badges/college_of_human_ecology.png
diff --git a/src/assets/badges/college_of_veterinary_medicine.png b/src/assets/badges/college_of_veterinary_medicine.png
new file mode 100644
index 00000000..1814aa97
--- /dev/null
+++ b/src/assets/badges/college_of_veterinary_medicine.png
diff --git a/src/assets/badges/cornell_law_school.png b/src/assets/badges/cornell_law_school.png
new file mode 100644
index 00000000..43104e41
--- /dev/null
+++ b/src/assets/badges/cornell_law_school.png
diff --git a/src/assets/badges/cornell_tech.png b/src/assets/badges/cornell_tech.png
new file mode 100644
index 00000000..c40d3889
--- /dev/null
+++ b/src/assets/badges/cornell_tech.png
diff --git a/src/assets/badges/dyson_school.png b/src/assets/badges/dyson_school.png
new file mode 100644
index 00000000..d17663b7
--- /dev/null
+++ b/src/assets/badges/dyson_school.png
diff --git a/src/assets/badges/entrepreneurship_at_cornell.png b/src/assets/badges/entrepreneurship_at_cornell.png
new file mode 100644
index 00000000..6b86abd4
--- /dev/null
+++ b/src/assets/badges/entrepreneurship_at_cornell.png
diff --git a/src/assets/badges/graduate_school.png b/src/assets/badges/graduate_school.png
new file mode 100644
index 00000000..f1c4006e
--- /dev/null
+++ b/src/assets/badges/graduate_school.png
diff --git a/src/assets/badges/hotel_administration.png b/src/assets/badges/hotel_administration.png
new file mode 100644
index 00000000..a92cfa3d
--- /dev/null
+++ b/src/assets/badges/hotel_administration.png
diff --git a/src/assets/badges/ilr.png b/src/assets/badges/ilr.png
new file mode 100644
index 00000000..549d6955
--- /dev/null
+++ b/src/assets/badges/ilr.png
diff --git a/src/assets/badges/sc_johnson_school_of_management.png b/src/assets/badges/sc_johnson_school_of_management.png
new file mode 100644
index 00000000..3fc24aa4
--- /dev/null
+++ b/src/assets/badges/sc_johnson_school_of_management.png
diff --git a/src/assets/badges/student_agencies.png b/src/assets/badges/student_agencies.png
new file mode 100644
index 00000000..ac31a1ee
--- /dev/null
+++ b/src/assets/badges/student_agencies.png
diff --git a/src/assets/badges/weill_cornell_medical_sciences.png b/src/assets/badges/weill_cornell_medical_sciences.png
new file mode 100644
index 00000000..2167df79
--- /dev/null
+++ b/src/assets/badges/weill_cornell_medical_sciences.png
diff --git a/src/assets/badges/weill_cornell_medicine.png b/src/assets/badges/weill_cornell_medicine.png
new file mode 100644
index 00000000..3e8a60b3
--- /dev/null
+++ b/src/assets/badges/weill_cornell_medicine.png
diff --git a/src/constants/badges.ts b/src/constants/badges.ts
index aca53f26..54979ecd 100644
--- a/src/constants/badges.ts
+++ b/src/constants/badges.ts
@@ -1,7 +1,7 @@
 import {BadgeDataType} from '../types';
 
 export const _badgeImages = {
-  iff: require('../assets/badges/iff.png'),
+  aap: require('../assets/badges/aap.png'),
   acacia: require('../assets/badges/acacia.png'),
   acapella: require('../assets/badges/acapella.png'),
   alpha_chi_omega: require('../assets/badges/alpha_chi_omega.png'),
@@ -26,8 +26,15 @@ export const _badgeImages = {
   brown_womens_collective: require('../assets/badges/brown_womens_collective.png'),
   bsu: require('../assets/badges/bsu.png'),
   buxton_international: require('../assets/badges/buxton_international.png'),
+  cals: require('../assets/badges/cals.png'),
   chi_phi: require('../assets/badges/chi_phi.png'),
   chi_psi: require('../assets/badges/chi_psi.png'),
+  college_of_arts_and_sciences: require('../assets/badges/college_of_arts_and_sciences.png'),
+  college_of_engineering: require('../assets/badges/college_of_engineering.png'),
+  college_of_human_ecology: require('../assets/badges/college_of_human_ecology.png'),
+  college_of_veterinary_medicine: require('../assets/badges/college_of_veterinary_medicine.png'),
+  cornell_law_school: require('../assets/badges/cornell_law_school.png'),
+  cornell_tech: require('../assets/badges/cornell_tech.png'),
   delta_chi: require('../assets/badges/delta_chi.png'),
   delta_delta_delta: require('../assets/badges/delta_delta_delta.png'),
   delta_gamma: require('../assets/badges/delta_gamma.png'),
@@ -36,13 +43,19 @@ export const _badgeImages = {
   delta_tau: require('../assets/badges/delta_tau.png'),
   delta_tau_delta: require('../assets/badges/delta_tau_delta.png'),
   delta_upsilon: require('../assets/badges/delta_upsilon.png'),
+  dyson_school: require('../assets/badges/dyson_school.png'),
+  entrepreneurship_at_cornell: require('../assets/badges/entrepreneurship_at_cornell.png'),
   fashion_at_brown: require('../assets/badges/fashion_at_brown.png'),
   fencing: require('../assets/badges/fencing.png'),
   field_hockey: require('../assets/badges/field_hockey.png'),
   football: require('../assets/badges/football.png'),
   golf: require('../assets/badges/golf.png'),
+  graduate_school: require('../assets/badges/graduate_school.png'),
   gymnastics: require('../assets/badges/gymnastics.png'),
   hockey: require('../assets/badges/hockey.png'),
+  hotel_administration: require('../assets/badges/hotel_administration.png'),
+  iff: require('../assets/badges/iff.png'),
+  ilr: require('../assets/badges/ilr.png'),
   impulse_and_mezcla: require('../assets/badges/impulse_and_mezcla.png'),
   kappa_alpha_theta: require('../assets/badges/kappa_alpha_theta.png'),
   kappa_delta: require('../assets/badges/kappa_delta.png'),
@@ -69,6 +82,7 @@ export const _badgeImages = {
   polo: require('../assets/badges/polo.png'),
   rowing: require('../assets/badges/rowing.png'),
   sailing: require('../assets/badges/sailing.png'),
+  sc_johnson_school_of_management: require('../assets/badges/sc_johnson_school_of_management.png'),
   sigma_alpha_mu: require('../assets/badges/sigma_alpha_mu.png'),
   sigma_chi: require('../assets/badges/sigma_chi.png'),
   sigma_delta_tau: require('../assets/badges/sigma_delta_tau.png'),
@@ -77,6 +91,7 @@ export const _badgeImages = {
   soccer: require('../assets/badges/soccer.png'),
   softball: require('../assets/badges/softball.png'),
   squash: require('../assets/badges/squash.png'),
+  student_agencies: require('../assets/badges/student_agencies.png'),
   swimming_and_diving: require('../assets/badges/swimming_and_diving.png'),
   tap: require('../assets/badges/tap.png'),
   tennis: require('../assets/badges/tennis.png'),
@@ -86,6 +101,8 @@ export const _badgeImages = {
   track_and_field: require('../assets/badges/track_and_field.png'),
   ucs: require('../assets/badges/ucs.png'),
   volleyball: require('../assets/badges/volleyball.png'),
+  weill_cornell_medical_sciences: require('../assets/badges/weill_cornell_medical_sciences.png'),
+  weill_cornell_medicine: require('../assets/badges/weill_cornell_medicine.png'),
   women_in_business: require('../assets/badges/women_in_business.png'),
   wrestling: require('../assets/badges/wrestling.png'),
   zeta_beta_tau: require('../assets/badges/zeta_beta_tau.png'),
@@ -244,13 +261,13 @@ const _brownUniversityBadges = [
         badgeImage: _badgeImages.fashion_at_brown,
       },
       {
-        badgeName: 'Impulse',
-        badgeImage: _badgeImages.impulse_and_mezcla,
-      },
-      {
         badgeName: 'Ivy Film Festival ',
         badgeImage: _badgeImages.iff,
       },
+      {
+        badgeName: 'Impulse',
+        badgeImage: _badgeImages.impulse_and_mezcla,
+      },
     ],
   },
   {
@@ -629,6 +646,89 @@ const _cornellUniversityBadges = [
       },
     ],
   },
+  {
+    title: 'School',
+    data: [
+      {
+        badgeName: 'College of Agriculture and Life Sciences or (CALS)',
+        badgeImage: _badgeImages.cals,
+      },
+      {
+        badgeName: 'College of Architecture, Art and Planning or (AAP)',
+        badgeImage: _badgeImages.aap,
+      },
+      {
+        badgeName: 'College of Arts and Sciences ',
+        badgeImage: _badgeImages.college_of_arts_and_sciences,
+      },
+      {
+        badgeName: 'Hotel Administration ',
+        badgeImage: _badgeImages.hotel_administration,
+      },
+      {
+        badgeName: 'Dyson School',
+        badgeImage: _badgeImages.dyson_school,
+      },
+      {
+        badgeName: 'College of Engineering ',
+        badgeImage: _badgeImages.college_of_engineering,
+      },
+      {
+        badgeName: 'College of Human Ecology',
+        badgeImage: _badgeImages.college_of_human_ecology,
+      },
+      {
+        badgeName: 'School of Industrial and Labor Relations or ILR',
+        badgeImage: _badgeImages.ilr,
+      },
+    ],
+  },
+  {
+    title: 'Graduate Program',
+    data: [
+      {
+        badgeName: 'SC Johnson School of Management',
+        badgeImage: _badgeImages.sc_johnson_school_of_management,
+      },
+      {
+        badgeName: 'Conrell Tech (NYC)',
+        badgeImage: _badgeImages.cornell_tech,
+      },
+      {
+        badgeName: 'Cornell Law School',
+        badgeImage: _badgeImages.cornell_law_school,
+      },
+      {
+        badgeName: 'College of Veterinary Medicine',
+        badgeImage: _badgeImages.college_of_veterinary_medicine,
+      },
+      {
+        badgeName: 'Graduate School',
+        badgeImage: _badgeImages.graduate_school,
+      },
+      {
+        badgeName: 'Weill Cornell Medicine (NYC)',
+        badgeImage: _badgeImages.weill_cornell_medicine,
+      },
+      {
+        badgeName: 'Weill Cornell Medical Sciences (NYC)',
+        badgeImage: _badgeImages.weill_cornell_medical_sciences,
+      },
+    ],
+  },
+  {
+    title: 'Network',
+    data: [
+      {
+        badgeName: 'Entrepreneurship @ Cornell ',
+        badgeImage: _badgeImages.entrepreneurship_at_cornell,
+      },
+      {
+        badgeName: 'Student Agencies, INC',
+        badgeImage: _badgeImages.student_agencies,
+      },
+    ],
+  },
 ];
 
 export const BADGE_DATA: BadgeDataType = {
diff --git a/src/screens/badge/BadgeItem.tsx b/src/screens/badge/BadgeItem.tsx
index 1051d4a7..e4f1b1da 100644
--- a/src/screens/badge/BadgeItem.tsx
+++ b/src/screens/badge/BadgeItem.tsx
@@ -43,9 +43,15 @@ const BadgeItem: React.FC<BadgeItemProps> = ({
           style={styles.item}>
           <View style={styles.detailContainer}>
             <Image source={resourcePath} style={styles.imageStyles} />
-            <View style={styles.textContainer}>
-              <Text style={styles.title}>{title}</Text>
-            </View>
+            <Text
+              style={[
+                styles.title,
+                title.length > 30
+                  ? {fontSize: normalize(12), lineHeight: normalize(16)}
+                  : {},
+              ]}>
+              {title}
+            </Text>
           </View>
         </LinearGradient>
       </TouchableOpacity>
@@ -53,33 +59,30 @@ const BadgeItem: React.FC<BadgeItemProps> = ({
   );
 };
 
+const ITEM_WIDTH = SCREEN_WIDTH / 3 - 20;
+
 const styles = StyleSheet.create({
   border: {
-    width: SCREEN_WIDTH / 3 - 20 + 6,
-    height: 146,
+    width: ITEM_WIDTH + 6,
+    height: 156,
     marginLeft: 10,
     marginBottom: 12,
     borderRadius: 8,
   },
   item: {
-    width: SCREEN_WIDTH / 3 - 20,
-    height: 140,
+    width: ITEM_WIDTH,
+    height: 150,
     borderRadius: 8,
   },
   detailContainer: {
     flexGrow: 1,
-    justifyContent: 'center',
+    justifyContent: 'space-evenly',
     alignItems: 'center',
-    borderWidth: 3,
-    borderRadius: 8,
-    borderColor: 'transparent',
   },
   imageStyles: {
-    width: 40,
-    height: 40,
-    marginTop: '11%',
+    width: normalize(50),
+    height: normalize(50),
   },
-  textContainer: {marginTop: '16%'},
   title: {
     fontSize: normalize(15),
     fontWeight: '500',