From f1c28f1a4c6813ce6e1398e94df21bd234c6a9e9 Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Thu, 18 Oct 2018 11:33:05 -0400
Subject: [PATCH] made layout look good on actual phones

---
 .../src/main/res/layout/activity_log_in.xml   |  8 ++---
 .../app/src/main/res/layout/activity_main.xml |  6 ++--
 .../src/main/res/layout/activity_sign_up.xml  | 29 +++++++++----------
 .../src/main/res/layout/activity_welcome.xml  |  8 ++---
 .../app/src/main/res/values/styles.xml        |  2 +-
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/OlympusServices/app/src/main/res/layout/activity_log_in.xml b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
index 7071ee9..887e5f8 100644
--- a/OlympusServices/app/src/main/res/layout/activity_log_in.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
@@ -29,10 +29,10 @@
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/UsernameInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@color/colorWhite"
         android:hint="Username"
-        android:textSize="20sp"
+        android:textSize="15sp"
         android:layout_marginTop="40dp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
@@ -43,10 +43,10 @@
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/PasswordInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@drawable/customborder"
         android:hint="Password"
-        android:textSize="20sp"
+        android:textSize="15sp"
         android:layout_marginTop="20dp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
diff --git a/OlympusServices/app/src/main/res/layout/activity_main.xml b/OlympusServices/app/src/main/res/layout/activity_main.xml
index 8ea5186..0d7cfff 100644
--- a/OlympusServices/app/src/main/res/layout/activity_main.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_main.xml
@@ -31,13 +31,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="50dp"
-        android:text="@string/signup" />
+        android:text="@string/signup"
+        android:onClick="SignUp"/>
 
     <Button
         android:theme="@style/AppTheme.Button"
         android:id="@+id/LogIn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/login" />
+        android:text="@string/login"
+        android:onClick="LogIn"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_sign_up.xml b/OlympusServices/app/src/main/res/layout/activity_sign_up.xml
index 0fca832..194e722 100644
--- a/OlympusServices/app/src/main/res/layout/activity_sign_up.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_sign_up.xml
@@ -16,13 +16,13 @@
     <TextView
         android:id="@+id/Title"
         android:layout_width="300dp"
-        android:layout_height="50dp"
-        android:layout_marginBottom="20dp"
+        android:layout_height="20dp"
+        android:layout_marginBottom="10dp"
         android:gravity="center"
         android:text="@string/signup"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@android:color/white"
-        android:textSize="36sp"
+        android:textSize="15sp"
         app:fontFamily="@font/julius_sans_one" />
 
     <TextView
@@ -31,23 +31,23 @@
         android:layout_height="wrap_content"
         android:text="Role"
         android:textColor="#6d81a5"
-        android:textSize="20sp" />
+        android:textSize="15sp" />
 
     // component used from https://github.com/jaredrummler/MaterialSpinner
     <com.jaredrummler.materialspinner.MaterialSpinner
         android:id="@+id/RoleInput"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="45dp"
         android:layout_marginBottom="10dp" />
 
     //component used from https://github.com/rengwuxian/MaterialEditText
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/UsernameInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@color/colorWhite"
         android:hint="Username"
-        android:textSize="20sp"
+        android:textSize="15sp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
         app:met_primaryColor="?colorAccent"
@@ -57,10 +57,10 @@
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/PasswordInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@drawable/customborder"
         android:hint="Password"
-        android:textSize="20sp"
+        android:textSize="15sp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
         app:met_primaryColor="?colorAccent"
@@ -70,10 +70,10 @@
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/FirstNameInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@drawable/customborder"
         android:hint="First Name"
-        android:textSize="20sp"
+        android:textSize="15sp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
         app:met_primaryColor="?colorAccent"
@@ -83,10 +83,10 @@
     <com.rengwuxian.materialedittext.MaterialEditText
         android:id="@+id/LastNameInput"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@drawable/customborder"
         android:hint="Last Name"
-        android:textSize="20sp"
+        android:textSize="15sp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
         app:met_primaryColor="?colorAccent"
@@ -97,8 +97,7 @@
         android:id="@+id/SignUp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/signup"
-        android:layout_marginTop="20dp"/>
+        android:text="@string/signup"/>
 
 
 
diff --git a/OlympusServices/app/src/main/res/layout/activity_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_welcome.xml
index e1d2169..5a7ab8a 100644
--- a/OlympusServices/app/src/main/res/layout/activity_welcome.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_welcome.xml
@@ -22,7 +22,7 @@
         android:text="Welcome"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@android:color/white"
-        android:textSize="36sp"
+        android:textSize="30sp"
         android:layout_marginTop="50dp"
         app:fontFamily="@font/julius_sans_one" />
 
@@ -35,7 +35,7 @@
         android:text="FirstNameHere"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@android:color/white"
-        android:textSize="36sp"
+        android:textSize="30sp"
         android:background="@drawable/customborder"
         app:fontFamily="@font/julius_sans_one" />
 
@@ -48,7 +48,7 @@
         android:text="You are logged in as"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@android:color/white"
-        android:textSize="36sp"
+        android:textSize="30sp"
         app:fontFamily="@font/julius_sans_one" />
 
     <TextView
@@ -61,7 +61,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@android:color/white"
         android:background="@drawable/customborder"
-        android:textSize="36sp"
+        android:textSize="30sp"
         app:fontFamily="@font/julius_sans_one" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/values/styles.xml b/OlympusServices/app/src/main/res/values/styles.xml
index 3b46a0f..0158fb3 100644
--- a/OlympusServices/app/src/main/res/values/styles.xml
+++ b/OlympusServices/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Base.Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>