From 990259830440d043bb00be0bf81757644cb81f69 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sat, 13 May 2023 14:51:41 +0900 Subject: [PATCH 1/6] remove accentColor --- example/lib/accessibility/neumorphic_accessibility.dart | 7 +++---- example/lib/playground/neumorphic_playground.dart | 8 ++++---- example/lib/playground/text_playground.dart | 9 ++++----- example/lib/sample_neumorphic_playground.dart | 6 ++---- lib/src/widget/app_bar.dart | 7 ++----- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/example/lib/accessibility/neumorphic_accessibility.dart b/example/lib/accessibility/neumorphic_accessibility.dart index 15f6223a..b8cbe581 100644 --- a/example/lib/accessibility/neumorphic_accessibility.dart +++ b/example/lib/accessibility/neumorphic_accessibility.dart @@ -1,5 +1,4 @@ import 'package:example/lib/color_selector.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicAccessibility extends StatefulWidget { @@ -71,7 +70,7 @@ class __PageState extends State<_Page> { child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12)), - color: Theme.of(context).accentColor, + color: Theme.of(context).colorScheme.secondary, child: Text( "back", style: TextStyle(color: Colors.white), @@ -104,7 +103,7 @@ class __PageState extends State<_Page> { int selectedConfiguratorIndex = 0; Widget _configurators() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; @@ -513,7 +512,7 @@ class __PageState extends State<_Page> { } Widget shapeWidget() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color iconActiveColor = Colors.white; diff --git a/example/lib/playground/neumorphic_playground.dart b/example/lib/playground/neumorphic_playground.dart index eb52041c..94846eba 100644 --- a/example/lib/playground/neumorphic_playground.dart +++ b/example/lib/playground/neumorphic_playground.dart @@ -71,7 +71,7 @@ class __PageState extends State<_Page> { child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12)), - color: Theme.of(context).accentColor, + color: Theme.of(context).colorScheme.secondary, child: Text( "back", style: TextStyle(color: Colors.white), @@ -102,7 +102,7 @@ class __PageState extends State<_Page> { int selectedConfiguratorIndex = 0; Widget _configurators() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; @@ -622,7 +622,7 @@ class __PageState extends State<_Page> { } Widget boxshapeWidget() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; @@ -756,7 +756,7 @@ class __PageState extends State<_Page> { } Widget shapeWidget() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color iconActiveColor = Colors.white; diff --git a/example/lib/playground/text_playground.dart b/example/lib/playground/text_playground.dart index f1a547cd..dda81e4b 100644 --- a/example/lib/playground/text_playground.dart +++ b/example/lib/playground/text_playground.dart @@ -1,5 +1,4 @@ import 'package:example/lib/color_selector.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicTextPlayground extends StatefulWidget { @@ -92,7 +91,7 @@ class __PageState extends State<_Page> { child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12)), - color: Theme.of(context).accentColor, + color: Theme.of(context).colorScheme.secondary, child: Text( "back", style: TextStyle(color: Colors.white), @@ -125,7 +124,7 @@ class __PageState extends State<_Page> { int selectedConfiguratorIndex = 0; Widget _configurators() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; @@ -238,7 +237,7 @@ class __PageState extends State<_Page> { } Widget shapeWidget() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color iconActiveColor = Colors.white; @@ -444,7 +443,7 @@ class __PageState extends State<_Page> { } FontWeight _fontWeight() { - switch ((this.fontWeight / 100).toInt()) { + switch (this.fontWeight ~/ 100) { case 1: return FontWeight.w100; case 2: diff --git a/example/lib/sample_neumorphic_playground.dart b/example/lib/sample_neumorphic_playground.dart index afb309e7..d5de1e45 100644 --- a/example/lib/sample_neumorphic_playground.dart +++ b/example/lib/sample_neumorphic_playground.dart @@ -1,5 +1,3 @@ -import 'package:example/lib/color_selector.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; void main() => runApp(NeumorphicPlayground()); @@ -85,7 +83,7 @@ class __PageState extends State<_Page> { } Widget _configurators() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; @@ -246,7 +244,7 @@ class __PageState extends State<_Page> { } Widget shapeWidget() { - final Color buttonActiveColor = Theme.of(context).accentColor; + final Color buttonActiveColor = Theme.of(context).colorScheme.secondary; final Color buttonInnactiveColor = Colors.white; final Color iconActiveColor = Colors.white; diff --git a/lib/src/widget/app_bar.dart b/lib/src/widget/app_bar.dart index 75768744..2f4268fa 100644 --- a/lib/src/widget/app_bar.dart +++ b/lib/src/widget/app_bar.dart @@ -1,7 +1,4 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import 'package:flutter_neumorphic/src/widget/back_button.dart'; class NeumorphicAppBar extends StatefulWidget implements PreferredSizeWidget { static const toolbarHeight = kToolbarHeight + 16 * 2; @@ -180,8 +177,8 @@ class NeumorphicAppBarState extends State { if (title != null) { final AppBarTheme appBarTheme = AppBarTheme.of(context); title = DefaultTextStyle( - style: (appBarTheme.textTheme?.headline5 ?? - Theme.of(context).textTheme.headline5!) + style: (appBarTheme.titleTextStyle ?? + Theme.of(context).textTheme.titleMedium!) .merge(widget.textStyle ?? nTheme?.current?.appBarTheme.textStyle), softWrap: false, overflow: TextOverflow.ellipsis, From ad0b48874f52a9da1efb3ac60b1c519a7f57f427 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sat, 13 May 2023 14:52:03 +0900 Subject: [PATCH 2/6] remove textTheme --- lib/src/widget/app.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/src/widget/app.dart b/lib/src/widget/app.dart index 70948b8d..72b88b2b 100644 --- a/lib/src/widget/app.dart +++ b/lib/src/widget/app.dart @@ -1,4 +1,3 @@ -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicApp extends StatelessWidget { @@ -86,13 +85,8 @@ class NeumorphicApp extends StatelessWidget { return ThemeData( primaryColor: theme.accentColor, - accentColor: theme.variantColor, iconTheme: theme.iconTheme, brightness: ThemeData.estimateBrightnessForColor(theme.baseColor), - primaryColorBrightness: - ThemeData.estimateBrightnessForColor(theme.accentColor), - accentColorBrightness: - ThemeData.estimateBrightnessForColor(theme.variantColor), textTheme: theme.textTheme, scaffoldBackgroundColor: theme.baseColor, ); From 07f44e0ae36cf68452ed65f0516352da262c9814 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sun, 1 Oct 2023 10:15:55 +0900 Subject: [PATCH 3/6] fix NeumorphicAppBar --- lib/src/widget/app_bar.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/widget/app_bar.dart b/lib/src/widget/app_bar.dart index 2f4268fa..f58b7758 100644 --- a/lib/src/widget/app_bar.dart +++ b/lib/src/widget/app_bar.dart @@ -99,9 +99,9 @@ class NeumorphicAppBar extends StatefulWidget implements PreferredSizeWidget { @override NeumorphicAppBarState createState() => NeumorphicAppBarState(); - bool _getEffectiveCenterTitle(ThemeData theme, NeumorphicThemeData nTheme) { - if (centerTitle != null || nTheme.appBarTheme.centerTitle != null) - return centerTitle ?? nTheme.appBarTheme.centerTitle!; + bool _getEffectiveCenterTitle(ThemeData theme, NeumorphicThemeData? nTheme) { + if (centerTitle != null || nTheme?.appBarTheme.centerTitle != null) + return centerTitle ?? nTheme?.appBarTheme.centerTitle ?? false; switch (theme.platform) { case TargetPlatform.android: case TargetPlatform.fuchsia: @@ -232,7 +232,7 @@ class NeumorphicAppBarState extends State { middle: title, trailing: actions, centerMiddle: - widget._getEffectiveCenterTitle(theme, nTheme!.current!), + widget._getEffectiveCenterTitle(theme, nTheme?.current), middleSpacing: widget.titleSpacing, ), ), From ca93cb0bf3a8207daf007e807cfaddfddc8c0788 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sat, 18 May 2024 18:34:48 +0900 Subject: [PATCH 4/6] [3.22.0] replace bodyText2 bodyText2 with bodyMedium --- lib/src/widget/container.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/widget/container.dart b/lib/src/widget/container.dart index 9e1e94fa..10180926 100644 --- a/lib/src/widget/container.dart +++ b/lib/src/widget/container.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart' as material; import 'package:flutter/widgets.dart'; -import '../neumorphic_box_shape.dart'; import '../decoration/neumorphic_decorations.dart'; +import '../neumorphic_box_shape.dart'; import '../theme/neumorphic_theme.dart'; import 'clipper/neumorphic_box_shape_clipper.dart'; -export '../neumorphic_box_shape.dart'; export '../decoration/neumorphic_decorations.dart'; +export '../neumorphic_box_shape.dart'; export '../theme/neumorphic_theme.dart'; /// The main container of the Neumorphic UI KIT @@ -118,7 +118,7 @@ class _NeumorphicContainer extends StatelessWidget { final shape = this.style.boxShape ?? NeumorphicBoxShape.rect(); return DefaultTextStyle( - style: this.textStyle ?? material.Theme.of(context).textTheme.bodyText2!, + style: this.textStyle ?? material.Theme.of(context).textTheme.bodyMedium!, child: AnimatedContainer( margin: this.margin, duration: this.duration, From 23af54ff4f92dca92f7deaab09338885568bca48 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sat, 18 May 2024 18:35:29 +0900 Subject: [PATCH 5/6] [3.22.0] Fix SDK dependency --- example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- example/pubspec.yaml | 2 +- pubspec.yaml | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index cf981460..cccf817a 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - import FlutterMacOS import Foundation diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 5f19d033..83b9f4ad 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,7 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ">=2.6.0 <3.0.0" + sdk: '>=3.2.6 <4.0.0' dependencies: flutter: diff --git a/pubspec.yaml b/pubspec.yaml index 5044f0f8..66c31db0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,8 +10,8 @@ homepage: https://github.com/Idean/Flutter-Neumorphic issue_tracker: https://github.com/Idean/Flutter-Neumorphic/issues environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=1.13.18" + sdk: '>=3.2.6 <4.0.0' + flutter: '>=1.13.18' dependencies: flutter: @@ -23,6 +23,6 @@ dev_dependencies: flutter: fonts: - - family: NeumorphicIcons - fonts: - - asset: fonts/NeumorphicIcons.ttf \ No newline at end of file + - family: NeumorphicIcons + fonts: + - asset: fonts/NeumorphicIcons.ttf From c847817d840ddfb71d74054e8e3482828e761cb2 Mon Sep 17 00:00:00 2001 From: den0206 Date: Sat, 21 Dec 2024 14:23:08 +0900 Subject: [PATCH 6/6] [3.27.1] Fix SDK dependency --- example/lib/accessibility/neumorphic_accessibility.dart | 2 +- example/lib/lib/back_button.dart | 2 -- example/lib/samples/galaxy_sample.dart | 1 - example/lib/samples/testla_sample.dart | 4 ---- .../lib/widgets/range_slider/widget_range_slider.dart | 3 +-- example/lib/widgets/switch/widget_switch.dart | 3 +-- example/lib/widgets/toggle/widget_toggle.dart | 3 +-- example/lib/widgets/widgets_home.dart | 3 +-- lib/src/colors.dart | 4 ++-- .../cache/abstract_neumorphic_painter_cache.dart | 1 - .../cache/neumorphic_emboss_painter_cache.dart | 2 -- lib/src/decoration/cache/neumorphic_painter_cache.dart | 2 -- lib/src/decoration/neumorphic_decoration_painter.dart | 1 - .../decoration/neumorphic_emboss_decoration_painter.dart | 4 ---- .../decoration/neumorphic_text_decoration_painter.dart | 1 - lib/src/neumorphic_box_shape.dart | 2 -- lib/src/shape/beveled_path_provider.dart | 4 ++-- lib/src/shape/circle_path_provider.dart | 1 - lib/src/shape/rect_path_provider.dart | 1 - lib/src/shape/rrect_path_provider.dart | 1 - lib/src/theme/app_bar.dart | 3 --- lib/src/theme/inherited_neumorphic_theme.dart | 5 ----- lib/src/theme/neumorphic_theme.dart | 7 ------- lib/src/theme/theme.dart | 9 --------- lib/src/theme/theme_wrapper.dart | 6 +++--- lib/src/widget/back_button.dart | 2 -- lib/src/widget/button.dart | 6 +----- lib/src/widget/checkbox.dart | 2 -- lib/src/widget/close_button.dart | 2 -- lib/src/widget/icon.dart | 3 --- lib/src/widget/indicator.dart | 2 -- lib/src/widget/progress.dart | 2 -- lib/src/widget/radio.dart | 2 -- lib/src/widget/range_slider.dart | 5 ----- lib/src/widget/slider.dart | 4 ---- lib/src/widget/switch.dart | 4 ---- lib/src/widget/text.dart | 2 -- lib/src/widget/toggle.dart | 6 ------ 38 files changed, 13 insertions(+), 104 deletions(-) diff --git a/example/lib/accessibility/neumorphic_accessibility.dart b/example/lib/accessibility/neumorphic_accessibility.dart index b8cbe581..733beae6 100644 --- a/example/lib/accessibility/neumorphic_accessibility.dart +++ b/example/lib/accessibility/neumorphic_accessibility.dart @@ -107,7 +107,7 @@ class __PageState extends State<_Page> { final Color buttonInnactiveColor = Colors.white; final Color textActiveColor = Colors.white; - final Color textInactiveColor = Colors.black.withOpacity(0.3); + final Color textInactiveColor = Colors.black.withValues(alpha: 0.3); return Card( margin: EdgeInsets.all(8), diff --git a/example/lib/lib/back_button.dart b/example/lib/lib/back_button.dart index 6f0b876a..79453357 100644 --- a/example/lib/lib/back_button.dart +++ b/example/lib/lib/back_button.dart @@ -1,5 +1,3 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicBack extends StatelessWidget { diff --git a/example/lib/samples/galaxy_sample.dart b/example/lib/samples/galaxy_sample.dart index 5bae0f8e..aca638ca 100644 --- a/example/lib/samples/galaxy_sample.dart +++ b/example/lib/samples/galaxy_sample.dart @@ -1,6 +1,5 @@ import 'package:example/lib/ThemeConfigurator.dart'; import 'package:example/lib/top_bar.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class GalaxySample extends StatelessWidget { diff --git a/example/lib/samples/testla_sample.dart b/example/lib/samples/testla_sample.dart index 400ecf07..a9c69bfd 100644 --- a/example/lib/samples/testla_sample.dart +++ b/example/lib/samples/testla_sample.dart @@ -1,7 +1,3 @@ -import 'dart:ui'; - -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class TeslaSample extends StatefulWidget { diff --git a/example/lib/widgets/range_slider/widget_range_slider.dart b/example/lib/widgets/range_slider/widget_range_slider.dart index c8c312f3..4d34354f 100644 --- a/example/lib/widgets/range_slider/widget_range_slider.dart +++ b/example/lib/widgets/range_slider/widget_range_slider.dart @@ -2,11 +2,10 @@ import 'package:example/lib/Code.dart'; import 'package:example/lib/ThemeConfigurator.dart'; import 'package:example/lib/color_selector.dart'; import 'package:example/lib/top_bar.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class RangeSliderWidgetPage extends StatefulWidget { - RangeSliderWidgetPage({Key key}) : super(key: key); + RangeSliderWidgetPage({required Key key}) : super(key: key); @override createState() => _RangeWidgetPageState(); diff --git a/example/lib/widgets/switch/widget_switch.dart b/example/lib/widgets/switch/widget_switch.dart index cb26b465..abdc56ab 100644 --- a/example/lib/widgets/switch/widget_switch.dart +++ b/example/lib/widgets/switch/widget_switch.dart @@ -2,11 +2,10 @@ import 'package:example/lib/Code.dart'; import 'package:example/lib/ThemeConfigurator.dart'; import 'package:example/lib/color_selector.dart'; import 'package:example/lib/top_bar.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class SwitchWidgetPage extends StatefulWidget { - SwitchWidgetPage({Key key}) : super(key: key); + SwitchWidgetPage({required Key key}) : super(key: key); @override createState() => _WidgetPageState(); diff --git a/example/lib/widgets/toggle/widget_toggle.dart b/example/lib/widgets/toggle/widget_toggle.dart index c2ebbf80..ac83ce47 100644 --- a/example/lib/widgets/toggle/widget_toggle.dart +++ b/example/lib/widgets/toggle/widget_toggle.dart @@ -1,11 +1,10 @@ import 'package:example/lib/Code.dart'; import 'package:example/lib/ThemeConfigurator.dart'; import 'package:example/lib/top_bar.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class ToggleWidgetPage extends StatefulWidget { - ToggleWidgetPage({Key key}) : super(key: key); + ToggleWidgetPage({required Key key}) : super(key: key); @override createState() => _WidgetPageState(); diff --git a/example/lib/widgets/widgets_home.dart b/example/lib/widgets/widgets_home.dart index 4cea506b..26af8ff1 100644 --- a/example/lib/widgets/widgets_home.dart +++ b/example/lib/widgets/widgets_home.dart @@ -1,7 +1,6 @@ import 'package:example/lib/top_bar.dart'; import 'package:example/widgets/appbar/widget_app_bar.dart'; import 'package:example/widgets/toggle/widget_toggle.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; import 'background/widget_background.dart'; @@ -18,7 +17,7 @@ import 'slider/widget_slider.dart'; import 'switch/widget_switch.dart'; class WidgetsHome extends StatelessWidget { - Widget _buildButton({String text, VoidCallback onClick}) { + Widget _buildButton({required String text, required VoidCallback onClick}) { return NeumorphicButton( margin: EdgeInsets.only(bottom: 12), padding: EdgeInsets.symmetric( diff --git a/lib/src/colors.dart b/lib/src/colors.dart index 84f3533d..c30e2970 100644 --- a/lib/src/colors.dart +++ b/lib/src/colors.dart @@ -85,11 +85,11 @@ class NeumorphicColors { static Color _applyPercentageOnOpacity( {required Color maxColor, required double percent}) { - final maxOpacity = maxColor.opacity; + final maxOpacity = maxColor.a; final maxIntensity = Neumorphic.MAX_INTENSITY; final newOpacity = percent * maxOpacity / maxIntensity; final newColor = - maxColor.withOpacity(newOpacity); //<-- intensity act on opacity; + maxColor.withValues(alpha: newOpacity); //<-- intensity act on opacity; return newColor; } } diff --git a/lib/src/decoration/cache/abstract_neumorphic_painter_cache.dart b/lib/src/decoration/cache/abstract_neumorphic_painter_cache.dart index 9b2b235b..518067a0 100644 --- a/lib/src/decoration/cache/abstract_neumorphic_painter_cache.dart +++ b/lib/src/decoration/cache/abstract_neumorphic_painter_cache.dart @@ -1,5 +1,4 @@ import 'dart:math'; -import 'dart:ui'; import '../../../flutter_neumorphic.dart'; diff --git a/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart b/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart index 59f9b5c7..9cc93d47 100644 --- a/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart +++ b/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import '../../../flutter_neumorphic.dart'; import 'abstract_neumorphic_painter_cache.dart'; diff --git a/lib/src/decoration/cache/neumorphic_painter_cache.dart b/lib/src/decoration/cache/neumorphic_painter_cache.dart index e63daa1c..85d9d8ab 100644 --- a/lib/src/decoration/cache/neumorphic_painter_cache.dart +++ b/lib/src/decoration/cache/neumorphic_painter_cache.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import '../../../flutter_neumorphic.dart'; import 'abstract_neumorphic_painter_cache.dart'; diff --git a/lib/src/decoration/neumorphic_decoration_painter.dart b/lib/src/decoration/neumorphic_decoration_painter.dart index 36de0f2c..940ba4b6 100644 --- a/lib/src/decoration/neumorphic_decoration_painter.dart +++ b/lib/src/decoration/neumorphic_decoration_painter.dart @@ -1,4 +1,3 @@ -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/painting.dart'; diff --git a/lib/src/decoration/neumorphic_emboss_decoration_painter.dart b/lib/src/decoration/neumorphic_emboss_decoration_painter.dart index 299a9694..700e1409 100644 --- a/lib/src/decoration/neumorphic_emboss_decoration_painter.dart +++ b/lib/src/decoration/neumorphic_emboss_decoration_painter.dart @@ -1,8 +1,4 @@ -import 'dart:ui'; - -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/painting.dart'; import '../neumorphic_box_shape.dart'; import '../theme/theme.dart'; diff --git a/lib/src/decoration/neumorphic_text_decoration_painter.dart b/lib/src/decoration/neumorphic_text_decoration_painter.dart index 72ec6696..f5582c58 100644 --- a/lib/src/decoration/neumorphic_text_decoration_painter.dart +++ b/lib/src/decoration/neumorphic_text_decoration_painter.dart @@ -1,6 +1,5 @@ import 'dart:ui' as ui; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/painting.dart'; diff --git a/lib/src/neumorphic_box_shape.dart b/lib/src/neumorphic_box_shape.dart index 10b927e6..d2ca3a77 100644 --- a/lib/src/neumorphic_box_shape.dart +++ b/lib/src/neumorphic_box_shape.dart @@ -1,11 +1,9 @@ -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; import 'package:flutter_neumorphic/src/shape/rrect_path_provider.dart'; import 'package:flutter_neumorphic/src/shape/stadium_path_provider.dart'; import 'shape/beveled_path_provider.dart'; import 'shape/circle_path_provider.dart'; -import 'shape/neumorphic_path_provider.dart'; import 'shape/rect_path_provider.dart'; export 'shape/path/flutter_logo_path_provider.dart'; diff --git a/lib/src/shape/beveled_path_provider.dart b/lib/src/shape/beveled_path_provider.dart index d4bb4745..bd95a618 100644 --- a/lib/src/shape/beveled_path_provider.dart +++ b/lib/src/shape/beveled_path_provider.dart @@ -1,7 +1,7 @@ -import '../../flutter_neumorphic.dart'; -import 'neumorphic_path_provider.dart'; import 'dart:math' as math; +import '../../flutter_neumorphic.dart'; + class BeveledPathProvider extends NeumorphicPathProvider { final BorderRadius borderRadius; diff --git a/lib/src/shape/circle_path_provider.dart b/lib/src/shape/circle_path_provider.dart index 59980509..c4c304ce 100644 --- a/lib/src/shape/circle_path_provider.dart +++ b/lib/src/shape/circle_path_provider.dart @@ -1,7 +1,6 @@ import 'dart:math'; import '../../flutter_neumorphic.dart'; -import 'neumorphic_path_provider.dart'; class CirclePathProvider extends NeumorphicPathProvider { const CirclePathProvider({Listenable? reclip}); diff --git a/lib/src/shape/rect_path_provider.dart b/lib/src/shape/rect_path_provider.dart index 8d8625a0..af4fa773 100644 --- a/lib/src/shape/rect_path_provider.dart +++ b/lib/src/shape/rect_path_provider.dart @@ -1,5 +1,4 @@ import '../../flutter_neumorphic.dart'; -import 'neumorphic_path_provider.dart'; class RectPathProvider extends NeumorphicPathProvider { const RectPathProvider({Listenable? reclip}); diff --git a/lib/src/shape/rrect_path_provider.dart b/lib/src/shape/rrect_path_provider.dart index 6e1e702e..a83a46df 100644 --- a/lib/src/shape/rrect_path_provider.dart +++ b/lib/src/shape/rrect_path_provider.dart @@ -1,5 +1,4 @@ import '../../flutter_neumorphic.dart'; -import 'neumorphic_path_provider.dart'; class RRectPathProvider extends NeumorphicPathProvider { final BorderRadius borderRadius; diff --git a/lib/src/theme/app_bar.dart b/lib/src/theme/app_bar.dart index d4e1b8f7..25accccf 100644 --- a/lib/src/theme/app_bar.dart +++ b/lib/src/theme/app_bar.dart @@ -1,8 +1,5 @@ import 'dart:io'; -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; - import 'package:flutter_neumorphic/flutter_neumorphic.dart'; @immutable diff --git a/lib/src/theme/inherited_neumorphic_theme.dart b/lib/src/theme/inherited_neumorphic_theme.dart index d86145cd..b11ee29f 100644 --- a/lib/src/theme/inherited_neumorphic_theme.dart +++ b/lib/src/theme/inherited_neumorphic_theme.dart @@ -1,10 +1,5 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import 'theme.dart'; -import 'theme_wrapper.dart'; - export 'theme.dart'; export 'theme_wrapper.dart'; diff --git a/lib/src/theme/neumorphic_theme.dart b/lib/src/theme/neumorphic_theme.dart index 034fca3f..a0ac754f 100644 --- a/lib/src/theme/neumorphic_theme.dart +++ b/lib/src/theme/neumorphic_theme.dart @@ -1,10 +1,4 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; - import '../../flutter_neumorphic.dart'; -import 'inherited_neumorphic_theme.dart'; -import 'theme.dart'; -import 'theme_wrapper.dart'; export 'inherited_neumorphic_theme.dart'; export 'theme.dart'; @@ -106,7 +100,6 @@ class NeumorphicTheme extends StatefulWidget { } static double? embossDepth(BuildContext context) { - if (currentTheme(context).depth == null) return null; return -currentTheme(context).depth.abs(); } diff --git a/lib/src/theme/theme.dart b/lib/src/theme/theme.dart index 8da325c2..92efa86d 100644 --- a/lib/src/theme/theme.dart +++ b/lib/src/theme/theme.dart @@ -1,15 +1,6 @@ import 'dart:ui'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart' show IconThemeData, TextTheme; -import 'package:flutter/painting.dart'; -import 'package:flutter_neumorphic/src/theme/app_bar.dart'; -import 'package:flutter_neumorphic/src/widget/container.dart'; - import '../../flutter_neumorphic.dart'; -import '../colors.dart'; -import '../light_source.dart'; -import '../shape.dart'; export '../colors.dart'; export '../light_source.dart'; diff --git a/lib/src/theme/theme_wrapper.dart b/lib/src/theme/theme_wrapper.dart index e7241b2b..41230884 100644 --- a/lib/src/theme/theme_wrapper.dart +++ b/lib/src/theme/theme_wrapper.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flutter/material.dart'; import 'theme.dart'; @@ -25,7 +23,9 @@ class ThemeWrapper { themeMode == ThemeMode.dark || //The setting indicating the current brightness mode of the host platform. If the platform has no preference, platformBrightness defaults to Brightness.light. (themeMode == ThemeMode.system && - window.platformBrightness == Brightness.dark); + WidgetsBinding.instance.platformDispatcher.views.first + .platformDispatcher.platformBrightness == + Brightness.dark); NeumorphicThemeData? get current { if (useDark) { diff --git a/lib/src/widget/back_button.dart b/lib/src/widget/back_button.dart index 8757160c..ae74031c 100644 --- a/lib/src/widget/back_button.dart +++ b/lib/src/widget/back_button.dart @@ -1,5 +1,3 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicBackButton extends StatelessWidget { diff --git a/lib/src/widget/button.dart b/lib/src/widget/button.dart index 5bf02bbb..5479b96b 100644 --- a/lib/src/widget/button.dart +++ b/lib/src/widget/button.dart @@ -1,11 +1,7 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import '../theme/neumorphic_theme.dart'; -import '../widget/app_bar.dart'; + import 'animation/animated_scale.dart' as animationScale; -import 'container.dart'; typedef void NeumorphicButtonClickListener(); diff --git a/lib/src/widget/checkbox.dart b/lib/src/widget/checkbox.dart index 5f3959cc..431a7883 100644 --- a/lib/src/widget/checkbox.dart +++ b/lib/src/widget/checkbox.dart @@ -2,8 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/src/neumorphic_icons.dart'; import 'package:flutter_neumorphic/src/widget/container.dart'; -import '../neumorphic_box_shape.dart'; -import '../theme/neumorphic_theme.dart'; import 'button.dart'; typedef void NeumorphicCheckboxListener(T value); diff --git a/lib/src/widget/close_button.dart b/lib/src/widget/close_button.dart index f9e087f6..a11c1d65 100644 --- a/lib/src/widget/close_button.dart +++ b/lib/src/widget/close_button.dart @@ -1,5 +1,3 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicCloseButton extends StatelessWidget { diff --git a/lib/src/widget/icon.dart b/lib/src/widget/icon.dart index 507af0cd..33afbbe5 100644 --- a/lib/src/widget/icon.dart +++ b/lib/src/widget/icon.dart @@ -1,7 +1,4 @@ -import 'package:flutter/widgets.dart'; - import '../../flutter_neumorphic.dart'; -import '../theme/neumorphic_theme.dart'; export '../decoration/neumorphic_decorations.dart'; export '../neumorphic_box_shape.dart'; diff --git a/lib/src/widget/indicator.dart b/lib/src/widget/indicator.dart index 35e43d2f..a28cea95 100644 --- a/lib/src/widget/indicator.dart +++ b/lib/src/widget/indicator.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flutter/widgets.dart'; import 'container.dart'; diff --git a/lib/src/widget/progress.dart b/lib/src/widget/progress.dart index c5e00de6..551251b6 100644 --- a/lib/src/widget/progress.dart +++ b/lib/src/widget/progress.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flutter/widgets.dart'; import 'container.dart'; diff --git a/lib/src/widget/radio.dart b/lib/src/widget/radio.dart index f2fc0ab5..20a8e4b0 100644 --- a/lib/src/widget/radio.dart +++ b/lib/src/widget/radio.dart @@ -1,7 +1,5 @@ import 'package:flutter/widgets.dart'; -import '../neumorphic_box_shape.dart'; -import '../theme/neumorphic_theme.dart'; import 'button.dart'; import 'container.dart'; diff --git a/lib/src/widget/range_slider.dart b/lib/src/widget/range_slider.dart index 2c8a718b..79d363ee 100644 --- a/lib/src/widget/range_slider.dart +++ b/lib/src/widget/range_slider.dart @@ -1,10 +1,5 @@ -import 'package:flutter/rendering.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import 'container.dart'; -import 'progress.dart'; - typedef void NeumorphicRangeSliderLowListener(double percent); typedef void NeumorphicRangeSliderHighListener(double percent); diff --git a/lib/src/widget/slider.dart b/lib/src/widget/slider.dart index 4e5a5eed..45abac72 100644 --- a/lib/src/widget/slider.dart +++ b/lib/src/widget/slider.dart @@ -1,9 +1,5 @@ -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import 'container.dart'; -import 'progress.dart'; - typedef void NeumorphicSliderListener(double percent); /// A style to customize the [NeumorphicSlider] diff --git a/lib/src/widget/switch.dart b/lib/src/widget/switch.dart index 25cb6824..56614d3e 100644 --- a/lib/src/widget/switch.dart +++ b/lib/src/widget/switch.dart @@ -1,11 +1,7 @@ -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/src/widget/animation/animated_scale.dart' as animationScale; import '../../flutter_neumorphic.dart'; -import '../neumorphic_box_shape.dart'; -import '../theme/neumorphic_theme.dart'; -import 'container.dart'; /// A style to customize the [NeumorphicSwitch] /// diff --git a/lib/src/widget/text.dart b/lib/src/widget/text.dart index bc7765fd..573b93f9 100644 --- a/lib/src/widget/text.dart +++ b/lib/src/widget/text.dart @@ -1,11 +1,9 @@ import 'dart:ui' as ui show FontFeature; import 'package:flutter/material.dart' as material; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/src/decoration/neumorphic_text_decorations.dart'; import '../../flutter_neumorphic.dart'; -import '../theme/neumorphic_theme.dart'; export '../decoration/neumorphic_decorations.dart'; export '../neumorphic_box_shape.dart'; diff --git a/lib/src/widget/toggle.dart b/lib/src/widget/toggle.dart index cfb560e0..620282c4 100644 --- a/lib/src/widget/toggle.dart +++ b/lib/src/widget/toggle.dart @@ -1,11 +1,5 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; -import '../neumorphic_box_shape.dart'; -import '../theme/neumorphic_theme.dart'; -import 'container.dart'; - class NeumorphicToggleStyle { final double? depth; final bool? disableDepth;