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

lib/appbar/appbar_home.dart

@@ -38,7 +38,7 @@ AppBar AppbarHomeLarge(Size screenSize, BuildContext context, Color home,
           flex: 1,
         ),
         ButtonAppbar_baru(
-            arah: '/service', menu: 'Our Solution', warna: ourServices),
+            arah: '/solutions', menu: 'Our Solution', warna: ourServices),
         const Spacer(
           flex: 1,
         ),

lib/main.dart

 import 'package:flutter/material.dart';
 import 'package:medapp_eksad/homepage.dart';
-import 'package:medapp_eksad/screen/contact_us.dart';
+import 'package:medapp_eksad/screen/contact_us/contact_us.dart';
 import 'package:medapp_eksad/screen/solution.dart';
 
 void main() {

lib/screen/contact_us.dart → lib/screen/contact_us/contact_us.dart

 import 'package:flutter/material.dart';
 import 'package:medapp_eksad/appbar/appbar_home.dart';
+import 'package:medapp_eksad/screen/contact_us/contact_us1.dart';
+import 'package:medapp_eksad/screen/contact_us/contact_us2.dart';
 import 'package:medapp_eksad/screen/footer.dart';
 import 'package:medapp_eksad/widget/responsive.dart';
 import 'package:flutter/services.dart';
@@ -19,7 +21,7 @@ class ContactUs extends StatefulWidget {
 }
 
 class _ContactUsState extends State<ContactUs> {
-  final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   @override
   Widget build(BuildContext context) {
     setPageTitle('Contact Us', context);
@@ -29,33 +31,36 @@ class _ContactUsState extends State<ContactUs> {
       appBar: ResponsiveWidget.isSmallScreen(context)
           ? AppBarKecil()
           : AppbarHomeLarge(screenSize, context, Colors.black, Colors.black,
-          Colors.black, Colors.black, Colors.blue),
+              Colors.black, Colors.black, Colors.blue),
       body: ListView(
         children: [
-          Footer()
+          const ContactUs1(),
+          ContactUs2(),
+          const Footer(),
         ],
       ),
     );
   }
 
-
   AppBar AppBarKecil() {
     return AppBar(
       leading: IconButton(
         onPressed: () => _scaffoldKey.currentState!.openDrawer(),
-        icon: Icon(Icons.list_outlined,size: 30,color: Colors.black,),),
+        icon: const Icon(
+          Icons.list_outlined,
+          size: 30,
+          color: Colors.black,
+        ),
+      ),
       backgroundColor: Colors.white,
       centerTitle: true,
-      title: Container(
-        child: SizedBox(
-          height: 50,
-          width: 150,
-          child: Image.asset("assets/logo/medapp-logo.png"),
-        ),
+      title: SizedBox(
+        height: 50,
+        width: 150,
+        child: Image.asset("assets/logo/medapp-logo.png"),
       ),
 
       // ),
     );
   }
 }
-

lib/screen/contact_us/contact_us1.dart

+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+class ContactUs1 extends StatefulWidget {
+  const ContactUs1({Key? key}) : super(key: key);
+
+  @override
+  State<ContactUs1> createState() => _ContactUsState();
+}
+
+class _ContactUsState extends State<ContactUs1> {
+  @override
+  Widget build(BuildContext context) {
+    var screenSize = MediaQuery.of(context).size;
+    return Stack(
+      children: [
+        Container(
+          width: screenSize.width,
+          height: screenSize.height * 0.42,
+          decoration: const BoxDecoration(
+              image: DecorationImage(
+                  image: AssetImage(
+                    "assets/images/contactus1.jpg",
+                  ),
+                  alignment: Alignment.center,
+                  fit: BoxFit.cover)),
+        ),
+        Container(
+          width: screenSize.width * 0.5,
+          height: screenSize.height * 0.34,
+          padding: EdgeInsets.only(
+              right: screenSize.width * 0.30, left: screenSize.height * 0.06),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+              Text(
+                'Contact Us',
+                style: GoogleFonts.poppins(
+                    fontSize: 37,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.white),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/widget/button_color.dart

+import 'package:flutter/material.dart';
+
+ButtonStyle DefaultColors() {
+  return ButtonStyle(
+    backgroundColor: MaterialStateProperty.resolveWith<Color?>(
+      (Set<MaterialState> states) {
+        return const Color(0xff1e5ea8); // Defer to the widget's default.
+      },
+    ),
+    overlayColor: MaterialStateProperty.resolveWith<Color?>(
+      (Set<MaterialState> states) {
+        if (states.contains(MaterialState.hovered)) {
+          return Colors.red;
+        } //<-- SEE HERE
+        return null; // Defer to the widget's default.
+      },
+    ),
+  );
+}
+
+ButtonStyle Btn_Submit() {
+  return ButtonStyle(
+    shape: MaterialStateProperty.resolveWith((ShapeBorder) =>
+        RoundedRectangleBorder(borderRadius: BorderRadius.circular(8))),
+    backgroundColor: MaterialStateProperty.resolveWith<Color?>(
+      (Set<MaterialState> states) {
+        return const Color(0xff1e5ea8); // Defer to the widget's default.
+      },
+    ),
+    overlayColor: MaterialStateProperty.resolveWith<Color?>(
+      (Set<MaterialState> states) {
+        if (states.contains(MaterialState.hovered)) {
+          return Colors.red;
+        } //<-- SEE HERE
+        return null; // Defer to the widget's default.
+      },
+    ),
+  );
+}

pubspec.lock

@@ -122,7 +122,7 @@ packages:
     source: hosted
     version: "3.0.1"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       url: "https://pub.dartlang.org"

pubspec.yaml

@@ -44,6 +44,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   show_up_animation: ^2.0.0
+  http: ^0.13.4
 
 dev_dependencies:
   flutter_test: