From b2acf9627834dbad9a8df98f7444ac931dc0bb32 Mon Sep 17 00:00:00 2001 From: Thomas Klein Langenhorst Date: Sun, 26 Mar 2023 12:16:25 +0200 Subject: [PATCH] feature: Remove unnessecary Riverpod dependency --- example/pubspec.lock | 32 +++---------------- lib/src/inputs/carousel/carousel.dart | 5 ++- lib/src/inputs/date_picker/date_picker.dart | 5 ++- .../inputs/date_picker/date_picker_field.dart | 7 ++-- .../inputs/number_picker/number_picker.dart | 5 ++- lib/src/inputs/slider/slider.dart | 5 ++- lib/src/inputs/switch/switch.dart | 6 ++-- lib/src/inputs/text/password.dart | 7 ++-- lib/src/inputs/text/plain_text.dart | 6 ++-- pubspec.yaml | 5 ++- 10 files changed, 24 insertions(+), 59 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 4452471..9e47677 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "1.0.6" + version: "2.0.0" flutter_lints: dependency: "direct dev" description: @@ -77,14 +77,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" - flutter_riverpod: - dependency: transitive - description: - name: flutter_riverpod - sha256: "371f6e8acb69dbe8aa3e0a50c8a65f8a9352b599134d585cc4923261cb5ae4d6" - url: "https://pub.dev" - source: hosted - version: "2.1.1" flutter_test: dependency: "direct dev" description: flutter @@ -94,10 +86,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" js: dependency: transitive description: @@ -146,14 +138,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.2" - riverpod: - dependency: transitive - description: - name: riverpod - sha256: "899cd0999b2f3b798349d9b5639cfea81d406c011bd914097145ff92e91b29f9" - url: "https://pub.dev" - source: hosted - version: "2.1.1" sky_engine: dependency: transitive description: flutter @@ -175,14 +159,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.11.0" - state_notifier: - dependency: transitive - description: - name: state_notifier - sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" - url: "https://pub.dev" - source: hosted - version: "0.7.2+1" stream_channel: dependency: transitive description: @@ -225,4 +201,4 @@ packages: version: "2.1.4" sdks: dart: ">=2.18.2 <3.0.0" - flutter: ">=3.0.0" + flutter: ">=1.17.0" diff --git a/lib/src/inputs/carousel/carousel.dart b/lib/src/inputs/carousel/carousel.dart index 32f9f09..bd03da4 100644 --- a/lib/src/inputs/carousel/carousel.dart +++ b/lib/src/inputs/carousel/carousel.dart @@ -3,11 +3,10 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'carousel_form.dart'; -class FlutterFormInputCarousel extends ConsumerWidget { +class FlutterFormInputCarousel extends StatelessWidget { const FlutterFormInputCarousel({ Key? key, required this.items, @@ -28,7 +27,7 @@ class FlutterFormInputCarousel extends ConsumerWidget { final int? initialValue; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { return CarouselFormField( onSaved: (value) => onSaved?.call(value), validator: (value) => validator?.call(value), diff --git a/lib/src/inputs/date_picker/date_picker.dart b/lib/src/inputs/date_picker/date_picker.dart index b0f5183..47a3086 100644 --- a/lib/src/inputs/date_picker/date_picker.dart +++ b/lib/src/inputs/date_picker/date_picker.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/src/inputs/date_picker/date_picker_field.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; enum FlutterFormDateTimeType { @@ -14,7 +13,7 @@ enum FlutterFormDateTimeType { range, } -class FlutterFormInputDateTime extends ConsumerWidget { +class FlutterFormInputDateTime extends StatelessWidget { const FlutterFormInputDateTime({ this.decoration, this.style, @@ -56,7 +55,7 @@ class FlutterFormInputDateTime extends ConsumerWidget { final TimePickerEntryMode timePickerEntryMode; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { return DateTimeInputField( style: style, decoration: decoration, diff --git a/lib/src/inputs/date_picker/date_picker_field.dart b/lib/src/inputs/date_picker/date_picker_field.dart index 604e1e7..99e60c2 100644 --- a/lib/src/inputs/date_picker/date_picker_field.dart +++ b/lib/src/inputs/date_picker/date_picker_field.dart @@ -6,10 +6,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_input_library/src/inputs/date_picker/date_picker.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; -class DateTimeInputField extends ConsumerStatefulWidget { +class DateTimeInputField extends StatefulWidget { const DateTimeInputField({ this.decoration, Key? key, @@ -51,10 +50,10 @@ class DateTimeInputField extends ConsumerStatefulWidget { final TimePickerEntryMode timePickerEntryMode; @override - ConsumerState createState() => _DateInputFieldState(); + State createState() => _DateInputFieldState(); } -class _DateInputFieldState extends ConsumerState { +class _DateInputFieldState extends State { late final DateTime firstDate; late final DateTime lastDate; late final DateTime initialDate; diff --git a/lib/src/inputs/number_picker/number_picker.dart b/lib/src/inputs/number_picker/number_picker.dart index 2409089..dce1ffd 100644 --- a/lib/src/inputs/number_picker/number_picker.dart +++ b/lib/src/inputs/number_picker/number_picker.dart @@ -3,11 +3,10 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'number_picker_field.dart'; -class FlutterFormInputNumberPicker extends ConsumerWidget { +class FlutterFormInputNumberPicker extends StatelessWidget { const FlutterFormInputNumberPicker({ Key? key, Widget? label, @@ -30,7 +29,7 @@ class FlutterFormInputNumberPicker extends ConsumerWidget { final Function(int?)? onChanged; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { return NumberPickerFormField( minValue: minValue, maxValue: maxValue, diff --git a/lib/src/inputs/slider/slider.dart b/lib/src/inputs/slider/slider.dart index 0533695..d33c525 100644 --- a/lib/src/inputs/slider/slider.dart +++ b/lib/src/inputs/slider/slider.dart @@ -5,9 +5,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/src/inputs/slider/slider_field.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -class FlutterFormInputSlider extends ConsumerWidget { +class FlutterFormInputSlider extends StatelessWidget { const FlutterFormInputSlider({ Key? key, this.minValue = 0, @@ -31,7 +30,7 @@ class FlutterFormInputSlider extends ConsumerWidget { final FocusNode? focusNode; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { return SliderFormField( onSaved: (value) => onSaved?.call(value), validator: (value) => validator?.call(value), diff --git a/lib/src/inputs/switch/switch.dart b/lib/src/inputs/switch/switch.dart index c7d6311..c0962f2 100644 --- a/lib/src/inputs/switch/switch.dart +++ b/lib/src/inputs/switch/switch.dart @@ -6,9 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/src/inputs/switch/switch_field.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -class FlutterFormInputSwitch extends ConsumerWidget { +class FlutterFormInputSwitch extends StatelessWidget { final Widget? label; final Function(bool?)? onSaved; final String? Function(bool?)? validator; @@ -29,7 +27,7 @@ class FlutterFormInputSwitch extends ConsumerWidget { ); @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { return SwitchFormField( onSaved: (value) => onSaved?.call(value), onChanged: (value) => onChanged?.call(value), diff --git a/lib/src/inputs/text/password.dart b/lib/src/inputs/text/password.dart index b4df4cc..f56c100 100644 --- a/lib/src/inputs/text/password.dart +++ b/lib/src/inputs/text/password.dart @@ -3,11 +3,10 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; /// Generates a [TextFormField] for passwords. It requires a [FlutterFormInputController] /// as the [controller] parameter and an optional [Widget] as [label] -class FlutterFormInputPassword extends ConsumerStatefulWidget { +class FlutterFormInputPassword extends StatefulWidget { final Widget? label; final FocusNode? focusNode; final String? initialValue; @@ -28,11 +27,11 @@ class FlutterFormInputPassword extends ConsumerStatefulWidget { }) : super(key: key); @override - ConsumerState createState() => + State createState() => _PasswordTextFieldState(); } -class _PasswordTextFieldState extends ConsumerState { +class _PasswordTextFieldState extends State { bool obscured = true; @override diff --git a/lib/src/inputs/text/plain_text.dart b/lib/src/inputs/text/plain_text.dart index bb91c21..3fc638c 100644 --- a/lib/src/inputs/text/plain_text.dart +++ b/lib/src/inputs/text/plain_text.dart @@ -4,9 +4,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -class FlutterFormInputPlainText extends ConsumerWidget { +class FlutterFormInputPlainText extends StatelessWidget { const FlutterFormInputPlainText({ Key? key, this.label, @@ -45,7 +43,7 @@ class FlutterFormInputPlainText extends ConsumerWidget { final TextStyle? style; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { InputDecoration inputDecoration = decoration ?? InputDecoration( label: label ?? const Text("Plain text"), diff --git a/pubspec.yaml b/pubspec.yaml index 3cbc1e2..0f67585 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_input_library description: A new Flutter package project. -version: 1.0.6 +version: 2.0.0 repository: https://github.com/Iconica-Development/flutter_input_library environment: @@ -10,8 +10,7 @@ environment: dependencies: flutter: sdk: flutter - flutter_riverpod: any - intl: any + intl: ^0.18.0 dev_dependencies: flutter_test: