diff --git a/lib/main.dart b/lib/main.dart index 450c046f..37f3d3d0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -36,7 +36,8 @@ class MyApp extends StatelessWidget { SizeConfig().init(constraints, orientation); return MultiProvider( providers: [ - ChangeNotifierProvider(create: (context) => AuthenticationViewModel()), + ChangeNotifierProvider( + create: (context) => AuthenticationViewModel()), ChangeNotifierProvider( create: (context) => ProjectViewModel(), ), @@ -67,7 +68,7 @@ class MyApp extends StatelessWidget { theme: ThemeData( primarySwatch: Colors.grey, primaryColor: Colors.grey, - buttonColor: HexColor('#B8382C'), + buttonColor: HexColor('#D02127'), fontFamily: 'Poppins', dividerColor: Colors.grey[350], backgroundColor: Color.fromRGBO(255, 255, 255, 1), diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index f562077b..083c2ab3 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -196,7 +196,7 @@ class _LoginScreenState extends State { AppButton( title: TranslationBase.of(context).login, color: Color(0xFFD02127), - fontWeight: FontWeight.w700, + fontWeight: FontWeight.w600, disabled: authenticationViewModel.userInfo.userID == null || authenticationViewModel.userInfo.password == null, onPressed: () { diff --git a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart index 9d22962a..0d622420 100644 --- a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart +++ b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart @@ -29,7 +29,7 @@ class PrescriptionInPatientWidget extends StatelessWidget { padding: EdgeInsets.all(40), decoration: BoxDecoration( border: - Border.all(color: HexColor('#B8382C'), width: 4), + Border.all(color: HexColor('#D02127'), width: 4), borderRadius: BorderRadius.all(Radius.circular(100))), child: IconButton( icon: Icon( diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index acbd27fe..0a225dde 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -54,10 +56,13 @@ class _AppButtonState extends State { // height: MediaQuery.of(context).size.height * 0.075, height: widget.height, child: IgnorePointer( - ignoring: widget.loading ||widget.disabled, + ignoring: widget.loading || widget.disabled, child: RawMaterialButton( fillColor: widget.disabled - ? Colors.grey : widget.color != null ? widget.color : HexColor("#B8382C"), + ? Colors.grey + : widget.color != null + ? widget.color + : HexColor("#D02127"), splashColor: widget.color, child: Padding( padding: (widget.hPadding > 0 || widget.vPadding > 0) @@ -103,18 +108,21 @@ class _AppButtonState extends State { widget.title, color: widget.fontColor, fontSize: SizeConfig.textMultiplier * widget.fontSize, - fontWeight: widget.fontWeight, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, ), ), ], ), ), - onPressed: widget.disabled ? (){} : widget.onPressed, + onPressed: widget.disabled ? () {} : widget.onPressed, shape: RoundedRectangleBorder( side: BorderSide( - color: - widget.hasBorder ? widget.borderColor : widget.disabled - ? Colors.grey : widget.color ?? Color(0xFFB8382C), + color: widget.hasBorder + ? widget.borderColor + : widget.disabled + ? Colors.grey + : widget.color ?? Color(0xFFB8382C), width: 0.8, ), borderRadius: BorderRadius.all(Radius.circular(widget.radius))), diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index 98207888..2a77eb2d 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -102,7 +102,8 @@ class _AppTextFieldCustomState extends State { Color(0Xffffffff), widget.validationError == null ? Color(0xFFEFEFEF) - : Colors.red.shade700) + : Colors.red.shade700, + ) : null, padding: EdgeInsets.only(top: 4.0, bottom: 4.0, left: 8.0, right: 8.0), @@ -116,8 +117,8 @@ class _AppTextFieldCustomState extends State { padding: widget.dropDownText == null ? widget.isSearchTextField ? EdgeInsets.only(top: 10) - : EdgeInsets.symmetric(vertical: 0) - : EdgeInsets.symmetric(vertical: 0), // 8.0 + : EdgeInsets.only(top: 7.5) + : EdgeInsets.only(top: 0), // 8.0 child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -135,6 +136,8 @@ class _AppTextFieldCustomState extends State { // (SizeConfig.isWidthLarge ? 1.1 : 1.3) : 0, fontWeight: FontWeight.w500, + letterSpacing: -0.44, + fontFamily: 'Poppins', ), widget.dropDownText == null ? Container( @@ -147,14 +150,17 @@ class _AppTextFieldCustomState extends State { ? TextAlign.right : TextAlign.left, focusNode: _focusNode, - textAlignVertical: TextAlignVertical.center, + textAlignVertical: TextAlignVertical.top, decoration: TextFieldsUtils .textFieldSelectorDecoration( widget.hintText, null, true), style: TextStyle( - fontSize: SizeConfig.textMultiplier * 1.7, + fontSize: + 14.0, //SizeConfig.textMultiplier * 1.7, fontFamily: 'Poppins', color: Color(0xFF575757), + fontWeight: FontWeight.w400, + letterSpacing: -0.56, ), controller: widget.controller, keyboardType: widget.inputType ?? @@ -203,7 +209,8 @@ class _AppTextFieldCustomState extends State { Icons.keyboard_arrow_down, color: widget.dropDownColor != null ? widget.dropDownColor - : Colors.black, + : Color(0xff2E303A), + size: 12.0, ), ) : Container(), diff --git a/lib/widgets/shared/text_fields/text_fields_utils.dart b/lib/widgets/shared/text_fields/text_fields_utils.dart index 1f1ff2bb..8ca24a68 100644 --- a/lib/widgets/shared/text_fields/text_fields_utils.dart +++ b/lib/widgets/shared/text_fields/text_fields_utils.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; -class TextFieldsUtils{ - +class TextFieldsUtils { static BoxDecoration containerBorderDecoration( Color containerColor, Color borderColor, - {double borderWidth = -1, double borderRadius = 12}) { + {double borderWidth = -1, double borderRadius = 10.0}) { return BoxDecoration( color: containerColor, shape: BoxShape.rectangle, @@ -46,13 +45,15 @@ class TextFieldsUtils{ borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), borderRadius: BorderRadius.circular(8), ),*/ - hintText: selectedText != null ? selectedText : hintText??"", - suffixIcon: Icon(suffixIcon??null, color: Colors.grey.shade600,), - + hintText: selectedText != null ? selectedText : hintText ?? "", + suffixIcon: Icon( + suffixIcon ?? null, + color: Colors.grey.shade600, + ), hintStyle: TextStyle( - fontSize: 14, + fontSize: 11, color: Colors.grey.shade600, ), ); } -} \ No newline at end of file +}