Merge branch 'ECAP1-24-verify_otp' into 'dev'

Text field common component  and common app colors added

See merge request !1

lib/customWidget/app_text.dart

+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import '../constants/font_constants.dart';
+
+class AppText extends StatelessWidget {
+   String text;
+   Color textColor;
+   double fontSize;
+   FontWeight fontWeight;
+   FontStyle fontStyle;
+   // double lineHeight;
+   TextAlign textAlign;
+   int maxLine;
+   bool softWrap,  underLine,isCurrency;
+
+   AppText(
+      {Key? key,
+      required this.text,
+      required this.textColor,
+      required this.fontSize,
+      this.fontWeight = FontWeight.w600,
+       this.textAlign=TextAlign.start,
+      this.softWrap=true,
+      // required this.lineHeight,
+      this.maxLine=1,
+      this.fontStyle = FontStyle.normal,
+      this.underLine = false,
+      this.isCurrency = false})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      isCurrency ? '\u{20B9}$text' : text,
+      textAlign: textAlign,
+      overflow: TextOverflow.ellipsis,
+      maxLines: maxLine,
+      style: GoogleFonts.getFont(FontConstants.fontFamilyName,
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+          fontStyle: fontStyle,
+          // height: lineHeight,
+          color: textColor,
+          decoration:
+              underLine ? TextDecoration.underline : TextDecoration.none),
+      softWrap: softWrap,
+    );
+  }
+}

lib/customWidget/button_widget.dart

@@ -86,7 +86,7 @@ class CustomButton extends StatelessWidget {
                           /// button name
                           buttonName,
                           style: GoogleFonts.getFont(
-                            FontConstants.fontFamily,
+                            FontConstants.fontFamilyName,
                             fontSize: TextSize.textButtonSize,
                             fontWeight: FontWeight.w700,
                             color: foregroundColor,

lib/res/app_color_text_size.dart

@@ -10,115 +10,30 @@ class AppColor {
   static const int accentColorHexValue = 0xFF000080;
   static const loaderColor = Color(0xffff9800);
 
-  static const primaryColor = Color(primaryColorHexValue);
-  static const accentColor = Color(accentColorHexValue);
-
-  //////////Radha Exports Colors////////////////-
-  static const textFieldBorderColor = Color(0xffFF5050);
-  static const activeButtonColor = Color(0xff1A1A1A);
-  static const inActiveButtonColor = Color(0xff808080);
   static const errorMessageColor = Color(0xffF40C0C);
-  static const bottomSelectedColor = Color(0xffF40C0C);
-  static const bottomUnSelectedColor = Color(0xffFFFFFF);
-  static const primaryRed = Color(0xffFF1717);
-  static const errorTextColor = Color(0xffF40C0C);
+
+  static const lightBlack = Color(0xFF292E36);
+  static const lightGrey = Color(0xFF555E6C);
+  static const lightWhite = Color(0xFFF5F7FA);
+  static const darkRed = Color(0xFFEC1B27);
+  static const whiteColor = Color(0xffffffff);
   static const gradientFirstColor = Color(0xffF40C0C);
   static const gradientSecondColor = Color(0xff1071FF);
-  static const buttonBorderColor = Color(0xff2474E9);
-  static const buttonBgColor = Color(0xff2474E9);
-  static const textFieldBorderSearchColor = Color(0xF2F2F2F2);
-  static const tiercontainer = Color(0x1A1071FF);
-  static const chipBorderColor = Color(0xff2474E9);
-  static const customButtonColor = Color(0xff2474E9);
-
-  // base project color codes
-  static Color success = const Color(0xFF38C976);
-  static Color pending = const Color(0xFFFFB53A);
-  static const Color error = Color(0xFFFF3819);
-  static Color links = const Color(0xFF427DF6);
-  static const Color textHigh = Color(0xFF232424);
-  static Color textNormal = const Color(0xFF7B7C7C);
-  static Color textLow = const Color(0xFF999999);
-  static Color white = const Color(0xFFFFFFFF);
-  static Color black = const Color(0xFF000000);
-  static Color lightGrey = const Color(0xFFD5D4DC);
-  static Color lightTextGrey = const Color(0xFF878787);
-  static Color greyLine = const Color(0xFFBFC9DE);
-  static Color cardBorder = const Color(0xFFE5E5E5);
-  static Color redLight = const Color(0xffFF1717);
-  static Color smokeyGrey = const Color(0xFF727272);
-
-  static Color linkBlue = const Color(0xFF427DF6);
-  static Color dotLightBlue = const Color(0xFF7BA6FF);
-  static Color primaryWhite = const Color(0xFFFFFFFF);
-  static Color errorFill = const Color(0xFFFBEFEF);
-  static Color charcoalGrey = const Color(0xFF3D3D3D);
-  static Color smokyBlack = const Color(0xFF121212);
-  static Color darkSkyBlue = const Color(0xFF427DF6);
-  static Color darkJungle = const Color(0xFF232424);
-  static Color greyShadow = const Color(0xFF7798CA);
-  static const Color water = Color(0xFFEEF4FF);
-  static Color lightBlue = const Color(0xFFEDF1F8);
-  static Color greyLight = const Color(0xFFD9D9D9);
-  static Color darkGrey = const Color(0xFF878787);
-  static const Color blue = Color(0xFF427DF6);
-  static Color shadowColor = const Color(0xff7090b0);
-  static const Color lightGreen = Color(0xFF248E52);
-  static const Color lightGreenish = Color(0XFF9AE4BA);
-  static const Color honeydew = Color(0xFFE7FFED);
-  static const Color lightOrange = Color(0xFFF2A72B);
-  static const Color lemonChiffon = Color(0xFFFFF6D1);
-  static const Color textLightOrange = Color(0xFFF27F2B);
-  static const Color unbleachedSilk = Color(0XFFFCDBC4);
-  static const Color backgroundWarning = Color(0xFFFEF2EA);
-  static const Color backGroundRed = Color(0xFFF3464D);
-  static const Color aliceBlue = Color(0xFFEEF4FF);
-  static const Color palePink = Color(0xFFFAD5D6);
-  static const Color ruddyPink = Color(0xFFEF8E91);
-  static const Color lightRed = Color(0xFFFDE9EA);
-  static const Color brightRed = Color(0xFFFE5158);
-  static const Color darkRed = Color(0xFFE31F26);
-
-  /////////////////////////////////
 
-  static const appBarColor = Color(0xffE0F0FA);
-  static const viewRouteColor = Color(0xffF5FBFF);
-  static const transparent = Color(0x00000000);
-  static const primarySecColor = Color(0xFF3A88F4);
-  static Color textFieldBackgroundColor =
-  const Color(0xFFE5E5E5).withOpacity(0.2);
-  static const backgroundColor = Color(0xFFF5F5F5);
-  static const chevronColor = Color(0xFFEC5F5F);
-  static const darkBlueColor = Color(0xff161946);
-  static const whiteColor = Color(0xffffffff);
-  static const buttonColor = Color(0xffe51a4b);
+  static const primaryColor = Color(primaryColorHexValue);
   static const fontColor = Color(0xff1A1A1A);
-  static const fontSubColor = Color(0xff7A7A7A);
-  static const textFieldHintColor = Color(0xff9B9B9B);
-  static const indicatorColor = Color(0xffc8ced2);
   static const greyColor = Color(0xff696969);
-  static const blueColor = Color(0xff008dd2);
+  static Color black = const Color(0xFF000000);
   static const blackColor = Color(0xff131313);
-  static const greyBackgroundColor = Color(0xff8F8F8E);
-  static const naturalGreyColor = Color(0xffF6F7FA);
-  static const greyLightBackgroundColor = Color(0xffECECEC);
+  static const errorTextColor = Color(0xffF40C0C);
+  static const transparent = Color(0x00000000);
+  static Color white = const Color(0xFFFFFFFF);
+  static const backgroundColor = Color(0xFFF5F5F5);
   static const primaryRedColor = Color(0xFFEC0000);
-  static const inactiveBottomBarColor = Color(0xFFB3B3B3);
-  static const dividerColor = Color(0xFFF1F1F5);
-  static const lightGreyColor = Color(0xFF9B9B9B);
-  static const containerWhite = Color(0xFFF1F6FF);
-
-  static const menuHeaderStartColor = Color(0xfffecc00);
-  static const menuHeaderEndColor = Color(0xfffe8f00);
-
-  static const greenColor = Color(0xff159F54);
-  static const locationColor = Color(0xff696F79);
-  static const navigationRouteColor = Color(0xff354BC3);
-  static const rowContainer = Color(0xFFF9F9F9);
-  static const logoutContainer = Color(0xFF242424);
-
-  // static Color passwordHintColor = const Color(0xFFEC0000).withOpacity(0.6);
-  static Color passwordHintColor = const Color(0xff000000).withOpacity(0.6);
+  static const textFieldHintColor = Color(0xff9B9B9B);
+  static const primarySecColor = Color(0xFF3A88F4);
+  static Color redLight = const Color(0xffFF1717);
+  static const inActiveButtonColor = Color(0xff808080);
 
   static const MaterialColor primaryColorSwatch =
   MaterialColor(primaryColorHexValue, <int, Color>{
@@ -159,36 +74,6 @@ class AppColor {
       Color(0xFF1f1c2a),
     ],
   );
-
-  static const blueTextColor = Color(0xFF1071FF);
-  static const blackTextColor = Color(0xFF1A1A1A);
-  static const almostBlack = Color(0xFF0C0C0C);
-  static const sandStone = Color(0xFF707070);
-  static const snowDrift = Color(0xFFFBFBFB);
-  static const dustyGrey = Color(0xFF9D9D9D);
-  static const mediumGrey = Color(0xFF737B7D);
-  static const geyser = Color(0xFFDEDEDE);
-  static const blackSqueeze = Color(0xFFF6FAFF);
-  static const light = Color(0xFF444444);
-  static const whiteText = Color(0xFFFFFFFF);
-  static const greyLightMid = Color(0xFF7A7A7A);
-  static const greyAdmin = Color(0xFF2C2C2C);
-  static const profileBlue = Color(0xFF2474E9);
-  static const greyScrollBar = Color(0xFFCDCDCD);
-  static const greyScrollBarTrack = Color(0xFFF2F2F2);
-  static const tableColumnHeading = Color(0xFFF7F9FC);
-  static const divideGrey = Color(0xFFF0F1F3);
-  static const borderGrey = Color(0xFFDDDDDD);
-  static const inProgressStatusColor = Color(0xFFDFC124);
-  static const yellow = Color(0xFFDFC124);
-  static const green = Color(0xFF00BE1E);
-  static const checkBoxGrey = Color(0xFFD0D5DD);
-
-  static const availableStockBlue = Color(0xFFF1F6FF);
-  static const paginationActiveColor = Color(0xFF4200FF);
-  static const paginationInActiveColor = Color(0xFFDFE3E8);
-  static const subHeadingText = Color(0xFF808080);
-  static const resentColor = Color(0xFFE98D02);
 }
 
 // -----------------------------------------------------------------------------