Merge pull request #1 from kalismeras61/master

Sign Page 4 Created

Author: Echonox

Diff for: assets/fonts/montserrat/Montserrat-Black.ttf

@@ -0,0 +1,93 @@
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

Diff for: assets/fonts/montserrat/Montserrat-BlackItalic.ttf

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>

Diff for: assets/fonts/montserrat/Montserrat-Bold.ttf

@@ -11,4 +11,5 @@ const BOTTOM_COLORS = [MAIN_COLOR, DARK_COLOR];
 const YELLOW = Color(0xfffbed96);
 const BLUE = Color(0xffabecd6);
 const PURPLE = Color(0xffccc3fc);
+const LIGHT_RED = Color(0xffffc2a1);
 const RED = Color(0xffffb6b3);

Diff for: assets/fonts/montserrat/Montserrat-BoldItalic.ttf

@@ -0,0 +1 @@
+import 'package:flutter/material.dart';

Diff for: assets/fonts/montserrat/Montserrat-ExtraBold.ttf

@@ -2,12 +2,22 @@ import 'package:flutter/material.dart';
 import 'color_const.dart';
 
 const LinearGradient #_BACKGROUND = LinearGradient(
-    begin: FractionalOffset(0.0, 0.4),
-    end: FractionalOffset(0.9, 0.7),
+    begin: FractionalOffset(0.0, 0.4), end: FractionalOffset(0.9, 0.7),
     // Add one stop for each color. Stops should increase from 0 to 1
-    stops: [0.1, 0.9],
-    colors: [
-      YELLOW,
-      BLUE
-    ]
-);
+    stops: [0.1, 0.9], colors: [YELLOW, BLUE]);
+
+const LinearGradient #_CARD_BACKGROUND = LinearGradient(
+  tileMode: TileMode.clamp,
+  begin: FractionalOffset.centerLeft,
+  end: FractionalOffset.centerRight,
+  // Add one stop for each color. Stops should increase from 0 to 1
+  stops: [0.1, 1.0], colors: [LIGHT_RED, RED],
+);
+
+const LinearGradient #_CIRCLE_BUTTON_BACKGROUND = LinearGradient(
+  tileMode: TileMode.clamp,
+  begin: FractionalOffset.centerLeft,
+  end: FractionalOffset.centerRight,
+  // Add one stop for each color. Stops should increase from 0 to 1
+  stops: [0.4, 1], colors: [Colors.black, Colors.black54],
+);

Diff for: assets/fonts/montserrat/Montserrat-ExtraBoldItalic.ttf

@@ -6,7 +6,7 @@
 
 class ImagePath {
   //images
-  static const String imageDir = "images";
+  static const String imageDir = "assets/images";
   static const String pkImage = "$imageDir/pk.jpg";
   static const String profileImage = "$imageDir/ui.profile.jpg";
   static const String blankImage = "$imageDir/blank.jpg";
@@ -21,9 +21,9 @@ class ImagePath {
 }
 
 class MainImagePath {
-  static const String image_path = "images/main";
+  static const String image_path = "assets/images/main";
   static const String image_app = "$image_path/ic_launcher.png";
-  static const String image_header= "$image_path/main_background.png";
+  static const String image_header = "$image_path/main_background.png";
   static const String image_sign_up = "$image_path/main_background.png";
   static const String image_walk_through = "$image_path/main_background.png";
   static const String image_navigation = "$image_path/main_background.png";
@@ -35,3 +35,8 @@ class MainImagePath {
   static const String image_media = "$image_path/main_background.png";
   static const String image_camera = "$image_path/main_background.png";
 }
+
+class #ImagePath {
+  static const String image_path = "assets/images/#";
+  static const String #Logo = "$image_path/logo_#.png";
+}

Diff for: assets/fonts/montserrat/Montserrat-ExtraLight.ttf

@@ -13,4 +13,6 @@ class StringConst {
   static const String DEVELOPER = "Volunteer";
   static const String PROFESSION = "Flutter Developer";
   static const String DEV_EMAIL = "niebin312@gmail.com";
+  static const String SIGN_UP = "Sing Up";
+  static const String SIGN_UP_TEXT = "Don't have an account?";
 }

Diff for: assets/fonts/montserrat/Montserrat-ExtraLightItalic.ttf

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_ui_nice/page/page_const.dart';
+import 'package:flutter_ui_nice/page/#/SignPageFour.dart';
 import 'const/string_const.dart';
 import 'const/color_const.dart';
 import 'const/page_str_const.dart';
@@ -14,13 +15,18 @@ class MyApp extends StatelessWidget {
     return MaterialApp(
       title: StringConst.APP_NAME,
       debugShowCheckedModeBanner: false,
-      theme: ThemeData(primaryColor: MAIN_COLOR, accentColor: MAIN_COLOR),
+      theme: ThemeData(
+        primaryColor: MAIN_COLOR,
+        accentColor: MAIN_COLOR,
+        fontFamily: "Montserrat",
+      ),
       home: HomePage(),
       routes: {
         SIGN_UP_PAGES[0]: (context) => SignPageOne(),
         SIGN_UP_PAGES[1]: (context) => SignPageTwo(),
+        //SIGN_UP_PAGES[2]: (context) => SignPageThird(),
+        SIGN_UP_PAGES[3]: (context) => SignPageFour(),
         //FIXME there are other pages to jump with 'page_str_const.dart',there should be make by manager
-
       },
       onUnknownRoute: (setting) =>
           MaterialPageRoute(builder: (context) => EmptyPage()),

Diff for: assets/fonts/montserrat/Montserrat-Italic.ttf

@@ -21,7 +21,7 @@ class HomePage extends StatelessWidget {
         expandedHeight: 150.0,
         flexibleSpace: FlexibleSpaceBar(
           title: Padding(
-            padding: EdgeInsets.only(top: 10.0),
+            padding: EdgeInsets.only(top: 30.0),
             child: Row(
               children: <Widget>[
                 Image.asset(

Diff for: assets/fonts/montserrat/Montserrat-Light.ttf

@@ -7,3 +7,4 @@ export "home_page.dart";
 export "empty_page.dart";
 export '#/SignPageOne.dart';
 export '#/SignPageTwo.dart';
+export '#/SignPageFour.dart';

Diff for: assets/fonts/montserrat/Montserrat-LightItalic.ttf

@@ -0,0 +1,177 @@
+///
+/// Created by Yasinilhan on 18-12-24
+/// Email: yasinilhan61@gmail.com
+///
+import 'package:flutter/material.dart';
+import 'package:flutter_ui_nice/const/color_const.dart';
+import 'package:flutter_ui_nice/const/gradient_const.dart';
+import 'package:flutter_ui_nice/const/images_const.dart';
+import 'package:flutter_ui_nice/const/size_const.dart';
+import 'package:flutter_ui_nice/const/string_const.dart';
+import 'package:flutter_ui_nice/page/#/widgets/#_arrow_button.dart';
+
+class SignPageFour extends StatefulWidget {
+  @override
+  _SignPageFourState createState() => _SignPageFourState();
+}
+
+class _SignPageFourState extends State<SignPageFour> {
+  TextEditingController _username = TextEditingController();
+  TextEditingController _password = TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+    final _media = MediaQuery.of(context).size;
+
+    return Scaffold(
+        body: Container(
+      height: double.infinity,
+      width: double.infinity,
+      decoration: BoxDecoration(
+        gradient: #_BACKGROUND,
+      ),
+      child: SingleChildScrollView(
+        physics: BouncingScrollPhysics(),
+        child: Stack(
+          children: <Widget>[
+            Column(
+              children: <Widget>[
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                      vertical: 60.0, horizontal: 40),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      Center(
+                        child: Image.asset(
+                          #ImagePath.#Logo,
+                          height: _media.height / 7,
+                        ),
+                      ),
+                      SizedBox(
+                        height: 30,
+                      ),
+                      Text(
+                        "WELCOME BACK!",
+                        style: TextStyle(
+                          letterSpacing: 4,
+                          fontFamily: "Montserrat",
+                          fontWeight: FontWeight.bold,
+                          fontSize: TEXT_LARGE_SIZE,
+                        ),
+                      ),
+                      SizedBox(height: 30),
+                      Text(
+                        'Log in',
+                        style: TextStyle(
+                            fontFamily: "Montserrat",
+                            fontWeight: FontWeight.w200,
+                            fontSize: 40),
+                      ),
+                      Text(
+                        'to continue.',
+                        style: TextStyle(
+                            fontFamily: "Montserrat",
+                            fontWeight: FontWeight.w200,
+                            fontSize: 40),
+                      ),
+                      SizedBox(
+                        height: 50,
+                      ),
+                      Container(
+                        height: _media.height / 3.8,
+                        decoration: BoxDecoration(
+                          gradient: #_CARD_BACKGROUND,
+                          borderRadius: BorderRadius.circular(15),
+                          boxShadow: [
+                            BoxShadow(
+                              color: Colors.black12,
+                              blurRadius: 15,
+                              spreadRadius: 8,
+                            ),
+                          ],
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.all(30.0),
+                          child: Column(
+                            children: <Widget>[
+                              Expanded(
+                                child: inputText("USERNAME",
+                                    'hristov123@gmail.com', _username, false),
+                              ),
+                              Divider(
+                                height: 5,
+                                color: Colors.black,
+                              ),
+                              Expanded(
+                                  child: inputText(
+                                      "PASSWORD", '******', _password, true)),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: <Widget>[
+                    Text(
+                      StringConst.SIGN_UP_TEXT,
+                      style: TextStyle(color: MAIN_COLOR),
+                    ),
+                    SizedBox(
+                      width: 5,
+                    ),
+                    GestureDetector(
+                      onTap: () => print("# Tapped"),
+                      child: Text(StringConst.SIGN_UP),
+                    ),
+                  ],
+                ),
+                SizedBox(
+                  height: 50,
+                )
+              ],
+            ),
+            Positioned(
+              bottom: _media.height / 6.3,
+              right: 15,
+              child: #ArrowButton(
+                icon: Icons.arrow_forward,
+                iconSize: 26,
+                onTap: () => print("# Tapped"),
+              ),
+            ),
+          ],
+        ),
+      ),
+    ));
+  }
+
+  Widget inputText(
+    String fieldName,
+    String hintText,
+    TextEditingController controller,
+    bool obSecure,
+  ) {
+    return TextField(
+      style: TextStyle(height: 1.3),
+      controller: controller,
+      decoration: InputDecoration(
+        hintText: hintText,
+        labelText: fieldName,
+        labelStyle: TextStyle(
+          fontSize: TEXT_NORMAL_SIZE,
+          fontFamily: "Montserrat",
+          fontWeight: FontWeight.w400,
+          letterSpacing: 1,
+          height: 0,
+        ),
+        border: InputBorder.none,
+      ),
+      obscureText: obSecure,
+    );
+  }
+}