From 6f9590413fb22dd792ff5ecdc1eb39f39e6d7e07 Mon Sep 17 00:00:00 2001 From: IvanaE Date: Mon, 15 Oct 2018 10:36:54 -0400 Subject: [PATCH] gave credit to style repos, removed admin option from sign up drop down --- .../.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes .../uottawa/olympus/olympusservices/SignUp.java | 2 +- .../app/src/main/res/layout/activity_log_in.xml | 2 ++ .../src/main/res/layout/activity_sign_up.xml | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser index fd45243b8979a58d2942cf230fb518af75fdd99e..3f15c9447bfb05c2e7674aea9bcf672ba994caaa 100644 GIT binary patch delta 81 zcmV-X0IvU;1epYom;`ttD3Xz!iIZvpLlD_W$tl{C@OZ}J`o`JG_284e0UaSB{&XT5 nK=U7(IQ~;;G$*cf04PH`Tvc;ra&ufsc42N|lQaP~lk5R4^DiSx delta 87 zcmV-d0I2_&1epYom;`dc@R5<6i4Q14I$TwAWpZ;|VqtW3Xp^=9Hj^a*Ll9H6SIv|B tH~f;Cw|b3URxOiw0UZ-KzTtb!tK4#gUU#&l?rnc`01=bF0UMJD0ugIQB_;p> diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java index 25c108c..9d1f5f8 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java @@ -11,7 +11,7 @@ public class SignUp extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sign_up); MaterialSpinner spinner = findViewById(R.id.RoleInput); - spinner.setItems("Admin", "User", "Service Provider"); + spinner.setItems("User", "Service Provider"); spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() { @Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) { 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 17ce1f3..7071ee9 100644 --- a/OlympusServices/app/src/main/res/layout/activity_log_in.xml +++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml @@ -25,6 +25,7 @@ android:textSize="36sp" app:fontFamily="@font/julius_sans_one" /> + //component used from https://github.com/rengwuxian/MaterialEditText + //component used from https://github.com/rengwuxian/MaterialEditText + // component used from https://github.com/jaredrummler/MaterialSpinner + //component used from https://github.com/rengwuxian/MaterialEditText + //component used from https://github.com/rengwuxian/MaterialEditText + //component used from https://github.com/rengwuxian/MaterialEditText + //component used from https://github.com/rengwuxian/MaterialEditText