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

added sign up page, still working on drop down menu

Browse source
This commit is contained in:
IvanaE 2018-09-28 18:09:05 -04:00
parent 5663255788
commit 5a97ad2ec8
13 changed files with 167 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

6
OlympusServices/app/src/main/res/drawable/customborder.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!--Border width and color-->
<stroke android:width="5px" android:color="#ffffff" />
</shape>

18
OlympusServices/app/src/main/res/layout/activity_login.xml → OlympusServices/app/src/main/res/layout/activity_main.xml
View file

@ -11,35 +11,27 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".LoginActivity">
<!-- Login progress -->
tools:context=".Main">
<TextView
android:id="@+id/textView"
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="100dp"
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" />
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="50dp" />
<Button
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:text="@string/signup" />
<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="30dp" />
<Button
android:id="@+id/LogIn"
android:layout_width="match_parent"

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

@ -0,0 +1,76 @@
<?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=".SignUp">
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="80dp"
android:gravity="center"
android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<Spinner
android:id="@+id/RolesInput"
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.support.design.widget.TextInputLayout
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.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
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.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>

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

@ -0,0 +1,11 @@
<?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"
/>

1
OlympusServices/app/src/main/res/values/dimens.xml
View file

@ -2,4 +2,5 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="padding_bottom">100dp</dimen>
</resources>

8
OlympusServices/app/src/main/res/values/strings.xml
View file

@ -17,4 +17,12 @@
<string name="CompanyName">Olympus Services</string>
<string name="signup">Sign Up</string>
<string name="login">Log In</string>
<string name="newusername">Enter Username</string>
<string name="newpassword">Enter Password</string>
<string-array name="roles">
<item>Admin</item>
<item>User</item>
<item>Service Provider</item>
</string-array>
</resources>