Merge branch 'master' of http://103.44.149.204/qorridi/medapp_eksad

lib/screen/home/home2.dart

@@ -18,9 +18,10 @@ class Home2 extends StatelessWidget {
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: [
           Spacer(
-            flex: 2,
+            flex: 1,
           ),
           Container(
             width: screenSize.width,
@@ -30,7 +31,9 @@ class Home2 extends StatelessWidget {
                     color: const Color.fromARGB(255, 12, 66, 101),
                     fontWeight: FontWeight.bold)),
           ),
-          SizedBox(height: 10),
+          Spacer(
+            flex: 1,
+          ),
           Container(
             width: screenSize.width,
             height: 100,
@@ -44,7 +47,9 @@ class Home2 extends StatelessWidget {
                     height: 1.6,
                     fontWeight: FontWeight.w500)),
           ),
-          SizedBox(height: 10),
+          Spacer(
+            flex: 1,
+          ),
           Container(
             // padding: const EdgeInsets.only(left: 1),
             // width: screenSize.width * 0.3,
@@ -74,7 +79,9 @@ class Home2 extends StatelessWidget {
               ],
             ),
           ),
-          SizedBox(height: 30),
+          Spacer(
+            flex: 1,
+          ),
           Container(
             width: screenSize.width,
             height: 100,
@@ -90,7 +97,9 @@ class Home2 extends StatelessWidget {
                     height: 1.6,
                     fontWeight: FontWeight.w500)),
           ),
-          SizedBox(height: 10),
+          Spacer(
+            flex: 1,
+          ),
           Container(
             width: screenSize.width,
             height: 100,
@@ -105,6 +114,9 @@ class Home2 extends StatelessWidget {
                     height: 1.6,
                     fontWeight: FontWeight.w500)),
           ),
+          Spacer(
+            flex: 1,
+          ),
         ],
       ),
     );

lib/screen/home/home3.dart

@@ -23,7 +23,7 @@ class _Home3State extends State<Home3> {
           const SizedBox(
             height: 45,
           ),
-          Text("Why MedApps ?",
+          Text("Why MedApp ?",
               style: GoogleFonts.poppins(
                   fontSize: 36,
                   color: const Color(0xff1e5ea8),
@@ -339,7 +339,7 @@ class _Home3State extends State<Home3> {
                     ),
                     Container(
                         padding: const EdgeInsets.only(top: 10),
-                        width: 220,
+                        width: 250,
                         height: screenSize.height * 0.3,
                         child: ShowUpAnimation(
                           delayStart: const Duration(seconds: 1),
@@ -348,9 +348,13 @@ class _Home3State extends State<Home3> {
                           child: SizedBox(
                             height: screenSize.height * 0.42,
                             child: Text(
-                              'Online consultation (to be integrated with the current RSSC system), '
-                              'Emergency assistance to call ambulances and doctors, '
-                              'Rating by consumers for each service',
+                              // 'Online consultation (to be integrated with the current RSSC system), '
+                              // 'Emergency assistance to call ambulances and doctors, '
+                              // 'Rating by consumers for each service',
+                              'Online consultation (via chat, telephone, or video call),'
+                              'Emergency assistance to call ambulance and doctor,'
+                              'The MedApp system is ready to be integrated with HIS,'
+                              'The MedApp system has been integrated with the Mobile JKN (BPJS).',
                               style: GoogleFonts.poppins(
                                   fontSize: 15,
                                   fontWeight: FontWeight.w500,

lib/screen/solution.dart

@@ -43,6 +43,7 @@ class _SolutionsState extends State<Solutions> {
     var screenSize = MediaQuery.of(context).size;
     return Scaffold(
       key: _scaffoldKey,
+      floatingActionButton: WAChat(),
       appBar: ResponsiveWidget.isSmallScreen(context)
           ? AppBarKecil()
           : AppbarHomeLarge(screenSize, context, Colors.black, Colors.black,
@@ -73,7 +74,7 @@ class _SolutionsState extends State<Solutions> {
   ElevatedButton ButtonSolution(BuildContext context) {
     return ElevatedButton(
       onPressed: () {
-        _scrollToIndex(1500);
+        _scrollToIndex(500);
       },
       style: DefaultColors(),
       // ElevatedButton.styleFrom(

lib/widget/drawer.dart

@@ -10,17 +10,17 @@ class DrawerMedApp extends StatelessWidget {
       // backgroundColor: Color.fromARGB(255, 76, 154, 231),
       width: 200,
       child: Container(
-        decoration: BoxDecoration(
-          color: Colors.blue,
-          gradient: LinearGradient(
-            colors: [
-              Colors.blue,
-              Colors.blue.withOpacity(0.0),
-
-            ],
-            stops: [0.0, 1.0],
-          ),
-        ),
+        // decoration: BoxDecoration(
+        //   color: Colors.blue,
+        //   gradient: LinearGradient(
+        //     colors: [
+        //       Colors.blue,
+        //       Colors.blue.withOpacity(0.0),
+        //
+        //     ],
+        //     stops: [0.0, 1.0],
+        //   ),
+        // ),
         child: Column(
           children: [
             const SizedBox(height: 50,),