Merge pull request #202 from Shreya-Bhatia/main

Changed fonts of sidebar
TSEC-MAD-Club · Jul 13, 2024 · ce8e31c · ce8e31c
2 parents a39758d + adb8b55
commit ce8e31c
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 13 deletions.
diff --git a/assets/fonts/Karla-VariableFont_wght.ttf b/assets/fonts/Karla-VariableFont_wght.ttf
diff --git a/assets/fonts/Montserrat-Regular.ttf b/assets/fonts/Montserrat-Regular.ttf
diff --git a/lib/new_ui/screens/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart
@@ -452,7 +452,10 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                                   .of(context)
                                   .textTheme
                                   .headlineLarge!
-                                  .copyWith(fontSize: 20),
+                                  .copyWith(
+                                    fontSize: 20,
+                                    fontFamily: 'Karla'
+                                  ),
                             ),
                             SizedBox(height: 5,),
                             Text(
@@ -486,6 +489,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineMedium!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 0
                               ? Theme
                               .of(context)
@@ -532,6 +536,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineMedium!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 7
                               ? Theme
                               .of(context)
@@ -563,6 +568,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineSmall!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 6
                               ? Theme
                               .of(context)
@@ -598,6 +604,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineSmall!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 5
                               ? Theme
                               .of(context)
@@ -668,6 +675,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineMedium!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: Colors.white,
                         ),
                       ),
@@ -698,6 +706,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                                   .headlineMedium!
                                   .copyWith(
                                 fontSize: 13,
+                                fontFamily: 'Montserrat',
                                 color: currentPage == 4
                                     ? Theme
                                     .of(context)
@@ -721,6 +730,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineSmall!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 5
                               ? Theme
                               .of(context)
@@ -752,6 +762,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             .headlineSmall!
                             .copyWith(
                           fontSize: 13,
+                          fontFamily: 'Montserrat',
                           color: currentPage == 5
                               ? Theme
                               .of(context)

diff --git a/pubspec.lock b/pubspec.lock
@@ -784,6 +784,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.8.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   linkify:
     dependency: transitive
     description:
@@ -820,26 +844,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -876,10 +900,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -1225,10 +1249,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   textfield_search:
     dependency: "direct main"
     description:
@@ -1349,6 +1373,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
@@ -1438,5 +1470,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
-  flutter: ">=3.16.6"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -127,6 +127,13 @@ flutter:
           weight: 400
         - asset: assets/fonts/SF-Pro-Text-Semibold.otf
           weight: 600
+    - family: Montserrat
+      fonts:
+        - asset: assets/fonts/Montserrat-Regular.ttf
+          weight: 400
+    - family: Karla
+      fonts:
+        - asset: assets/fonts/Karla-VariableFont_wght.ttf          
     - family: Priego 
       fonts:
         - asset: assets/fonts/priego-extrabold.otf