home design

lib/screens/home/dashboard_swipe_widget.dart

@@ -40,7 +40,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
         return getSwipeWidget(widget.dashboardItemList, index);
       },
       itemCount: 3,
-      itemHeight: 300,
+      // itemHeight: 300,
       pagination: new SwiperCustomPagination(
           builder: (BuildContext context, SwiperPluginConfig config) {
         return new Stack(
@@ -82,22 +82,22 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
   Widget getSwipeWidget(List<DashboardModel> dashboardItemList, int index) {
     if (index == 1)
       return RoundedContainer(
-          height: MediaQuery.of(context).size.height * 0.35,
-          margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
+          raduis: 16,
+          margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10),
           child: Padding(
               padding: const EdgeInsets.all(5.0),
               child: GetOutPatientStack(dashboardItemList[1])));
     if (index == 0)
       return RoundedContainer(
-          height: MediaQuery.of(context).size.height * 0.35,
-          margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
+          raduis: 16,
+          margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10),
           child: Padding(
               padding: const EdgeInsets.all(5.0),
               child: GetOutPatientStack(dashboardItemList[0])));
     if (index == 2)
       return RoundedContainer(
-          height: MediaQuery.of(context).size.height * 0.35,
-          margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
+          raduis: 16,
+          margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10),
           child:
               Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
             Expanded(
@@ -122,16 +122,19 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
                                         crossAxisAlignment:
                                             CrossAxisAlignment.start,
                                         children: [
-                                          AppText(TranslationBase.of(context)
-                                              .patients,
-                                              fontSize: 12,
-                                              fontWeight: FontWeight.bold,
-                                          fontHeight: 0.5,),
-                                          AppText(TranslationBase.of(context)
-                                              .referral,
+                                          AppText(
+                                            TranslationBase.of(context)
+                                                .patients,
+                                            fontSize: 12,
+                                            fontWeight: FontWeight.bold,
+                                            fontHeight: 0.5,
+                                          ),
+                                          AppText(
+                                            TranslationBase.of(context)
+                                                .referral,
                                             fontSize: 22,
                                             fontWeight: FontWeight.bold,
-                                            ),
+                                          ),
                                         ],
                                       ))),
                               Expanded(

lib/widgets/dashboard/activity_button.dart

@@ -3,7 +3,9 @@ import 'package:flutter/material.dart';
 
 class GetActivityButton extends StatelessWidget {
   final value;
+
   GetActivityButton(this.value);
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -15,24 +17,34 @@ class GetActivityButton extends StatelessWidget {
         color: Colors.white,
         borderRadius: BorderRadius.circular(20),
       ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: [
-          Padding(
-              padding: EdgeInsets.all(8),
-              child: AppText(value.value.toString(),
-                  fontSize: 30, fontWeight: FontWeight.bold)),
-          Expanded(
-            child: AppText(
-              value.kPIParameter,
-              textOverflow: TextOverflow.clip,
-              fontSize: 10,
-              textAlign: TextAlign.center,
-              fontWeight: FontWeight.w600,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            AppText(
+              value.value.toString(),
+              fontSize: 30,
+              fontWeight: FontWeight.bold,
+              color: Color(0xFF2B353E),
+            ),
+            Expanded(
+              child: Column(
+                children: [
+                  AppText(
+                    value.kPIParameter,
+                    textOverflow: TextOverflow.clip,
+                    fontSize: 10,
+                    color: Color(0xFF2B353E),
+                    textAlign: TextAlign.start,
+                    fontWeight: FontWeight.w700,
+                  ),
+                ],
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }

lib/widgets/dashboard/out_patient_stack.dart

@@ -33,7 +33,7 @@ class GetOutPatientStack extends StatelessWidget {
       child: Container(
         margin: EdgeInsets.symmetric(horizontal: 2),
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(6),
+          borderRadius: BorderRadius.circular(8),
           color: Colors.red[50],
         ),
         child: Stack(children: [
@@ -46,7 +46,7 @@ class GetOutPatientStack extends StatelessWidget {
               padding: EdgeInsets.all(10),
               height: max != 0 ? (150 * value.value) / max : 0,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(6),
+                borderRadius: BorderRadius.circular(8),
                 color: Color(0x63D02127),
               ),
             ),
@@ -60,13 +60,25 @@ class GetOutPatientStack extends StatelessWidget {
                 child: Center(
                   child: Align(
                       child: FittedBox(
-                    child: AppText(
-                      value.kPIParameter + ' (' + value.value.toString() + ') ',
-                      fontSize: 10,
-                      textAlign: TextAlign.center,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  )),
+                        child: Row(
+                          children: [
+                            AppText(
+                              value.kPIParameter,
+                              fontSize: 10,
+                              textAlign: TextAlign.center,
+                              color: Color(0xFF2B353E),
+                              fontWeight: FontWeight.w700,
+                            ),
+                            AppText(
+                              ' (' + value.value.toString() + ') ',
+                              fontSize: 12,
+                              textAlign: TextAlign.center,
+                              color: Color(0xFF2B353E),
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ],
+                        ),
+                      )),
                 ),
               ))
         ]),

lib/widgets/shared/rounded_container_widget.dart

@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
 
-// OWNER : Ibrahim albitar
-// DATE : 05-04-2020
-// DESCRIPTION : Custom widget for rounded container and custom decoration
-
 class RoundedContainer extends StatefulWidget {
   final double width;
   final double height;