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

Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus

Browse source
This commit is contained in:
Batuhan Berk Başoğlu 2018-10-17 17:53:59 -04:00
commit 9cd04e06da
5 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OlympusServices/.idea/caches/build_file_checksums.ser
View file

Binary file not shown.

2
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
View file

@ -11,7 +11,7 @@ public class SignUp extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up); setContentView(R.layout.activity_sign_up);
MaterialSpinner spinner = findViewById(R.id.RoleInput); MaterialSpinner spinner = findViewById(R.id.RoleInput);
spinner.setItems("Admin", "User", "Service Provider"); spinner.setItems("User", "Service Provider");
spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() { spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
@Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) { @Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {

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

@ -25,6 +25,7 @@
android:textSize="36sp" android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" /> app:fontFamily="@font/julius_sans_one" />
//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"
@ -38,6 +39,7 @@
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" /> app:met_singleLineEllipsis="true" />
//component used from https://github.com/rengwuxian/MaterialEditText
<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"

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

@ -33,12 +33,14 @@
android:textColor="#6d81a5" android:textColor="#6d81a5"
android:textSize="20sp" /> android:textSize="20sp" />
// 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="50dp"
android:layout_marginBottom="10dp" /> android:layout_marginBottom="10dp" />
//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"
@ -51,6 +53,7 @@
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" /> app:met_singleLineEllipsis="true" />
//component used from https://github.com/rengwuxian/MaterialEditText
<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"
@ -63,6 +66,7 @@
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" /> app:met_singleLineEllipsis="true" />
//component used from https://github.com/rengwuxian/MaterialEditText
<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"
@ -75,6 +79,7 @@
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" /> app:met_singleLineEllipsis="true" />
//component used from https://github.com/rengwuxian/MaterialEditText
<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"

1
README.md
View file

@ -1,2 +1,3 @@
# SEG2105-Olympus # SEG2105-Olympus
SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Basoglu, Mary Tran SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Basoglu, Mary Tran
https://github.com/ebivibe/SEG2105-Olympus