Updated UI, fixed bugs and refactored code

lib/components/dialog_boxes.dart

@@ -27,6 +27,7 @@ class DialogBoxes {
           buttonWidth: 8.w,
           onTap: () => Navigator.of(context).pop(false),
           text: 'No',
+          textSize: 18.0,
         ),
         HikeButton(
           buttonHeight: 2.5.h,
@@ -35,6 +36,7 @@ class DialogBoxes {
             navigationService.removeAllAndPush('/main', '/');
           },
           text: 'Yes',
+          textSize: 18.0,
         ),
       ],
     );
@@ -58,19 +60,21 @@ class DialogBoxes {
                             children: <Widget>[
                               Text(
                                 'Change Beacon Duration',
-                                style: TextStyle(color: kYellow, fontSize: 12),
+                                style:
+                                    TextStyle(color: kYellow, fontSize: 14.0),
                               ),
                             ],
                           ),
                         ),
                       ),
                       SizedBox(
-                        height: 30,
+                        height: 3.h,
                       ),
                       Flexible(
                         child: HikeButton(
-                            buttonWidth: 48,
+                            buttonWidth: optbwidth,
                             text: 'Done',
+                            textSize: 18.0,
                             textColor: Colors.white,
                             buttonColor: kYellow,
                             onTap: () {

lib/components/hike_button.dart

@@ -16,7 +16,7 @@ class HikeButton extends StatelessWidget {
       this.buttonColor = kYellow,
       this.text,
       this.textColor = Colors.white,
-      this.buttonWidth = 32,
+      this.buttonWidth = 32, //button sizes have been defined in constants.dart
       this.buttonHeight = 32,
       this.textSize = 18});
 

lib/components/hike_screen_widget.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:share/share.dart';
+import 'package:sizer/sizer.dart';
 
 class HikeScreenWidget {
   static copyPasskey(String passkey) {
@@ -24,7 +25,7 @@ class HikeScreenWidget {
             context: context,
             builder: (context) => Dialog(
                   child: Container(
-                    height: 400,
+                    height: 35.h,
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
                           horizontal: 32, vertical: 16),
@@ -40,11 +41,13 @@ class HikeScreenWidget {
                             ),
                           ),
                           SizedBox(
-                            height: 30,
+                            height: 3.h,
                           ),
                           Flexible(
                             child: HikeButton(
-                                textSize: 20,
+                                buttonHeight: optbheight,
+                                buttonWidth: optbwidth,
+                                textSize: 18,
                                 text: 'Generate URL',
                                 textColor: Colors.white,
                                 buttonColor: kYellow,
@@ -54,11 +57,13 @@ class HikeScreenWidget {
                                 }),
                           ),
                           SizedBox(
-                            height: 10,
+                            height: 1.h,
                           ),
                           Flexible(
                             child: HikeButton(
-                              textSize: 20,
+                              buttonHeight: optbheight * 1,
+                              buttonWidth: optbwidth,
+                              textSize: 18,
                               text: 'Copy Passkey',
                               textColor: Colors.white,
                               buttonColor: kYellow,

lib/main.dart

@@ -32,18 +32,20 @@ void main() async {
   await Hive.openBox<User>('currentUser');
   await Hive.openBox<Beacon>('beacons');
   setupLocator();
-  runApp(OverlaySupport(
-    child: Sizer(
-      builder: (context, orientation, deviceType) => MaterialApp(
-        debugShowCheckedModeBanner: false,
-        title: 'Beacon',
-        navigatorKey: navigationService.navigatorKey,
-        theme: ThemeData(fontFamily: 'FuturaBold'),
-        initialRoute: '/',
-        onGenerateRoute: router.generateRoute,
+  runApp(
+    OverlaySupport(
+      child: Sizer(
+        builder: (context, orientation, deviceType) => MaterialApp(
+          debugShowCheckedModeBanner: false,
+          title: 'Beacon',
+          navigatorKey: navigationService.navigatorKey,
+          theme: ThemeData(fontFamily: 'FuturaBold'),
+          initialRoute: '/',
+          onGenerateRoute: router.generateRoute,
+        ),
       ),
     ),
-  ));
+  );
 }
 
 class DemoPageView extends StatelessWidget {

lib/utilities/constants.dart

@@ -1,16 +1,26 @@
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:sizer/sizer.dart';
 
 const Color kYellow = Color(0xFFFDBB2C);
 const Color kBlue = Color(0xFF222375);
 const Color kLightBlue = Color(0xFFE8F1F8);
 const Color kBlack = Color(0xFF343434);
 const Color shimmerSkeletonColor = Color(0xff4e4f91);
+const Color hintColor = Colors.black54; // Hint Text Color
 const double CAMERA_ZOOM = 15;
 const double CAMERA_TILT = 80;
 const double CAMERA_BEARING = 30;
 
+// Button Sizings
+final double labelsize = 20;
+final double hintsize = 18;
+final double homebheight = 4.45.h;
+final double homebwidth = 3.w;
+final double optbheight = 3.5.h;
+final double optbwidth = 8.w;
+
 class AppConstants {
   static Future<LatLng> getLocation() async {
     bool serviceEnabled;

lib/view_model/home_view_model.dart

@@ -59,7 +59,7 @@ class HomeViewModel extends BaseModel {
       }
       //Snackbar is displayed by joinBeacon itself on any error or trying to join expired beacon.
     } else {
-      navigationService.showSnackBar('Enter valid passkey');
+      navigationService.showSnackBar('Enter Valid Passkey');
     }
   }