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

added all pages, using premade components

Browse source
This commit is contained in:
IvanaE 2018-10-04 13:23:53 -04:00
parent 5a97ad2ec8
commit 036c03f07e
18 changed files with 154 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".LogIn">
</LinearLayout>

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

@ -16,16 +16,17 @@
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_marginBottom="100dp"
android:gravity="center"
android:text="@string/CompanyName"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
android:gravity="center"
app:fontFamily="@font/julius_sans_one" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -33,6 +34,7 @@
android:text="@string/signup" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -17,7 +17,7 @@
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="80dp"
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
@ -25,52 +25,69 @@
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<Spinner
android:id="@+id/RolesInput"
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_marginBottom="50dp"
android:background="@drawable/customborder"
android:entries="@array/roles"
android:textColor="@android:color/white"
android:textSize="15sp"
android:theme="@android:style/TextAppearance.DeviceDefault.Widget.DropDownItem"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="108dp" />
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="Role" />
<android.support.design.widget.TextInputLayout
<com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/RoleInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp" />
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput"
android:layout_width="match_parent"
android:layout_height="81dp"
android:layout_marginBottom="50dp"
android:background="@drawable/customborder"
android:theme="@android:style/TextAppearance.DeviceDefault.Widget.EditText">
android:layout_height="wrap_content"
android:hint="Username"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
android:background="@color/colorWhite"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"/>
<android.support.design.widget.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/newusername"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput"
android:layout_width="match_parent"
android:layout_height="95dp"
android:background="@drawable/customborder"
android:theme="@android:style/TextAppearance.Holo.Widget.EditText">
android:layout_height="wrap_content"
android:hint="Password"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/FirstNameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="First Name"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/LastNameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Last Name"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
<android.support.design.widget.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint=""
android:text="@string/newpassword"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>

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

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".Welcome">
</LinearLayout>

11
OlympusServices/app/src/main/res/layout/customspinner.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:gravity="left"
android:textColor="#FF0000"
android:padding="5dip"
/>