From aa20bfc7167794822bfe144042d81d807b02671b Mon Sep 17 00:00:00 2001 From: Gaspard Merten Date: Fri, 22 Jan 2021 19:43:15 +0100 Subject: [PATCH] Removing the ripple effect --- CHANGELOG.md | 4 ++ README.md | 2 +- example/lib/main.dart | 129 ++++++++++++++++++++++-------------------- lib/date_field.dart | 13 +---- pubspec.yaml | 2 +- 5 files changed, 76 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de23f27..aca7476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,3 +66,7 @@ Breaking change: * Full support for input decoration * New standardized usage, many deprecations + +##1.0.1 + +* Removing the ripple effect diff --git a/README.md b/README.md index 86eed92..aaa7b94 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ In the `pubspec.yaml` of your flutter project, add the following dependency: ```yaml dependencies: ... - date_field: ^1.0.0 + date_field: ^1.0.1 ``` In your library add the following import: diff --git a/example/lib/main.dart b/example/lib/main.dart index e4bf540..de5d8d7 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -12,8 +12,10 @@ class MyApp extends StatelessWidget { return MaterialApp( title: 'Flutter Demo', theme: ThemeData( - inputDecorationTheme: - const InputDecorationTheme(border: OutlineInputBorder()), + inputDecorationTheme: const InputDecorationTheme( + border: OutlineInputBorder() + ), + primarySwatch: Colors.blue, ), home: MyHomePage(), @@ -21,6 +23,7 @@ class MyApp extends StatelessWidget { } } + class MyHomePage extends StatefulWidget { @override _MyHomePageState createState() => _MyHomePageState(); @@ -31,72 +34,74 @@ class _MyHomePageState extends State { @override Widget build(BuildContext context) { + return Scaffold( body: Padding( - padding: const EdgeInsets.all(20.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const FlutterLogo(size: 100), - const SizedBox(height: 20), - const Text('DateField package showcase'), - const Padding( - padding: EdgeInsets.symmetric(vertical: 20.0), - child: Text('DateTimeField'), - ), - DateTimeField( - decoration: const InputDecoration( - hintText: 'Please select your birthday date and time'), - selectedDate: selectedDate, - onDateSelected: (DateTime value) { - setState(() { - selectedDate = value; - }); - }), - const Padding( - padding: EdgeInsets.symmetric(vertical: 20.0), - child: Text('DateTimeFormField'), - ), - Form( - child: Column( - children: [ - DateTimeFormField( + padding: const EdgeInsets.all(20.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const FlutterLogo(size: 100), + const SizedBox(height: 20), + const Text('DateField package showcase'), + const Padding( + padding: EdgeInsets.symmetric(vertical: 20.0), + child: Text('DateTimeField'), + ), + DateTimeField( decoration: const InputDecoration( - hintStyle: TextStyle(color: Colors.black45), - errorStyle: TextStyle(color: Colors.redAccent), - border: OutlineInputBorder(), - suffixIcon: Icon(Icons.event_note), - labelText: 'My Super Date Time Field', + hintText: 'Please select your birthday date and time' ), - autovalidateMode: AutovalidateMode.always, - validator: (e) => - (e?.day ?? 0) == 1 ? 'Please not the first day' : null, + selectedDate: selectedDate, onDateSelected: (DateTime value) { - print(value); - }, + setState(() { + selectedDate = value; + }); + } + ), + const Padding( + padding: EdgeInsets.symmetric(vertical: 20.0), + child: Text('DateTimeFormField'), + ), + Form( + child: Column( + children: [ + DateTimeFormField( + decoration: const InputDecoration( + hintStyle: TextStyle(color: Colors.black45), + errorStyle: TextStyle(color: Colors.redAccent), + border: OutlineInputBorder(), + suffixIcon: Icon(Icons.event_note), + labelText: 'My Super Date Time Field', + ), + autovalidateMode: AutovalidateMode.always, + validator: (e) => (e?.day ?? 0) == 1 ? 'Please not the first day' : null, + onDateSelected: (DateTime value) { + print(value); + }, + ), + const SizedBox(height: 50), + DateTimeFormField( + decoration: const InputDecoration( + hintStyle: TextStyle(color: Colors.black45), + errorStyle: TextStyle(color: Colors.redAccent), + border: OutlineInputBorder(), + suffixIcon: Icon(Icons.event_note), + labelText: 'Only time', + ), + mode: DateTimeFieldPickerMode.time, + autovalidateMode: AutovalidateMode.always, + validator: (e) => (e?.day ?? 0) == 1 ? 'Please not the first day' : null, + onDateSelected: (DateTime value) { + print(value); + }, + ), + ], ), - const SizedBox(height: 50), - DateTimeFormField( - decoration: const InputDecoration( - hintStyle: TextStyle(color: Colors.black45), - errorStyle: TextStyle(color: Colors.redAccent), - border: OutlineInputBorder(), - suffixIcon: Icon(Icons.event_note), - labelText: 'Only time', - ), - mode: DateTimeFieldPickerMode.time, - autovalidateMode: AutovalidateMode.always, - validator: (e) => - (e?.day ?? 0) == 1 ? 'Please not the first day' : null, - onDateSelected: (DateTime value) { - print(value); - }, - ), - ], - ), + ), + ], ), - ], - ), - )); + ) + ); } } diff --git a/lib/date_field.dart b/lib/date_field.dart index dd7a31d..7d1bff9 100644 --- a/lib/date_field.dart +++ b/lib/date_field.dart @@ -312,16 +312,9 @@ class _InputDropdown extends StatelessWidget { suffixIcon: const Icon(Icons.arrow_drop_down), ).applyDefaults(Theme.of(context).inputDecorationTheme); - return Material( - color: Colors.transparent, - child: InkWell( - borderRadius: inkwellBorderRadius, - onTap: onPressed, - child: InputDecorator( - decoration: effectiveDecoration, - child: Text(text, style: textStyle), - ), - ), + return InputDecorator( + decoration: effectiveDecoration, + child: Text(text, style: textStyle), ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 474afa3..287b806 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: date_field description: A widget in the form of a field that lets people enter choose a date/time/date and time via a date/time picker dialog. -version: 1.0.0 +version: 1.0.1 homepage: 'https://github.com/GaspardMerten/date_field' environment: