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

info pop ups with info #83

Merged
s411201 merged 29 commits from infoIcons into develop 2018-12-11 00:22:55 +01:00
Conversation 0 Commits 29 Files Changed 18 +10 -5
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ffdf75b66 - Show all commits

2
.idea/misc.xml
View File

@ -29,7 +29,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

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

@ -339,6 +339,7 @@ public class MapActivity extends BaseActivity
modalUserInput.requestFocus();
} else {
sendLocation(body, latLng);
PrefUtils.putCurrentManualLocationName(getApplicationContext(),body);
alertDialog.dismiss();
}
});

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

@ -158,9 +158,11 @@ public class SharingFragment extends PreferenceFragment {
PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue)));
if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
if(!predefinedCoordsList.isEmpty()){
preferenceCategory.addPreference(manualLocationList);
getLocations(disposable);
}
preferenceCategory.addPreference(manualLocationButton);
} else {
@ -250,6 +252,8 @@ public class SharingFragment extends PreferenceFragment {
statusList.setValueIndex(resp.size() - 1);
PrefUtils.storeStatus(getApplicationContext(), resp.get(resp.size() - 1));
statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
}

2
app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
View File

@ -62,7 +62,7 @@ public class PrefUtils {
}
public static String getUserStatus(Context context) {
return getSharedPreferences(context).getString("status_entry", "Available");
return getSharedPreferences(context).getString("status_entry", "Dostępny");
}
public static void storeStatus(Context context, String status) {

2
app/src/main/res/layout/pref_sharing.xml
View File

@ -41,7 +41,7 @@
android:persistent="true"
android:title="@string/status_switch_title"/>
<ListPreference
android:defaultValue="1"
android:defaultValue="2"
android:key="@string/key_status_value"
android:summary="%s"
android:title="@string/status_list_title" />