From b3738eeb7bd5e65658a5c5a5a9df78c99cb89f04 Mon Sep 17 00:00:00 2001 From: Artem Panfilov <> Date: Sat, 6 Feb 2021 09:55:59 +0100 Subject: [PATCH 1/2] code cleanup according to best practices. - import package:example replaced with proper references. - Scaffold.of(context, nullOk: true) used instead of unsupported Scaffold.maybeOf(context) --- .../accessibility/neumorphic_accessibility.dart | 2 +- example/lib/main_home.dart | 4 ++-- example/lib/playground/neumorphic_playground.dart | 2 +- example/lib/playground/text_playground.dart | 2 +- example/lib/sample_neumorphic_playground.dart | 1 - example/lib/samples/clock/clock_sample.dart | 3 +-- .../lib/samples/clock/clock_second_sample.dart | 2 +- example/lib/samples/form_sample.dart | 4 ++-- example/lib/samples/galaxy_sample.dart | 4 ++-- example/lib/samples/sample_home.dart | 15 +++++++-------- example/lib/tips/border/tips_border.dart | 6 +++--- .../tips/border/tips_emboss_inside_emboss.dart | 6 +++--- example/lib/tips/tips_home.dart | 3 +-- .../lib/widgets/background/widget_background.dart | 6 +++--- example/lib/widgets/button/widget_button.dart | 8 ++++---- example/lib/widgets/checkbox/widget_checkbox.dart | 8 ++++---- .../lib/widgets/container/widget_container.dart | 8 ++++---- example/lib/widgets/icon/widget_icon.dart | 4 ++-- .../widget_indeterminate_progress.dart | 8 ++++---- .../lib/widgets/indicator/widget_indicator.dart | 8 ++++---- example/lib/widgets/progress/widget_progress.dart | 6 +++--- .../widgets/radiobutton/widget_radio_button.dart | 6 +++--- .../widgets/range_slider/widget_range_slider.dart | 8 ++++---- example/lib/widgets/slider/widget_slider.dart | 8 ++++---- example/lib/widgets/switch/widget_switch.dart | 8 ++++---- example/lib/widgets/toggle/widget_toggle.dart | 6 +++--- example/lib/widgets/widgets_home.dart | 7 +++---- lib/src/widget/app_bar.dart | 2 +- 28 files changed, 75 insertions(+), 80 deletions(-) diff --git a/example/lib/accessibility/neumorphic_accessibility.dart b/example/lib/accessibility/neumorphic_accessibility.dart index 15f6223a..e548d714 100644 --- a/example/lib/accessibility/neumorphic_accessibility.dart +++ b/example/lib/accessibility/neumorphic_accessibility.dart @@ -1,4 +1,4 @@ -import 'package:example/lib/color_selector.dart'; +import '../lib/color_selector.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; diff --git a/example/lib/main_home.dart b/example/lib/main_home.dart index b6d42dfb..48b884f0 100644 --- a/example/lib/main_home.dart +++ b/example/lib/main_home.dart @@ -1,5 +1,5 @@ -import 'package:example/tips/tips_home.dart'; -import 'package:example/widgets/widgets_home.dart'; +import 'tips/tips_home.dart'; +import 'widgets/widgets_home.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; diff --git a/example/lib/playground/neumorphic_playground.dart b/example/lib/playground/neumorphic_playground.dart index eb52041c..5e7a0960 100644 --- a/example/lib/playground/neumorphic_playground.dart +++ b/example/lib/playground/neumorphic_playground.dart @@ -1,4 +1,4 @@ -import 'package:example/lib/color_selector.dart'; +import '../lib/color_selector.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; class NeumorphicPlayground extends StatefulWidget { diff --git a/example/lib/playground/text_playground.dart b/example/lib/playground/text_playground.dart index f1a547cd..5b5e0ebc 100644 --- a/example/lib/playground/text_playground.dart +++ b/example/lib/playground/text_playground.dart @@ -1,4 +1,4 @@ -import 'package:example/lib/color_selector.dart'; +import '../lib/color_selector.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; diff --git a/example/lib/sample_neumorphic_playground.dart b/example/lib/sample_neumorphic_playground.dart index afb309e7..197d3ab6 100644 --- a/example/lib/sample_neumorphic_playground.dart +++ b/example/lib/sample_neumorphic_playground.dart @@ -1,4 +1,3 @@ -import 'package:example/lib/color_selector.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; diff --git a/example/lib/samples/clock/clock_sample.dart b/example/lib/samples/clock/clock_sample.dart index 05bc41e9..31f452ad 100644 --- a/example/lib/samples/clock/clock_sample.dart +++ b/example/lib/samples/clock/clock_sample.dart @@ -1,7 +1,6 @@ -import 'package:example/lib/top_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; - +import '../../lib/top_bar.dart'; import 'clock_second_sample.dart'; class ClockSample extends StatelessWidget { diff --git a/example/lib/samples/clock/clock_second_sample.dart b/example/lib/samples/clock/clock_second_sample.dart index 91873349..c52332b4 100644 --- a/example/lib/samples/clock/clock_second_sample.dart +++ b/example/lib/samples/clock/clock_second_sample.dart @@ -1,6 +1,6 @@ -import 'package:example/lib/top_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; +import '../../lib/top_bar.dart'; class ClockAlarmPage extends StatelessWidget { @override diff --git a/example/lib/samples/form_sample.dart b/example/lib/samples/form_sample.dart index 7d6af0cc..e9b878cf 100644 --- a/example/lib/samples/form_sample.dart +++ b/example/lib/samples/form_sample.dart @@ -1,7 +1,7 @@ -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'; +import '../lib/ThemeConfigurator.dart'; +import '../lib/top_bar.dart'; class FormSample extends StatelessWidget { @override diff --git a/example/lib/samples/galaxy_sample.dart b/example/lib/samples/galaxy_sample.dart index 5bae0f8e..9c013f67 100644 --- a/example/lib/samples/galaxy_sample.dart +++ b/example/lib/samples/galaxy_sample.dart @@ -1,7 +1,7 @@ -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'; +import '../lib/ThemeConfigurator.dart'; +import '../lib/top_bar.dart'; class GalaxySample extends StatelessWidget { @override diff --git a/example/lib/samples/sample_home.dart b/example/lib/samples/sample_home.dart index e4e120a0..35bf339d 100644 --- a/example/lib/samples/sample_home.dart +++ b/example/lib/samples/sample_home.dart @@ -1,13 +1,12 @@ -import 'package:example/lib/top_bar.dart'; -import 'package:example/samples/audio_player_sample.dart'; -import 'package:example/samples/calculator_sample.dart'; -import 'package:example/samples/clock/clock_sample.dart'; -import 'package:example/samples/credit_card_sample.dart'; -import 'package:example/samples/form_sample.dart'; -import 'package:example/samples/testla_sample.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; - +import '../lib/top_bar.dart'; +import '../samples/audio_player_sample.dart'; +import '../samples/calculator_sample.dart'; +import '../samples/clock/clock_sample.dart'; +import '../samples/credit_card_sample.dart'; +import '../samples/form_sample.dart'; +import '../samples/testla_sample.dart'; import 'galaxy_sample.dart'; import 'widgets_sample.dart'; diff --git a/example/lib/tips/border/tips_border.dart b/example/lib/tips/border/tips_border.dart index 69e04ea3..eeb7dbe2 100644 --- a/example/lib/tips/border/tips_border.dart +++ b/example/lib/tips/border/tips_border.dart @@ -1,8 +1,8 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class TipsBorderPage extends StatefulWidget { TipsBorderPage({Key key}) : super(key: key); diff --git a/example/lib/tips/border/tips_emboss_inside_emboss.dart b/example/lib/tips/border/tips_emboss_inside_emboss.dart index c9e03ae8..2fd64f0d 100644 --- a/example/lib/tips/border/tips_emboss_inside_emboss.dart +++ b/example/lib/tips/border/tips_emboss_inside_emboss.dart @@ -1,8 +1,8 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class TipsRecursiveeEmbossPage extends StatefulWidget { TipsRecursiveeEmbossPage({Key key}) : super(key: key); diff --git a/example/lib/tips/tips_home.dart b/example/lib/tips/tips_home.dart index 945a5e35..09206171 100644 --- a/example/lib/tips/tips_home.dart +++ b/example/lib/tips/tips_home.dart @@ -1,7 +1,6 @@ -import 'package:example/lib/top_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_neumorphic/flutter_neumorphic.dart'; - +import '../lib/top_bar.dart'; import 'border/tips_border.dart'; import 'border/tips_emboss_inside_emboss.dart'; diff --git a/example/lib/widgets/background/widget_background.dart b/example/lib/widgets/background/widget_background.dart index aa35b588..166fce47 100644 --- a/example/lib/widgets/background/widget_background.dart +++ b/example/lib/widgets/background/widget_background.dart @@ -1,8 +1,8 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class BackgroundWidgetPage extends StatefulWidget { BackgroundWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/button/widget_button.dart b/example/lib/widgets/button/widget_button.dart index 117225b3..5362d157 100644 --- a/example/lib/widgets/button/widget_button.dart +++ b/example/lib/widgets/button/widget_button.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class ButtonWidgetPage extends StatefulWidget { ButtonWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/checkbox/widget_checkbox.dart b/example/lib/widgets/checkbox/widget_checkbox.dart index 1412294c..8a96397b 100644 --- a/example/lib/widgets/checkbox/widget_checkbox.dart +++ b/example/lib/widgets/checkbox/widget_checkbox.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class CheckboxWidgetPage extends StatefulWidget { CheckboxWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/container/widget_container.dart b/example/lib/widgets/container/widget_container.dart index 90cafbf4..d179a83e 100644 --- a/example/lib/widgets/container/widget_container.dart +++ b/example/lib/widgets/container/widget_container.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class ContainerWidgetPage extends StatefulWidget { ContainerWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/icon/widget_icon.dart b/example/lib/widgets/icon/widget_icon.dart index deb111ed..6456dea5 100644 --- a/example/lib/widgets/icon/widget_icon.dart +++ b/example/lib/widgets/icon/widget_icon.dart @@ -1,7 +1,7 @@ -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'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class IconWidgetPage extends StatefulWidget { IconWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/indeterminate_progress/widget_indeterminate_progress.dart b/example/lib/widgets/indeterminate_progress/widget_indeterminate_progress.dart index 09f2b289..926fa8ed 100644 --- a/example/lib/widgets/indeterminate_progress/widget_indeterminate_progress.dart +++ b/example/lib/widgets/indeterminate_progress/widget_indeterminate_progress.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class IndeterminateProgressWidgetPage extends StatefulWidget { IndeterminateProgressWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/indicator/widget_indicator.dart b/example/lib/widgets/indicator/widget_indicator.dart index a5c42247..b661f328 100644 --- a/example/lib/widgets/indicator/widget_indicator.dart +++ b/example/lib/widgets/indicator/widget_indicator.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; import 'dart:math' show Random; diff --git a/example/lib/widgets/progress/widget_progress.dart b/example/lib/widgets/progress/widget_progress.dart index 7867cb06..3131dab9 100644 --- a/example/lib/widgets/progress/widget_progress.dart +++ b/example/lib/widgets/progress/widget_progress.dart @@ -1,8 +1,8 @@ -import 'package:example/lib/Code.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'; +import '../../lib/Code.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; import 'dart:math' show Random; diff --git a/example/lib/widgets/radiobutton/widget_radio_button.dart b/example/lib/widgets/radiobutton/widget_radio_button.dart index f8e1434f..03b4629d 100644 --- a/example/lib/widgets/radiobutton/widget_radio_button.dart +++ b/example/lib/widgets/radiobutton/widget_radio_button.dart @@ -1,8 +1,8 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class RadioButtonWidgetPage extends StatefulWidget { RadioButtonWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/range_slider/widget_range_slider.dart b/example/lib/widgets/range_slider/widget_range_slider.dart index c8c312f3..56cf874e 100644 --- a/example/lib/widgets/range_slider/widget_range_slider.dart +++ b/example/lib/widgets/range_slider/widget_range_slider.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class RangeSliderWidgetPage extends StatefulWidget { RangeSliderWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/slider/widget_slider.dart b/example/lib/widgets/slider/widget_slider.dart index 522c9c30..4b9a70a6 100644 --- a/example/lib/widgets/slider/widget_slider.dart +++ b/example/lib/widgets/slider/widget_slider.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class SliderWidgetPage extends StatefulWidget { SliderWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/switch/widget_switch.dart b/example/lib/widgets/switch/widget_switch.dart index cb26b465..d998215e 100644 --- a/example/lib/widgets/switch/widget_switch.dart +++ b/example/lib/widgets/switch/widget_switch.dart @@ -1,9 +1,9 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/color_selector.dart'; +import '../../lib/top_bar.dart'; class SwitchWidgetPage extends StatefulWidget { SwitchWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/toggle/widget_toggle.dart b/example/lib/widgets/toggle/widget_toggle.dart index c2ebbf80..15cda4e8 100644 --- a/example/lib/widgets/toggle/widget_toggle.dart +++ b/example/lib/widgets/toggle/widget_toggle.dart @@ -1,8 +1,8 @@ -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'; +import '../../lib/Code.dart'; +import '../../lib/ThemeConfigurator.dart'; +import '../../lib/top_bar.dart'; class ToggleWidgetPage extends StatefulWidget { ToggleWidgetPage({Key key}) : super(key: key); diff --git a/example/lib/widgets/widgets_home.dart b/example/lib/widgets/widgets_home.dart index 4cea506b..05005715 100644 --- a/example/lib/widgets/widgets_home.dart +++ b/example/lib/widgets/widgets_home.dart @@ -1,9 +1,8 @@ -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 '../lib/top_bar.dart'; +import '../widgets/appbar/widget_app_bar.dart'; +import '../widgets/toggle/widget_toggle.dart'; import 'background/widget_background.dart'; import 'button/widget_button.dart'; import 'checkbox/widget_checkbox.dart'; diff --git a/lib/src/widget/app_bar.dart b/lib/src/widget/app_bar.dart index 6e165a3b..139f7e92 100644 --- a/lib/src/widget/app_bar.dart +++ b/lib/src/widget/app_bar.dart @@ -144,7 +144,7 @@ class NeumorphicAppBarState extends State { final bool canPop = parentRoute?.canPop ?? false; final bool useCloseButton = parentRoute is PageRoute && parentRoute.fullscreenDialog; - final ScaffoldState scaffold = Scaffold.maybeOf(context); + final ScaffoldState scaffold = Scaffold.of(context, nullOk: true); final bool hasDrawer = scaffold?.hasDrawer ?? false; final bool hasEndDrawer = scaffold?.hasEndDrawer ?? false; From bb353f6a2a2f33503c6bc2b91f23cee3ba869e97 Mon Sep 17 00:00:00 2001 From: Artem Panfilov <> Date: Sat, 6 Feb 2021 10:40:17 +0100 Subject: [PATCH 2/2] more cleanup - minor math optimisation - removed unused vars --- example/lib/playground/text_playground.dart | 2 +- example/lib/sample_neumorphic_playground.dart | 6 ------ example/pubspec.yaml | 2 +- lib/src/theme/theme.dart | 2 +- pubspec.yaml | 3 +-- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/example/lib/playground/text_playground.dart b/example/lib/playground/text_playground.dart index 5b5e0ebc..39fbbb15 100644 --- a/example/lib/playground/text_playground.dart +++ b/example/lib/playground/text_playground.dart @@ -444,7 +444,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 197d3ab6..c56aa29e 100644 --- a/example/lib/sample_neumorphic_playground.dart +++ b/example/lib/sample_neumorphic_playground.dart @@ -84,12 +84,6 @@ class __PageState extends State<_Page> { } Widget _configurators() { - final Color buttonActiveColor = Theme.of(context).accentColor; - final Color buttonInnactiveColor = Colors.white; - - final Color textActiveColor = Colors.white; - final Color textInactiveColor = Colors.black.withOpacity(0.3); - return Column( children: [ styleCustomizer(), diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 20759b1d..669fe259 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: ">=2.8.0 <3.0.0" dependencies: flutter: diff --git a/lib/src/theme/theme.dart b/lib/src/theme/theme.dart index f894bd99..4d1bb61d 100644 --- a/lib/src/theme/theme.dart +++ b/lib/src/theme/theme.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart' show IconTheme, IconThemeData, TextTheme; +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'; diff --git a/pubspec.yaml b/pubspec.yaml index 55a89d17..0a6bba9f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,8 +10,7 @@ homepage: https://github.com/Idean/Flutter-Neumorphic issue_tracker: https://github.com/Idean/Flutter-Neumorphic/issues environment: - sdk: ">=2.1.0 <3.0.0" - flutter: ">=1.13.18 <2.0.0" + sdk: ">=2.8.0 <3.0.0" dependencies: flutter: