batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

made layout look good on actual phones

Browse source
This commit is contained in:
IvanaE 2018-10-18 11:33:05 -04:00
parent 6f9590413f
commit f1c28f1a4c
5 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OlympusServices/app/src/main/res/layout/activity_log_in.xml
View file

@ -29,10 +29,10 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput" android:id="@+id/UsernameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@color/colorWhite" android:background="@color/colorWhite"
android:hint="Username" android:hint="Username"
android:textSize="20sp" android:textSize="15sp"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
@ -43,10 +43,10 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput" android:id="@+id/PasswordInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@drawable/customborder" android:background="@drawable/customborder"
android:hint="Password" android:hint="Password"
android:textSize="20sp" android:textSize="15sp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"

6
OlympusServices/app/src/main/res/layout/activity_main.xml
View file

@ -31,13 +31,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:text="@string/signup" /> android:text="@string/signup"
android:onClick="SignUp"/>
<Button <Button
android:theme="@style/AppTheme.Button" android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn" android:id="@+id/LogIn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login" /> android:text="@string/login"
android:onClick="LogIn"/>
</LinearLayout> </LinearLayout>

29
OlympusServices/app/src/main/res/layout/activity_sign_up.xml
View file

@ -16,13 +16,13 @@
<TextView <TextView
android:id="@+id/Title" android:id="@+id/Title"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="50dp" android:layout_height="20dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="10dp"
android:gravity="center" android:gravity="center"
android:text="@string/signup" android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="36sp" android:textSize="15sp"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
<TextView <TextView
@ -31,23 +31,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Role" android:text="Role"
android:textColor="#6d81a5" android:textColor="#6d81a5"
android:textSize="20sp" /> android:textSize="15sp" />
// component used from https://github.com/jaredrummler/MaterialSpinner // component used from https://github.com/jaredrummler/MaterialSpinner
<com.jaredrummler.materialspinner.MaterialSpinner <com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/RoleInput" android:id="@+id/RoleInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="45dp"
android:layout_marginBottom="10dp" /> android:layout_marginBottom="10dp" />
//component used from https://github.com/rengwuxian/MaterialEditText //component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput" android:id="@+id/UsernameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@color/colorWhite" android:background="@color/colorWhite"
android:hint="Username" android:hint="Username"
android:textSize="20sp" android:textSize="15sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
@ -57,10 +57,10 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput" android:id="@+id/PasswordInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@drawable/customborder" android:background="@drawable/customborder"
android:hint="Password" android:hint="Password"
android:textSize="20sp" android:textSize="15sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
@ -70,10 +70,10 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/FirstNameInput" android:id="@+id/FirstNameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@drawable/customborder" android:background="@drawable/customborder"
android:hint="First Name" android:hint="First Name"
android:textSize="20sp" android:textSize="15sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
@ -83,10 +83,10 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/LastNameInput" android:id="@+id/LastNameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="80dp"
android:background="@drawable/customborder" android:background="@drawable/customborder"
android:hint="Last Name" android:hint="Last Name"
android:textSize="20sp" android:textSize="15sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
@ -97,8 +97,7 @@
android:id="@+id/SignUp" android:id="@+id/SignUp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/signup" android:text="@string/signup"/>
android:layout_marginTop="20dp"/>

8
OlympusServices/app/src/main/res/layout/activity_welcome.xml
View file

@ -22,7 +22,7 @@
android:text="Welcome" android:text="Welcome"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="36sp" android:textSize="30sp"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
@ -35,7 +35,7 @@
android:text="FirstNameHere" android:text="FirstNameHere"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="36sp" android:textSize="30sp"
android:background="@drawable/customborder" android:background="@drawable/customborder"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
@ -48,7 +48,7 @@
android:text="You are logged in as" android:text="You are logged in as"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="36sp" android:textSize="30sp"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
<TextView <TextView
@ -61,7 +61,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:background="@drawable/customborder" android:background="@drawable/customborder"
android:textSize="36sp" android:textSize="30sp"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
</LinearLayout> </LinearLayout>

2
OlympusServices/app/src/main/res/values/styles.xml
View file

@ -1,7 +1,7 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="Base.Theme.AppCompat.Light">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>