Merge pull request #11 from Mastersam07/hotfix-batthemedata

✨ chore: provide defaults for theming styles
Mastersam07 · Apr 24, 2023 · 9940a34 · 9940a34
2 parents 86f4151 + 9d8d190
commit 9940a34
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -58,6 +58,23 @@ class MyApp extends StatelessWidget {
 }
 ```
 
+Or you can also use the `BatThemeData` light/dark constructors:
+
+```dart
+class MyApp extends StatelessWidget {
+  const MyApp({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+        theme: BatThemeData.light(),
+        darkTheme: BatThemeData.dark(),
+        home: Homepage(),
+    );
+  }
+}
+```
+
 ## Full Usage
 
 You can check the [example](./example) to see this theming system in usage.

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -39,6 +39,8 @@ class MyApp extends StatelessWidget {
               debugShowCheckedModeBanner: false,
               title: 'Smarty',
               themeMode: value.theme,
+              theme: const BatThemeData.light(),
+              darkTheme: const BatThemeData.dark(),
               home: const MyHomePage(),
               onGenerateRoute: AppRouter.generateRoutes,
               navigatorKey: AppNavigator.key,

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -231,6 +231,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.5"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.8.0"
   lints:
     dependency: transitive
     description:
@@ -271,6 +279,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  opay_online_flutter_sdk:
+    dependency: "direct main"
+    description:
+      name: opay_online_flutter_sdk
+      sha256: b76039ade09403ca845876dc4cae734047f27a57048f671bcf4e9477da8022f5
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.6"
   path:
     dependency: transitive
     description:
@@ -500,6 +516,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  webview_flutter:
+    dependency: transitive
+    description:
+      name: webview_flutter
+      sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.4"
+  webview_flutter_android:
+    dependency: transitive
+    description:
+      name: webview_flutter_android
+      sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.4"
+  webview_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: webview_flutter_platform_interface
+      sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.5"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_wkwebview
+      sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.9.5"
   win32:
     dependency: transitive
     description:

diff --git a/lib/src/themes/button_style.dart b/lib/src/themes/button_style.dart
@@ -21,6 +21,17 @@ class BatButtonStyle extends ThemeExtension<BatButtonStyle> {
     this.elevation,
   });
 
+  /// Default for the button style.
+  const BatButtonStyle.fallback()
+      : this(
+          shape: const RoundedRectangleBorder(),
+          elevation: 0.0,
+          childColor: BatPalette.white,
+          color: BatPalette.primary,
+          height: 53,
+          padding: const EdgeInsets.symmetric(vertical: 16),
+        );
+
   /// Default for the light button style.
   const BatButtonStyle.light()
       : this(

diff --git a/lib/src/themes/colors.dart b/lib/src/themes/colors.dart
@@ -14,6 +14,14 @@ class BatColors extends ThemeExtension<BatColors> {
     required this.tertiary,
   });
 
+  const BatColors.fallback()
+      : this(
+          background: BatPalette.white,
+          primary: BatPalette.primary,
+          secondary: BatPalette.secondary,
+          tertiary: BatPalette.grey,
+        );
+
   const BatColors.light()
       : this(
           background: BatPalette.white,

diff --git a/lib/src/themes/theme_data.dart b/lib/src/themes/theme_data.dart
@@ -9,12 +9,26 @@ class BatThemeData extends ThemeExtension<BatThemeData> {
   final BatColors colors;
   final BatTypography typography;
 
-  BatThemeData({
-    required this.colors,
-    required this.buttonStyle,
+  const BatThemeData({
+    this.colors = const BatColors.fallback(),
+    this.buttonStyle = const BatButtonStyle.fallback(),
     this.typography = const BatTypography.regular(),
   });
 
+  const BatThemeData.light()
+      : this(
+          colors: const BatColors.light(),
+          buttonStyle: const BatButtonStyle.light(),
+          typography: const BatTypography.regular(),
+        );
+
+  const BatThemeData.dark()
+      : this(
+          colors: const BatColors.dark(),
+          buttonStyle: const BatButtonStyle.dark(),
+          typography: const BatTypography.regular(),
+        );
+
   static BatThemeData of(BuildContext context) =>
       Theme.of(context).extension<BatThemeData>()!;
 

diff --git a/test/src/themes/theme_data_test.dart b/test/src/themes/theme_data_test.dart
@@ -14,7 +14,7 @@ void main() {
       const buttonStyle = BatButtonStyle();
       const typography = BatTypography.regular();
 
-      final batTheme = BatThemeData(
+      const batTheme = BatThemeData(
         colors: colors,
         buttonStyle: buttonStyle,
         typography: typography,
@@ -26,15 +26,15 @@ void main() {
     });
 
     test('copyWith() creates a new instance with updated properties', () {
-      final batTheme = BatThemeData(
-        colors: const BatColors(
+      const batTheme = BatThemeData(
+        colors: BatColors(
           primary: Colors.red,
           secondary: Colors.blue,
           background: Colors.white,
           tertiary: Colors.green,
         ),
-        buttonStyle: const BatButtonStyle(),
-        typography: const BatTypography.regular(),
+        buttonStyle: BatButtonStyle(),
+        typography: BatTypography.regular(),
       );
 
       const updatedColors = BatColors(
@@ -58,26 +58,26 @@ void main() {
     });
 
     test('lerp() interpolates properties of two BatThemeData instances', () {
-      final batTheme1 = BatThemeData(
-        colors: const BatColors(
+      const batTheme1 = BatThemeData(
+        colors: BatColors(
           primary: Colors.red,
           secondary: Colors.blue,
           background: Colors.white,
           tertiary: Colors.green,
         ),
-        buttonStyle: const BatButtonStyle(),
-        typography: const BatTypography.regular(),
+        buttonStyle: BatButtonStyle(),
+        typography: BatTypography.regular(),
       );
 
-      final batTheme2 = BatThemeData(
-        colors: const BatColors(
+      const batTheme2 = BatThemeData(
+        colors: BatColors(
           primary: Colors.green,
           secondary: Colors.yellow,
           background: Colors.black,
           tertiary: Colors.green,
         ),
-        buttonStyle: const BatButtonStyle(),
-        typography: const BatTypography.regular(),
+        buttonStyle: BatButtonStyle(),
+        typography: BatTypography.regular(),
       );
 
       final interpolatedBatTheme = batTheme1.lerp(batTheme2, 0);
@@ -100,7 +100,7 @@ void main() {
       const typography = BatTypography.regular();
 
       final themeData = ThemeData();
-      final batTheme = BatThemeData(
+      const batTheme = BatThemeData(
         colors: colors,
         buttonStyle: buttonStyle,
         typography: typography,
@@ -126,15 +126,15 @@ void main() {
     });
 
     test('copyWith', () {
-      final original = BatThemeData(
-        colors: const BatColors(
+      const original = BatThemeData(
+        colors: BatColors(
           primary: Colors.red,
           secondary: Colors.blue,
           background: Colors.white,
           tertiary: Colors.green,
         ),
-        buttonStyle: const BatButtonStyle(elevation: 2.0),
-        typography: const BatTypography.regular(),
+        buttonStyle: BatButtonStyle(elevation: 2.0),
+        typography: BatTypography.regular(),
       );
 
       final copy = original.copyWith(

diff --git a/test/src/themes/theme_widget_test.dart b/test/src/themes/theme_widget_test.dart
@@ -10,9 +10,9 @@ void main() {
           (WidgetTester tester) async {
         await tester.pumpWidget(
           BatThemeWidget(
-            data: BatThemeData(
-              buttonStyle: const BatButtonStyle(),
-              colors: const BatColors(
+            data: const BatThemeData(
+              buttonStyle: BatButtonStyle(),
+              colors: BatColors(
                 background: Colors.white,
                 primary: Colors.blue,
                 secondary: Colors.green,
@@ -27,9 +27,9 @@ void main() {
       });
       testWidgets('BatThemeWidget applies BatThemeData to Theme',
           (WidgetTester tester) async {
-        final batThemeData = BatThemeData(
-          buttonStyle: const BatButtonStyle(),
-          colors: const BatColors(
+        const batThemeData = BatThemeData(
+          buttonStyle: BatButtonStyle(),
+          colors: BatColors(
             background: Colors.white,
             primary: Colors.blue,
             secondary: Colors.green,
@@ -56,9 +56,9 @@ void main() {
         final existingThemeData = ThemeData(
             colorScheme:
                 ColorScheme.fromSwatch().copyWith(secondary: Colors.green));
-        final batThemeData = BatThemeData(
-          buttonStyle: const BatButtonStyle(),
-          colors: const BatColors(
+        const batThemeData = BatThemeData(
+          buttonStyle: BatButtonStyle(),
+          colors: BatColors(
             background: Colors.white,
             primary: Colors.blue,
             secondary: Colors.green,