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

fixed merge conflict, when you pull check the right dependency is in your build.gradle file

Browse source
This commit is contained in:
IvanaE 2018-10-10 13:44:55 -04:00
parent 1aa8e4c819
commit 13de8619d9
5 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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);
setContentView(R.layout.activity_sign_up);
MaterialSpinner spinner = findViewById(R.id.RoleInput);
spinner.setItems("Ice Cream Sandwich", "Jelly Bean", "KitKat", "Lollipop", "Marshmallow");
spinner.setItems("Admin", "User", "Service Provider");
spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
@Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {