Skip to content

M
medapp_eksad
Commit 9aea59b8 authored by rizky ramadhan's avatar rizky ramadhan
Browse files
Options

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

parents 12ebdfd0 6b7a8e61
Expand all Show whitespace changes
Inline Side-by-side
Showing with 564 additions and 33 deletions
lib/appbar/appbar_home.dart
View file @ 9aea59b8
...@@ -38,7 +38,7 @@ AppBar AppbarHomeLarge(Size screenSize, BuildContext context, Color home, ...@@ -38,7 +38,7 @@ AppBar AppbarHomeLarge(Size screenSize, BuildContext context, Color home,
flex: 1, flex: 1,
), ),
ButtonAppbar_baru( ButtonAppbar_baru(
arah: '/service', menu: 'Our Solution', warna: ourServices), arah: '/solutions', menu: 'Our Solution', warna: ourServices),
const Spacer( const Spacer(
flex: 1, flex: 1,
), ),
......
lib/main.dart
View file @ 9aea59b8
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:medapp_eksad/homepage.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'; import 'package:medapp_eksad/screen/solution.dart';
void main() { void main() {
......
lib/screen/contact_us.dart → lib/screen/contact_us/contact_us.dart
View file @ 9aea59b8
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:medapp_eksad/appbar/appbar_home.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/screen/footer.dart';
import 'package:medapp_eksad/widget/responsive.dart'; import 'package:medapp_eksad/widget/responsive.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
...@@ -19,7 +21,7 @@ class ContactUs extends StatefulWidget { ...@@ -19,7 +21,7 @@ class ContactUs extends StatefulWidget {
} }
class _ContactUsState extends State<ContactUs> { class _ContactUsState extends State<ContactUs> {
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
setPageTitle('Contact Us', context); setPageTitle('Contact Us', context);
...@@ -32,30 +34,33 @@ class _ContactUsState extends State<ContactUs> { ...@@ -32,30 +34,33 @@ class _ContactUsState extends State<ContactUs> {
Colors.black, Colors.black, Colors.blue), Colors.black, Colors.black, Colors.blue),
body: ListView( body: ListView(
children: [ children: [
Footer() const ContactUs1(),
ContactUs2(),
const Footer(),
], ],
), ),
); );
} }
AppBar AppBarKecil() { AppBar AppBarKecil() {
return AppBar( return AppBar(
leading: IconButton( leading: IconButton(
onPressed: () => _scaffoldKey.currentState!.openDrawer(), 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, backgroundColor: Colors.white,
centerTitle: true, centerTitle: true,
title: Container( title: SizedBox(
child: SizedBox(
height: 50, height: 50,
width: 150, width: 150,
child: Image.asset("assets/logo/medapp-logo.png"), child: Image.asset("assets/logo/medapp-logo.png"),
), ),
),
// ), // ),
); );
} }
} }
lib/screen/contact_us/contact_us1.dart 0 → 100644
View file @ 9aea59b8
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/screen/contact_us/contact_us2.dart 0 → 100644
View file @ 9aea59b8
This diff is collapsed.
lib/screen/home/home3.dart
View file @ 9aea59b8
...@@ -15,8 +15,8 @@ class _Home3State extends State<Home3> { ...@@ -15,8 +15,8 @@ class _Home3State extends State<Home3> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return Container( return SizedBox(
height: screenSize.height * 1.1, height: screenSize.height * 1.75,
width: screenSize.width, width: screenSize.width,
child: Column( child: Column(
children: [ children: [
...@@ -35,7 +35,7 @@ class _Home3State extends State<Home3> { ...@@ -35,7 +35,7 @@ class _Home3State extends State<Home3> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( SizedBox(
width: screenSize.width * 0.2, width: screenSize.width * 0.2,
child: Column( child: Column(
children: [ children: [
...@@ -81,7 +81,7 @@ class _Home3State extends State<Home3> { ...@@ -81,7 +81,7 @@ class _Home3State extends State<Home3> {
], ],
), ),
), ),
Container( SizedBox(
width: screenSize.width * 0.2, width: screenSize.width * 0.2,
child: Column( child: Column(
children: [ children: [
...@@ -128,7 +128,7 @@ class _Home3State extends State<Home3> { ...@@ -128,7 +128,7 @@ class _Home3State extends State<Home3> {
], ],
), ),
), ),
Container( SizedBox(
width: screenSize.width * 0.2, width: screenSize.width * 0.2,
child: Column( child: Column(
children: [ children: [
...@@ -173,7 +173,13 @@ class _Home3State extends State<Home3> { ...@@ -173,7 +173,13 @@ class _Home3State extends State<Home3> {
], ],
), ),
), ),
Container( ],
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: screenSize.width * 0.2, width: screenSize.width * 0.2,
child: Column( child: Column(
children: [ children: [
...@@ -215,11 +221,130 @@ class _Home3State extends State<Home3> { ...@@ -215,11 +221,130 @@ class _Home3State extends State<Home3> {
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
curve: Curves.decelerate, curve: Curves.decelerate,
direction: Direction.horizontal, direction: Direction.horizontal,
child: Container( child: SizedBox(
height: screenSize.height * 0.42, height: screenSize.height * 0.42,
child: Text( child: Text(
'Acceptance of payments can be done easily and flexibly with the availability of ' 'Acceptance of payments can be done easily and flexibly with the availability of '
'online payment systems (credit cards, transfers, digital-wallet)', 'online payment systems (credit cards, transfers, digital-wallet).',
style: GoogleFonts.poppins(
fontSize: 15,
fontWeight: FontWeight.w500,
letterSpacing: 1.3,
height: 1.4),
textAlign: TextAlign.center,
),
),
))
],
),
),
SizedBox(
width: screenSize.width * 0.2,
child: Column(
children: [
Container(
padding: EdgeInsets.only(top: screenSize.height * 0.01),
width: screenSize.width * 0.5,
child: Animasi_Kiri_Kanan(
screenSize: screenSize,
widget: Image.asset(
'assets/icons/why4.png',
height: 60,
width: 60,
))),
const SizedBox(
height: 10,
),
Container(
padding: const EdgeInsets.only(top: 5),
width: 250,
height: 75,
child: const Text(
'DRUG DELIVERY',
style: TextStyle(
color: Colors.blueAccent,
fontSize: 17,
letterSpacing: 1.1,
fontWeight: FontWeight.w600),
textAlign: TextAlign.center,
),
),
const SizedBox(
height: 10,
),
Container(
padding: const EdgeInsets.only(top: 10),
width: 220,
height: screenSize.height * 0.55,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.decelerate,
direction: Direction.horizontal,
child: SizedBox(
height: screenSize.height * 0.42,
child: Text(
'Drug delivery works in collaboration with goods delivery service providers '
'which are currently developing fast.',
style: GoogleFonts.poppins(
fontSize: 15,
fontWeight: FontWeight.w500,
letterSpacing: 1.3,
height: 1.4),
textAlign: TextAlign.center,
),
),
))
],
),
),
SizedBox(
width: screenSize.width * 0.2,
child: Column(
children: [
Container(
padding: EdgeInsets.only(top: screenSize.height * 0.01),
width: screenSize.width * 0.5,
child: Animasi_Kiri_Kanan(
screenSize: screenSize,
widget: Image.asset(
'assets/icons/why4.png',
height: 60,
width: 60,
))),
const SizedBox(
height: 10,
),
Container(
padding: const EdgeInsets.only(top: 5),
width: 250,
height: 75,
child: const Text(
'OTHER FEATURES',
style: TextStyle(
color: Colors.blueAccent,
fontSize: 17,
letterSpacing: 1.1,
fontWeight: FontWeight.w600),
textAlign: TextAlign.center,
),
),
const SizedBox(
height: 10,
),
Container(
padding: const EdgeInsets.only(top: 10),
width: 220,
height: screenSize.height * 0.55,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.decelerate,
direction: Direction.horizontal,
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',
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
...@@ -228,13 +353,7 @@ class _Home3State extends State<Home3> { ...@@ -228,13 +353,7 @@ class _Home3State extends State<Home3> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
) ))
// Animasi_Kanan_Kiri(judul: 'WE ARE A TEAM OF EXPERT RECRUITERS, '
// 'WITH A MISSION TO MATCH TALENTED PEOPLE WITH SUCCESSFUL EMPLOYERS. '
// 'WE STRONGLY BELIEVE IN BUILDING A VALUE OF TRUST, HONESTY, '
// 'AND TRANSPARENCY WITH OUR CLIENTS TO DEVELOP LONG-TERM RELATIONSHIPS '
// 'AND ADOPT A FLEXIBLE APPROACH AS PER THEIR NEEDS.')
)
], ],
), ),
), ),
......
lib/widget/button_color.dart 0 → 100644
View file @ 9aea59b8
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
View file @ 9aea59b8
...@@ -122,7 +122,7 @@ packages: ...@@ -122,7 +122,7 @@ packages:
source: hosted source: hosted
version: "3.0.1" version: "3.0.1"
http: http:
dependency: transitive dependency: "direct main"
description: description:
name: http name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
......
pubspec.yaml
View file @ 9aea59b8
...@@ -44,6 +44,7 @@ dependencies: ...@@ -44,6 +44,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2
show_up_animation: ^2.0.0 show_up_animation: ^2.0.0
http: ^0.13.4
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment