Checkbox (#9)

* checkbox * remove comment * widgetbook * widgetbook
ZebraDevs · Feb 2, 2024 · 6d9ad76 · 6d9ad76
1 parent dec383d
commit 6d9ad76
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 203 deletions.
diff --git a/example/lib/pages/theme/color_example.dart b/example/lib/pages/theme/color_example.dart
@@ -123,15 +123,15 @@ class _ColorExampleState extends State<ColorExample> {
         };
 
         final Map<String, Color> primaries = {
-          'primaryColor': colors.primary,
-          'secondaryColor': colors.secondary,
+          'primaryColor': colors.primary.text,
+          'secondaryColor': colors.secondary.text,
         };
 
         final Map<String, Color> alerts = {
-          'positive': colors.positive,
-          'negative': colors.negative,
-          'warning': colors.warning,
-          'info': colors.info,
+          'positive': colors.positive.text,
+          'negative': colors.negative.text,
+          'warning': colors.warning.text,
+          'info': colors.info.text,
         };
 
         return ExampleScaffold(
@@ -291,12 +291,6 @@ class MyRow extends StatelessWidget {
   }
 }
 
-extension StringExtension on Color {
-  String get toHexString {
-    return toString().substring(10, 16).toUpperCase();
-  }
-}
-
 Color calculateTextColor(Color background) {
   return ThemeData.estimateBrightnessForColor(background) == Brightness.light ? Colors.black : Colors.white;
 }
diff --git a/example/lib/pages/theme_color_switch.dart b/example/lib/pages/theme_color_switch.dart
diff --git a/example/lib/pages/theme_constrast_switch.dart b/example/lib/pages/theme_constrast_switch.dart
diff --git a/example/lib/pages/theme_mode_switch.dart b/example/lib/pages/theme_mode_switch.dart
diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -0,0 +1,16 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import path_provider_foundation
+import shared_preferences_foundation
+import sqflite
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+}
diff --git a/example/widgetbook/widgetbook.dart b/example/widgetbook/widgetbook.dart
@@ -42,10 +42,7 @@ class HotReload extends StatelessWidget {
             WidgetbookCategory(
               name: 'Theme',
               isInitiallyExpanded: false,
-              children: [
-                textWidgetBook(),
-                colorWidgetBook(),
-              ],
+              children: [textWidgetBook(), colorWidgetBook(), checkboxWidgetBook()],
             ),
           ],
           addons: [

diff --git a/lib/src/assets/fonts/zeta-icons-other.ttf b/lib/src/assets/fonts/zeta-icons-other.ttf
diff --git a/lib/src/components/bottom sheets/bottom_sheet.dart b/lib/src/components/bottom sheets/bottom_sheet.dart
@@ -66,7 +66,10 @@ class ZetaBottomSheet extends StatelessWidget {
                 style: ZetaTextStyles.titleMedium,
               ),
             ),
-          Material(child: body ?? const SizedBox()),
+          Material(
+            color: colors.surfaceSecondary,
+            child: body ?? const SizedBox(),
+          ),
         ],
       ),
     );

diff --git a/lib/src/components/buttons/fab.dart b/lib/src/components/buttons/fab.dart
@@ -125,7 +125,7 @@ class _ZetaFABState extends State<ZetaFAB> {
         padding: EdgeInsets.zero,
         shape: widget.shape.buttonShape(isExpanded: _isExpanded, size: widget.size),
         backgroundColor: backgroundColor,
-        foregroundColor: colors.shade60.onColor,
+        foregroundColor: backgroundColor.onColor,
       ).copyWith(
         overlayColor: MaterialStateProperty.resolveWith((Set<MaterialState> states) {
           if (states.contains(MaterialState.hovered)) return colors.hover;