diff --git a/lib/main.dart b/lib/main.dart index 1b5188ac51e22610224a3546c9d183a4cabd50cd..617815e38acb3195a3bb33ec0cd9a09292126166 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'flavor/flavor.dart'; -import 'page/login/login.dart'; -import 'page/registrasi/registrasi.dart'; +import 'page/login/landing.dart'; void main() { ApiFlavor.flavor = BuildFlavor.production.toString(); @@ -91,12 +90,8 @@ class _MyHomePageState extends State { 'Hello World', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 40) ), RaisedButton( - onPressed: () => _navigateToLogin(context), - child: Text('Login'), - ), - RaisedButton( - onPressed: () => _navigateToRegistrasi(context), - child: Text('Registrasi'), + onPressed: () => _navigateToLanding(context), + child: Text('Landing'), ), ], ), @@ -105,13 +100,8 @@ class _MyHomePageState extends State { ); } - void _navigateToLogin(BuildContext context) { - final route = MaterialPageRoute(builder: (_) => Login()); - Navigator.of(context).push(route); - } - - void _navigateToRegistrasi(BuildContext context) { - final route = MaterialPageRoute(builder: (_) => Registrasi()); + void _navigateToLanding(BuildContext context) { + final route = MaterialPageRoute(builder: (_) => Landing()); Navigator.of(context).push(route); } } diff --git a/lib/page/login/landing.dart b/lib/page/login/landing.dart new file mode 100644 index 0000000000000000000000000000000000000000..50b5ae5c14897493beb482e4f5582c30094179af --- /dev/null +++ b/lib/page/login/landing.dart @@ -0,0 +1,77 @@ +import 'package:flutter/material.dart'; +import 'package:ppl_disabilitas/page/login/login.dart'; +import 'package:ppl_disabilitas/page/registrasi/registrasi.dart'; +import 'package:ppl_disabilitas/utils/customButton.dart'; + +class Landing extends StatelessWidget { + const Landing({Key key}) : super(key: key); + + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: Color(0xff3A903A), + ), + backgroundColor: Color(0xff3A903A), + body: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Container( + margin: EdgeInsets.fromLTRB(20, 30, 20, 10), + alignment: Alignment.center, + child: ButtonTheme( + minWidth: double.infinity, + height: 60, + child: RaisedButton( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: new BorderRadius.all(Radius.circular(10)), + ), + child: Text( + 'Masuk', + style: TextStyle(fontSize: 25, color: Color(0xff3A903A), fontWeight: FontWeight.bold), + ), + onPressed: () => _navigateToLogin(context), + ), + ) + ), + Container( + child: separator('ATAU', 20, 0xffFFFFFF, 2, 0xffFFFFFF), + ), + Container( + margin: EdgeInsets.fromLTRB(20, 10, 20, 30), + alignment: Alignment.center, + child: ButtonTheme( + minWidth: double.infinity, + height: 60, + child: RaisedButton( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: new BorderRadius.all(Radius.circular(10)), + ), + child: Text( + 'Daftar', + style: TextStyle(fontSize: 25, color: Color(0xff3A903A), fontWeight: FontWeight.bold), + ), + onPressed: () => _navigateToRegistrasi(context), + ), + ) + ), + ], + ), + ), + ); + } + + void _navigateToLogin(BuildContext context) { + final route = MaterialPageRoute(builder: (_) => Login()); + Navigator.of(context).push(route); + } + + void _navigateToRegistrasi(BuildContext context) { + final route = MaterialPageRoute(builder: (_) => Registrasi()); + Navigator.of(context).push(route); + } + +} \ No newline at end of file diff --git a/lib/page/login/login.dart b/lib/page/login/login.dart index b1183db79ea5de4060251adce44fae517b7226cf..8e2054b4420a4d1f3a6167dae1689d8a35d6418b 100644 --- a/lib/page/login/login.dart +++ b/lib/page/login/login.dart @@ -71,7 +71,7 @@ class LoginState extends State { ) ), Container( - child: separator('Atau masuk dengan'), + child: separator('Atau masuk dengan', 12, 0xff000000, 1, 0xff000000), ), Container( margin: EdgeInsets.fromLTRB(0, 10, 0, 30), diff --git a/lib/page/registrasi/registrasi.dart b/lib/page/registrasi/registrasi.dart index c4e413412dee23d91d25d2cb5f8c58d3390b0a6c..59aae7185b4363954ce51f2b5454565f90f59149 100644 --- a/lib/page/registrasi/registrasi.dart +++ b/lib/page/registrasi/registrasi.dart @@ -73,7 +73,7 @@ class RegistrasiState extends State { ) ), Container( - child: separator('Atau daftar dengan'), + child: separator('Atau daftar dengan', 12, 0xff000000, 1, 0xff000000), ), Container( margin: EdgeInsets.fromLTRB(0, 10, 0, 30), diff --git a/lib/utils/customButton.dart b/lib/utils/customButton.dart index b5d46eefc4b87f88280896bbce2d5b71920ebab3..2c71a88fa9d9d3b7c48c70ce35bb06c2aea9a92d 100644 --- a/lib/utils/customButton.dart +++ b/lib/utils/customButton.dart @@ -17,13 +17,11 @@ Color fillColor, Color textColor, void function()) { text, style: TextStyle(fontSize: 20, color: textColor, fontWeight: FontWeight.bold), ), - onPressed: () { - function(); - }, + onPressed: () => function(), ); } -Widget separator(String text) { +Widget separator(String text, double textSize, int textColor, double thickness, int color) { return Row( children: [ SizedBox( @@ -33,16 +31,19 @@ Widget separator(String text) { child: Padding( padding: EdgeInsets.symmetric(horizontal: 10), child: Divider( - thickness: 1, + thickness: thickness, + color: Color(color), ), ), ), - Text(text), + Text(text, + style: TextStyle(fontSize: textSize, color: Color(textColor))), Expanded( child: Padding( padding: EdgeInsets.symmetric(horizontal: 10), child: Divider( - thickness: 1, + thickness: thickness, + color: Color(color), ), ), ),