Fixing Pali Word fonts & share

* fonts are now serif * share is now sort of shaped like the card (albeit still text-only)
pariyatti · Aug 10, 2022 · 8bc07b9 · 8bc07b9
1 parent c5ca556
commit 8bc07b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/app/style.dart b/lib/app/style.dart
@@ -14,11 +14,11 @@ sanSerifFont({BuildContext? context, double? fontSize, Color? color, TextStyle?
       color: color ?? getColor(context)));
 }
 
-serifFont({BuildContext? context, TextStyle? textStyle}) {
+serifFont({BuildContext? context, double? fontSize, Color? color, TextStyle? textStyle}) {
   return GoogleFonts.getFont('Gentium Book Basic', textStyle: TextStyle(
       inherit: true,
-      fontSize: textStyle?.fontSize ?? 18.0,
+      fontSize: fontSize ?? textStyle?.fontSize ?? 18.0,
       fontWeight: FontWeight.normal,
       fontStyle: textStyle?.fontStyle ?? FontStyle.normal,
-      color: getColor(context)));
+      color: color ?? getColor(context)));
 }
diff --git a/lib/ui/widgets/cards/PaliWordCard.dart b/lib/ui/widgets/cards/PaliWordCard.dart
@@ -71,7 +71,7 @@ class PaliWordCard extends StatelessWidget {
                     ),
                     child: Text(
                         data.pali ?? "<pali text was empty>",
-                        style: sanSerifFont(context: context, fontSize: 18.0, color: Theme.of(context).colorScheme.onSurface)
+                        style: serifFont(context: context, fontSize: 18.0, color: Theme.of(context).colorScheme.onSurface)
                     ),
                   )
                 ),
@@ -95,7 +95,7 @@ class PaliWordCard extends StatelessWidget {
                     padding: const EdgeInsets.fromLTRB(12.0, 0.0, 12.0, 12.0),
                     child: Text(
                         data.translation ?? "<translation was empty>",
-                        style: sanSerifFont(context: context, fontSize: 18.0, color: Theme.of(context).colorScheme.onSurface)
+                        style: serifFont(context: context, fontSize: 18.0, color: Theme.of(context).colorScheme.onSurface)
                     ),
                   )
                 )
@@ -117,7 +117,7 @@ class PaliWordCard extends StatelessWidget {
         await WcFlutterShare.share(
           sharePopupTitle: AppStrings.get().labelSharePaliWord,
           mimeType: 'text/plain',
-          text: '${data.header}: ${data.pali}\n${AppStrings.get().labelTranslation}: ${data.translation}',
+          text: '${data.header}: \n${data.pali}\n\n${AppStrings.get().labelTranslation}: \n${data.translation}',
         );
       },
     ));