Merge branch 'master' of https://git.mokkon.com/tzw/fcs

lib/pages/widgets/display_text.dart

@@ -6,22 +6,26 @@ import 'package:provider/provider.dart';
 
 class DisplayText extends StatelessWidget {
   final String? text;
+  final String? text1;
   final String? labelTextKey;
   final IconData? iconData;
   final int? maxLines;
   final bool? withBorder;
   final Color? borderColor;
   final Widget? icon;
+  
 
   const DisplayText({
     Key? key,
     this.text,
+    this.text1,
     this.labelTextKey,
     this.iconData,
     this.maxLines = 1,
     this.withBorder = false,
     this.borderColor,
     this.icon,
+   
   }) : super(key: key);
   @override
   Widget build(BuildContext context) {
@@ -45,12 +49,13 @@ class DisplayText extends StatelessWidget {
                   : icon!
               : Padding(
                   padding: const EdgeInsets.only(
-                      left: .0, right: 15.0, top: 8.0, bottom: 8.0),
+                      left: .0, right: 15, top: 8.0, bottom: 8.0),
                   child: Icon(
                     iconData,
                     color: primaryColor,
                   ),
                 ),
+               
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -67,6 +72,12 @@ class DisplayText extends StatelessWidget {
                         text!,
                         style: textStyle,
                       ),
+                       text1 == null
+                    ? Container()
+                    : Text(
+                        text1!,
+                        style: textStyle,
+                      ),
               ],
             ),
           ),