diff --git a/lib/controls/blurry_container.dart b/lib/controls/blurry_container.dart index 7e61d24..ac68e9c 100644 --- a/lib/controls/blurry_container.dart +++ b/lib/controls/blurry_container.dart @@ -1,7 +1,5 @@ //Copied from https://github.com/ranjeetrocky/blurry_container -import 'dart:ui'; - import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:smarthome/helper/preference_manager.dart'; @@ -12,7 +10,7 @@ const Color kDefaultColor = Colors.transparent; const BorderRadius kBorderRadius = BorderRadius.all(Radius.circular(10)); const BlendMode kblendMode = BlendMode.srcOver; -final blurryContainerBlurProvider = StateProvider((ref) { +final blurryContainerBlurProvider = StateProvider((final ref) { return PreferencesManager.instance.getDouble("BlurryContainerBlur") ?? 0; }); @@ -36,19 +34,14 @@ class BlurryContainer extends ConsumerWidget { @override Widget build(final BuildContext context, final WidgetRef ref) { - final blur = ref.watch(blurryContainerBlurProvider); return ClipRRect( borderRadius: borderRadius, - // child: BackdropFilter( - // blendMode: blendMode, - // filter: ImageFilter.blur(sigmaX: blur, sigmaY: blur), child: Container( padding: padding, margin: margin, color: color, child: child, ), - // ), ); } } diff --git a/lib/devices/heater/log_screen.dart b/lib/devices/heater/log_screen.dart index 83f67ff..a5bd412 100644 --- a/lib/devices/heater/log_screen.dart +++ b/lib/devices/heater/log_screen.dart @@ -11,8 +11,8 @@ class LogScreen extends ConsumerWidget { LogScreen(this._logs, this._id, {final Key? key}) : super(key: key); @override - Widget build(BuildContext context, WidgetRef ref) { - final _logsArray = ref.watch(_logs(_id)).split('\n'); + Widget build(final BuildContext context, final WidgetRef ref) { + final logsArray = ref.watch(_logs(_id)).split('\n'); return Scaffold( key: _scaffoldKey, appBar: AppBar( @@ -20,7 +20,7 @@ class LogScreen extends ConsumerWidget { ), body: Container( decoration: ThemeManager.getBackgroundDecoration(context), - child: ListView(padding: const EdgeInsets.all(16.0), children: _logsArray.map(_logLineWidget).toList())), + child: ListView(padding: const EdgeInsets.all(16.0), children: logsArray.map(_logLineWidget).toList())), ); } diff --git a/lib/devices/tradfrimotionsensor/tradfri_motion_sensor.dart b/lib/devices/tradfrimotionsensor/tradfri_motion_sensor.dart index 72c0ddd..e2b0fb5 100644 --- a/lib/devices/tradfrimotionsensor/tradfri_motion_sensor.dart +++ b/lib/devices/tradfrimotionsensor/tradfri_motion_sensor.dart @@ -95,10 +95,10 @@ class TradfriMotionSensorScreen extends ConsumerStatefulWidget { const TradfriMotionSensorScreen(this.device, {final Key? key}) : super(key: key); @override - _TradfriMotionSensorScreenState createState() => _TradfriMotionSensorScreenState(); + TradfriMotionSensorScreenState createState() => TradfriMotionSensorScreenState(); } -class _TradfriMotionSensorScreenState extends ConsumerState { +class TradfriMotionSensorScreenState extends ConsumerState { DateTime dateTime = DateTime.now(); @override diff --git a/lib/helper/update_manager.dart b/lib/helper/update_manager.dart index 4c4a7f1..f17c2b2 100644 --- a/lib/helper/update_manager.dart +++ b/lib/helper/update_manager.dart @@ -17,7 +17,7 @@ final versionAndUrlProvider = StateNotifierProvider { - static final Version version = Version(1, 2, 1); + static final Version version = Version(1, 2, 2); static const int checkEveryHours = 16; static final GitHub gitHub = GitHub(); static final RepositorySlug repositorySlug = RepositorySlug("susch19", "SmartHome"); diff --git a/lib/main.dart b/lib/main.dart index f8bfb9c..b54f167 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -46,11 +46,7 @@ final _brightnessChangeProvider = return AdaptiveThemeModeWatcher(b); }); -final _addItemSelectorProvider = StateProvider.family( - (ref, arg) { - return false; - }, -); +final _addItemSelectorProvider = StateProvider.family((final ref, final arg) => false); @riverpod Brightness brightness(final BrightnessRef ref, final AdaptiveThemeManager b) { diff --git a/pubspec.yaml b/pubspec.yaml index a102a74..96e15b9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ description: Controlling Smarthome devices with AppBroker. # Both the version and the builder number may be overridden in flutter # build by specifying --build-name and --build-number, respectively. # Read more about versioning at semver.org. -version: 1.2.1+0 +version: 1.2.2+0 environment: sdk: ">=2.17.0" @@ -47,8 +47,14 @@ dependencies: url_launcher: ^6.0.20 version: ^3.0.2 oktoast: ^3.3.1 + riverpod: flutter_riverpod: ^2.4.4 signalr_netcore: ^1.3.6 + path: ^1.8.3 + intl: ^0.18.1 + logging: ^1.2.0 + url_launcher_web: ^2.0.20 + encrypt: dev_dependencies: @@ -63,6 +69,7 @@ dev_dependencies: encrypt: pointycastle: ^3.6.1 riverpod_generator: + riverpod_annotation: ^2.2.1 flutter: uses-material-design: true