Skip to content

M
medapp_eksad
Commit 61e41436 authored by Arham Aulia Nugraha's avatar Arham Aulia Nugraha
Browse files
Options

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

 Conflicts:
	lib/screen/home/home4.dart
parents 2fcb09b1 820c7e04
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 60 deletions
lib/screen/home/home1.dart
View file @ 61e41436
...@@ -44,15 +44,15 @@ class Home1 extends StatelessWidget { ...@@ -44,15 +44,15 @@ class Home1 extends StatelessWidget {
width: screenSize.width, width: screenSize.width,
height: screenSize.height * 0.6, height: screenSize.height * 0.6,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: screenSize.width * 0.4, top: screenSize.height * 0.12), left: screenSize.width * 0.46, top: screenSize.height * 0.12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Container( Container(
// color: Colors.blue, // color: Colors.blue,
width: screenSize.width * 0.25, width: screenSize.width * 0.35,
height: screenSize.height * 0.1, height: screenSize.height * 0.15,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
direction: Direction.horizontal, direction: Direction.horizontal,
...@@ -71,7 +71,7 @@ class Home1 extends StatelessWidget { ...@@ -71,7 +71,7 @@ class Home1 extends StatelessWidget {
// color: Colors.green, // color: Colors.green,
// padding: EdgeInsets.only(top: 1), // padding: EdgeInsets.only(top: 1),
width: screenSize.width * 0.3, width: screenSize.width * 0.3,
height: screenSize.height * 0.17, height: screenSize.height * 0.23,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
curve: Curves.bounceIn, curve: Curves.bounceIn,
...@@ -83,7 +83,7 @@ class Home1 extends StatelessWidget { ...@@ -83,7 +83,7 @@ class Home1 extends StatelessWidget {
' patient outcomes, safely and securely.', ' patient outcomes, safely and securely.',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 20, fontSize: 18,
// letterSpacing: 1.3, // letterSpacing: 1.3,
// height: 1.5, // height: 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
...@@ -92,7 +92,7 @@ class Home1 extends StatelessWidget { ...@@ -92,7 +92,7 @@ class Home1 extends StatelessWidget {
), ),
), ),
Container( Container(
width: screenSize.width * 0.15, width: screenSize.width * 0.17,
height: screenSize.height * 0.07, height: screenSize.height * 0.07,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
......
lib/screen/home/home2.dart
View file @ 61e41436
...@@ -11,7 +11,7 @@ class Home2 extends StatelessWidget { ...@@ -11,7 +11,7 @@ class Home2 extends StatelessWidget {
return Container( return Container(
width: screenSize.width * 0.5, width: screenSize.width * 0.5,
color: const Color.fromARGB(255, 227, 235, 253), color: const Color.fromARGB(255, 227, 235, 253),
height: screenSize.height, height: screenSize.height*1.1,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: screenSize.width * 0.10, left: screenSize.width * 0.10,
right: screenSize.width * 0.10, right: screenSize.width * 0.10,
...@@ -20,7 +20,7 @@ class Home2 extends StatelessWidget { ...@@ -20,7 +20,7 @@ class Home2 extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Spacer( Spacer(
flex: 2, flex: 3,
), ),
Container( Container(
width: screenSize.width, width: screenSize.width,
...@@ -31,7 +31,7 @@ class Home2 extends StatelessWidget { ...@@ -31,7 +31,7 @@ class Home2 extends StatelessWidget {
fontWeight: FontWeight.bold)), fontWeight: FontWeight.bold)),
), ),
Spacer( Spacer(
flex: 2, flex: 3,
), ),
Container( Container(
width: screenSize.width, width: screenSize.width,
...@@ -41,9 +41,9 @@ class Home2 extends StatelessWidget { ...@@ -41,9 +41,9 @@ class Home2 extends StatelessWidget {
'and seize opportunities that arise will be critical to ensuring the company`s sustainability in the future.', 'and seize opportunities that arise will be critical to ensuring the company`s sustainability in the future.',
textAlign: TextAlign.justify, textAlign: TextAlign.justify,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 18, fontSize: 16,
letterSpacing: 1.1, letterSpacing: 1.1,
height: 1.8, height: 1.6,
fontWeight: FontWeight.w500)), fontWeight: FontWeight.w500)),
), ),
Spacer( Spacer(
...@@ -86,13 +86,13 @@ class Home2 extends StatelessWidget { ...@@ -86,13 +86,13 @@ class Home2 extends StatelessWidget {
'not harder. Which means you can get on with doing what you do best, in ways that work best for you.', 'not harder. Which means you can get on with doing what you do best, in ways that work best for you.',
textAlign: TextAlign.justify, textAlign: TextAlign.justify,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 18, fontSize: 16,
letterSpacing: 1.1, letterSpacing: 1.1,
height: 1.8, height: 1.6,
fontWeight: FontWeight.w500)), fontWeight: FontWeight.w500)),
), ),
Spacer( Spacer(
flex:2, flex:1,
), ),
Container( Container(
width: screenSize.width, width: screenSize.width,
...@@ -103,9 +103,9 @@ class Home2 extends StatelessWidget { ...@@ -103,9 +103,9 @@ class Home2 extends StatelessWidget {
'Benefit from server-free* infrastructure, automatic upgrades and simple licensing.', 'Benefit from server-free* infrastructure, automatic upgrades and simple licensing.',
textAlign: TextAlign.justify, textAlign: TextAlign.justify,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 18, fontSize: 16,
letterSpacing: 1.1, letterSpacing: 1.1,
height: 1.8, height: 1.6,
fontWeight: FontWeight.w500)), fontWeight: FontWeight.w500)),
), ),
Spacer( Spacer(
......
lib/screen/home/home3.dart
View file @ 61e41436
...@@ -16,12 +16,12 @@ class _Home3State extends State<Home3> { ...@@ -16,12 +16,12 @@ class _Home3State extends State<Home3> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
var screenSize = MediaQuery.of(context).size; var screenSize = MediaQuery.of(context).size;
return SizedBox( return SizedBox(
height: screenSize.height * 1.75, height: screenSize.height * 1.72,
width: screenSize.width, width: screenSize.width,
child: Column( child: Column(
children: [ children: [
const SizedBox( const SizedBox(
height: 40, height: 45,
), ),
Text("Why MedApps ?", Text("Why MedApps ?",
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
...@@ -220,13 +220,13 @@ class _Home3State extends State<Home3> { ...@@ -220,13 +220,13 @@ class _Home3State extends State<Home3> {
Container( Container(
padding: const EdgeInsets.only(top: 10), padding: const EdgeInsets.only(top: 10),
width: 220, width: 220,
height: screenSize.height * 0.35, height: screenSize.height * 0.3,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
curve: Curves.decelerate, curve: Curves.decelerate,
direction: Direction.horizontal, direction: Direction.horizontal,
child: SizedBox( child: SizedBox(
height: screenSize.height * 0.42, height: screenSize.height * 0.4,
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).',
...@@ -280,13 +280,13 @@ class _Home3State extends State<Home3> { ...@@ -280,13 +280,13 @@ class _Home3State extends State<Home3> {
Container( Container(
padding: const EdgeInsets.only(top: 10), padding: const EdgeInsets.only(top: 10),
width: 220, width: 220,
height: screenSize.height * 0.35, height: screenSize.height * 0.3,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
curve: Curves.decelerate, curve: Curves.decelerate,
direction: Direction.horizontal, direction: Direction.horizontal,
child: SizedBox( child: SizedBox(
height: screenSize.height * 0.42, height: screenSize.height * 0.40,
child: Text( child: Text(
'Drug delivery works in collaboration with goods delivery service providers ' 'Drug delivery works in collaboration with goods delivery service providers '
'which are currently developing fast.', 'which are currently developing fast.',
...@@ -340,7 +340,7 @@ class _Home3State extends State<Home3> { ...@@ -340,7 +340,7 @@ class _Home3State extends State<Home3> {
Container( Container(
padding: const EdgeInsets.only(top: 10), padding: const EdgeInsets.only(top: 10),
width: 220, width: 220,
height: screenSize.height * 0.35, height: screenSize.height * 0.3,
child: ShowUpAnimation( child: ShowUpAnimation(
delayStart: const Duration(seconds: 1), delayStart: const Duration(seconds: 1),
curve: Curves.decelerate, curve: Curves.decelerate,
......
lib/screen/home/home4.dart
View file @ 61e41436
...@@ -17,8 +17,21 @@ class Home4 extends StatelessWidget { ...@@ -17,8 +17,21 @@ class Home4 extends StatelessWidget {
width: ScreenSize.width * 0.20, width: ScreenSize.width * 0.20,
height: ScreenSize.height * 0.90, height: ScreenSize.height * 0.90,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.blue[900],
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
//color: Color.fromARGB(200, 9, 47, 171),
color: Colors.blue[900],
boxShadow: [
BoxShadow(
color:
const Color.fromARGB(255, 10, 116, 255).withAlpha(60),
blurRadius: 15.0,
spreadRadius: 10.0,
offset: const Offset(
0.0,
3.0,
),
),
],
), ),
child: Container( child: Container(
child: Row( child: Row(
...@@ -70,29 +83,9 @@ class Home4 extends StatelessWidget { ...@@ -70,29 +83,9 @@ class Home4 extends StatelessWidget {
width : 200, width : 200,
child: ElevatedButton( child: ElevatedButton(
onPressed: (){}, onPressed: (){},
style: ElevatedButton.styleFrom( style: DefaultColors(),
primary: Colors.blue[900], // ElevatedButton.styleFrom(
onPrimary: Colors.white, // primary: Colors.blue,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(30)
)
),
side: BorderSide(
color: Colors.white
),
fixedSize: Size(170, 85),
),
child: Text('LEARN MORE',
style: TextStyle(
fontSize: 18,
letterSpacing: 2
),
),
),
// child: ElevatedButton(
// onPressed: (){},
// style: ElevatedButton.styleFrom(
// primary: Colors.blue[900],
// fixedSize: Size(170, 85), // fixedSize: Size(170, 85),
// onPrimary: Colors.white, // onPrimary: Colors.white,
// shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
...@@ -100,13 +93,13 @@ class Home4 extends StatelessWidget { ...@@ -100,13 +93,13 @@ class Home4 extends StatelessWidget {
// ) // )
// ) // )
// ), // ),
// child: Text("LEARN MORE", child: Text("LEARN MORE",
// style: TextStyle( style: TextStyle(
// fontSize: 18, fontSize: 18,
// letterSpacing: 2 letterSpacing: 2
// ), ),
// ), ),
// ), ),
), ),
], ],
), ),
......
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