Merge pull request #30 from langx/fix-font

Fix font
langx · Jun 28, 2024 · 46978c4 · 46978c4
2 parents f213f31 + e95b932
commit 46978c4
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 236 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,4 +43,7 @@ app.*.map.json
 /android/app/release
 
 # Environment
-.env
+.env
+
+# Vscode
+.vscode/
diff --git a/lib/components/bottom_navigation_bar.dart b/lib/components/bottom_navigation_bar.dart
@@ -28,7 +28,6 @@ class AppBottomNavigationBar extends StatelessWidget {
         ),
       ],
       currentIndex: currentIndex,
-      selectedItemColor: Colors.amber[800],
       onTap: onTap,
     );
   }

diff --git a/lib/components/profile/about_me_card.dart b/lib/components/profile/about_me_card.dart
@@ -47,11 +47,9 @@ class ProfileAboutMeCard extends StatelessWidget {
           height: cardHeight,
           width: MediaQuery.of(context).size.width,
           child: Card(
-            elevation: 5.0,
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(16.0),
             ),
-            color: Colors.white,
             child: Padding(
               padding: const EdgeInsets.all(16.0),
               child: Column(

diff --git a/lib/components/profile/badges_card.dart b/lib/components/profile/badges_card.dart
@@ -14,11 +14,9 @@ class BadgesCard extends StatelessWidget {
       height: 260,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(

diff --git a/lib/components/profile/day_streaks_card.dart b/lib/components/profile/day_streaks_card.dart
@@ -16,11 +16,9 @@ class ProfileDayStreaksCard extends StatelessWidget {
       height: 250,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(

diff --git a/lib/components/profile/mother_tongues_card.dart b/lib/components/profile/mother_tongues_card.dart
@@ -17,11 +17,9 @@ class MotherTonguesCard extends StatelessWidget {
       height: 165,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
@@ -66,7 +64,6 @@ class MotherTonguesCard extends StatelessWidget {
                             languages[index],
                             style: const TextStyle(
                               fontSize: 18,
-                              color: Colors.black,
                             ),
                           ),
                           const Spacer(),

diff --git a/lib/components/profile/others_card.dart b/lib/components/profile/others_card.dart
@@ -15,11 +15,9 @@ class OthersCard extends StatelessWidget {
       height: 230,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(

diff --git a/lib/components/profile/study_languages_card.dart b/lib/components/profile/study_languages_card.dart
@@ -17,11 +17,9 @@ class StudyLanguagesCard extends StatelessWidget {
       height: 165,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
@@ -66,7 +64,6 @@ class StudyLanguagesCard extends StatelessWidget {
                             languages[index],
                             style: const TextStyle(
                               fontSize: 18,
-                              color: Colors.black,
                             ),
                           ),
                           const Spacer(),

diff --git a/lib/components/profile/token_card.dart b/lib/components/profile/token_card.dart
@@ -17,11 +17,9 @@ class ProfileTokenCard extends StatelessWidget {
       height: 320,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
@@ -109,7 +107,6 @@ class ProfileTokenCard extends StatelessWidget {
                             'Leaderboard',
                             style: TextStyle(
                               fontSize: 18,
-                              color: Colors.black,
                             ),
                           ),
                           const Spacer(),
@@ -122,10 +119,6 @@ class ProfileTokenCard extends StatelessWidget {
                         ],
                       ),
                     ),
-                    Container(
-                      height: 1,
-                      color: Colors.grey[300],
-                    ),
                   ],
                 ),
               ),

diff --git a/lib/components/profile/user_card.dart b/lib/components/profile/user_card.dart
@@ -24,11 +24,9 @@ class ProfileUserCard extends StatelessWidget {
       height: 330,
       width: MediaQuery.of(context).size.width,
       child: Card(
-        elevation: 5.0,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16.0),
         ),
-        color: Colors.white,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ class AppBottomNavigationBar extends StatelessWidget { @@
             ),
           ],
           currentIndex: currentIndex,
-          selectedItemColor: Colors.amber[800],
           onTap: onTap,
         );
       }
@@ Expand Down @@