➕ Add google_fonts

Add warning if select tajwid kdn option, now defaulted to no tajwid
My-Quran-Tajwid · Dec 23, 2024 · 90a598c · 90a598c
1 parent 7edfa6e
commit 90a598c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,7 @@
 import 'dart:developer';
 
 import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 
 import 'database/mydb.dart';
 import 'utils/runtime_font_loader.dart';
@@ -56,6 +57,7 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
         useMaterial3: true,
+        textTheme: GoogleFonts.spaceGroteskTextTheme(),
       ),
       home: const HomePage(),
     );

diff --git a/lib/views/components/preview_control_card.dart b/lib/views/components/preview_control_card.dart
@@ -44,6 +44,8 @@ class _PreviewControlCardState extends State<PreviewControlCard> {
                     .map((previewType) => DropdownMenuItem(
                           value: previewType,
                           child: Text(previewType.label),
+                          // TODO: Remove this after adding page preview feature
+                          enabled: previewType == PreviewType.justText,
                         ))
                     .toList(),
                 onChanged: (value) {

diff --git a/lib/views/home_page.dart b/lib/views/home_page.dart
@@ -37,7 +37,8 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage> {
   late Future<List<SurahItem>> _surahListFuture;
 
-  TajwidOptions _selectedTajwidOption = TajwidOptions.tajwidKdn;
+  // TODO: Default to Tajwid KDN after the fonts is ready
+  TajwidOptions _selectedTajwidOption = TajwidOptions.noTajwid;
 
   // Set default to surah al fatihah
   int fromSurah = 1;
@@ -98,8 +99,13 @@ class _HomePageState extends State<HomePage> {
                             ),
                           );
                         },
-                        child: Text('Quran Computer Publication',
-                            style: Theme.of(context).textTheme.titleLarge),
+                        child: const Text(
+                          'Quran Computer Publication',
+                          style: TextStyle(
+                            fontSize: 30,
+                            fontWeight: FontWeight.w600,
+                          ),
+                        ),
                       ),
                     ),
                     const Gap(24),
@@ -148,6 +154,14 @@ class _HomePageState extends State<HomePage> {
                               )
                             ],
                           ),
+                          // TODO: Remove this warning after the fonts is ready
+                          if (_selectedTajwidOption == TajwidOptions.tajwidKdn)
+                            const Text(
+                              'Warning: Tajwid font is experimental and in early stage of development. You might encounter missing glyphs.',
+                              style: TextStyle(
+                                color: Colors.deepOrange,
+                              ),
+                            ),
                         ],
                       ),
                     ),

diff --git a/pubspec.lock b/pubspec.lock
@@ -317,6 +317,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.1"
   graphs:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -36,6 +36,7 @@ dependencies:
   drift_flutter: ^0.2.1
   drift: ^2.21.0
   gap: ^3.0.1
+  google_fonts: ^6.2.1
   package_info_plus: ^8.1.1
   path_provider: ^2.1.5
   path: ^1.9.0