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

polished behaviour of sharing tab #78

Merged
s416084 merged 1 commits from fixUXSharingTab into develop 2018-12-10 01:53:25 +01:00
Conversation 0 Commits 1 Files Changed 3 +29 -23
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,10 +149,9 @@ public class LoginActivity extends AppCompatActivity {
private void loginProcess(String email, String password) { private void loginProcess(String email, String password) {
ValidateUser user = new ValidateUser(email, password); ValidateUser user = new ValidateUser(email, password);
LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email); // LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
// disposable.add(ldapService.fakeValidate(fakeUser) // disposable.add(ldapService.fakeValidate(fakeUser)
// disposable.add(ldapService.validate(user) disposable.add(ldapService.validate(user)
disposable.add(ldapService.fakeValidate(fakeUser)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::handleResponse, this::handleError)); .subscribe(this::handleResponse, this::handleError));

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

@ -98,11 +98,12 @@ public class SharingFragment extends PreferenceFragment {
else{ else{
setListPreferenceData(manualLocationList.getKey(), stringnames,null); setListPreferenceData(manualLocationList.getKey(), stringnames,null);
} }
Log.d("sharingpref", names.toString());
} }
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Toast.makeText(getApplicationContext(), R.string.manual_status_error, Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), R.string.error_location_fetch, Toast.LENGTH_SHORT).show();
} }
})); }));
@ -123,14 +124,7 @@ public class SharingFragment extends PreferenceFragment {
statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class); statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
disposable = new CompositeDisposable(); disposable = new CompositeDisposable();
getStatuses(disposable); getStatuses(disposable);
getLocations(disposable);
if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
getLocations(disposable);
}
Log.d("SHAR TAB", (String) statusList.getSummary());
Log.d("SHAR TAB",( String) manualLocationList.getSummary());
// Log.d("SHAR TAB","dupa");
locationLevelMapping = new HashMap<Integer, String>(); locationLevelMapping = new HashMap<Integer, String>();
locationLevelMapping.put(0, SharingLevel.PRESENCE.toString()); locationLevelMapping.put(0, SharingLevel.PRESENCE.toString());
@ -160,7 +154,6 @@ public class SharingFragment extends PreferenceFragment {
if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) { if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
if(!predefinedCoordsList.isEmpty()){ if(!predefinedCoordsList.isEmpty()){
preferenceCategory.addPreference(manualLocationList); preferenceCategory.addPreference(manualLocationList);
getLocations(disposable);
} }
preferenceCategory.addPreference(manualLocationButton); preferenceCategory.addPreference(manualLocationButton);
@ -176,6 +169,12 @@ public class SharingFragment extends PreferenceFragment {
if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) { if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
preferenceCategory.removePreference(manualLocationList); preferenceCategory.removePreference(manualLocationList);
preferenceCategory.removePreference(manualLocationButton); preferenceCategory.removePreference(manualLocationButton);
}else{
// if(predefinedCoordsList.isEmpty()){
//// preferenceCategory.removePreference(manualLocationList);
//
//
// }
} }
/** Custom manual location list change listener **/ /** Custom manual location list change listener **/
@ -219,6 +218,7 @@ public class SharingFragment extends PreferenceFragment {
return true; return true;
}); });
} }
@Override @Override
@ -230,19 +230,25 @@ public class SharingFragment extends PreferenceFragment {
} }
protected void setListPreferenceData(String lp_name, String[] entries, Integer activeId) { protected void setListPreferenceData(String lp_name, String[] entries, Integer activeId) {
ListPreference lp = (ListPreference) findPreference(lp_name); try {
lp.setEntries(entries); ListPreference lp = (ListPreference) findPreference(lp_name);
CharSequence[] entryValues = new CharSequence[entries.length]; lp.setEntries(entries);
CharSequence[] entryValues = new CharSequence[entries.length];
for (int i = 0; i < entries.length; i++) { for (int i = 0; i < entries.length; i++) {
entryValues[i] = Integer.toString(i); entryValues[i] = Integer.toString(i);
} }
lp.setDefaultValue(0); lp.setDefaultValue(0);
lp.setEntryValues(entryValues); lp.setEntryValues(entryValues);
if(entries.length > 0 && activeId != null)
lp.setValueIndex(activeId);
}catch (Exception e){
// Toast.makeText(getApplicationContext(),
// "duupa", Toast.LENGTH_SHORT).show();
}
if(entries.length > 0 && activeId != null)
lp.setValueIndex(activeId);
}; };
private void handleResponse(List<String> resp) { private void handleResponse(List<String> resp) {

1
app/src/main/res/values/strings.xml
View File

@ -233,6 +233,7 @@
<string name="network_error">Network Error!</string> <string name="network_error">Network Error!</string>
<string name="manual_status_error">Error handling status fetch</string> <string name="manual_status_error">Error handling status fetch</string>
<string name="error_status_fetch">Error handling status fetch</string> <string name="error_status_fetch">Error handling status fetch</string>
<string name="error_location_fetch">Error handling status fetch</string>
<string name="pref_acra_disabled" translatable="false">Auto reporting on issue is OFF</string> <string name="pref_acra_disabled" translatable="false">Auto reporting on issue is OFF</string>
<string name="pref_acra_enabled" translatable="false">Auto reporting on issue is ON</string> <string name="pref_acra_enabled" translatable="false">Auto reporting on issue is ON</string>