Merge pull request #3 from Nuxify/feature/upgrade-flutter

feat: upgrade to flutter 2
Nuxify · May 1, 2021 · 476b357 · 476b357
2 parents 16bcfd5 + 655836b
commit 476b357
Show file tree

Hide file tree

Showing 22 changed files with 249 additions and 253 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - MTBBarcodeScanner (5.0.11)
   - path_provider (0.0.1):
     - Flutter
-  - qr_code_scanner (0.0.2):
+  - qr_code_scanner (0.2.0):
     - Flutter
     - MTBBarcodeScanner
 
@@ -31,10 +31,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   camera: a0ca5080336f7af47b88436e5e26da3dee5568f0
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  qr_code_scanner: 16107718bdad7d708cdf6a5eacdca24b56cdf471
+  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
 
 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
 

diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/lib/infrastructures/api/api_response.dart b/lib/infrastructures/api/api_response.dart
@@ -6,11 +6,16 @@ part 'api_response.g.dart';
   genericArgumentFactories: true,
 )
 class APIResponse<T> {
-  APIResponse({this.success, this.message, this.errorCode, this.data});
+  APIResponse({
+    required this.success,
+    required this.message,
+    required this.errorCode,
+    required this.data,
+  });
 
   factory APIResponse.fromJson(
     Map<String, dynamic> json,
-    T Function(Object json) fromJsonT,
+    T Function(Object? json) fromJsonT,
   ) =>
       _$APIResponseFromJson(json, fromJsonT);
   Map<String, dynamic> toJson(Object Function(T value) toJsonT) =>
@@ -27,21 +32,24 @@ class APIResponse<T> {
   /// base API response
   final bool success;
   final String message;
-  @JsonKey(nullable: true)
-  final String errorCode;
-  @JsonKey(nullable: true)
+  final String? errorCode;
   final T data;
 }
 
 @JsonSerializable(
   genericArgumentFactories: true,
 )
 class APIListResponse<T> {
-  APIListResponse({this.success, this.message, this.errorCode, this.data});
+  APIListResponse({
+    required this.success,
+    required this.message,
+    required this.errorCode,
+    required this.data,
+  });
 
   factory APIListResponse.fromJson(
     Map<String, dynamic> json,
-    T Function(Object json) fromJsonT,
+    T Function(Object? json) fromJsonT,
   ) =>
       _$APIListResponseFromJson(json, fromJsonT);
   Map<String, dynamic> toJson(Object Function(T value) toJsonT) =>
@@ -50,8 +58,6 @@ class APIListResponse<T> {
   /// base API response
   final bool success;
   final String message;
-  @JsonKey(nullable: true)
-  final String errorCode;
-  @JsonKey(nullable: true)
+  final String? errorCode;
   final List<T> data;
 }
diff --git a/lib/interfaces/widgets/header.dart b/lib/interfaces/widgets/header.dart
@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 
 class Header extends StatelessWidget with PreferredSizeWidget {
-  const Header({
-    Key key,
-    this.title,
-  }) : super(key: key);
+  const Header({required this.title, Key? key}) : super(key: key);
 
   final String title;
 

diff --git a/lib/interfaces/widgets/rounded_button.dart b/lib/interfaces/widgets/rounded_button.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
 class RoundedButton extends StatelessWidget {
-  const RoundedButton({
-    @required this.buttonLabel,
-    @required this.buttonIcon,
-    @required this.onPressedFunc,
-    Key key,
-  }) : super(key: key);
+  const RoundedButton(
+      {required this.buttonLabel,
+      required this.buttonIcon,
+      required this.onPressedFunc,
+      Key? key})
+      : super(key: key);
 
   final String buttonLabel;
   final IconData buttonIcon;
@@ -29,7 +29,7 @@ class RoundedButton extends StatelessWidget {
           ),
           borderRadius: BorderRadius.circular(5.0),
         ),
-        child: FlatButton.icon(
+        child: TextButton.icon(
           onPressed: () {
             onPressedFunc();
           },
@@ -42,12 +42,18 @@ class RoundedButton extends StatelessWidget {
             buttonIcon,
             color: Colors.white,
           ),
-          padding: const EdgeInsets.symmetric(
-            vertical: 15,
-          ),
-          color: Colors.transparent,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(5.0),
+          style: ButtonStyle(
+            padding: MaterialStateProperty.all(
+              const EdgeInsets.symmetric(
+                vertical: 15,
+              ),
+            ),
+            backgroundColor: MaterialStateProperty.all(Colors.transparent),
+            shape: MaterialStateProperty.all(
+              RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(5.0),
+              ),
+            ),
           ),
         ),
       ),

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-import 'package:Flirt/configs/themes.dart';
-import 'package:Flirt/routes.dart';
-import 'package:Flirt/module/record/service/cubit/record_cubit.dart';
-import 'package:Flirt/module/home/interfaces/screens/home_screen.dart';
+import 'package:flirt/configs/themes.dart';
+import 'package:flirt/routes.dart';
+import 'package:flirt/module/record/service/cubit/record_cubit.dart';
+import 'package:flirt/module/home/interfaces/screens/home_screen.dart';
 
 void main() => runApp(const App());
 
 class App extends StatelessWidget {
-  const App({Key key}) : super(key: key);
+  const App({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/module/home/interfaces/screens/home_screen.dart b/lib/module/home/interfaces/screens/home_screen.dart
@@ -1,13 +1,11 @@
 import 'package:flutter/material.dart';
 
-import 'package:Flirt/module/home/interfaces/widgets/bottom_bubble.dart';
-import 'package:Flirt/module/home/interfaces/widgets/main_button_bar.dart';
-import 'package:Flirt/module/home/interfaces/widgets/top_bubble.dart';
+import 'package:flirt/module/home/interfaces/widgets/bottom_bubble.dart';
+import 'package:flirt/module/home/interfaces/widgets/main_button_bar.dart';
+import 'package:flirt/module/home/interfaces/widgets/top_bubble.dart';
 
 class HomeScreen extends StatelessWidget {
-  const HomeScreen({
-    Key key,
-  }) : super(key: key);
+  const HomeScreen({Key? key}) : super(key: key);
 
   static const String routeName = '/home';
 

diff --git a/lib/module/home/interfaces/widgets/bottom_bubble.dart b/lib/module/home/interfaces/widgets/bottom_bubble.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 
 class BottomBubble extends StatelessWidget {
-  const BottomBubble({
-    Key key,
-  }) : super(key: key);
+  const BottomBubble({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/module/home/interfaces/widgets/main_button_bar.dart b/lib/module/home/interfaces/widgets/main_button_bar.dart
@@ -1,13 +1,11 @@
 import 'package:flutter/material.dart';
 
-import 'package:Flirt/module/record/interfaces/screens/generate/generate_screen.dart';
-import 'package:Flirt/module/record/interfaces/screens/scan/scan_screen.dart';
-import 'package:Flirt/interfaces/widgets/rounded_button.dart';
+import 'package:flirt/module/record/interfaces/screens/generate/generate_screen.dart';
+import 'package:flirt/module/record/interfaces/screens/scan/scan_screen.dart';
+import 'package:flirt/interfaces/widgets/rounded_button.dart';
 
 class MainButtonBar extends StatelessWidget {
-  const MainButtonBar({
-    Key key,
-  }) : super(key: key);
+  const MainButtonBar({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/module/home/interfaces/widgets/top_bubble.dart b/lib/module/home/interfaces/widgets/top_bubble.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 
 class TopBubble extends StatelessWidget {
-  const TopBubble({
-    Key key,
-  }) : super(key: key);
+  const TopBubble({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/module/record/interfaces/screens/generate/generate_screen.dart b/lib/module/record/interfaces/screens/generate/generate_screen.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
-import 'package:Flirt/interfaces/widgets/header.dart';
-import 'package:Flirt/module/record/service/cubit/record_dto.dart';
-import 'package:Flirt/module/record/service/cubit/record_cubit.dart';
+import 'package:flirt/interfaces/widgets/header.dart';
+import 'package:flirt/module/record/service/cubit/record_dto.dart';
+import 'package:flirt/module/record/service/cubit/record_cubit.dart';
 
 class GenerateScreen extends StatefulWidget {
   const GenerateScreen({
-    Key key,
+    Key? key,
   }) : super(key: key);
 
   static const String routeName = '/generate';
@@ -45,7 +45,7 @@ class _GenerateScreenState extends State<GenerateScreen> {
       data: _dataTextController.text,
     );
     context.read<RecordCubit>().recordData(payload);
-    Scaffold.of(context).hideCurrentSnackBar();
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
   }
 
   @override
@@ -89,7 +89,7 @@ class _GenerateScreenState extends State<GenerateScreen> {
                   RecordState state,
                 ) {
                   if (state is RecordFailed) {
-                    Scaffold.of(context).showSnackBar(
+                    ScaffoldMessenger.of(context).showSnackBar(
                       SnackBar(
                         backgroundColor: _theme.errorColor,
                         content: Text('Error: ${state.message}'),
@@ -100,7 +100,7 @@ class _GenerateScreenState extends State<GenerateScreen> {
                     setState(() {
                       _generatedQRCode = state.recordResponse.id;
                     });
-                    Scaffold.of(context).showSnackBar(
+                    ScaffoldMessenger.of(context).showSnackBar(
                       SnackBar(
                         duration: const Duration(seconds: 120),
                         backgroundColor: Colors.green,
@@ -124,21 +124,27 @@ class _GenerateScreenState extends State<GenerateScreen> {
                       final String buttonText = (state is RecordLoading)
                           ? 'GENERATING...'
                           : 'GENERATE';
-                      return FlatButton.icon(
-                        textColor: Colors.white,
+                      return TextButton.icon(
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(
+                            const EdgeInsets.symmetric(
+                              vertical: 20,
+                            ),
+                          ),
+                          backgroundColor:
+                              MaterialStateProperty.all(_theme.primaryColor),
+                        ),
                         icon: const Icon(
                           Icons.select_all,
                         ),
-                        label: Text(buttonText,
-                            style: const TextStyle(fontSize: 20.0)),
-                        padding: const EdgeInsets.symmetric(
-                          vertical: 20,
+                        label: Text(
+                          buttonText,
+                          style: const TextStyle(fontSize: 20.0),
                         ),
                         onPressed:
                             (state is RecordLoading || state is RecordSuccess)
                                 ? null
                                 : () => _generateQRCode(context),
-                        color: _theme.primaryColor,
                       );
                     },
                   ),

diff --git a/lib/module/record/interfaces/screens/result/result_screen.dart b/lib/module/record/interfaces/screens/result/result_screen.dart
@@ -2,22 +2,22 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
-import 'package:Flirt/interfaces/widgets/header.dart';
-import 'package:Flirt/module/record/service/cubit/record_cubit.dart';
-import 'package:Flirt/interfaces/widgets/rounded_button.dart';
-import 'package:Flirt/module/record/interfaces/screens/scan/scan_screen.dart';
+import 'package:flirt/interfaces/widgets/header.dart';
+import 'package:flirt/module/record/service/cubit/record_cubit.dart';
+import 'package:flirt/interfaces/widgets/rounded_button.dart';
+import 'package:flirt/module/record/interfaces/screens/scan/scan_screen.dart';
 
 class ResultScreen extends StatefulWidget {
   const ResultScreen({
-    Key key,
+    Key? key,
     this.qrData,
     this.rescan,
   }) : super(key: key);
 
   static const String routeName = '/result';
 
-  final String qrData;
-  final Function rescan;
+  final String? qrData;
+  final Function? rescan;
 
   @override
   _ResultScreenState createState() => _ResultScreenState();
@@ -26,7 +26,7 @@ class ResultScreen extends StatefulWidget {
 class _ResultScreenState extends State<ResultScreen> {
   @override
   void initState() {
-    context.read<RecordCubit>().fetchRecord(widget.qrData);
+    context.read<RecordCubit>().fetchRecord(widget.qrData!);
     super.initState();
   }
 
@@ -36,7 +36,7 @@ class _ResultScreenState extends State<ResultScreen> {
     final ThemeData _theme = Theme.of(context);
     return WillPopScope(
       onWillPop: () async {
-        widget.rescan();
+        widget.rescan!();
         return true;
       },
       child: Scaffold(
@@ -136,7 +136,7 @@ class _ResultScreenState extends State<ResultScreen> {
                       context,
                       ScanScreen.routeName,
                     );
-                    widget.rescan();
+                    widget.rescan!();
                   },
                 )
               ],