Merge pull request #39 from webreinvent/revert-30-feature/Task-7797-update-button-text-with-icon

Revert "Feature->Develop | Task 7797 update button text with icon"

Author: themodernpk

lib/vaahextendflutter/widgets/atoms/buttons.dart

@@ -297,7 +297,7 @@ class ButtonText extends StatelessWidget {
 class ButtonTextWithIcon extends StatelessWidget {
   final OnPressed onPressed;
   final String text;
-  final Widget leading;
+  final IconData? iconData;
   final ButtonStyle? style;
   final ButtonType? buttonType;
   final Color? foregroundColor;
@@ -310,7 +310,7 @@ class ButtonTextWithIcon extends StatelessWidget {
     Key? key,
     required this.onPressed,
     required this.text,
-    required this.leading,
+    required this.iconData,
     this.style,
     this.buttonType,
     this.foregroundColor,
@@ -341,7 +341,10 @@ class ButtonTextWithIcon extends StatelessWidget {
           fontSize: fontSize,
         ),
       ),
-      icon: leading,
+      icon: FaIcon(
+        iconData,
+        size: iconSize,
+      ),
     );
   }
 }

lib/vaahextendflutter/widgets/atoms/input_text.dart

@@ -26,7 +26,6 @@ class InputText extends StatelessWidget {
   final Function()? suffixOnTap;
   final int? minLines;
   final int? maxLines;
-  final InputBorderType inputBorder;
 
   const InputText({
     super.key,
@@ -49,20 +48,19 @@ class InputText extends StatelessWidget {
     this.suffixOnTap,
     this.minLines,
     this.maxLines,
-    this.inputBorder = InputBorderType.outline,
   });
 
   @override
   Widget build(BuildContext context) {
     return TextFormField(
       decoration: InputDecoration(
         contentPadding: padding,
-        border: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
-        enabledBorder: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
-        disabledBorder: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
-        focusedBorder: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
-        errorBorder: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
-        focusedErrorBorder: getInputBorder(inputBorder, AppTheme.colors['black']!.shade400),
+        border: border(AppTheme.colors['black']!.shade400),
+        enabledBorder: border(AppTheme.colors['black']!.shade400),
+        disabledBorder: border(AppTheme.colors['black']!.shade300),
+        focusedBorder: border(AppTheme.colors['black']!.shade400),
+        errorBorder: border(AppTheme.colors['danger']!.shade400),
+        focusedErrorBorder: border(AppTheme.colors['danger']!.shade400),
         errorStyle: TextStyle(color: AppTheme.colors['danger']!.shade400),
         hintText: label,
         hintStyle: TextStyle(
@@ -125,29 +123,14 @@ class InputText extends StatelessWidget {
     );
   }
 
-  InputBorder getInputBorder(InputBorderType inputBorderType, Color color) {
-    switch (inputBorderType) {
-      case InputBorderType.none:
-        return InputBorder.none;
-
-      case InputBorderType.underline:
-        return UnderlineInputBorder(
-          borderRadius: BorderRadius.circular(borderRadius),
-          borderSide: BorderSide(
-            width: 1,
-            color: color,
-          ),
-        );
-
-      case InputBorderType.outline:
-        return OutlineInputBorder(
-          borderRadius: BorderRadius.circular(borderRadius),
-          borderSide: BorderSide(
-            width: 1,
-            color: color,
-          ),
-        );
-    }
+  OutlineInputBorder border(Color color) {
+    return OutlineInputBorder(
+      borderRadius: BorderRadius.circular(borderRadius),
+      borderSide: BorderSide(
+        width: 1,
+        color: color,
+      ),
+    );
   }
 
   double getFontSize() {
@@ -165,9 +148,3 @@ class InputText extends StatelessWidget {
     }
   }
 }
-
-enum InputBorderType {
-  underline,
-  outline,
-  none,
-}

lib/views/pages/ui/components/buttons/icon_and_label.dart

@@ -34,7 +34,7 @@ class ButtonIconLabelPreview extends StatelessWidget {
             ButtonTextWithIcon(
               onPressed: () {},
               text: "Icon Button",
-              leading: const Icon(FontAwesomeIcons.user),
+              iconData: FontAwesomeIcons.user,
             ),
           ],
         ),