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 {
width: screenSize.width,
height: screenSize.height * 0.6,
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(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Container(
// color: Colors.blue,
width: screenSize.width * 0.25,
height: screenSize.height * 0.1,
width: screenSize.width * 0.35,
height: screenSize.height * 0.15,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
direction: Direction.horizontal,
......@@ -71,7 +71,7 @@ class Home1 extends StatelessWidget {
// color: Colors.green,
// padding: EdgeInsets.only(top: 1),
width: screenSize.width * 0.3,
height: screenSize.height * 0.17,
height: screenSize.height * 0.23,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.bounceIn,
......@@ -83,7 +83,7 @@ class Home1 extends StatelessWidget {
' patient outcomes, safely and securely.',
textAlign: TextAlign.center,
style: GoogleFonts.poppins(
fontSize: 20,
fontSize: 18,
// letterSpacing: 1.3,
// height: 1.5,
fontWeight: FontWeight.bold,
......@@ -92,7 +92,7 @@ class Home1 extends StatelessWidget {
),
),
Container(
width: screenSize.width * 0.15,
width: screenSize.width * 0.17,
height: screenSize.height * 0.07,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
......
lib/screen/home/home2.dart
View file @ 61e41436
......@@ -11,7 +11,7 @@ class Home2 extends StatelessWidget {
return Container(
width: screenSize.width * 0.5,
color: const Color.fromARGB(255, 227, 235, 253),
height: screenSize.height,
height: screenSize.height*1.1,
padding: EdgeInsets.only(
left: screenSize.width * 0.10,
right: screenSize.width * 0.10,
......@@ -20,7 +20,7 @@ class Home2 extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Spacer(
flex: 2,
flex: 3,
),
Container(
width: screenSize.width,
......@@ -31,7 +31,7 @@ class Home2 extends StatelessWidget {
fontWeight: FontWeight.bold)),
),
Spacer(
flex: 2,
flex: 3,
),
Container(
width: screenSize.width,
......@@ -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.',
textAlign: TextAlign.justify,
style: GoogleFonts.poppins(
fontSize: 18,
fontSize: 16,
letterSpacing: 1.1,
height: 1.8,
height: 1.6,
fontWeight: FontWeight.w500)),
),
Spacer(
......@@ -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.',
textAlign: TextAlign.justify,
style: GoogleFonts.poppins(
fontSize: 18,
fontSize: 16,
letterSpacing: 1.1,
height: 1.8,
height: 1.6,
fontWeight: FontWeight.w500)),
),
Spacer(
flex:2,
flex:1,
),
Container(
width: screenSize.width,
......@@ -103,9 +103,9 @@ class Home2 extends StatelessWidget {
'Benefit from server-free* infrastructure, automatic upgrades and simple licensing.',
textAlign: TextAlign.justify,
style: GoogleFonts.poppins(
fontSize: 18,
fontSize: 16,
letterSpacing: 1.1,
height: 1.8,
height: 1.6,
fontWeight: FontWeight.w500)),
),
Spacer(
......
lib/screen/home/home3.dart
View file @ 61e41436
......@@ -16,12 +16,12 @@ class _Home3State extends State<Home3> {
Widget build(BuildContext context) {
var screenSize = MediaQuery.of(context).size;
return SizedBox(
height: screenSize.height * 1.75,
height: screenSize.height * 1.72,
width: screenSize.width,
child: Column(
children: [
const SizedBox(
height: 40,
height: 45,
),
Text("Why MedApps ?",
style: GoogleFonts.poppins(
......@@ -220,13 +220,13 @@ class _Home3State extends State<Home3> {
Container(
padding: const EdgeInsets.only(top: 10),
width: 220,
height: screenSize.height * 0.35,
height: screenSize.height * 0.3,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.decelerate,
direction: Direction.horizontal,
child: SizedBox(
height: screenSize.height * 0.42,
height: screenSize.height * 0.4,
child: Text(
'Acceptance of payments can be done easily and flexibly with the availability of '
'online payment systems (credit cards, transfers, digital-wallet).',
......@@ -280,13 +280,13 @@ class _Home3State extends State<Home3> {
Container(
padding: const EdgeInsets.only(top: 10),
width: 220,
height: screenSize.height * 0.35,
height: screenSize.height * 0.3,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.decelerate,
direction: Direction.horizontal,
child: SizedBox(
height: screenSize.height * 0.42,
height: screenSize.height * 0.40,
child: Text(
'Drug delivery works in collaboration with goods delivery service providers '
'which are currently developing fast.',
......@@ -340,7 +340,7 @@ class _Home3State extends State<Home3> {
Container(
padding: const EdgeInsets.only(top: 10),
width: 220,
height: screenSize.height * 0.35,
height: screenSize.height * 0.3,
child: ShowUpAnimation(
delayStart: const Duration(seconds: 1),
curve: Curves.decelerate,
......
lib/screen/home/home4.dart
View file @ 61e41436
......@@ -17,8 +17,21 @@ class Home4 extends StatelessWidget {
width: ScreenSize.width * 0.20,
height: ScreenSize.height * 0.90,
decoration: BoxDecoration(
color: Colors.blue[900],
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: Row(
......@@ -70,29 +83,9 @@ class Home4 extends StatelessWidget {
width : 200,
child: ElevatedButton(
onPressed: (){},
style: ElevatedButton.styleFrom(
primary: Colors.blue[900],
onPrimary: Colors.white,
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],
style: DefaultColors(),
// ElevatedButton.styleFrom(
// primary: Colors.blue,
// fixedSize: Size(170, 85),
// onPrimary: Colors.white,
// shape: RoundedRectangleBorder(
......@@ -100,13 +93,13 @@ class Home4 extends StatelessWidget {
// )
// )
// ),
// child: Text("LEARN MORE",
// style: TextStyle(
// fontSize: 18,
// letterSpacing: 2
// ),
// ),
// ),
child: Text("LEARN MORE",
style: TextStyle(
fontSize: 18,
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