diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index c634881..3696a2d 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,26 +1,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index a52d7c7..488dce9 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,33 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + diff --git a/analysis_options.yaml b/analysis_options.yaml index 6888e0c..7773adc 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -17,7 +17,6 @@ analyzer: - "**/*.config.dart" - "lib/infrastructure/core/gen/**" - linter: rules: # Use parameter order as in json response @@ -26,6 +25,3 @@ linter: avoid_classes_with_only_static_members: false sort_constructors_first: true - - # Good packages document everything - public_member_api_docs: true diff --git a/lib/application/new_home_page/new_home_page_bloc.freezed.dart b/lib/application/new_home_page/new_home_page_bloc.freezed.dart index 282e588..01bd0cf 100644 --- a/lib/application/new_home_page/new_home_page_bloc.freezed.dart +++ b/lib/application/new_home_page/new_home_page_bloc.freezed.dart @@ -76,25 +76,25 @@ class _$NewHomePageEventCopyWithImpl<$Res, $Val extends NewHomePageEvent> } /// @nodoc -abstract class _$$InitializedCopyWith<$Res> { - factory _$$InitializedCopyWith( - _$Initialized value, $Res Function(_$Initialized) then) = - __$$InitializedCopyWithImpl<$Res>; +abstract class _$$InitializedImplCopyWith<$Res> { + factory _$$InitializedImplCopyWith( + _$InitializedImpl value, $Res Function(_$InitializedImpl) then) = + __$$InitializedImplCopyWithImpl<$Res>; } /// @nodoc -class __$$InitializedCopyWithImpl<$Res> - extends _$NewHomePageEventCopyWithImpl<$Res, _$Initialized> - implements _$$InitializedCopyWith<$Res> { - __$$InitializedCopyWithImpl( - _$Initialized _value, $Res Function(_$Initialized) _then) +class __$$InitializedImplCopyWithImpl<$Res> + extends _$NewHomePageEventCopyWithImpl<$Res, _$InitializedImpl> + implements _$$InitializedImplCopyWith<$Res> { + __$$InitializedImplCopyWithImpl( + _$InitializedImpl _value, $Res Function(_$InitializedImpl) _then) : super(_value, _then); } /// @nodoc -class _$Initialized implements Initialized { - const _$Initialized(); +class _$InitializedImpl implements Initialized { + const _$InitializedImpl(); @override String toString() { @@ -102,9 +102,9 @@ class _$Initialized implements Initialized { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is _$Initialized); + (other.runtimeType == runtimeType && other is _$InitializedImpl); } @override @@ -175,24 +175,24 @@ class _$Initialized implements Initialized { } abstract class Initialized implements NewHomePageEvent { - const factory Initialized() = _$Initialized; + const factory Initialized() = _$InitializedImpl; } /// @nodoc -abstract class _$$ScrollPageCopyWith<$Res> { - factory _$$ScrollPageCopyWith( - _$ScrollPage value, $Res Function(_$ScrollPage) then) = - __$$ScrollPageCopyWithImpl<$Res>; +abstract class _$$ScrollPageImplCopyWith<$Res> { + factory _$$ScrollPageImplCopyWith( + _$ScrollPageImpl value, $Res Function(_$ScrollPageImpl) then) = + __$$ScrollPageImplCopyWithImpl<$Res>; @useResult $Res call({double scrollPosition, int currentPage}); } /// @nodoc -class __$$ScrollPageCopyWithImpl<$Res> - extends _$NewHomePageEventCopyWithImpl<$Res, _$ScrollPage> - implements _$$ScrollPageCopyWith<$Res> { - __$$ScrollPageCopyWithImpl( - _$ScrollPage _value, $Res Function(_$ScrollPage) _then) +class __$$ScrollPageImplCopyWithImpl<$Res> + extends _$NewHomePageEventCopyWithImpl<$Res, _$ScrollPageImpl> + implements _$$ScrollPageImplCopyWith<$Res> { + __$$ScrollPageImplCopyWithImpl( + _$ScrollPageImpl _value, $Res Function(_$ScrollPageImpl) _then) : super(_value, _then); @pragma('vm:prefer-inline') @@ -201,7 +201,7 @@ class __$$ScrollPageCopyWithImpl<$Res> Object? scrollPosition = null, Object? currentPage = null, }) { - return _then(_$ScrollPage( + return _then(_$ScrollPageImpl( null == scrollPosition ? _value.scrollPosition : scrollPosition // ignore: cast_nullable_to_non_nullable @@ -216,8 +216,8 @@ class __$$ScrollPageCopyWithImpl<$Res> /// @nodoc -class _$ScrollPage implements ScrollPage { - const _$ScrollPage(this.scrollPosition, this.currentPage); +class _$ScrollPageImpl implements ScrollPage { + const _$ScrollPageImpl(this.scrollPosition, this.currentPage); @override final double scrollPosition; @@ -230,10 +230,10 @@ class _$ScrollPage implements ScrollPage { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _$ScrollPage && + other is _$ScrollPageImpl && (identical(other.scrollPosition, scrollPosition) || other.scrollPosition == scrollPosition) && (identical(other.currentPage, currentPage) || @@ -246,8 +246,8 @@ class _$ScrollPage implements ScrollPage { @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') - _$$ScrollPageCopyWith<_$ScrollPage> get copyWith => - __$$ScrollPageCopyWithImpl<_$ScrollPage>(this, _$identity); + _$$ScrollPageImplCopyWith<_$ScrollPageImpl> get copyWith => + __$$ScrollPageImplCopyWithImpl<_$ScrollPageImpl>(this, _$identity); @override @optionalTypeArgs @@ -315,12 +315,12 @@ class _$ScrollPage implements ScrollPage { abstract class ScrollPage implements NewHomePageEvent { const factory ScrollPage(final double scrollPosition, final int currentPage) = - _$ScrollPage; + _$ScrollPageImpl; double get scrollPosition; int get currentPage; @JsonKey(ignore: true) - _$$ScrollPageCopyWith<_$ScrollPage> get copyWith => + _$$ScrollPageImplCopyWith<_$ScrollPageImpl> get copyWith => throw _privateConstructorUsedError; } @@ -397,25 +397,25 @@ class _$NewHomePageStateCopyWithImpl<$Res, $Val extends NewHomePageState> } /// @nodoc -abstract class _$$_NewHomePageStateCopyWith<$Res> { - factory _$$_NewHomePageStateCopyWith( - _$_NewHomePageState value, $Res Function(_$_NewHomePageState) then) = - __$$_NewHomePageStateCopyWithImpl<$Res>; +abstract class _$$NewHomePageStateImplCopyWith<$Res> { + factory _$$NewHomePageStateImplCopyWith(_$NewHomePageStateImpl value, + $Res Function(_$NewHomePageStateImpl) then) = + __$$NewHomePageStateImplCopyWithImpl<$Res>; } /// @nodoc -class __$$_NewHomePageStateCopyWithImpl<$Res> - extends _$NewHomePageStateCopyWithImpl<$Res, _$_NewHomePageState> - implements _$$_NewHomePageStateCopyWith<$Res> { - __$$_NewHomePageStateCopyWithImpl( - _$_NewHomePageState _value, $Res Function(_$_NewHomePageState) _then) +class __$$NewHomePageStateImplCopyWithImpl<$Res> + extends _$NewHomePageStateCopyWithImpl<$Res, _$NewHomePageStateImpl> + implements _$$NewHomePageStateImplCopyWith<$Res> { + __$$NewHomePageStateImplCopyWithImpl(_$NewHomePageStateImpl _value, + $Res Function(_$NewHomePageStateImpl) _then) : super(_value, _then); } /// @nodoc -class _$_NewHomePageState implements _NewHomePageState { - const _$_NewHomePageState(); +class _$NewHomePageStateImpl implements _NewHomePageState { + const _$NewHomePageStateImpl(); @override String toString() { @@ -423,9 +423,9 @@ class _$_NewHomePageState implements _NewHomePageState { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is _$_NewHomePageState); + (other.runtimeType == runtimeType && other is _$NewHomePageStateImpl); } @override @@ -507,22 +507,24 @@ class _$_NewHomePageState implements _NewHomePageState { } abstract class _NewHomePageState implements NewHomePageState { - const factory _NewHomePageState() = _$_NewHomePageState; + const factory _NewHomePageState() = _$NewHomePageStateImpl; } /// @nodoc -abstract class _$$LoadingCopyWith<$Res> { - factory _$$LoadingCopyWith(_$Loading value, $Res Function(_$Loading) then) = - __$$LoadingCopyWithImpl<$Res>; +abstract class _$$LoadingImplCopyWith<$Res> { + factory _$$LoadingImplCopyWith( + _$LoadingImpl value, $Res Function(_$LoadingImpl) then) = + __$$LoadingImplCopyWithImpl<$Res>; @useResult $Res call({double scrollPosition, int currentPage}); } /// @nodoc -class __$$LoadingCopyWithImpl<$Res> - extends _$NewHomePageStateCopyWithImpl<$Res, _$Loading> - implements _$$LoadingCopyWith<$Res> { - __$$LoadingCopyWithImpl(_$Loading _value, $Res Function(_$Loading) _then) +class __$$LoadingImplCopyWithImpl<$Res> + extends _$NewHomePageStateCopyWithImpl<$Res, _$LoadingImpl> + implements _$$LoadingImplCopyWith<$Res> { + __$$LoadingImplCopyWithImpl( + _$LoadingImpl _value, $Res Function(_$LoadingImpl) _then) : super(_value, _then); @pragma('vm:prefer-inline') @@ -531,7 +533,7 @@ class __$$LoadingCopyWithImpl<$Res> Object? scrollPosition = null, Object? currentPage = null, }) { - return _then(_$Loading( + return _then(_$LoadingImpl( null == scrollPosition ? _value.scrollPosition : scrollPosition // ignore: cast_nullable_to_non_nullable @@ -546,8 +548,8 @@ class __$$LoadingCopyWithImpl<$Res> /// @nodoc -class _$Loading implements Loading { - const _$Loading(this.scrollPosition, this.currentPage); +class _$LoadingImpl implements Loading { + const _$LoadingImpl(this.scrollPosition, this.currentPage); @override final double scrollPosition; @@ -560,10 +562,10 @@ class _$Loading implements Loading { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _$Loading && + other is _$LoadingImpl && (identical(other.scrollPosition, scrollPosition) || other.scrollPosition == scrollPosition) && (identical(other.currentPage, currentPage) || @@ -576,8 +578,8 @@ class _$Loading implements Loading { @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') - _$$LoadingCopyWith<_$Loading> get copyWith => - __$$LoadingCopyWithImpl<_$Loading>(this, _$identity); + _$$LoadingImplCopyWith<_$LoadingImpl> get copyWith => + __$$LoadingImplCopyWithImpl<_$LoadingImpl>(this, _$identity); @override @optionalTypeArgs @@ -656,28 +658,30 @@ class _$Loading implements Loading { abstract class Loading implements NewHomePageState { const factory Loading(final double scrollPosition, final int currentPage) = - _$Loading; + _$LoadingImpl; double get scrollPosition; int get currentPage; @JsonKey(ignore: true) - _$$LoadingCopyWith<_$Loading> get copyWith => + _$$LoadingImplCopyWith<_$LoadingImpl> get copyWith => throw _privateConstructorUsedError; } /// @nodoc -abstract class _$$LoadedCopyWith<$Res> { - factory _$$LoadedCopyWith(_$Loaded value, $Res Function(_$Loaded) then) = - __$$LoadedCopyWithImpl<$Res>; +abstract class _$$LoadedImplCopyWith<$Res> { + factory _$$LoadedImplCopyWith( + _$LoadedImpl value, $Res Function(_$LoadedImpl) then) = + __$$LoadedImplCopyWithImpl<$Res>; @useResult $Res call({double scrollPosition, int currentPage}); } /// @nodoc -class __$$LoadedCopyWithImpl<$Res> - extends _$NewHomePageStateCopyWithImpl<$Res, _$Loaded> - implements _$$LoadedCopyWith<$Res> { - __$$LoadedCopyWithImpl(_$Loaded _value, $Res Function(_$Loaded) _then) +class __$$LoadedImplCopyWithImpl<$Res> + extends _$NewHomePageStateCopyWithImpl<$Res, _$LoadedImpl> + implements _$$LoadedImplCopyWith<$Res> { + __$$LoadedImplCopyWithImpl( + _$LoadedImpl _value, $Res Function(_$LoadedImpl) _then) : super(_value, _then); @pragma('vm:prefer-inline') @@ -686,7 +690,7 @@ class __$$LoadedCopyWithImpl<$Res> Object? scrollPosition = null, Object? currentPage = null, }) { - return _then(_$Loaded( + return _then(_$LoadedImpl( null == scrollPosition ? _value.scrollPosition : scrollPosition // ignore: cast_nullable_to_non_nullable @@ -701,8 +705,8 @@ class __$$LoadedCopyWithImpl<$Res> /// @nodoc -class _$Loaded implements Loaded { - const _$Loaded(this.scrollPosition, this.currentPage); +class _$LoadedImpl implements Loaded { + const _$LoadedImpl(this.scrollPosition, this.currentPage); @override final double scrollPosition; @@ -715,10 +719,10 @@ class _$Loaded implements Loaded { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _$Loaded && + other is _$LoadedImpl && (identical(other.scrollPosition, scrollPosition) || other.scrollPosition == scrollPosition) && (identical(other.currentPage, currentPage) || @@ -731,8 +735,8 @@ class _$Loaded implements Loaded { @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') - _$$LoadedCopyWith<_$Loaded> get copyWith => - __$$LoadedCopyWithImpl<_$Loaded>(this, _$identity); + _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith => + __$$LoadedImplCopyWithImpl<_$LoadedImpl>(this, _$identity); @override @optionalTypeArgs @@ -811,33 +815,35 @@ class _$Loaded implements Loaded { abstract class Loaded implements NewHomePageState { const factory Loaded(final double scrollPosition, final int currentPage) = - _$Loaded; + _$LoadedImpl; double get scrollPosition; int get currentPage; @JsonKey(ignore: true) - _$$LoadedCopyWith<_$Loaded> get copyWith => + _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith => throw _privateConstructorUsedError; } /// @nodoc -abstract class _$$ErrorCopyWith<$Res> { - factory _$$ErrorCopyWith(_$Error value, $Res Function(_$Error) then) = - __$$ErrorCopyWithImpl<$Res>; +abstract class _$$ErrorImplCopyWith<$Res> { + factory _$$ErrorImplCopyWith( + _$ErrorImpl value, $Res Function(_$ErrorImpl) then) = + __$$ErrorImplCopyWithImpl<$Res>; } /// @nodoc -class __$$ErrorCopyWithImpl<$Res> - extends _$NewHomePageStateCopyWithImpl<$Res, _$Error> - implements _$$ErrorCopyWith<$Res> { - __$$ErrorCopyWithImpl(_$Error _value, $Res Function(_$Error) _then) +class __$$ErrorImplCopyWithImpl<$Res> + extends _$NewHomePageStateCopyWithImpl<$Res, _$ErrorImpl> + implements _$$ErrorImplCopyWith<$Res> { + __$$ErrorImplCopyWithImpl( + _$ErrorImpl _value, $Res Function(_$ErrorImpl) _then) : super(_value, _then); } /// @nodoc -class _$Error implements Error { - const _$Error(); +class _$ErrorImpl implements Error { + const _$ErrorImpl(); @override String toString() { @@ -845,9 +851,9 @@ class _$Error implements Error { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is _$Error); + (other.runtimeType == runtimeType && other is _$ErrorImpl); } @override @@ -929,5 +935,5 @@ class _$Error implements Error { } abstract class Error implements NewHomePageState { - const factory Error() = _$Error; + const factory Error() = _$ErrorImpl; } diff --git a/lib/injection.config.dart b/lib/injection.config.dart index 569f4af..a6baf43 100644 --- a/lib/injection.config.dart +++ b/lib/injection.config.dart @@ -4,8 +4,7 @@ // InjectableConfigGenerator // ************************************************************************** -// ignore_for_file: unnecessary_lambdas -// ignore_for_file: lines_longer_than_80_chars +// ignore_for_file: type=lint // coverage:ignore-file // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -15,7 +14,7 @@ import 'package:get_it/get_it.dart' as _i1; import 'package:injectable/injectable.dart' as _i2; extension GetItInjectableX on _i1.GetIt { - // initializes the registration of main-scope dependencies inside of GetIt +// initializes the registration of main-scope dependencies inside of GetIt _i1.GetIt init({ String? environment, _i2.EnvironmentFilter? environmentFilter, diff --git a/lib/main.dart b/lib/main.dart index a442e00..c5fd898 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -23,7 +23,7 @@ void main() async { supportedLocales: const [ Locale('en', 'US'), ], - path: 'assets/translations', // <-- change patch to your + path: 'assets/translations', fallbackLocale: const Locale('en', 'US'), child: MyApp(), ), @@ -51,25 +51,6 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - // title: 'Flutter Demo', - // theme: ThemeData( - // // This is the theme of your application. - // // - // // Try running your application with "flutter run". You'll see the - // // application has a blue toolbar. Then, without quitting the app, try - // // changing the primarySwatch below to Colors.green and then invoke - // // "hot reload" (press "r" in the console where you ran "flutter run", - // // or simply save your changes to "hot reload" in a Flutter IDE). - // // Notice that the counter didn't reset back to zero; the application - // // is not restarted. - // primarySwatch: Colors.blue, - // // This makes the visual density adapt to the platform that you run - // // the app on. For desktop platforms, the controls will be smaller and - // // closer together (more dense) than on mobile platforms. - // visualDensity: VisualDensity.adaptivePlatformDensity, - // ), - // home: MyHomePage(title: 'Flutter Demo Home Page'), - title: 'CyBear Jinni Smart Home', localizationsDelegates: context.localizationDelegates, supportedLocales: context.supportedLocales, diff --git a/lib/presentation/about_page/about_page_content_desktop.dart b/lib/presentation/about_page/about_page_content_desktop.dart index 053e795..145dc37 100644 --- a/lib/presentation/about_page/about_page_content_desktop.dart +++ b/lib/presentation/about_page/about_page_content_desktop.dart @@ -20,7 +20,7 @@ class AboutPageContentDesktop extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/about_page/about_page_content_mobile_tablet.dart b/lib/presentation/about_page/about_page_content_mobile_tablet.dart index c43f93f..0da3fca 100644 --- a/lib/presentation/about_page/about_page_content_mobile_tablet.dart +++ b/lib/presentation/about_page/about_page_content_mobile_tablet.dart @@ -21,7 +21,7 @@ class AboutPageContentMobileTablet extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/faq_page/faq_page.dart b/lib/presentation/faq_page/faq_page.dart index d3d33c6..fdc1b1f 100644 --- a/lib/presentation/faq_page/faq_page.dart +++ b/lib/presentation/faq_page/faq_page.dart @@ -19,7 +19,7 @@ class FaqPage extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 6445116..50dda75 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -21,7 +21,7 @@ class HomePage extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/home_page/widgets/easy_to_set_up_benefit_block.dart b/lib/presentation/home_page/widgets/easy_to_set_up_benefit_block.dart index e574876..47cd728 100644 --- a/lib/presentation/home_page/widgets/easy_to_set_up_benefit_block.dart +++ b/lib/presentation/home_page/widgets/easy_to_set_up_benefit_block.dart @@ -49,7 +49,7 @@ class EasyToSetUpBenefitBlock extends StatelessWidget { ), ), ], - ) + ), ], ), const SizedBox( diff --git a/lib/presentation/home_page/widgets/privacy_and_open_source_benefit_block.dart b/lib/presentation/home_page/widgets/privacy_and_open_source_benefit_block.dart index 3192b4b..7af8356 100644 --- a/lib/presentation/home_page/widgets/privacy_and_open_source_benefit_block.dart +++ b/lib/presentation/home_page/widgets/privacy_and_open_source_benefit_block.dart @@ -54,7 +54,7 @@ class PrivacyAndOpenSourceBenefitBlock extends StatelessWidget { ), ), ], - ) + ), ], ), const SizedBox( diff --git a/lib/presentation/integrations_page/integrations_page.dart b/lib/presentation/integrations_page/integrations_page.dart index 3001b26..ecc3008 100644 --- a/lib/presentation/integrations_page/integrations_page.dart +++ b/lib/presentation/integrations_page/integrations_page.dart @@ -19,7 +19,7 @@ class IntegrationsPage extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/new_home_page/widgets/home_page_second_part.dart b/lib/presentation/new_home_page/widgets/home_page_second_part.dart index 5317030..1ec1986 100644 --- a/lib/presentation/new_home_page/widgets/home_page_second_part.dart +++ b/lib/presentation/new_home_page/widgets/home_page_second_part.dart @@ -86,7 +86,7 @@ class HomePageSecondPart extends StatelessWidget { const SizedBox(), ], ), - ) + ), ], ), ], diff --git a/lib/presentation/new_home_page/widgets/home_page_thired_part.dart b/lib/presentation/new_home_page/widgets/home_page_thired_part.dart index 456685e..89dcac9 100644 --- a/lib/presentation/new_home_page/widgets/home_page_thired_part.dart +++ b/lib/presentation/new_home_page/widgets/home_page_thired_part.dart @@ -199,11 +199,11 @@ class HomePageThiredPart extends StatelessWidget { ), ], ), - ) + ), ], ), ), - ) + ), ], ), ], diff --git a/lib/presentation/news_page/news.dart b/lib/presentation/news_page/news.dart index 1a19c4d..5446e5e 100644 --- a/lib/presentation/news_page/news.dart +++ b/lib/presentation/news_page/news.dart @@ -20,7 +20,7 @@ class NewsTab extends StatelessWidget { Container( height: 20, ), - const Text('Empty_history').tr() + const Text('Empty_history').tr(), ], ); } diff --git a/lib/presentation/set_up_page/set_up_page.dart b/lib/presentation/set_up_page/set_up_page.dart index e9bcb7c..0d00fd7 100644 --- a/lib/presentation/set_up_page/set_up_page.dart +++ b/lib/presentation/set_up_page/set_up_page.dart @@ -19,7 +19,7 @@ class SetUpPage extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/set_up_page/set_up_page_content_desktop.dart b/lib/presentation/set_up_page/set_up_page_content_desktop.dart index b454a6c..2978434 100644 --- a/lib/presentation/set_up_page/set_up_page_content_desktop.dart +++ b/lib/presentation/set_up_page/set_up_page_content_desktop.dart @@ -316,7 +316,7 @@ class SetUpPageContentDesktop extends StatelessWidget { const Icon(Icons.error), ), ), - ) + ), ], ), const SizedBox( @@ -369,7 +369,7 @@ class SetUpPageContentDesktop extends StatelessWidget { const Icon(Icons.error), ), ), - ) + ), ], ), const SizedBox( @@ -422,7 +422,7 @@ class SetUpPageContentDesktop extends StatelessWidget { const Icon(Icons.error), ), ), - ) + ), ], ), const SizedBox( @@ -568,7 +568,7 @@ class SetUpPageContentDesktop extends StatelessWidget { ), ), ], - ) + ), ], ), ], diff --git a/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer.dart b/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer.dart index 7f662e3..b267077 100644 --- a/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer.dart +++ b/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer.dart @@ -21,7 +21,7 @@ class NavigationDrawerWidget extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer_header.dart b/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer_header.dart index 2450942..e194bd9 100644 --- a/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer_header.dart +++ b/lib/presentation/shared_widgets/navigation_drawer/navigation_drawer_header.dart @@ -17,7 +17,7 @@ class NavigationDrawerHeader extends StatelessWidget { Theme.of(context).primaryColor, Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary, - Theme.of(context).primaryColor + Theme.of(context).primaryColor, ], ), ), diff --git a/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_desktop.dart b/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_desktop.dart deleted file mode 100644 index 4a4ef32..0000000 --- a/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_desktop.dart +++ /dev/null @@ -1,196 +0,0 @@ -import 'package:cybear_jinni_site/my_singleton.dart'; -import 'package:cybear_jinni_site/presentation/home_page/home_page.dart'; -import 'package:cybear_jinni_site/presentation/route_names.dart'; -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -/// The specific look for the top navigation menu for tablet desktop -class TopNavigationMenuDesktop extends StatelessWidget { - @override - Widget build(BuildContext context) { - return Container( - margin: const EdgeInsets.all(20), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - ClipPath( - clipper: CrosRightSizde(), - child: ColoredBox( - color: Colors.black87, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const SizedBox( - height: 72, - width: 20, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != 'landingPage' && - MySingleton.getCurrentPageName != homeRoute) { - Navigator.pushNamed( - context, - homeRoute, - ); - } else { - Navigator.pushReplacementNamed(context, homeRoute); - } - }, - child: const Image( - height: 60, - image: AssetImage( - 'assets/images/cbj_app_icon_no_bg.png', - ), - fit: BoxFit.fitHeight, - ), - ), - const SizedBox( - width: 40, - ) - ], - ), - ), - ), - ClipPath( - clipper: CrosLeftSizde(), - child: ColoredBox( - color: Colors.black87, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const SizedBox( - width: 40, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != aboutRoute) { - Navigator.pushNamed(context, aboutRoute); - } else { - Navigator.pushReplacementNamed(context, aboutRoute); - } - }, - child: Tab( - icon: FaIcon( - FontAwesomeIcons.addressCard, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - child: Text( - 'About', - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - ), - ), - ), - const SizedBox( - width: 20, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != faqRoute) { - Navigator.pushNamed(context, faqRoute); - } else { - Navigator.pushReplacementNamed(context, faqRoute); - } - }, - child: Tab( - icon: FaIcon( - FontAwesomeIcons.circleQuestion, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - child: Text( - 'FAQ', - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - ), - ), - ), - const SizedBox( - width: 20, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != setUpRoute) { - Navigator.pushNamed(context, setUpRoute); - } else { - Navigator.pushReplacementNamed(context, setUpRoute); - } - }, - child: Tab( - icon: FaIcon( - FontAwesomeIcons.shapes, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - child: Text( - 'Set Up', - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - ), - ), - ), - const SizedBox( - width: 20, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != integrationsRoute) { - Navigator.pushNamed(context, integrationsRoute); - } else { - Navigator.pushReplacementNamed( - context, - integrationsRoute, - ); - } - }, - child: Tab( - icon: FaIcon( - FontAwesomeIcons.lightbulb, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - child: Text( - 'Integrations', - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - ), - ), - ), - const SizedBox( - width: 20, - ), - TextButton( - onPressed: () { - if (MySingleton.getCurrentPageName != 'landingPage' && - MySingleton.getCurrentPageName != homeRoute) { - Navigator.pushNamed(context, homeRoute); - } else { - Navigator.pushReplacementNamed(context, homeRoute); - } - }, - child: Tab( - icon: FaIcon( - FontAwesomeIcons.house, - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - child: Text( - 'Home', - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge!.color, - ), - ), - ), - ), - const SizedBox( - width: 20, - ), - ], - ), - ), - ) - ], - ), - ); - } -} diff --git a/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_mobile_tablet.dart b/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_mobile_tablet.dart index 4314a70..02cdce9 100644 --- a/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_mobile_tablet.dart +++ b/lib/presentation/shared_widgets/top_navigation_menu/top_navigation_menu_mobile_tablet.dart @@ -18,7 +18,7 @@ class TopNavigationMenuMobileTablet extends StatelessWidget { FontAwesomeIcons.bars, color: Theme.of(context).textTheme.bodyLarge!.color, ), - ) + ), ], ), ); diff --git a/pubspec.lock b/pubspec.lock index 9dba81d..c381fd1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -125,26 +125,26 @@ packages: dependency: "direct main" description: name: cached_network_image - sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15 + sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" url: "https://pub.dev" source: hosted - version: "3.2.3" + version: "3.3.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7 + sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0 + sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.1" characters: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -193,14 +193,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" - cool_nav: - dependency: "direct main" - description: - name: cool_nav - sha256: "68ddfae03e8a55b2dae1dfb54aa0c4c8111c9b6fc90eb4daec9a3dd706ecc8bc" - url: "https://pub.dev" - source: hosted - version: "0.1.0" crypto: dependency: transitive description: @@ -213,10 +205,10 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" dart_style: dependency: transitive description: @@ -229,10 +221,10 @@ packages: dependency: "direct main" description: name: easy_localization - sha256: "30ebf25448ffe169e0bd9bc4b5da94faa8398967a2ad2ca09f438be8b6953645" + sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" easy_logger: dependency: transitive description: @@ -294,14 +286,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.3" - flutter_blurhash: - dependency: transitive - description: - name: flutter_blurhash - sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" - url: "https://pub.dev" - source: hosted - version: "0.7.0" flutter_cache_manager: dependency: transitive description: @@ -319,10 +303,10 @@ packages: dependency: "direct main" description: name: flutter_staggered_grid_view - sha256: "1312314293acceb65b92754298754801b0e1f26a1845833b740b30415bbbcf07" + sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395" url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.7.0" flutter_test: dependency: "direct dev" description: flutter @@ -337,18 +321,18 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3" + sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08" url: "https://pub.dev" source: hosted - version: "10.5.0" + version: "10.6.0" freezed: dependency: "direct dev" description: name: freezed - sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" + sha256: "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.6" freezed_annotation: dependency: "direct main" description: @@ -369,10 +353,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468" + sha256: f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3 url: "https://pub.dev" source: hosted - version: "7.6.0" + version: "7.6.4" glob: dependency: transitive description: @@ -425,26 +409,26 @@ packages: dependency: "direct main" description: name: injectable - sha256: fbe4b673f8c344e03eb4ab50fa853405872f401bbf6a7ba84b2b7447ac81ed1b + sha256: cd3c422e13270c81f64ab73c80406b2b2ed563fe59d0ff2093eb7eee63d0bbeb url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.2" injectable_generator: dependency: "direct dev" description: name: injectable_generator - sha256: "4fe3db041b680098ce3af40b680734906e955a0ce89170d3993626d48d27b2f3" + sha256: f9d3c05f0938403f79ad6c6d23ec8e37a7a05ad980b1bf9399493f3e41845788 url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.4.1" intl: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -473,26 +457,26 @@ packages: dependency: "direct main" description: name: linkable - sha256: "28e934b81957c75b1f07ecadf0d7aa3ae6e693b2701eb15661774d051eafc807" + sha256: "3cb3ccc83da8b23d27dc66b1421d5b42ed9e6e56ace045121e02a1235ee7a7e0" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lint: dependency: "direct dev" description: name: lint - sha256: f4bd4dbaa39f4ae8836f2d1275f2f32bc68b3a8cce0a0735dd1f7a601f06682a + sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.0" logger: dependency: "direct main" description: name: logger - sha256: "66cb048220ca51cf9011da69fa581e4ee2bed4be6e82870d9e9baae75739da49" + sha256: "6bbb9d6f7056729537a4309bda2e74e18e5d9f14302489cc1e93f33b3fe32cac" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2+1" logging: dependency: transitive description: @@ -505,26 +489,26 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -545,10 +529,10 @@ packages: dependency: transitive description: name: octo_image - sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "2.0.0" package_config: dependency: transitive description: @@ -617,42 +601,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "10.4.3" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221" + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "10.3.3" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" + url: "https://pub.dev" + source: hosted + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.11.3" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" platform: dependency: transitive description: @@ -814,10 +806,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -838,18 +830,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -886,10 +878,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -910,66 +902,66 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.1.12" + version: "6.2.2" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "78cb6dea3e93148615109e58e42c35d1ffbf5ef66c44add673d0ab75f12ff3af" + sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" url: "https://pub.dev" source: hosted - version: "6.0.37" + version: "6.2.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.2.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.2.2" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.1" uuid: dependency: transitive description: @@ -994,6 +986,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1075,5 +1075,5 @@ packages: source: hosted version: "2.0.2" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.2.3 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index df4318c..2163031 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,11 +2,10 @@ name: cybear_jinni_site description: Site for CyBear Jinni Smart Home version: 1.0.0+3 -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 - + sdk: ^3.2.3 flutter: # Ensures that the Material Icons font is included with your application. @@ -30,14 +29,12 @@ dependencies: # Helps implement the BLoC pattern. bloc: ^8.1.2 # Show images from the internet and keep them in the cache directory. - cached_network_image: ^3.2.3 - # Spotlight Bottom Navigation Bar - cool_nav: ^0.1.0 + cached_network_image: ^3.3.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.6 # Internationalization (Easy translations) - easy_localization: ^3.0.2 + easy_localization: ^3.0.3 # Widget that can be expanded or collapsed by the user. expandable: ^5.0.1 flutter: @@ -45,27 +42,27 @@ dependencies: # Bloc for state management, replace StatefulWidget flutter_bloc: ^8.1.3 # staggered grid view which supports multiple columns with rows of varying sizes. - flutter_staggered_grid_view: ^0.6.2 + flutter_staggered_grid_view: ^0.7.0 # The Font Awesome Icon pack available as set of Flutter Icons. https://fontawesome.com/ - font_awesome_flutter: ^10.5.0 + font_awesome_flutter: ^10.6.0 # Annotations for freezed freezed_annotation: ^2.4.1 # Service locator - get_it: ^7.6.0 + get_it: ^7.6.4 # Add hex color codes to your flutter projects hexcolor: ^3.0.1 # Convenient code generator for get_it - injectable: ^2.1.2 + injectable: ^2.3.2 # Links to your text. - linkable: ^3.0.1 + linkable: ^3.0.2 # Small, easy to use and extensible logger which prints beautiful logs. - logger: ^2.0.1 + logger: ^2.0.2+1 # Popup that ask for the requested permission - permission_handler: ^10.4.3 + permission_handler: ^11.1.0 # Allows you to create a readable responsive UI responsive_builder: ^0.7.0 # Launching a URL in the mobile platform - url_launcher: ^6.1.12 + url_launcher: ^6.2.2 # YouTube iFrame player youtube_player_iframe: ^4.0.4 @@ -76,9 +73,8 @@ dev_dependencies: flutter_test: sdk: flutter # Code generator for unions/pattern-matching/copy. - freezed: ^2.4.1 + freezed: ^2.4.6 # Convenient code generator for get_it. - injectable_generator: ^2.1.6 + injectable_generator: ^2.4.1 # Collection of lint rules for Dart and Flutter projects. - lint: ^2.1.2 - + lint: ^2.3.0 diff --git a/test/widget_test.dart b/test/widget_test.dart index 981a4a5..ae40864 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,20 +8,5 @@ import 'package:flutter_test/flutter_test.dart'; void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // // Build our app and trigger a frame. - // await tester.pumpWidget(MyApp()); - // - // // Verify that our counter starts at 0. - // expect(find.text('0'), findsOneWidget); - // expect(find.text('1'), findsNothing); - // - // // Tap the '+' icon and trigger a frame. - // await tester.tap(find.byIcon(Icons.add)); - // await tester.pump(); - // - // // Verify that our counter has incremented. - // expect(find.text('0'), findsNothing); - // expect(find.text('1'), findsOneWidget); - }); + testWidgets('Counter increments smoke test', (WidgetTester tester) async {}); }