From ae7ccdcf73f92bed7d4bb06a69a8bf4e8fd8699c Mon Sep 17 00:00:00 2001 From: Mac Milin Date: Thu, 16 Apr 2020 22:10:01 +0800 Subject: [PATCH 1/3] UI changes --- .DS_Store | Bin 6148 -> 6148 bytes .idea/libraries/Dart_Packages.xml | 248 ++++++++++++------------- ssad_pro/assets/fonts/MyFlutterApp.ttf | Bin 0 -> 2232 bytes ssad_pro/lib/view/home_page.dart | 49 ++--- ssad_pro/pubspec.yaml | 2 + 5 files changed, 153 insertions(+), 146 deletions(-) create mode 100755 ssad_pro/assets/fonts/MyFlutterApp.ttf diff --git a/.DS_Store b/.DS_Store index 22f39120dcfc626b743d5ec4c02e9cbbe859958f..22ddc1979421df810a683de77b8a5c539d7b8975 100644 GIT binary patch delta 33 ncmZoMXffEZomIrp&|F8s#K^Q(N1@u>+yKZnHrsrf)lvumpz{d= delta 33 ocmZoMXffEZomIrd#8^kc(7>QpN1@u>+(1Xc%*=H2X;w=i0HBQs{r~^~ diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index c070217..72b9779 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -5,154 +5,154 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -166,7 +166,7 @@ - @@ -187,168 +187,168 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -362,173 +362,173 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ssad_pro/assets/fonts/MyFlutterApp.ttf b/ssad_pro/assets/fonts/MyFlutterApp.ttf new file mode 100755 index 0000000000000000000000000000000000000000..e7b0209bdecaffe142d1774348ea782a2a348dd3 GIT binary patch literal 2232 zcmd^AOK%fb6h3zzcI@~;oMaM=6Gjsn$Ia9>ZWtn*vn`DMeMw;CHY+#-1RO z(#H}B7FmTwE2z{BQkQg9MP0B!EW4rr3aM&HzdN3yL?XYS=jzV=&Uene z=ixhJVnozSUy?}4lV{HzRd2qsO2iIHGc>w(u^u>JLX#UaOxC#AF%x1Z^ zQaWGW-ysqU(4SU{Mq&7~jj!SR1arCq!aXCN1Kz+qP^nwj+&^t?!uNORJvB3L(BD8L zeuRgsZd_}!0s0R1Vd!eZs2A^jwYHB)J`bN{(`;M6J}tDd^#<%oLhj=H))Jl_eyZ5v z%nlK32JFLy(=I0RqTlK(0fSWEQFsV&|NTGIP1kA+TtpN z+r7vkL&EXgdkYk(8CHYBB-z%keLH5gYT2+)<2xDrxRrrn6nPm795|`V7a%B z6;*# zrj?;lHlz&M_OSpPWj1SX?4q|An@-zitb73Xcip4o7;(mz1nVA`Vd(%9zSU+lZRR+C zX!~_NqwAX=_yf|+O6FB_7J_c_rwV-(`Epq=*)a zhGz8d6X{rN)Gx_yuP<_9z#~hHd3?%9Z2s9Dsle8p%#hwAo?1rV3=R73exvDcT)E6x z{CXocp-02R1Hup4>5F|KIX;=yq9c((sVC%h3;w>~gd9E))|E)_>0DUpbN2@%iTU<~ z!jY*XN3((8!s_~iz0Z~P{n3~fk)D70_MGewDu)ionI|@)_&khBvS;8##OHO(l7BQ7 zOD8@qNOzvuw;@E2ojX93dvPBa`Ji?0hCptbcd!WlLkCO1MF-3HI$v?H3;cBlduftx zIJlSk={|phB@g1aw(Dyd#tQB6?QhEY?EWvgPg+Ul%Ysx4bqu~p5RjduSkt zSjAe+[ Icon( FontAwesomeIcons.rocket, color: Colors.white, - size: 70, + size: 50, ), SizedBox( width: 10, @@ -111,13 +112,14 @@ class HomePage extends StatelessWidget { ), SizedBox( width: 300.0, + height: 75, child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(18.0), - side: BorderSide(color: Colors.white)), + side: BorderSide(color: Color(0xffFF8A2B))), padding: EdgeInsets.fromLTRB(0, 5, 0, 5), textColor: Colors.white, - color: Colors.blue[700], + color: Color(0xffFF8A2B), onPressed: () { Navigator.push( context, @@ -126,12 +128,12 @@ class HomePage extends StatelessWidget { ); }, child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Icon( - Icons.compare_arrows, + FontAwesomeIcons.trophy, color: Colors.white, - size: 70, + size: 50, ), SizedBox( width: 10, @@ -146,13 +148,14 @@ class HomePage extends StatelessWidget { ), SizedBox( width: 300.0, + height: 75, child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(18.0), - side: BorderSide(color: Colors.white)), + side: BorderSide(color: Color(0xff139CC1))), padding: EdgeInsets.fromLTRB(0, 5, 0, 5), textColor: Colors.white, - color: Colors.blue[700], + color: Color(0xff139CC1), onPressed: () { Navigator.push( context, @@ -161,12 +164,12 @@ class HomePage extends StatelessWidget { ); }, child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Icon( Icons.assignment, color: Colors.white, - size: 60, + size: 50, ), SizedBox( width: 10, @@ -181,23 +184,24 @@ class HomePage extends StatelessWidget { ), SizedBox( width: 300.0, + height: 75, child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(18.0), - side: BorderSide(color: Colors.white)), + side: BorderSide(color: Color(0xff5B62AD))), padding: EdgeInsets.fromLTRB(0, 5, 0, 5), textColor: Colors.white, - color: Colors.blue[700], + color: Color(0xff5B62AD), onPressed: () { print('StudentAssignments'); }, child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Icon( - Icons.show_chart, + FontAwesomeIcons.medal, color: Colors.white, - size: 70, + size: 50, ), SizedBox( width: 10, @@ -212,13 +216,14 @@ class HomePage extends StatelessWidget { ), SizedBox( width: 300.0, + height: 75, child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(18.0), - side: BorderSide(color: Colors.white)), + side: BorderSide(color: Color(0xff0B555B))), padding: EdgeInsets.fromLTRB(0, 5, 0, 5), textColor: Colors.white, - color: Colors.blue[700], + color: Color(0xff0B555B), onPressed: () { Navigator.push( context, @@ -226,12 +231,12 @@ class HomePage extends StatelessWidget { ); }, child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Icon( Icons.settings, color: Colors.white, - size: 60, + size: 50, ), SizedBox( width: 10, diff --git a/ssad_pro/pubspec.yaml b/ssad_pro/pubspec.yaml index c7a477c..b3b023c 100644 --- a/ssad_pro/pubspec.yaml +++ b/ssad_pro/pubspec.yaml @@ -74,6 +74,8 @@ flutter: - assets/images/man.png - assets/images/man-1.png - assets/images/whatsapp_logo.png + - assets/images/space.jpg + - assets/images/ # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see From ea6f1f15cfdeaf194b2bd5e0dbb10206907eb26f Mon Sep 17 00:00:00 2001 From: Mac Milin Date: Fri, 17 Apr 2020 13:29:54 +0800 Subject: [PATCH 2/3] UI changes --- ssad_pro/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ssad_pro/pubspec.yaml b/ssad_pro/pubspec.yaml index b3b023c..f95ddee 100644 --- a/ssad_pro/pubspec.yaml +++ b/ssad_pro/pubspec.yaml @@ -76,6 +76,7 @@ flutter: - assets/images/whatsapp_logo.png - assets/images/space.jpg - assets/images/ + - assets/images/linkedin_logo.png # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see From 29817053f13f72cd1aa73cd08614d471b931ab68 Mon Sep 17 00:00:00 2001 From: Mac Milin Date: Fri, 17 Apr 2020 13:32:34 +0800 Subject: [PATCH 3/3] UI changes --- ssad_pro/pubspec.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ssad_pro/pubspec.yaml b/ssad_pro/pubspec.yaml index f95ddee..eba5741 100644 --- a/ssad_pro/pubspec.yaml +++ b/ssad_pro/pubspec.yaml @@ -76,8 +76,9 @@ flutter: - assets/images/whatsapp_logo.png - assets/images/space.jpg - assets/images/ + # - images/a_dot_ham.jpeg + - assets/images/linkedin_logo.png - # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.