diff --git a/lib/config/config.dart b/lib/config/config.dart index 0c92975..719f964 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -1,4 +1,5 @@ import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; /// End points const BASE_URL = 'https://uat.hmgwebservices.com/Services'; @@ -23,3 +24,10 @@ const MAX_SMALL_SCREEN = 660; class AppGlobal { static BuildContext context; } + +const LINEAR_GRADIENT = LinearGradient( + colors: [ + Color(0xff49C1BC), + Color(0xff17AFB8), + ], +); diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 9b5604a..4c62adc 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,4 +1,5 @@ import 'package:barcode_scan/platform_wrapper.dart'; +import 'package:driverapp/config/config.dart'; import 'package:driverapp/config/size_config.dart'; import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart'; @@ -137,10 +138,7 @@ class _DashboardScreenState extends State { width: MediaQuery.of(context).size.width * 0.44, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - gradient: LinearGradient(colors: [ - Color(0xff17AFB8), - Color(0xff49C1BC) - ]), + gradient: LINEAR_GRADIENT, ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -247,10 +245,7 @@ class _DashboardScreenState extends State { width: MediaQuery.of(context).size.width * 0.45, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - gradient: LinearGradient(colors: [ - Color(0xff17AFB8), - Color(0xff49C1BC) - ]), + gradient: LINEAR_GRADIENT, ), child: InkWell( onTap: () => Navigator.push( @@ -314,8 +309,9 @@ class _DashboardScreenState extends State { width: 100, height: 100, decoration: BoxDecoration( - color: Colors.white10, - shape: BoxShape.circle), + color: Colors.white10, + shape: BoxShape.circle, + ), child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -371,12 +367,7 @@ class _DashboardScreenState extends State { width: MediaQuery.of(context).size.width * 0.50, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - gradient: LinearGradient( - colors: [ - Hexcolor("#45B7AE"), - Hexcolor("#119FA9") - ], - ), + gradient: LINEAR_GRADIENT, ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 6919cff..ede4f9c 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -49,4 +49,6 @@ class Utils { LocationData currentLocation = await location.getLocation(); return currentLocation; } + + static nameFormat(String) {} } diff --git a/lib/widgets/buttons/secondary_button.dart b/lib/widgets/buttons/secondary_button.dart index 4aa11f2..152ddd6 100644 --- a/lib/widgets/buttons/secondary_button.dart +++ b/lib/widgets/buttons/secondary_button.dart @@ -1,3 +1,4 @@ +import 'package:driverapp/config/config.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; @@ -13,19 +14,18 @@ import 'package:hexcolor/hexcolor.dart'; /// [borderColor] the button border color /// [noBorderRadius] remove border radius class SecondaryButton extends StatefulWidget { - SecondaryButton( - {Key key, - this.label = "", - this.icon, - this.iconOnly = false, - this.color, - this.textColor, - this.onTap, - this.loading: false, - this.small = false, - this.disabled = false, - this.borderColor, - this.noBorderRadius = false}) + SecondaryButton({Key key, + this.label = "", + this.icon, + this.iconOnly = false, + this.color, + this.textColor, + this.onTap, + this.loading: false, + this.small = false, + this.disabled = false, + this.borderColor, + this.noBorderRadius = false}) : super(key: key); final String label; @@ -148,7 +148,7 @@ class _SecondaryButtonState extends State decoration: BoxDecoration( border: widget.borderColor != null ? Border.all( - color: widget.borderColor.withOpacity(0.1), width: 2.0) + color: widget.borderColor.withOpacity(0.1), width: 2.0) : null, borderRadius: BorderRadius.all(Radius.circular(100.0)), boxShadow: [ @@ -191,14 +191,8 @@ class _SecondaryButtonState extends State height: MediaQuery.of(context).size.width * 2.2, decoration: BoxDecoration( shape: BoxShape.circle, - gradient: widget.color != null - ? null - : LinearGradient( - colors: [ - Hexcolor("#45B7AE"), - Hexcolor("#119FA9") - ], - ), + gradient: + widget.color != null ? null : LINEAR_GRADIENT, color: widget.color != null ? widget.color : Hexcolor("#000000"), @@ -226,29 +220,29 @@ class _SecondaryButtonState extends State children: [ widget.loading ? Padding( - padding: EdgeInsets.all(2.6), - child: SizedBox( - height: 19.0, - width: 19.0, - child: CircularProgressIndicator( - backgroundColor: Colors.white, - valueColor: AlwaysStoppedAnimation( - Colors.grey[300], - ), - ), - ), - ) + padding: EdgeInsets.all(2.6), + child: SizedBox( + height: 19.0, + width: 19.0, + child: CircularProgressIndicator( + backgroundColor: Colors.white, + valueColor: AlwaysStoppedAnimation( + Colors.grey[300], + ), + ), + ), + ) : Padding( - padding: EdgeInsets.only( - bottom: widget.small ? 4.0 : 2.0), - child: Text(widget.label, - style: TextStyle( - color: widget.textColor != null - ? widget.textColor - : Colors.white, - fontSize: 17.0, - fontFamily: "WorkSans")), - ) + padding: EdgeInsets.only( + bottom: widget.small ? 4.0 : 2.0), + child: Text(widget.label, + style: TextStyle( + color: widget.textColor != null + ? widget.textColor + : Colors.white, + fontSize: 17.0, + fontFamily: "WorkSans")), + ) ], ) ], diff --git a/lib/widgets/data_display/circle-container.dart b/lib/widgets/data_display/circle-container.dart index 071de37..598988a 100644 --- a/lib/widgets/data_display/circle-container.dart +++ b/lib/widgets/data_display/circle-container.dart @@ -6,7 +6,7 @@ class CircleContainer extends StatelessWidget { {this.child, this.color = Colors.white, this.borderColor, - this.borderWidth = 1.5, + this.borderWidth = 2, this.onTap}); final Widget child;