diff --git a/lib/screens/components.dart b/lib/screens/components.dart index a2eaf11..852f2a6 100644 --- a/lib/screens/components.dart +++ b/lib/screens/components.dart @@ -52,16 +52,18 @@ class _ComponentsState extends State { ), SizedBox( width: double.infinity, - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.defaultColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.defaultColor, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), @@ -72,16 +74,18 @@ class _ComponentsState extends State { width: double.infinity, child: Padding( padding: const EdgeInsets.only(top: 8), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.primary, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.primary, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), @@ -94,16 +98,18 @@ class _ComponentsState extends State { width: double.infinity, child: Padding( padding: const EdgeInsets.only(top: 8), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.info, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.info, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), @@ -115,16 +121,18 @@ class _ComponentsState extends State { width: double.infinity, child: Padding( padding: const EdgeInsets.only(top: 8), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.success, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.success, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), @@ -137,16 +145,18 @@ class _ComponentsState extends State { width: double.infinity, child: Padding( padding: const EdgeInsets.only(top: 8), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.warning, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.warning, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), @@ -159,16 +169,18 @@ class _ComponentsState extends State { width: double.infinity, child: Padding( padding: const EdgeInsets.only(top: 8), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.error, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.error, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 12, bottom: 12), diff --git a/lib/screens/onboarding.dart b/lib/screens/onboarding.dart index 63ba76d..813106f 100644 --- a/lib/screens/onboarding.dart +++ b/lib/screens/onboarding.dart @@ -88,15 +88,17 @@ class Onboarding extends StatelessWidget { padding: const EdgeInsets.only(top: 16.0), child: SizedBox( width: double.infinity, - child: FlatButton( - textColor: NowUIColors.white, - color: NowUIColors.info, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.info, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), - ), child: Padding( padding: EdgeInsets.only( left: 16.0, right: 16.0, top: 16, bottom: 16), diff --git a/lib/screens/pro.dart b/lib/screens/pro.dart index fdb8fdf..382f4c6 100644 --- a/lib/screens/pro.dart +++ b/lib/screens/pro.dart @@ -125,13 +125,15 @@ class Pro extends StatelessWidget { padding: const EdgeInsets.only(top: 16.0), child: SizedBox( width: double.infinity, - child: FlatButton( - textColor: NowUIColors.white, - color: NowUIColors.info, - onPressed: _launchURL, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4.0), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.info, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), ), + onPressed: _launchURL, child: Padding( padding: EdgeInsets.only( left: 16.0, diff --git a/lib/screens/profile.dart b/lib/screens/profile.dart index 5706d41..bbb4659 100644 --- a/lib/screens/profile.dart +++ b/lib/screens/profile.dart @@ -184,16 +184,18 @@ class Profile extends StatelessWidget { children: [ Padding( padding: const EdgeInsets.only(right: 8.0), - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.info, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: NowUIColors.info, // background + onPrimary: NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed(context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(32.0), - ), child: Padding( padding: EdgeInsets.only( left: 12.0, right: 12.0, top: 10, bottom: 10), diff --git a/lib/screens/register.dart b/lib/screens/register.dart index 028d3a3..9225fbd 100644 --- a/lib/screens/register.dart +++ b/lib/screens/register.dart @@ -172,18 +172,22 @@ class _RegisterState extends State { ], ), Center( - child: RaisedButton( - textColor: NowUIColors.white, - color: NowUIColors.primary, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + primary: + NowUIColors.primary, // background + onPrimary: + NowUIColors.white, // foreground + shape: RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(32.0), + ), + ), onPressed: () { // Respond to button press Navigator.pushReplacementNamed( context, '/home'); }, - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(32.0), - ), child: Padding( padding: EdgeInsets.only( left: 32.0, diff --git a/pubspec.lock b/pubspec.lock index 057071a..8a40c48 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.8.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" carousel_slider: dependency: "direct main" description: @@ -28,28 +28,28 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.3.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -86,27 +86,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "8.11.0" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" plugin_platform_interface: dependency: transitive description: @@ -132,49 +139,49 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.4.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" url_launcher: dependency: "direct main" description: @@ -223,7 +230,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.22.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.22.0"