Skip to content

M
medapp_eksad
Commit 69e1699e authored by Budi Prasetyo's avatar Budi Prasetyo
Browse files
Options

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

parents 9d8c7357 747fc7cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 212 deletions
lib/login.dart
View file @ 69e1699e
...@@ -37,7 +37,7 @@ class _SignInState extends State<SignIn> { ...@@ -37,7 +37,7 @@ class _SignInState extends State<SignIn> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// setPageTitle('Login MedApps', context); setPageTitle('Login MedApps', context);
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return Scaffold( return Scaffold(
body: Stack( body: Stack(
......
lib/screen/about_us.dart
View file @ 69e1699e
...@@ -54,7 +54,7 @@ class _AboutUsState extends State<AboutUs> { ...@@ -54,7 +54,7 @@ class _AboutUsState extends State<AboutUs> {
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// setPageTitle('About Us', context); setPageTitle('About Us', context);
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
...@@ -67,56 +67,34 @@ class _AboutUsState extends State<AboutUs> { ...@@ -67,56 +67,34 @@ class _AboutUsState extends State<AboutUs> {
body: ResponsiveWidget.isSmallScreen(context) body: ResponsiveWidget.isSmallScreen(context)
? Stack( ? Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), scrollDirection: Axis.vertical,
builder: (BuildContext context, AsyncSnapshot snapshot) { controller: controller2,
var pgm = snapshot.data[0]; children: [
return Title( SmallHome1(wijet: Button_scroll_small()),
title: pgm['title'], SmallHome2(),
color: Colors.white, SmallHome3(),
child: ListView( SmallHome4(),
scrollDirection: Axis.vertical, ContactUs2_small(),
controller: controller2, FooterSmall(),
children: [ ],
SmallHome1(wijet: Button_scroll_small()),
SmallHome2(),
SmallHome3(),
SmallHome4(),
ContactUs2_small(),
FooterSmall(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
) )
: Stack( : Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), scrollDirection: Axis.vertical,
builder: (BuildContext context, AsyncSnapshot snapshot) { controller: controller2,
var pgm = snapshot.data[0]; children: [
return Title( Home1(wijet: Button_scroll()),
title: pgm['title'], const Home2(),
color: Colors.white, const Home3(),
child: ListView( const Home4(),
scrollDirection: Axis.vertical, ContactUs2(),
controller: controller2, Footer(),
children: [ ],
Home1(wijet: Button_scroll()),
const Home2(),
const Home3(),
const Home4(),
ContactUs2(),
Footer(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
), ),
); );
......
lib/screen/contact_us/contact_us.dart
View file @ 69e1699e
...@@ -48,7 +48,7 @@ class _ContactUsState extends State<ContactUs> { ...@@ -48,7 +48,7 @@ class _ContactUsState extends State<ContactUs> {
final GlobalKey<ScaffoldState> _scaffoldKey = 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);
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
...@@ -60,50 +60,28 @@ class _ContactUsState extends State<ContactUs> { ...@@ -60,50 +60,28 @@ class _ContactUsState extends State<ContactUs> {
body: ResponsiveWidget.isSmallScreen(context) body: ResponsiveWidget.isSmallScreen(context)
? Stack( ? Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), scrollDirection: Axis.vertical,
builder: (BuildContext context, AsyncSnapshot snapshot) { controller: controller2,
var pgm = snapshot.data[0]; children: [
return Title( ContactUs1_small(wijet: Button_scroll_small()),
title: pgm['title'], ContactUs2_small(),
color: Colors.white, FooterSmall(),
child: ListView( ],
scrollDirection: Axis.vertical,
controller: controller2,
children: [
ContactUs1_small(wijet: Button_scroll_small()),
ContactUs2_small(),
FooterSmall(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
) )
: Stack( : Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), scrollDirection: Axis.vertical,
builder: (BuildContext context, AsyncSnapshot snapshot) { controller: controller2,
var pgm = snapshot.data[0]; children: [
return Title( ContactUs1(wijet: Button_scroll()),
title: pgm['title'], ContactUs2(),
color: Colors.white, Footer(),
child: ListView( ],
scrollDirection: Axis.vertical,
controller: controller2,
children: [
ContactUs1(wijet: Button_scroll()),
ContactUs2(),
Footer(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat, floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
......
lib/screen/contact_us/contact_us2.dart
View file @ 69e1699e
...@@ -52,45 +52,37 @@ class ContactUs2 extends StatelessWidget { ...@@ -52,45 +52,37 @@ class ContactUs2 extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox(
height: screenSize.height * 0.23,
child: Text(
'Yes, you need '
'\n'
'an outsourcing partner '
'you can trust and thrive with',
textAlign: TextAlign.left,
style: GoogleFonts.poppins(
color: Colors.white,
fontSize: 30,
fontWeight: FontWeight.bold)),
),
const Spacer( const Spacer(
flex: 1, flex: 2,
),
SizedBox(
height: screenSize.height * 0.22,
child: Text(
'Go for the one who knows what they are doing, those who you share values with, '
'and those who will celebrate your success, and help you win over your biggest challenges. '
'\nLooking for an outsourcing partner? ',
textAlign: TextAlign.justify,
style: GoogleFonts.poppins(
color: Colors.white,
fontSize: 18,
// fontWeight: FontWeight.bold,
letterSpacing: 1.1)),
), ),
Text("Leave Your Contact Info and Let's Discuss Business",
style: GoogleFonts.poppins(
color: Colors.white,
fontSize: 30,
fontWeight: FontWeight.w500)),
// const Spacer(
// flex: 1,
// ),
// Text("Let's Discuss Business",
// style: GoogleFonts.poppins(
// color: Colors.white,
// fontSize: 35,
//
// fontWeight: FontWeight.w500,
// // fontWeight: FontWeight.bold,
// letterSpacing: 1.1)
// ),
const Spacer( const Spacer(
flex: 1, flex: 1,
), ),
Text("We’ll contact you immediately to discuss to help you.", Text(
"We’ll contact you immediately to discuss potential business",
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
color: Colors.white, color: Colors.white,
fontSize: 18, fontSize: 18,
letterSpacing: 1.2)), fontWeight: FontWeight.w500)),
const Spacer( const Spacer(
flex: 2, flex: 3,
), ),
], ],
), ),
......
lib/screen/solution.dart
View file @ 69e1699e
...@@ -42,7 +42,7 @@ class _SolutionsState extends State<Solutions> { ...@@ -42,7 +42,7 @@ class _SolutionsState extends State<Solutions> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// setPageTitle('MeddApp Solutions', context); setPageTitle('Our Solutions', context);
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
...@@ -55,53 +55,31 @@ class _SolutionsState extends State<Solutions> { ...@@ -55,53 +55,31 @@ class _SolutionsState extends State<Solutions> {
body: ResponsiveWidget.isSmallScreen(context) body: ResponsiveWidget.isSmallScreen(context)
? Stack( ? Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), scrollDirection: Axis.vertical,
builder: (BuildContext context, AsyncSnapshot snapshot) { controller: controller2,
var pgm = snapshot.data[0]; children: [
return Title( SmallOurSolution(wijet: Button_scroll()),
title: pgm['title'], SmallOurSolution2(),
color: Colors.white, FooterSmall(),
child: ListView( ],
scrollDirection: Axis.vertical,
controller: controller2,
children: [
SmallOurSolution(wijet: Button_scroll()),
SmallOurSolution2(),
FooterSmall(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
) )
: Stack( : Stack(
children: [ children: [
FutureBuilder<dynamic>( ListView(
future: getSettingDesc2(), controller: controller2,
builder: (BuildContext context, AsyncSnapshot snapshot) { children: [
var pgm = snapshot.data[0]; OurSolution(
return Title( wijet: Button_scroll(),
title: pgm['title'], button: ButtonSolution(context),
color: Colors.white, ),
child: ListView( OurSolution2(),
controller: controller2, ContactUs2(),
children: [ Footer(),
OurSolution( ],
wijet: Button_scroll(),
button: ButtonSolution(context),
),
OurSolution2(),
ContactUs2(),
Footer(),
],
),
);
},
), ),
ScrollUpButton(controller2),
], ],
), ),
); );
......
lib/screen_user/demo_user.dart
View file @ 69e1699e
...@@ -28,7 +28,7 @@ class _DemoUserState extends State<DemoUser> { ...@@ -28,7 +28,7 @@ class _DemoUserState extends State<DemoUser> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// setPageTitle('Free Demo Medapp', context); setPageTitle('Demo', context);
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
final user = context.read<FirebaseAuthMethods>().user; final user = context.read<FirebaseAuthMethods>().user;
final String mail = user.email!; final String mail = user.email!;
......
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