diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index a5fa519..c267112 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,7 +15,6 @@ import irondash_engine_context import just_audio import package_info_plus import path_provider_foundation -import quill_native_bridge_macos import record_darwin import share_plus import shared_preferences_foundation @@ -37,7 +36,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - QuillNativeBridgePlugin.register(with: registry.registrar(forPlugin: "QuillNativeBridgePlugin")) RecordPlugin.register(with: registry.registrar(forPlugin: "RecordPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index db5b26e..5e55529 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -24,8 +24,6 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - quill_native_bridge_macos (0.0.1): - - FlutterMacOS - record_darwin (1.0.0): - Flutter - FlutterMacOS @@ -61,7 +59,6 @@ DEPENDENCIES: - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`) - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - - quill_native_bridge_macos (from `Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos`) - record_darwin (from `Flutter/ephemeral/.symlinks/plugins/record_darwin/macos`) - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) @@ -99,8 +96,6 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos path_provider_foundation: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin - quill_native_bridge_macos: - :path: Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos record_darwin: :path: Flutter/ephemeral/.symlinks/plugins/record_darwin/macos share_plus: @@ -131,11 +126,10 @@ SPEC CHECKSUMS: irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478 just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489 OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 - package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523 + package_info_plus: d2f71247aab4b6521434f887276093acc70d214c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - quill_native_bridge_macos: f90985c5269ac7ba84d933605b463d96e5f544fe record_darwin: df0a677188e5fed18472550298e675f19ddaffbe - share_plus: fd717ef89a2801d3491e737630112b80c310640e + share_plus: a182a58e04e51647c0481aadabbc4de44b3a2bce shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13 super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 284947a..1e8202a 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: table_calendar: ^3.0.9 zds_flutter: path: ../ - zeta_flutter: ^0.18.0 + zeta_flutter: ^0.19.0 flutter: uses-material-design: true diff --git a/lib/src/utils/theme/theme_builders/checkbox_theme.dart b/lib/src/utils/theme/theme_builders/checkbox_theme.dart index 1ff207b..64d5580 100644 --- a/lib/src/utils/theme/theme_builders/checkbox_theme.dart +++ b/lib/src/utils/theme/theme_builders/checkbox_theme.dart @@ -23,7 +23,7 @@ extension ZetaCheckboxTheme on ZetaColorScheme { /// Setting up custom fill color for different material states. fillColor: widgetStatePropertyResolver( selectedValue: zetaColors.secondary, - hoveredValue: zetaColors.secondary.hover, + hoveredValue: zetaColors.secondary, focusedValue: zetaColors.secondary.hover, disabledValue: zetaColors.secondary.subtle, defaultValue: Colors.transparent, @@ -35,13 +35,13 @@ extension ZetaCheckboxTheme on ZetaColorScheme { /// Setting up custom checkColor for different material states. checkColor: widgetStatePropertyResolver( selectedValue: onSecondary, - hoveredValue: secondary, + hoveredValue: onSecondary, defaultValue: zetaColors.secondary.onColor, ), /// Setting up custom overlayColor for different material states. overlayColor: widgetStatePropertyResolver( - hoveredValue: zetaColors.secondary.hover, + hoveredValue: zetaColors.surfaceHover, ), /// Setting tap target size to "padded". diff --git a/lib/src/utils/theme/theme_builders/radio_theme.dart b/lib/src/utils/theme/theme_builders/radio_theme.dart index 1d05d41..43db8de 100644 --- a/lib/src/utils/theme/theme_builders/radio_theme.dart +++ b/lib/src/utils/theme/theme_builders/radio_theme.dart @@ -34,7 +34,7 @@ extension RadioExtension on ZetaColorScheme { /// Defines the overlay color for hover state of radio button. overlayColor: widgetStatePropertyResolver( - hoveredValue: zetaColors.secondary.hover, + hoveredValue: zetaColors.surfaceHover, ), /// Defines the size of the material tap target. diff --git a/lib/src/utils/theme/theme_builders/switch_theme.dart b/lib/src/utils/theme/theme_builders/switch_theme.dart index e2d4aa2..765b2c9 100644 --- a/lib/src/utils/theme/theme_builders/switch_theme.dart +++ b/lib/src/utils/theme/theme_builders/switch_theme.dart @@ -33,7 +33,7 @@ extension SwitchExtension on ZetaColorScheme { /// Defines the overlay [Color] for the [Switch] when it's hovered. overlayColor: widgetStatePropertyResolver( - hoveredValue: zetaColors.secondary, + hoveredValue: zetaColors.black.withOpacity(0.1), ), /// The smallest detectable part of [Switch] that can lead to a tap event. diff --git a/pubspec.yaml b/pubspec.yaml index 8f7d0ab..e0952a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -74,7 +74,7 @@ dependencies: video_compress: ^3.1.3 video_player: ^2.8.6 vsc_quill_delta_to_html: ^1.0.5 - zeta_flutter: ^0.18.0 + zeta_flutter: ^0.19.0 dev_dependencies: flutter_test: