Merge pull request #5 from rusiruavb/master

Redesign home screen, login and sign up screen

android/app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
     package="com.example.dialog_doc990_mobile">
     <uses-permission android:name="android.permission.INTERNET"/>
    <application
-        android:label="dialog_doc990_mobile"
+        android:label="Doc990"
         android:icon="@mipmap/logo">
         <activity
             android:name=".MainActivity"
@@ -24,10 +24,10 @@
                  screen fades out. A splash screen is useful to avoid any visual
                  gap between the end of Android's launch screen and the painting of
                  Flutter's first frame. -->
-            <meta-data
+            <!-- <meta-data
               android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+              android:resource="@mipmap/logo"
+              /> -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <!-- <item
+        android:width="120dp"
+        android:height="150dp"
+        android:gravity="center"
+    >
         <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
+            android:src="@mipmap/logo" />
     </item> -->
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -3,10 +3,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
 
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <!-- <item
+        android:width="300dp"
+        android:height="300dp"
+        android:gravity="center"
+    >
         <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
+            android:src="@mipmap/logo" />
     </item> -->
 </layer-list>

android/gradle/wrapper/gradle-wrapper.properties

@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+org.gradle.configureondemand=false

lib/api_endpoints.dart

@@ -0,0 +1,2 @@
+const RootURLPath = 'http://10.0.2.2:4000';
+const GET_SEARCHED_DOCTORS = '$RootURLPath/doctor/search';

lib/components/rounded_button.dart → lib/components/common/rounded_button.dart

@@ -1,48 +1,64 @@
+import 'package:dialog_doc990_mobile/constants.dart';
 import 'package:flutter/material.dart';
 
 class RoundedButton extends StatefulWidget {
   final String text;
   final Function action;
-  final Color color = Colors.red;
+  final Color color;
   final double height;
   final double width;
   final IconData icon;
-  final Color textColor = Colors.white;
+  final double iconSize;
+  final Color textColor;
+  final double fontSize;
 
   const RoundedButton({
     Key key,
     this.text,
     this.action,
     this.height,
     this.width,
+    this.color,
+    this.textColor,
     this.icon,
+    this.iconSize,
+    this.fontSize,
   }) : super(key: key);
   @override
   _RoundedButtonState createState() => _RoundedButtonState(
         action: action,
         height: height,
         icon: icon,
         text: text,
+        textColor: textColor,
         width: width,
+        color: color,
+        fontSize: fontSize,
+        iconSize: iconSize,
       );
 }
 
 class _RoundedButtonState extends State<RoundedButton> {
   final String text;
   final Function action;
-  final Color color = Colors.red;
+  final Color color;
   final double height;
   final double width;
   final IconData icon;
-  final Color textColor = Colors.white;
+  final double iconSize;
+  final Color textColor;
+  final double fontSize;
 
   _RoundedButtonState({
-    Key key,
     this.text,
     this.action,
     this.height,
     this.width,
     this.icon,
+    this.textColor,
+    this.color,
+    this.fontSize,
+    this.iconSize,
   });
 
   @override
@@ -52,22 +68,23 @@ class _RoundedButtonState extends State<RoundedButton> {
       height: height,
       width: width,
       child: ClipRRect(
-        borderRadius: BorderRadius.circular(30),
+        borderRadius: BorderRadius.circular(8),
         child: FlatButton(
           padding: EdgeInsets.symmetric(vertical: 17.5, horizontal: 22),
           color: color,
           onPressed: action,
           child: Row(
-            children: <Widget>[
-              Padding(
-                padding: EdgeInsets.only(right: 0),
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Align(
+                alignment: Alignment.center,
                 child: Text(
                   text,
                   style: TextStyle(
                     color: textColor,
-                    fontFamily: 'Larsseit',
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
+                    fontFamily: SF_PRO_FONT,
+                    fontSize: fontSize,
+                    fontWeight: FontWeight.w100,
                   ),
                 ),
               ),

lib/components/rounded_dropdown_feild.dart → lib/components/common/rounded_dropdown_feild.dart

@@ -1,16 +1,19 @@
+import 'package:dialog_doc990_mobile/constants.dart';
 import 'package:flutter/material.dart';
 
 class RoundedDropDownFeild extends StatefulWidget {
   final ValueChanged<String> onChange;
   final String text;
   final bool isRequiredFeild;
   final bool isCountry;
+  final String value;
 
   const RoundedDropDownFeild({
     Key key,
     this.isRequiredFeild,
     this.onChange,
     this.text,
+    this.value,
     this.isCountry,
   }) : super(key: key);
 
@@ -19,6 +22,7 @@ class RoundedDropDownFeild extends StatefulWidget {
         isRequiredFeild: isRequiredFeild,
         onChange: onChange,
         text: text,
+        value: value,
         isCountry: isCountry,
       );
 }
@@ -28,13 +32,15 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
   final String text;
   final bool isRequiredFeild;
   final bool isCountry;
+  final String value;
   bool _isFieldValid;
 
   _RoundedDropDownFeildState({
     Key key,
     this.isRequiredFeild,
     this.onChange,
     this.text,
+    this.value,
     this.isCountry,
   });
 
@@ -49,7 +55,7 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
             text,
             style: TextStyle(
               fontFamily: 'Larsseit',
-              fontSize: 18,
+              fontSize: 15,
               fontWeight: FontWeight.normal,
             ),
             textAlign: TextAlign.left,
@@ -82,8 +88,8 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
                             child: Text(
                               item,
                               style: TextStyle(
-                                fontFamily: 'Larsseit',
-                                fontSize: 20,
+                                fontFamily: FONT_FAMILY_PRIMARY,
+                                fontSize: 18,
                               ),
                             ),
                             value: item,
@@ -93,7 +99,7 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
                     hint: Text(
                       'Select your country',
                       style: TextStyle(
-                        fontFamily: 'Larsseit',
+                        fontFamily: FONT_FAMILY_PRIMARY,
                         fontSize: 20,
                         color: Colors.grey[600],
                       ),
@@ -126,8 +132,8 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
                             child: Text(
                               item,
                               style: TextStyle(
-                                fontFamily: 'Larsseit',
-                                fontSize: 20,
+                                fontFamily: FONT_FAMILY_PRIMARY,
+                                fontSize: 18,
                               ),
                             ),
                             value: item,
@@ -137,8 +143,8 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
                     hint: Text(
                       'Select your title',
                       style: TextStyle(
-                        fontFamily: 'Larsseit',
-                        fontSize: 20,
+                        fontFamily: FONT_FAMILY_PRIMARY,
+                        fontSize: 18,
                         color: Colors.grey[600],
                       ),
                     ),
@@ -153,12 +159,13 @@ class _RoundedDropDownFeildState extends State<RoundedDropDownFeild> {
                   _isFieldValid != null &&
                   !_isFieldValid
               ? Padding(
-                  padding: EdgeInsets.only(left: 15),
+                  padding: EdgeInsets.only(left: 5),
                   child: Text(
                     text + ' is required!',
                     style: TextStyle(
                       color: Colors.red[800],
-                      fontFamily: 'Larsseit',
+                      fontFamily: FONT_FAMILY_PRIMARY,
+                      fontSize: 12,
                     ),
                   ),
                 )
@@ -185,11 +192,10 @@ class DropDownContainer extends StatelessWidget {
     final size = MediaQuery.of(context).size;
 
     return Container(
-      margin: EdgeInsets.symmetric(vertical: 1),
-      padding: EdgeInsets.symmetric(horizontal: 25, vertical: 3),
+      padding: EdgeInsets.symmetric(horizontal: 18, vertical: 3),
       width: size.width * 0.9,
       decoration: BoxDecoration(
-          color: Colors.grey[300], borderRadius: BorderRadius.circular(30)),
+          color: Colors.grey[300], borderRadius: BorderRadius.circular(8)),
       child: child,
     );
   }