[#231] [NF] BrandBook and Custom Theme. Correct styling for titles an…

…d buttons
lyskouski · Sep 16, 2023 · 329f442 · 329f442
1 parent d64ab5f
commit 329f442
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/lib/_configs/custom_color_scheme.dart b/lib/_configs/custom_color_scheme.dart
@@ -52,8 +52,7 @@ class AppDefaultColors {
   }
 
   factory AppDefaultColors.fromJson(Map<String, dynamic> json) {
-    final palette = AppDefaultColors();
-    return palette
+    return AppDefaultColors()
       ..primary = Color(json['primary'])
       ..inversePrimary = Color(json['inversePrimary'])
       ..onSecondary = Color(json['onSecondary'])

diff --git a/lib/_configs/custom_text_theme.dart b/lib/_configs/custom_text_theme.dart
@@ -10,6 +10,21 @@ extension CustomTextTheme on TextTheme {
 
   static TextTheme? textTheme(ThemeData baseTheme) {
     return baseTheme.textTheme.copyWith(
+      titleLarge: GoogleFonts.abel(
+        fontSize: 32,
+        fontWeight: FontWeight.w400,
+        letterSpacing: letterSpacingOrNone(1.2),
+      ),
+      titleMedium: GoogleFonts.abel(
+        fontSize: 18,
+        fontWeight: FontWeight.w400,
+        letterSpacing: letterSpacingOrNone(1.2),
+      ),
+      titleSmall: GoogleFonts.abel(
+        fontSize: 12,
+        fontWeight: FontWeight.w400,
+        letterSpacing: letterSpacingOrNone(1.2),
+      ),
       headlineLarge: GoogleFonts.abel(
         fontSize: 32,
         fontWeight: FontWeight.w400,

diff --git a/lib/pages/about_page.dart b/lib/pages/about_page.dart
@@ -114,6 +114,7 @@ class AboutPageState extends AbstractPageState<AboutPage> with LauncherMixin {
               },
             ),
           ),
+          ThemeHelper.formEndBox,
         ],
       ),
     );

diff --git a/lib/pages/subscription/widgets/other_widget.dart b/lib/pages/subscription/widgets/other_widget.dart
@@ -4,7 +4,7 @@
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_mixins/launcher_mixin.dart';
-import 'package:app_finance/widgets/wrapper/elevate_button_widget.dart';
+import 'package:app_finance/widgets/wrapper/full_sized_button_widget.dart';
 import 'package:flutter/material.dart';
 
 class OtherWidget extends StatelessWidget with LauncherMixin {
@@ -15,33 +15,33 @@ class OtherWidget extends StatelessWidget with LauncherMixin {
     return Expanded(
       child: Column(children: [
         ThemeHelper.hIndent,
-        ElevatedButtonWidget(
-          onPressed: () => openURL('https://www.buymeacoffee.com/lyskouski'),
-          text: AppLocale.labels.subscriptionCoffee,
+        FullSizedButtonWidget(
+          setState: () => openURL('https://www.buymeacoffee.com/lyskouski'),
+          title: AppLocale.labels.subscriptionCoffee,
           icon: Icons.coffee,
         ),
         ThemeHelper.hIndent2x,
-        ElevatedButtonWidget(
-          onPressed: () => openURL('https://paypal.me/terCAD'),
-          text: AppLocale.labels.subscriptionPaypal,
+        FullSizedButtonWidget(
+          setState: () => openURL('https://paypal.me/terCAD'),
+          title: AppLocale.labels.subscriptionPaypal,
           icon: Icons.coffee_maker,
         ),
         ThemeHelper.hIndent2x,
-        ElevatedButtonWidget(
-          onPressed: () => openURL('https://donorbox.org/tercad'),
-          text: AppLocale.labels.subscriptionDonorbox,
+        FullSizedButtonWidget(
+          setState: () => openURL('https://donorbox.org/tercad'),
+          title: AppLocale.labels.subscriptionDonorbox,
           icon: Icons.support,
         ),
         ThemeHelper.hIndent2x,
-        ElevatedButtonWidget(
-          onPressed: () => openURL('https://patreon.com/terCAD'),
-          text: AppLocale.labels.subscriptionPatreon,
+        FullSizedButtonWidget(
+          setState: () => openURL('https://patreon.com/terCAD'),
+          title: AppLocale.labels.subscriptionPatreon,
           icon: Icons.pattern,
         ),
         ThemeHelper.hIndent2x,
-        ElevatedButtonWidget(
-          onPressed: () => openURL('https://github.com/sponsors/lyskouski'),
-          text: AppLocale.labels.subscriptionGithub,
+        FullSizedButtonWidget(
+          setState: () => openURL('https://github.com/sponsors/lyskouski'),
+          title: AppLocale.labels.subscriptionGithub,
           icon: Icons.gite,
         ),
       ]),

diff --git a/lib/widgets/wrapper/full_sized_button_widget.dart b/lib/widgets/wrapper/full_sized_button_widget.dart
@@ -16,30 +16,31 @@ class FullSizedButtonWidget extends AbstractInput {
   final OnPressedFunction setState;
   final String title;
   final IconData icon;
-  final BoxConstraints constraints;
+  final BoxConstraints? constraints;
   late final String heroTag;
 
   FullSizedButtonWidget({
     super.key,
     required this.setState,
-    required this.constraints,
     required this.title,
     required this.icon,
+    this.constraints,
   }) : super(value: null) {
     heroTag = 'fz_button_${UniqueKey()}';
   }
 
   @override
   Widget buildContent(BuildContext context) {
-    final isBottom = ResponsiveMatrix(getWindowType(context)).isNavBottom(constraints);
+    final isBottom = constraints != null ? ResponsiveMatrix(getWindowType(context)).isNavBottom(constraints!) : false;
     final bool isKeyboardVisible = ThemeHelper.isKeyboardVisible(context) || isBottom;
     final colorScheme = context.colorScheme;
-    final width = constraints.maxWidth - ThemeHelper.getIndent(4) - 2;
+    final width = constraints != null ? constraints!.maxWidth - ThemeHelper.getIndent(4) - 2 : double.infinity;
     return SizedBox(
       width: isKeyboardVisible ? null : width,
       child: FloatingActionButton(
         heroTag: heroTag,
         onPressed: setState,
+        hoverColor: colorScheme.primary,
         tooltip: title,
         focusNode: FocusController.getFocusNode(),
         child: Row(
-Original file line number
+Diff line change
@@ Expand Up @@
                   },
                 ),
               ),
+              ThemeHelper.formEndBox,
             ],
           ),
         );
@@ Expand Down @@