From c98acbdf1ad3871735903711e56e35ea8e98e2c2 Mon Sep 17 00:00:00 2001
From: w8385 <w8385@naver.com>
Date: Mon, 5 Jun 2023 13:58:29 +0900
Subject: [PATCH] feat: Badge categorize

---
 my_solved/lib/assets/icons/badge.svg   | 18 +++----
 my_solved/lib/widgets/user_widget.dart | 68 ++++++++++++++++++++------
 2 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/my_solved/lib/assets/icons/badge.svg b/my_solved/lib/assets/icons/badge.svg
index 8f7ffc93..575c7978 100644
--- a/my_solved/lib/assets/icons/badge.svg
+++ b/my_solved/lib/assets/icons/badge.svg
@@ -1,13 +1,7 @@
-<svg stroke-width="0" viewBox="0 0 512 512" width="1em" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M269 335.61q-6.33.47-12.78.47c-5.23 0-10.4-.24-15.51-.69a176.11 176.11 0 01-127.67-72.94 4 4 0 00-6.77.35l-72 129.4c-2.74 5-3.17 11-.28 15.88A16.78 16.78 0 0048.22 416h78a15.28 15.28 0 0113.62 7.33L178.5 488a16.26 16.26 0 0013.75 8c5.94-.33 12.09-4.19 14.56-9.6l66.11-145.15a4 4 0 00-3.92-5.64zm208.64 56.27l-71.53-129.17a4 4 0 00-6.74-.36 176.5 176.5 0 01-78.31 61.42 16.09 16.09 0 00-8.72 8.25l-36.86 81.1a7.92 7.92 0 000 6.6l30.27 66.59c2.45 5.41 8.59 9.36 14.52 9.69a16.3 16.3 0 0013.7-8.12l38.53-64.58c2.89-4.85 8.13-7.33 13.78-7.3h78.77c6.67 0 11.72-3.48 14-10a16.92 16.92 0 00-1.41-14.12z">
-
-    </path>
-    <ellipse cx="256.26" cy="160" rx="48.01" ry="48">
-
-    </ellipse>
-    <path
-        d="M256.26 16c-79.42 0-144 64.59-144 144s64.61 144 144 144 144-64.6 144-144-64.59-144-144-144zm0 224a80 80 0 1180-80 80.1 80.1 0 01-80 80z">
-
-    </path>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+    class="tabler-icon tabler-icon-award">
+    <path d="M12 9m-6 0a6 6 0 1 0 12 0a6 6 0 1 0 -12 0"></path>
+    <path d="M12 15l3.4 5.89l1.598 -3.233l3.598 .232l-3.4 -5.889"></path>
+    <path d="M6.802 12l-3.4 5.89l3.598 -.233l1.598 3.232l3.4 -5.889"></path>
 </svg>
\ No newline at end of file
diff --git a/my_solved/lib/widgets/user_widget.dart b/my_solved/lib/widgets/user_widget.dart
index 6e690a82..9fbe55e4 100644
--- a/my_solved/lib/widgets/user_widget.dart
+++ b/my_solved/lib/widgets/user_widget.dart
@@ -854,14 +854,14 @@ Widget badges(BuildContext context, Future<Badges> future) {
         }
         temp[0].sort((a, b) => a['badgeId'].compareTo(b['badgeId']));
 
-        List<dynamic> badges = [];
+        List<dynamic> badges = [[], [], [], []];
         for (int i = 0; i < 4; i++) {
           for (int j = 0; j < temp[i].length; j++) {
-            badges.add(temp[i][j]);
+            badges[i].add(temp[i][j]);
           }
         }
 
-        Widget badgeTier(BuildContext context, dynamic badge, int idx) {
+        Widget badgeTier(BuildContext context, dynamic badge) {
           String tier = badge['badgeTier'];
           bool isContest = badge['badgeCategory'] == 'contest';
           Color tierColor = Colors.white;
@@ -954,20 +954,60 @@ Widget badges(BuildContext context, Future<Badges> future) {
                 );
         }
 
+        const badgeCategory = ['도전과제', '시즌 도전과제', '이벤트', '대회'];
+
+        Widget badgeContainer(BuildContext context, int category) {
+          return Column(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                margin: EdgeInsets.only(
+                    left: MediaQuery.of(context).size.width * 0.05),
+                // padding: const EdgeInsets.all(10),
+                child: Row(
+                  children: [
+                    SvgPicture.asset(
+                      'lib/assets/icons/badge.svg',
+                      width: MediaQuery.of(context).size.width * 0.04,
+                      color: Colors.black45,
+                    ),
+                    const SizedBox(width: 5),
+                    Text(
+                      badgeCategory[category],
+                      style: TextStyle(
+                        fontSize: MediaQuery.of(context).size.width * 0.04,
+                        color: Colors.black45,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              GridView.builder(
+                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 6,
+                    childAspectRatio: 1,
+                  ),
+                  shrinkWrap: true,
+                  physics: NeverScrollableScrollPhysics(),
+                  itemCount: badges[category].length,
+                  itemBuilder: (BuildContext context, int index) {
+                    return badgeTier(context, badges[category][index]);
+                  }),
+              Divider(
+                color: Colors.black12,
+                thickness: 1,
+              )
+            ],
+          );
+        }
+
         return Column(
           children: [
             const SizedBox(height: 10),
-            GridView.builder(
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: 6,
-                  childAspectRatio: 1,
-                ),
-                shrinkWrap: true,
-                physics: NeverScrollableScrollPhysics(),
-                itemCount: count,
-                itemBuilder: (BuildContext context, int index) {
-                  return badgeTier(context, badges[index], index);
-                })
+            for (int i = 0; i < 4; i++) badgeContainer(context, i),
           ],
         );
       } else {