Merge pull request #173 from sparcs-kaist/feat@refactoring-people-page

Resolve #172, Refactoring people page
sparcs-kaist · Mar 29, 2024 · 9e0c161 · 9e0c161
2 parents 7d42261 + 4738034
commit 9e0c161
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 5 deletions.
diff --git a/assets/fonts/NanumSquareB.otf b/assets/fonts/NanumSquareB.otf
diff --git a/assets/fonts/NanumSquareEB.otf b/assets/fonts/NanumSquareEB.otf
diff --git a/assets/fonts/NanumSquareL.otf b/assets/fonts/NanumSquareL.otf
diff --git a/assets/fonts/NanumSquareR.otf b/assets/fonts/NanumSquareR.otf
diff --git a/assets/fonts/Raleway-Black.ttf b/assets/fonts/Raleway-Black.ttf
diff --git a/assets/fonts/Raleway-Bold.ttf b/assets/fonts/Raleway-Bold.ttf
diff --git a/assets/fonts/Raleway-ExtraBold.ttf b/assets/fonts/Raleway-ExtraBold.ttf
diff --git a/assets/fonts/Raleway-Light.ttf b/assets/fonts/Raleway-Light.ttf
diff --git a/assets/fonts/Raleway-Medium.ttf b/assets/fonts/Raleway-Medium.ttf
diff --git a/assets/fonts/Raleway-Regular.ttf b/assets/fonts/Raleway-Regular.ttf
diff --git a/assets/fonts/Raleway-Thin.ttf b/assets/fonts/Raleway-Thin.ttf
diff --git a/assets/icons/SPARCS.svg b/assets/icons/SPARCS.svg
diff --git a/lib/pages/people_page.dart b/lib/pages/people_page.dart
@@ -59,11 +59,35 @@ class PeoplePage extends StatelessWidget {
       'Developer',
     ];
 
+    const Map<String, dynamic> people_info = {
+      'yumyum': {
+        'name': '조유민',
+      },
+      'platypus': {
+        'name': '오승빈',
+      },
+      'star': {
+        'name': '문동우',
+      },
+      'lobe': {
+        'name': '정성엽',
+      },
+      'seungho': {
+        'name': '장승호',
+      },
+      'soongyu': {
+        'name': '권순규',
+      },
+      'edge': {
+        'name': '정재현',
+      },
+    };
+
     const List<List<String>> people = [
       ['yumyum'],
       ['platypus'],
       ['yumyum'],
-      ['platypus', 'star', 'lobe', 'seungho', 'soongyu'],
+      ['platypus', 'star', 'lobe', 'seungho', 'soongyu', 'edge'],
     ];
 
     return List.generate(
@@ -79,10 +103,49 @@ class PeoplePage extends StatelessWidget {
             people[i].length,
             (j) => Column(
               children: [
-                const SizedBox(height: 4.0),
-                SvgPicture.asset(
-                  'assets/people/${people[i][j]}.svg',
-                  height: 24.0,
+                const SizedBox(
+                  height: 4.0,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    SvgPicture.asset(
+                      'assets/icons/SPARCS.svg',
+                      height: 24.0,
+                    ),
+                    const SizedBox(
+                      width: 4,
+                    ),
+                    Text(
+                      people[i][j],
+                      style: TextStyle(
+                        color: Color(0xFFEBA12A),
+                        fontSize: 15,
+                        fontFamily: 'Raleway',
+                        fontWeight: FontWeight.w800,
+                        letterSpacing: 0.15,
+                        leadingDistribution: TextLeadingDistribution.even,
+                      ),
+                    ),
+                    const SizedBox(
+                      width: 3,
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(bottom: 2.0),
+                      child: Text(
+                        people_info[people[i][j]]['name'],
+                        style: TextStyle(
+                          color: Color(0xFFEBA12A).withOpacity(0.4),
+                          fontFamily: 'NanumSquare',
+                          fontSize: 9.5,
+                          fontWeight: FontWeight.w800,
+                          letterSpacing: 0.15,
+                          leadingDistribution: TextLeadingDistribution.even,
+                        ),
+                      ),
+                    ),
+                  ],
                 )
               ],
             ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -103,6 +103,32 @@ flutter:
           weight: 700
         - asset: assets/fonts/NotoSansKR-Black.otf
           weight: 900
+    - family: Raleway
+      fonts:
+        - asset: assets/fonts/Raleway-Thin.ttf
+          weight: 100
+        - asset: assets/fonts/Raleway-Light.ttf
+          weight: 300
+        - asset: assets/fonts/Raleway-Regular.ttf
+          weight: 400
+        - asset: assets/fonts/Raleway-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Raleway-Bold.ttf
+          weight: 700
+        - asset: assets/fonts/Raleway-ExtraBold.ttf
+          weight: 800
+        - asset: assets/fonts/Raleway-Black.ttf
+          weight: 900
+    - family: NanumSquare
+      fonts:
+        - asset: assets/fonts/NanumSquareL.otf
+          weight: 300
+        - asset: assets/fonts/NanumSquareR.otf
+          weight: 400
+        - asset: assets/fonts/NanumSquareB.otf
+          weight: 700
+        - asset: assets/fonts/NanumSquareEB.otf
+          weight: 800
 
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages