Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7579 from osmandapp/ProfileSettingsImprovements

Browse source 
Preferences fixes
This commit is contained in:
max-klaus 2019-09-23 09:06:08 +03:00 committed by GitHub
commit a74cd4fca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 89 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/preference_dialog_and_switch.xml
View file

@ -42,8 +42,8 @@
android:layout_marginBottom="@dimen/context_menu_padding_margin_tiny" android:layout_marginBottom="@dimen/context_menu_padding_margin_tiny"
android:background="?attr/divider_color_basic" /> android:background="?attr/divider_color_basic" />
<Switch <android.support.v7.widget.SwitchCompat
android:id="@android:id/switch_widget" android:id="@+id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"

4
OsmAnd/res/layout/preference_switch.xml
View file

@ -53,8 +53,8 @@
</LinearLayout> </LinearLayout>
<Switch <android.support.v7.widget.SwitchCompat
android:id="@android:id/switch_widget" android:id="@+id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"

4
OsmAnd/res/layout/preference_top_switch.xml
View file

@ -32,8 +32,8 @@
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium" /> osmand:typeface="@string/font_roboto_medium" />
<Switch <android.support.v7.widget.SwitchCompat
android:id="@android:id/switch_widget" android:id="@+id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"

4
OsmAnd/res/layout/preference_with_descr_dialog_and_switch.xml
View file

@ -61,8 +61,8 @@
android:layout_marginBottom="18dp" android:layout_marginBottom="18dp"
android:background="?attr/divider_color_basic" /> android:background="?attr/divider_color_basic" />
<Switch <android.support.v7.widget.SwitchCompat
android:id="@android:id/switch_widget" android:id="@+id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"

2
OsmAnd/res/xml/general_profile_settings.xml
View file

@ -82,7 +82,7 @@
android:summaryOn="@string/shared_string_on" android:summaryOn="@string/shared_string_on"
android:title="@string/tap_on_map_to_hide_interface" /> android:title="@string/tap_on_map_to_hide_interface" />
<SwitchPreference <SwitchPreferenceCompat
android:key="do_not_use_animations" android:key="do_not_use_animations"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:summaryOff="@string/shared_string_off" android:summaryOff="@string/shared_string_off"

2
OsmAnd/res/xml/global_settings.xml
View file

@ -40,7 +40,7 @@
android:summaryOn="@string/shared_string_on" android:summaryOn="@string/shared_string_on"
android:title="@string/analytics_pref_title" /> android:title="@string/analytics_pref_title" />
<SwitchPreference <SwitchPreferenceCompat
android:icon="@drawable/ic_action_notification" android:icon="@drawable/ic_action_notification"
android:key="do_not_show_startup_messages" android:key="do_not_show_startup_messages"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"

2
OsmAnd/res/xml/proxy_preferences.xml
View file

@ -5,7 +5,7 @@
android:key="proxy" android:key="proxy"
android:title="@string/proxy_pref_title"> android:title="@string/proxy_pref_title">
<SwitchPreference <SwitchPreferenceCompat
android:key="enable_proxy" android:key="enable_proxy"
android:summaryOff="@string/shared_string_off" android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on" /> android:summaryOn="@string/shared_string_on" />

10
OsmAnd/res/xml/screen_alerts.xml
View file

@ -2,7 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<SwitchPreference <SwitchPreferenceCompat
android:key="show_routing_alarms" android:key="show_routing_alarms"
android:layout="@layout/preference_top_switch" android:layout="@layout/preference_top_switch"
android:summaryOff="@string/shared_string_off" android:summaryOff="@string/shared_string_off"
@ -21,25 +21,25 @@
android:title="@string/screen_alerts_descr" android:title="@string/screen_alerts_descr"
tools:icon="@drawable/ic_action_info_dark" /> tools:icon="@drawable/ic_action_info_dark" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="show_routing_alarms" android:dependency="show_routing_alarms"
android:key="show_traffic_warnings" android:key="show_traffic_warnings"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/show_traffic_warnings" /> android:title="@string/show_traffic_warnings" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="show_routing_alarms" android:dependency="show_routing_alarms"
android:key="show_pedestrian" android:key="show_pedestrian"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/show_pedestrian_warnings" /> android:title="@string/show_pedestrian_warnings" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="show_routing_alarms" android:dependency="show_routing_alarms"
android:key="show_cameras" android:key="show_cameras"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/show_cameras" /> android:title="@string/show_cameras" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="show_routing_alarms" android:dependency="show_routing_alarms"
android:key="show_tunnels" android:key="show_tunnels"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"

2
OsmAnd/res/xml/turn_screen_on.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference <SwitchPreferenceCompat
android:key="turn_screen_on_enabled" android:key="turn_screen_on_enabled"
android:layout="@layout/preference_top_switch" android:layout="@layout/preference_top_switch"
android:summaryOff="@string/shared_string_off" android:summaryOff="@string/shared_string_off"

20
OsmAnd/res/xml/voice_announces.xml
View file

@ -2,7 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<SwitchPreference <SwitchPreferenceCompat
android:key="speak_routing_alarms" android:key="speak_routing_alarms"
android:layout="@layout/preference_top_switch" android:layout="@layout/preference_top_switch"
android:summaryOff="@string/shared_string_off" android:summaryOff="@string/shared_string_off"
@ -16,19 +16,19 @@
android:title="@string/voice_announces_info" android:title="@string/voice_announces_info"
tools:icon="@drawable/ic_action_info_dark" /> tools:icon="@drawable/ic_action_info_dark" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_street_names" android:key="speak_street_names"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/speak_street_names" /> android:title="@string/speak_street_names" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_traffic_warnings" android:key="speak_traffic_warnings"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/speak_traffic_warnings" /> android:title="@string/speak_traffic_warnings" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_pedestrian" android:key="speak_pedestrian"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
@ -38,7 +38,7 @@
android:layout="@layout/simple_divider_item" android:layout="@layout/simple_divider_item"
android:selectable="false" /> android:selectable="false" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_speed_limit" android:key="speak_speed_limit"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
@ -54,31 +54,31 @@
android:layout="@layout/simple_divider_item" android:layout="@layout/simple_divider_item"
android:selectable="false" /> android:selectable="false" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_cameras" android:key="speak_cameras"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/speak_cameras" /> android:title="@string/speak_cameras" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="speak_tunnels" android:key="speak_tunnels"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/show_tunnels" /> android:title="@string/show_tunnels" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="announce_wpt" android:key="announce_wpt"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/shared_string_gpx_waypoints" /> android:title="@string/shared_string_gpx_waypoints" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="announce_nearby_favorites" android:key="announce_nearby_favorites"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"
android:title="@string/speak_favorites" /> android:title="@string/speak_favorites" />
<SwitchPreference <SwitchPreferenceCompat
android:dependency="speak_routing_alarms" android:dependency="speak_routing_alarms"
android:key="announce_nearby_poi" android:key="announce_nearby_poi"
android:layout="@layout/preference_switch" android:layout="@layout/preference_switch"

31
OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
View file

@ -16,7 +16,6 @@ import android.support.annotation.Nullable;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.annotation.XmlRes; import android.support.annotation.XmlRes;
import android.support.design.widget.AppBarLayout; import android.support.design.widget.AppBarLayout;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@ -26,9 +25,11 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceFragmentCompat; import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceGroupAdapter; import android.support.v7.preference.PreferenceGroupAdapter;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.support.v7.view.ContextThemeWrapper; import android.support.v7.view.ContextThemeWrapper;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -199,6 +200,12 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
} }
} }
@SuppressLint("RestrictedApi")
protected void updatePreference(Preference preference) {
PreferenceGroupAdapter adapter = (PreferenceGroupAdapter) getListView().getAdapter();
adapter.onPreferenceChange(preference);
}
private void createToolbar(LayoutInflater inflater, View view) { private void createToolbar(LayoutInflater inflater, View view) {
AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.appbar); AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.appbar);
@ -299,19 +306,21 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
if (getSelectedAppMode() != null) { if (getSelectedAppMode() != null) {
int resId = getPreferencesResId(); int resId = getPreferencesResId();
if (resId != -1) { if (resId != -1) {
addPreferencesFromResource(getPreferencesResId()); addPreferencesFromResource(resId);
setupPreferences(); setupPreferences();
registerPreferences(); registerPreferences(getPreferenceScreen());
} }
} }
} }
private void registerPreferences() { private void registerPreferences(PreferenceGroup preferenceGroup) {
PreferenceScreen screen = getPreferenceScreen(); if (preferenceGroup != null) {
if (screen != null) { for (int i = 0; i < preferenceGroup.getPreferenceCount(); i++) {
for (int i = 0; i < screen.getPreferenceCount(); i++) { Preference preference = preferenceGroup.getPreference(i);
Preference preference = screen.getPreference(i);
registerPreference(preference); registerPreference(preference);
if (preference instanceof PreferenceGroup) {
registerPreferences((PreferenceGroup) preference);
}
} }
} }
} }
@ -483,12 +492,12 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
return app.getSettings(); return app.getSettings();
} }
public SwitchPreference createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, int title, int summary, int layoutId) { public SwitchPreferenceCompat createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, int title, int summary, int layoutId) {
return createSwitchPreference(b, getString(title), getString(summary), layoutId); return createSwitchPreference(b, getString(title), getString(summary), layoutId);
} }
public SwitchPreference createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, String title, String summary, int layoutId) { public SwitchPreferenceCompat createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, String title, String summary, int layoutId) {
SwitchPreference p = new SwitchPreference(getContext()); SwitchPreferenceCompat p = new SwitchPreferenceCompat(getContext());
p.setTitle(title); p.setTitle(title);
p.setKey(b.getId()); p.setKey(b.getId());
p.setSummary(summary); p.setSummary(summary);

18
OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
View file

@ -9,13 +9,13 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.ColorRes; import android.support.annotation.ColorRes;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceGroupAdapter; import android.support.v7.preference.PreferenceGroupAdapter;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -42,6 +42,8 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
public static final String TAG = "ConfigureProfileFragment"; public static final String TAG = "ConfigureProfileFragment";
private static final String PLUGIN_SETTINGS = "plugin_settings";
@Override @Override
protected int getPreferencesResId() { protected int getPreferencesResId() {
return R.xml.configure_profile; return R.xml.configure_profile;
@ -111,7 +113,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
Preference pref = ((PreferenceGroupAdapter) getListView().getAdapter()).getItem(position); Preference pref = ((PreferenceGroupAdapter) getListView().getAdapter()).getItem(position);
if (pref != null && pref.getParent() != null) { if (pref != null && pref.getParent() != null) {
PreferenceGroup preferenceGroup = pref.getParent(); PreferenceGroup preferenceGroup = pref.getParent();
return preferenceGroup.hasKey() && preferenceGroup.getKey().equals("plugin_settings"); return preferenceGroup.hasKey() && preferenceGroup.getKey().equals(PLUGIN_SETTINGS);
} }
return false; return false;
} }
@ -126,7 +128,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
setupNavigationSettingsPref(); setupNavigationSettingsPref();
setupConfigureMapPref(); setupConfigureMapPref();
PreferenceCategory pluginSettings = (PreferenceCategory) findPreference("plugin_settings"); PreferenceCategory pluginSettings = (PreferenceCategory) findPreference(PLUGIN_SETTINGS);
pluginSettings.setIconSpaceReserved(false); pluginSettings.setIconSpaceReserved(false);
setupConnectedAppsPref(pluginSettings); setupConnectedAppsPref(pluginSettings);
@ -163,11 +165,11 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
} }
List<ConnectedApp> connectedApps = app.getAidlApi().getConnectedApps(); List<ConnectedApp> connectedApps = app.getAidlApi().getConnectedApps();
for (ConnectedApp connectedApp : connectedApps) { for (ConnectedApp connectedApp : connectedApps) {
SwitchPreference preference = new SwitchPreference(app); SwitchPreferenceCompat preference = new SwitchPreferenceCompat(app);
preference.setPersistent(false); preference.setPersistent(false);
preference.setKey(connectedApp.getPack()); preference.setKey(connectedApp.getPack());
preference.setTitle(connectedApp.getName());
preference.setIcon(connectedApp.getIcon()); preference.setIcon(connectedApp.getIcon());
preference.setTitle(connectedApp.getName());
preference.setChecked(connectedApp.isEnabled()); preference.setChecked(connectedApp.isEnabled());
preference.setLayoutResource(R.layout.preference_switch); preference.setLayoutResource(R.layout.preference_switch);
@ -186,10 +188,10 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
preference.setPersistent(false); preference.setPersistent(false);
preference.setKey(plugin.getId()); preference.setKey(plugin.getId());
preference.setTitle(plugin.getName()); preference.setTitle(plugin.getName());
preference.setIcon(getPluginIcon(plugin));
preference.setChecked(plugin.isActive()); preference.setChecked(plugin.isActive());
preference.setLayoutResource(R.layout.preference_dialog_and_switch); preference.setIcon(getPluginIcon(plugin));
preference.setIntent(getPluginIntent(plugin)); preference.setIntent(getPluginIntent(plugin));
preference.setLayoutResource(R.layout.preference_dialog_and_switch);
preferenceCategory.addPreference(preference); preferenceCategory.addPreference(preference);
} }
@ -221,7 +223,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment {
if (newValue instanceof Boolean) { if (newValue instanceof Boolean) {
if ((plugin.isActive() || !plugin.needsInstallation())) { if ((plugin.isActive() || !plugin.needsInstallation())) {
if (OsmandPlugin.enablePlugin(getActivity(), app, plugin, (Boolean) newValue)) { if (OsmandPlugin.enablePlugin(getActivity(), app, plugin, (Boolean) newValue)) {
updateAllSettings(); preference.setIcon(getPluginIcon(plugin));
return true; return true;
} }
} else if (plugin.needsInstallation() && preference.getIntent() != null) { } else if (plugin.needsInstallation() && preference.getIntent() != null) {

9
OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java
View file

@ -178,14 +178,19 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
int newFormat = getCoordinatesFormatForKey(key); int newFormat = getCoordinatesFormatForKey(key);
if (newFormat != -1) { if (newFormat != -1) {
if (settings.COORDINATES_FORMAT.isSetForMode(getSelectedAppMode())) {
settings.COORDINATES_FORMAT.set(newFormat);
updateSelectedFormatPrefs(key);
return true;
} else {
FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getFragmentManager();
if (fragmentManager != null) { if (fragmentManager != null) {
ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, settings.COORDINATES_FORMAT.getId(), newFormat, this, false); ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, settings.COORDINATES_FORMAT.getId(), newFormat, this, false);
return false; }
} }
} }
return super.onPreferenceChange(preference, newValue); return false;
} }
private void updateSelectedFormatPrefs(String key) { private void updateSelectedFormatPrefs(String key) {

4
OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
View file

@ -47,10 +47,6 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment {
@Override @Override
protected void setupPreferences() { protected void setupPreferences() {
Preference appearanceCategory = findPreference("appearance_category");
Preference unitsAndFormats = findPreference("units_and_formats");
Preference other = findPreference("other");
setupAppThemePref(); setupAppThemePref();
setupRotateMapPref(); setupRotateMapPref();
setupMapScreenOrientationPref(); setupMapScreenOrientationPref();

4
OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
View file

@ -2,9 +2,9 @@ package net.osmand.plus.settings;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.util.Pair; import android.util.Pair;
import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode;
@ -157,7 +157,7 @@ public class GlobalSettingsFragment extends BaseSettingsFragment implements Send
private void setupSendAnonymousDataPref() { private void setupSendAnonymousDataPref() {
boolean enabled = settings.SEND_ANONYMOUS_MAP_DOWNLOADS_DATA.get() || settings.SEND_ANONYMOUS_APP_USAGE_DATA.get(); boolean enabled = settings.SEND_ANONYMOUS_MAP_DOWNLOADS_DATA.get() || settings.SEND_ANONYMOUS_APP_USAGE_DATA.get();
SwitchPreference sendAnonymousData = (SwitchPreference) findPreference(SEND_ANONYMOUS_DATA_PREF_ID); SwitchPreferenceCompat sendAnonymousData = (SwitchPreferenceCompat) findPreference(SEND_ANONYMOUS_DATA_PREF_ID);
sendAnonymousData.setChecked(enabled); sendAnonymousData.setChecked(enabled);
} }

9
OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
View file

@ -1,7 +1,7 @@
package net.osmand.plus.settings; package net.osmand.plus.settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.SwitchPreferenceCompat;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -27,10 +27,9 @@ public class NavigationFragment extends BaseSettingsFragment {
@Override @Override
protected void setupPreferences() { protected void setupPreferences() {
Preference routeParameters = findPreference("route_parameters"); Preference routeParameters = findPreference("route_parameters");
SwitchPreference showRoutingAlarms = (SwitchPreference) findPreference(settings.SHOW_ROUTING_ALARMS.getId()); SwitchPreferenceCompat showRoutingAlarms = (SwitchPreferenceCompat) findPreference(settings.SHOW_ROUTING_ALARMS.getId());
SwitchPreference speakRoutingAlarms = (SwitchPreference) findPreference(settings.SPEAK_ROUTING_ALARMS.getId()); SwitchPreferenceCompat speakRoutingAlarms = (SwitchPreferenceCompat) findPreference(settings.SPEAK_ROUTING_ALARMS.getId());
SwitchPreferenceCompat turnScreenOn = (SwitchPreferenceCompat) findPreference(settings.TURN_SCREEN_ON_ENABLED.getId());
SwitchPreference turnScreenOn = (SwitchPreference) findPreference(settings.TURN_SCREEN_ON_ENABLED.getId());
routeParameters.setIcon(getContentIcon(R.drawable.ic_action_route_distance)); routeParameters.setIcon(getContentIcon(R.drawable.ic_action_route_distance));
showRoutingAlarms.setIcon(getContentIcon(R.drawable.ic_action_alert)); showRoutingAlarms.setIcon(getContentIcon(R.drawable.ic_action_alert));

4
OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.settings;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
@ -104,7 +103,8 @@ public class RouteParametersFragment extends BaseSettingsFragment {
} }
private void setupTimeConditionalRoutingPref() { private void setupTimeConditionalRoutingPref() {
SwitchPreference timeConditionalRouting = createSwitchPreferenceEx(settings.ENABLE_TIME_CONDITIONAL_ROUTING.getId(), R.string.temporary_conditional_routing, R.layout.preference_with_descr_dialog_and_switch); SwitchPreferenceEx timeConditionalRouting = createSwitchPreferenceEx(settings.ENABLE_TIME_CONDITIONAL_ROUTING.getId(),
R.string.temporary_conditional_routing, R.layout.preference_with_descr_dialog_and_switch);
timeConditionalRouting.setIcon(getRoutingPrefIcon(settings.ENABLE_TIME_CONDITIONAL_ROUTING.getId())); timeConditionalRouting.setIcon(getRoutingPrefIcon(settings.ENABLE_TIME_CONDITIONAL_ROUTING.getId()));
timeConditionalRouting.setSummaryOn(R.string.shared_string_enable); timeConditionalRouting.setSummaryOn(R.string.shared_string_enable);
timeConditionalRouting.setSummaryOff(R.string.shared_string_disable); timeConditionalRouting.setSummaryOff(R.string.shared_string_disable);

15
OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java
View file

@ -3,11 +3,10 @@ package net.osmand.plus.settings;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroupAdapter;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.widget.ImageView; import android.widget.ImageView;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -37,10 +36,10 @@ public class ScreenAlertsFragment extends BaseSettingsFragment {
@Override @Override
protected void setupPreferences() { protected void setupPreferences() {
Preference showRoutingAlarmsInfo = findPreference(SHOW_ROUTING_ALARMS_INFO); Preference showRoutingAlarmsInfo = findPreference(SHOW_ROUTING_ALARMS_INFO);
SwitchPreference showTrafficWarnings = (SwitchPreference) findPreference(settings.SHOW_TRAFFIC_WARNINGS.getId()); SwitchPreferenceCompat showTrafficWarnings = (SwitchPreferenceCompat) findPreference(settings.SHOW_TRAFFIC_WARNINGS.getId());
SwitchPreference showPedestrian = (SwitchPreference) findPreference(settings.SHOW_PEDESTRIAN.getId()); SwitchPreferenceCompat showPedestrian = (SwitchPreferenceCompat) findPreference(settings.SHOW_PEDESTRIAN.getId());
SwitchPreference showCameras = (SwitchPreference) findPreference(settings.SHOW_CAMERAS.getId()); SwitchPreferenceCompat showCameras = (SwitchPreferenceCompat) findPreference(settings.SHOW_CAMERAS.getId());
SwitchPreference showTunnels = (SwitchPreference) findPreference(settings.SHOW_TUNNELS.getId()); SwitchPreferenceCompat showTunnels = (SwitchPreferenceCompat) findPreference(settings.SHOW_TUNNELS.getId());
showRoutingAlarmsInfo.setIcon(getContentIcon(R.drawable.ic_action_info_dark)); showRoutingAlarmsInfo.setIcon(getContentIcon(R.drawable.ic_action_info_dark));
showTrafficWarnings.setIcon(getIcon(R.drawable.list_warnings_traffic_calming)); showTrafficWarnings.setIcon(getIcon(R.drawable.list_warnings_traffic_calming));
@ -57,7 +56,7 @@ public class ScreenAlertsFragment extends BaseSettingsFragment {
String key = preference.getKey(); String key = preference.getKey();
if (settings.SHOW_ROUTING_ALARMS.getId().equals(key)) { if (settings.SHOW_ROUTING_ALARMS.getId().equals(key)) {
boolean checked = ((SwitchPreference) preference).isChecked(); boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off); int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off);
holder.itemView.setBackgroundColor(color); holder.itemView.setBackgroundColor(color);
@ -80,7 +79,7 @@ public class ScreenAlertsFragment extends BaseSettingsFragment {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
Preference routeParametersImage = findPreference(SCREEN_ALERTS_IMAGE); Preference routeParametersImage = findPreference(SCREEN_ALERTS_IMAGE);
((PreferenceGroupAdapter) getListView().getAdapter()).onPreferenceChange(routeParametersImage); updatePreference(routeParametersImage);
} }
return super.onPreferenceClick(preference); return super.onPreferenceClick(preference);

4
OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java
View file

@ -1,10 +1,10 @@
package net.osmand.plus.settings; package net.osmand.plus.settings;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.SwitchPreferenceCompat;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -44,7 +44,7 @@ public class TurnScreenOnFragment extends BaseSettingsFragment {
super.onBindPreferenceViewHolder(preference, holder); super.onBindPreferenceViewHolder(preference, holder);
if (settings.TURN_SCREEN_ON_ENABLED.getId().equals(preference.getKey())) { if (settings.TURN_SCREEN_ON_ENABLED.getId().equals(preference.getKey())) {
boolean checked = ((SwitchPreference) preference).isChecked(); boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off); int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off);
AndroidUtils.setBackground(holder.itemView, new ColorDrawable(color)); AndroidUtils.setBackground(holder.itemView, new ColorDrawable(color));

6
OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java
View file

@ -6,11 +6,11 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.media.AudioManager; import android.media.AudioManager;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.SwitchPreferenceCompat;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode;
@ -67,7 +67,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment {
super.onBindPreferenceViewHolder(preference, holder); super.onBindPreferenceViewHolder(preference, holder);
if (settings.SPEAK_ROUTING_ALARMS.getId().equals(preference.getKey())) { if (settings.SPEAK_ROUTING_ALARMS.getId().equals(preference.getKey())) {
boolean checked = ((SwitchPreference) preference).isChecked(); boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off); int color = checked ? getActiveProfileColor() : ContextCompat.getColor(app, R.color.preference_top_switch_off);
AndroidUtils.setBackground(holder.itemView, new ColorDrawable(color)); AndroidUtils.setBackground(holder.itemView, new ColorDrawable(color));
@ -196,7 +196,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
settings.SPEAK_SPEED_CAMERA.set(true); settings.SPEAK_SPEED_CAMERA.set(true);
SwitchPreference speakSpeedCamera = (SwitchPreference) findPreference(settings.SPEAK_SPEED_CAMERA.getId()); SwitchPreferenceCompat speakSpeedCamera = (SwitchPreferenceCompat) findPreference(settings.SPEAK_SPEED_CAMERA.getId());
if (speakSpeedCamera != null) { if (speakSpeedCamera != null) {
speakSpeedCamera.setChecked(true); speakSpeedCamera.setChecked(true);
} }

4
OsmAnd/src/net/osmand/plus/settings/preferences/SwitchPreferenceEx.java
View file

@ -1,10 +1,10 @@
package net.osmand.plus.settings.preferences; package net.osmand.plus.settings.preferences;
import android.content.Context; import android.content.Context;
import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.SwitchPreferenceCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
public class SwitchPreferenceEx extends SwitchPreference { public class SwitchPreferenceEx extends SwitchPreferenceCompat {
private String description; private String description;