bugs solved

2024-06-17 19:51:31 +05:30
parent bf6012114e
commit 26c3527dc3
20 changed files with 567 additions and 485 deletions
--- a/lib/shared/components/button_widget.dart
+++ b/lib/shared/components/button_widget.dart
@@ -32,12 +32,13 @@ class ButtonWidget {
        width: 1.sw,
        height: 56.h,
        decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(30),
-            color: clr,
-            border: Border.all(
-              width: 1,
-              color: borderClr!,
-            )),
+          borderRadius: BorderRadius.circular(30),
+          color: clr,
+          border: Border.all(
+            width: 1,
+            color: borderClr!,
+          ),
+        ),
        child: Center(
          child: TextWidget().text14W700(
            text,
--- a/lib/shared/components/text_widget.dart
+++ b/lib/shared/components/text_widget.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:tanami_app/core/styles/app_color.dart';

@@ -7,7 +8,7 @@ class TextWidget {
  Widget text11W400(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 11,
+            fontSize: 11.sp,
            fontWeight: FontWeight.w400,
            color: clr ?? AppColor.plainWhite));
  }
@@ -15,7 +16,7 @@ class TextWidget {
  Widget text11W500(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 11,
+            fontSize: 11.sp,
            fontWeight: FontWeight.w500,
            color: clr ?? AppColor.plainWhite));
  }
@@ -23,7 +24,7 @@ class TextWidget {
  Widget text11W700(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 11,
+            fontSize: 11.sp,
            fontWeight: FontWeight.w700,
            color: clr ?? AppColor.plainWhite));
  }
@@ -32,7 +33,7 @@ class TextWidget {
  Widget text12W400(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 12,
+            fontSize: 12.sp,
            fontWeight: FontWeight.w400,
            color: clr ?? AppColor.plainWhite));
  }
@@ -40,7 +41,7 @@ class TextWidget {
  Widget text12W500(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 12,
+            fontSize: 12.sp,
            fontWeight: FontWeight.w500,
            color: clr ?? AppColor.plainWhite));
  }
@@ -49,7 +50,7 @@ class TextWidget {
      {Color? clr, TextDecoration? txtDec, Color? decClr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 12,
+            fontSize: 12.sp,
            decorationColor: decClr ?? AppColor.plainWhite,
            decoration: txtDec ?? TextDecoration.none,
            fontWeight: FontWeight.w700,
@@ -79,7 +80,7 @@ class TextWidget {
        maxLines: maxLine ?? 20,
        overflow: txtOverflow ?? TextOverflow.ellipsis,
        style: GoogleFonts.dmSans(
-            fontSize: 14,
+            fontSize: 14.sp,
            fontWeight: FontWeight.w400,
            decoration: textDecoration ?? TextDecoration.none,
            color: clr ?? AppColor.plainWhite));
@@ -91,13 +92,16 @@ class TextWidget {
    TextDecoration? textDecoration,
    TextAlign? txtAlign,
  }) {
-    return Text(text,
-        textAlign: txtAlign ?? TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 14,
-            fontWeight: FontWeight.w500,
-            decoration: textDecoration ?? TextDecoration.none,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: txtAlign ?? TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 14.sp,
+        fontWeight: FontWeight.w500,
+        decoration: textDecoration ?? TextDecoration.none,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  Widget text14W600(
@@ -109,7 +113,7 @@ class TextWidget {
    return Text(text,
        textAlign: txtAlign ?? TextAlign.center,
        style: GoogleFonts.dmSans(
-            fontSize: 14,
+            fontSize: 14.sp,
            fontWeight: FontWeight.w600,
            decoration: textDecoration ?? TextDecoration.none,
            color: clr ?? AppColor.plainWhite));
@@ -120,7 +124,7 @@ class TextWidget {
    return Text(text,
        textAlign: txtAlign ?? TextAlign.center,
        style: GoogleFonts.dmSans(
-            fontSize: 14,
+            fontSize: 14.sp,
            fontWeight: FontWeight.w700,
            decoration: textDecoration ?? TextDecoration.none,
            color: clr ?? AppColor.plainWhite));
@@ -139,7 +143,7 @@ class TextWidget {
        style: GoogleFonts.dmSans(
            decoration: textDecoration ?? TextDecoration.none,
            decorationColor: clr ?? AppColor.plainWhite,
-            fontSize: 15,
+            fontSize: 15.sp,
            fontWeight: FontWeight.w400,
            color: clr ?? AppColor.plainWhite));
  }
@@ -149,14 +153,17 @@ class TextWidget {
    Color? clr,
    TextDecoration? textDecoration,
  }) {
-    return Text(text,
-        textAlign: TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 15,
-            decorationColor: AppColor.hintTextColor,
-            decoration: textDecoration ?? TextDecoration.none,
-            fontWeight: FontWeight.w500,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 15.sp,
+        decorationColor: AppColor.hintTextColor,
+        decoration: textDecoration ?? TextDecoration.none,
+        fontWeight: FontWeight.w500,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  Widget text15W700(
@@ -164,14 +171,17 @@ class TextWidget {
    Color? clr,
    TextDecoration? textDecoration,
  }) {
-    return Text(text,
-        textAlign: TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 15,
-            decorationColor: AppColor.hintTextColor,
-            decoration: textDecoration ?? TextDecoration.none,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 15.sp,
+        decorationColor: AppColor.hintTextColor,
+        decoration: textDecoration ?? TextDecoration.none,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  //Text Size 17
@@ -181,14 +191,17 @@ class TextWidget {
    Color? clr,
    TextDecoration? textDecoration,
  }) {
-    return Text(text,
-        textAlign: TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 17,
-            decorationColor: AppColor.hintTextColor,
-            decoration: textDecoration ?? TextDecoration.none,
-            fontWeight: FontWeight.w600,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 17.sp,
+        decorationColor: AppColor.hintTextColor,
+        decoration: textDecoration ?? TextDecoration.none,
+        fontWeight: FontWeight.w600,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  Widget text17W700(
@@ -196,14 +209,17 @@ class TextWidget {
    Color? clr,
    TextDecoration? textDecoration,
  }) {
-    return Text(text,
-        textAlign: TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 17,
-            decorationColor: AppColor.hintTextColor,
-            decoration: textDecoration ?? TextDecoration.none,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 17.sp,
+        decorationColor: AppColor.hintTextColor,
+        decoration: textDecoration ?? TextDecoration.none,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  //Text Size 18
@@ -213,56 +229,71 @@ class TextWidget {
    Color? clr,
    TextDecoration? textDecoration,
  }) {
-    return Text(text,
-        textAlign: TextAlign.center,
-        style: GoogleFonts.dmSans(
-            fontSize: 18,
-            decorationColor: AppColor.hintTextColor,
-            decoration: textDecoration ?? TextDecoration.none,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      textAlign: TextAlign.center,
+      style: GoogleFonts.dmSans(
+        fontSize: 18.sp,
+        decorationColor: AppColor.hintTextColor,
+        decoration: textDecoration ?? TextDecoration.none,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  //Text Size 22
  Widget text22W400(String text, {Color? clr}) {
-    return Text(text,
-        style: GoogleFonts.dmSans(
-            fontSize: 22,
-            fontWeight: FontWeight.w400,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      style: GoogleFonts.dmSans(
+        fontSize: 22.sp,
+        fontWeight: FontWeight.w400,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  Widget text22W700(String text, {Color? clr}) {
-    return Text(text,
-        style: GoogleFonts.dmSans(
-            fontSize: 22,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      style: GoogleFonts.dmSans(
+        fontSize: 22.sp,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

-   Widget text22W900(String text, {Color? clr}) {
+  Widget text22W900(String text, {Color? clr}) {
    return Text(text,
        style: GoogleFonts.dmSans(
-            fontSize: 22,
+            fontSize: 22.sp,
            fontWeight: FontWeight.w900,
            color: clr ?? AppColor.plainWhite));
  }

  //Text Size 20
  Widget text20W700(String text, {Color? clr}) {
-    return Text(text,
-        style: GoogleFonts.dmSans(
-            fontSize: 20,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      style: GoogleFonts.dmSans(
+        fontSize: 20.sp,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }

  //Text Size 28
  Widget text28W700(String text, {Color? clr}) {
-    return Text(text,
-        style: GoogleFonts.dmSans(
-            fontSize: 28,
-            fontWeight: FontWeight.w700,
-            color: clr ?? AppColor.plainWhite));
+    return Text(
+      text,
+      style: GoogleFonts.dmSans(
+        fontSize: 28.sp,
+        fontWeight: FontWeight.w700,
+        color: clr ?? AppColor.plainWhite,
+      ),
+    );
  }
 }