s416084
/
find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge branch 'develop' into developToMapPravilnie

This commit is contained in:
Mieszko Wrzeszczyński 2018-11-07 08:51:12 +01:00
parent 5d595c4c65 511d1a8fef
commit 98cc5bcc20
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
View File

@ -161,7 +161,7 @@ public class LoginActivity extends AppCompatActivity {
Log.e("LOGIN", String.valueOf(PrefUtils.getIsTutor(getApplicationContext())));
//Fake validate
LdapUser user = new LdapUser(email, password, "admin", (PrefUtils.getIsTutor(getApplicationContext())) ? "Tutor" : "Student", "string", "string", email);
LdapUser user = new LdapUser(email, password, "admin", (PrefUtils.getIsTutor(getApplicationContext())) ? "Tutor" : "Student", "Imię", "Nazwisko", email);
// ValidateUser user = new ValidateUser(email, password);

1
app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
View File

@ -198,7 +198,6 @@ public class MapActivity extends BaseActivity
Toast.makeText(MapActivity.this, message, Toast.LENGTH_SHORT).show();
}
private void setOnMapLongClickListener() {
final boolean[] cancel = {false};

4
app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
View File

@ -54,13 +54,17 @@ public class SharingFragment extends PreferenceFragment {
manualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
ListPreference lp = (ListPreference) findPreference("key_status_value");
updateListPreference(lp, newValue, "manual_statuses");
PrefUtils.storeStatus(getApplicationContext(),(String) newValue);
return true;
});
locationMode.setOnPreferenceChangeListener((preference, newValue) -> {
ListPreference lp = (ListPreference) preference;
PrefUtils.storeLocationMode(getApplicationContext(),locationLevelMapping.get(Integer.parseInt((String) newValue)));
return true;
});
statusList.setOnPreferenceChangeListener((preference, newValue) -> {
ListPreference lp = (ListPreference) preference;
CharSequence [] entries = lp.getEntries();