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

Change package name settings

Browse source
This commit is contained in:
Victor Shcherb 2020-05-19 13:13:32 +02:00
parent 3965243c19
commit f907be3ee1
73 changed files with 121 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/proxy_pref_title"
app:fragment="net.osmand.plus.settings.ProxySettingsFragment"
app:fragment="net.osmand.plus.settings.fragments.ProxySettingsFragment"
tools:icon="@drawable/ic_action_proxy" />
<Preference

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

@ -109,7 +109,7 @@
android:summaryOff="@string/shared_string_disabled"
android:summaryOn="@string/shared_string_enabled"
android:title="@string/live_monitoring"
app:fragment="net.osmand.plus.settings.LiveMonitoringFragment"
app:fragment="net.osmand.plus.settings.fragments.LiveMonitoringFragment"
tools:icon="@drawable/ic_world_globe_dark" />
<Preference

6
OsmAnd/res/xml/navigation_settings_new.xml
View file

@ -25,7 +25,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/screen_alerts"
app:fragment="net.osmand.plus.settings.ScreenAlertsFragment"
app:fragment="net.osmand.plus.settings.fragments.ScreenAlertsFragment"
tools:icon="@drawable/ic_action_alert" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@ -34,7 +34,7 @@
android:persistent="false"
android:summary="@string/voice_announces_descr"
android:title="@string/voice_announces"
app:fragment="net.osmand.plus.settings.VoiceAnnouncesFragment"
app:fragment="net.osmand.plus.settings.fragments.VoiceAnnouncesFragment"
tools:icon="@drawable/ic_action_volume_up" />
<Preference
@ -62,7 +62,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/turn_screen_on"
app:fragment="net.osmand.plus.settings.TurnScreenOnFragment"
app:fragment="net.osmand.plus.settings.fragments.TurnScreenOnFragment"
tools:icon="@drawable/ic_action_turn_screen_on" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx

2
OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
View file

@ -10,7 +10,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import java.io.IOException;
import java.util.HashMap;

4
OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
View file

@ -28,8 +28,8 @@ import net.osmand.plus.access.RelativeDirectionStyle;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
import net.osmand.plus.settings.preferences.ListPreferenceEx;

2
OsmAnd/src/net/osmand/plus/OsmandPlugin.java
View file

@ -41,7 +41,7 @@ import net.osmand.plus.osmedit.OsmEditingPlugin;
import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
import net.osmand.plus.quickaction.QuickActionType;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.skimapsplugin.SkiMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.OsmandMapTileView;

6
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -313,7 +313,7 @@ public class OsmandSettings {
}
}
void migrateEnumPreferences() {
public void migrateEnumPreferences() {
for (OsmandPreference pref : registeredPreferences.values()) {
if (pref instanceof EnumStringPreference) {
EnumStringPreference enumPref = (EnumStringPreference) pref;
@ -339,7 +339,7 @@ public class OsmandSettings {
}
}
void migrateHomeWorkParkingToFavorites() {
publicvoid migrateHomeWorkParkingToFavorites() {
FavouritesDbHelper favorites = ctx.getFavorites();
LatLon homePoint = null;
@ -665,7 +665,7 @@ public class OsmandSettings {
return true;
}
protected ApplicationMode readApplicationMode() {
public ApplicationMode readApplicationMode() {
String s = settingsAPI.getString(globalPreferences, APPLICATION_MODE.getId(), ApplicationMode.DEFAULT.getStringKey());
return ApplicationMode.valueOfStringKey(s, ApplicationMode.DEFAULT);
}

16
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -135,14 +135,14 @@ import net.osmand.plus.routing.TransportRoutingHelper.TransportRouteCalculationP
import net.osmand.plus.search.QuickSearchDialogFragment;
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
import net.osmand.plus.settings.ConfigureMenuItemsFragment;
import net.osmand.plus.settings.ConfigureProfileFragment;
import net.osmand.plus.settings.DataStorageFragment;
import net.osmand.plus.settings.ImportCompleteFragment;
import net.osmand.plus.settings.ImportSettingsFragment;
import net.osmand.plus.settings.ProfileAppearanceFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
import net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment;
import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
import net.osmand.plus.settings.fragments.DataStorageFragment;
import net.osmand.plus.settings.fragments.ImportCompleteFragment;
import net.osmand.plus.settings.fragments.ImportSettingsFragment;
import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.MapControlsLayer;

2
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -67,7 +67,7 @@ import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
import net.osmand.plus.routepreparationmenu.WaypointsFragment;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.BaseMapLayer;
import net.osmand.plus.views.MapControlsLayer;
import net.osmand.plus.views.MapTileLayer;

2
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -66,7 +66,7 @@ import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.quickaction.QuickActionType;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;

2
OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
View file

@ -33,7 +33,7 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
import net.osmand.plus.settings.preferences.ListPreferenceEx;

2
OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
View file

@ -9,7 +9,7 @@ import net.osmand.plus.OsmAndLocationSimulation;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.render.NativeOsmandLibrary;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import net.osmand.util.SunriseSunset;

2
OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
View file

@ -14,7 +14,7 @@ import net.osmand.plus.Version;
import net.osmand.plus.activities.ContributionVersionActivity;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;

2
OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
View file

@ -33,7 +33,7 @@ import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -58,7 +58,7 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.settings.ImportSettingsFragment;
import net.osmand.plus.settings.fragments.ImportSettingsFragment;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.router.RoutingConfiguration;
import net.osmand.util.Algorithms;

4
OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
View file

@ -19,8 +19,8 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -89,7 +89,7 @@ import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID;
import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_TOP_DP;
import static net.osmand.plus.settings.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
import static net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
public class MapContextMenuFragment extends BaseOsmAndFragment implements DownloadEvents {

2
OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
View file

@ -20,7 +20,7 @@ import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
import net.osmand.plus.settings.bottomsheets.SingleSelectPreferenceBottomSheet;

2
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -38,7 +38,7 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.activities.SavingTrackHelper.SaveGpxResult;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;

4
OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java
View file

@ -18,8 +18,8 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.bottomsheets.OsmLoginDataBottomSheet;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;

2
OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
View file

@ -43,7 +43,7 @@ import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.osmedit.OsmPoint.Action;
import net.osmand.plus.quickaction.QuickActionType;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java
View file

@ -13,7 +13,7 @@ import net.osmand.plus.R;
import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
public abstract class AppModesBottomSheetDialogFragment<T extends AbstractProfileMenuAdapter> extends MenuBottomSheetDialogFragment
implements AbstractProfileMenuAdapter.ButtonPressedListener, AbstractProfileMenuAdapter.ProfilePressedListener {

2
OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
View file

@ -16,7 +16,7 @@ import net.osmand.PlatformUtil;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
View file

@ -32,7 +32,7 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
import java.util.ArrayList;

4
OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java
View file

@ -19,13 +19,11 @@ import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.NavigationFragment;
import net.osmand.plus.settings.fragments.NavigationFragment;
import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SelectMultipleProfilesBottomSheet extends BasePreferenceBottomSheet {

6
OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
View file

@ -29,9 +29,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.MainSettingsFragment;
import net.osmand.plus.settings.NavigationFragment;
import net.osmand.plus.settings.ProfileAppearanceFragment;
import net.osmand.plus.settings.fragments.MainSettingsFragment;
import net.osmand.plus.settings.fragments.NavigationFragment;
import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
import net.osmand.router.RoutingConfiguration;

2
OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
View file

@ -19,7 +19,7 @@ import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
View file

@ -46,7 +46,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.ShowAlongTheRou
import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.TimeConditionalRoutingItem;
import net.osmand.plus.routing.RouteProvider;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.router.GeneralRouter;
import java.io.File;

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java
View file

@ -11,7 +11,7 @@ import androidx.preference.Preference;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.settings.ApplyQueryType;
import net.osmand.plus.settings.fragments.ApplyQueryType;
import java.util.List;

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

@ -25,9 +25,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.ApplyQueryType;
import net.osmand.plus.settings.OnConfirmPreferenceChange;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.ApplyQueryType;
import net.osmand.plus.settings.fragments.OnConfirmPreferenceChange;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import org.apache.commons.logging.Log;

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

@ -18,14 +18,14 @@ import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.DataStorageMenuItem;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.DataStorageMenuItem;
import org.apache.commons.logging.Log;
import java.io.File;
import static net.osmand.plus.settings.DataStorageHelper.MANUALLY_SPECIFIED;
import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED;
public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet {

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
View file

@ -17,7 +17,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java
View file

@ -17,7 +17,7 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.preferences.EditTextPreferenceEx;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java
View file

@ -16,7 +16,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.preferences.MultiSelectBooleanPreference;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
View file

@ -19,7 +19,7 @@ import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
import net.osmand.plus.osmedit.SettingsOsmEditingActivity;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {

8
OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
View file

@ -27,12 +27,12 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.SubtitmeListDividerItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.ApplyQueryType;
import net.osmand.plus.settings.OnConfirmPreferenceChange;
import net.osmand.plus.settings.fragments.ApplyQueryType;
import net.osmand.plus.settings.fragments.OnConfirmPreferenceChange;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import static net.osmand.plus.settings.RouteParametersFragment.DEFAULT_MODE;
import static net.osmand.plus.settings.RouteParametersFragment.DISABLE_MODE;
import static net.osmand.plus.settings.fragments.RouteParametersFragment.DEFAULT_MODE;
import static net.osmand.plus.settings.fragments.RouteParametersFragment.DISABLE_MODE;
public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBottomSheet {

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
View file

@ -19,7 +19,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
public class ResetProfilePrefsBottomSheet extends BasePreferenceBottomSheet {

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
View file

@ -14,7 +14,7 @@ import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java
View file

@ -18,7 +18,7 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTitleWithDescrAndButt
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.preferences.ListPreferenceEx;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java → OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
public enum ApplyQueryType {
NONE, SNACK_BAR, BOTTOM_SHEET

3
OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.annotation.SuppressLint;
import android.app.Activity;
@ -47,7 +47,6 @@ import androidx.preference.TwoStatePreference;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.snackbar.BaseTransientBottomBar;
import com.google.android.material.snackbar.Snackbar;
import net.osmand.AndroidUtils;

18
OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Context;
@ -36,11 +36,11 @@ import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.settings.ConfigureMenuRootFragment.ScreenType;
import net.osmand.plus.settings.fragments.ConfigureMenuRootFragment.ScreenType;
import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
import net.osmand.plus.settings.RearrangeMenuItemsAdapter.RearrangeMenuAdapterItem;
import net.osmand.plus.settings.RearrangeMenuItemsAdapter.MenuItemsAdapterListener;
import net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.RearrangeMenuAdapterItem;
import net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.MenuItemsAdapterListener;
import org.apache.commons.logging.Log;
@ -52,11 +52,11 @@ import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.APP_PROFILES_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID;
import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON;
import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION;
import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.DIVIDER;
import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.HEADER;
import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.MENU_ITEM;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DIVIDER;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.HEADER;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.MENU_ITEM;
public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
implements SelectCopyAppModeBottomSheet.CopyAppModePrefsListener {

2
OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Intent;

2
OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.content.Context;
import android.content.DialogInterface;

2
OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.content.Context;
import android.net.Uri;

10
OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.Manifest;
import android.annotation.SuppressLint;
@ -43,10 +43,10 @@ import java.lang.ref.WeakReference;
import java.text.DecimalFormat;
import java.util.ArrayList;
import static net.osmand.plus.settings.DataStorageHelper.INTERNAL_STORAGE;
import static net.osmand.plus.settings.DataStorageHelper.MANUALLY_SPECIFIED;
import static net.osmand.plus.settings.DataStorageHelper.OTHER_MEMORY;
import static net.osmand.plus.settings.DataStorageHelper.TILES_MEMORY;
import static net.osmand.plus.settings.fragments.DataStorageHelper.INTERNAL_STORAGE;
import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED;
import static net.osmand.plus.settings.fragments.DataStorageHelper.OTHER_MEMORY;
import static net.osmand.plus.settings.fragments.DataStorageHelper.TILES_MEMORY;
import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.CHOSEN_DIRECTORY;
import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.MOVE_DATA;
import static net.osmand.plus.settings.bottomsheets.SelectFolderBottomSheet.NEW_PATH;

10
OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java → OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.os.AsyncTask;
import android.os.Build;
@ -13,10 +13,10 @@ import java.io.File;
import java.text.DecimalFormat;
import java.util.ArrayList;
import static net.osmand.plus.settings.DataStorageFragment.UI_REFRESH_TIME_MS;
import static net.osmand.plus.settings.DataStorageMemoryItem.Directory;
import static net.osmand.plus.settings.DataStorageMemoryItem.EXTENSIONS;
import static net.osmand.plus.settings.DataStorageMemoryItem.PREFIX;
import static net.osmand.plus.settings.fragments.DataStorageFragment.UI_REFRESH_TIME_MS;
import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.Directory;
import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.EXTENSIONS;
import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.PREFIX;
public class DataStorageHelper {
public final static String INTERNAL_STORAGE = "internal_storage";

2
OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java → OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
public class DataStorageMemoryItem {
public final static int EXTENSIONS = 0;

2
OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java → OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.os.Parcel;
import android.os.Parcelable;

2
OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.view.LayoutInflater;
import android.view.View;

2
OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java → OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.view.LayoutInflater;
import android.view.View;

2
OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java → OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.content.res.ColorStateList;
import android.view.LayoutInflater;

4
OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java → OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.ProgressDialog;
import android.content.Context;
@ -42,7 +42,7 @@ import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.quickaction.QuickAction;
import net.osmand.plus.quickaction.QuickActionRegistry;
import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.content.Context;
import android.content.DialogInterface;

2
OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Context;

8
OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.graphics.Typeface;
@ -30,13 +30,13 @@ import net.osmand.plus.dialogs.SelectMapStyleBottomSheetDialogFragment;
import net.osmand.plus.quickaction.QuickActionListFragment;
import net.osmand.plus.routepreparationmenu.AvoidRoadsBottomSheetDialogFragment;
import net.osmand.plus.search.QuickSearchDialogFragment;
import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
import static net.osmand.plus.settings.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
import static net.osmand.plus.settings.ImportSettingsFragment.getSettingsToOperate;
import static net.osmand.plus.settings.fragments.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
import static net.osmand.plus.settings.fragments.ImportSettingsFragment.getSettingsToOperate;
public class ImportCompleteFragment extends BaseOsmAndFragment {
public static final String TAG = ImportCompleteFragment.class.getSimpleName();

4
OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.Typeface;
import android.os.Build;
@ -44,7 +44,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static net.osmand.plus.settings.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
import static net.osmand.plus.settings.fragments.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
public class ImportDuplicatesFragment extends BaseOsmAndFragment implements View.OnClickListener {

4
OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Context;
@ -52,7 +52,7 @@ import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.quickaction.QuickAction;
import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
import net.osmand.plus.widgets.TextViewEx;
import org.apache.commons.logging.Log;

4
OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java → OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.Typeface;
import android.view.LayoutInflater;
@ -14,7 +14,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
import java.util.ArrayList;

7
OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@ -8,20 +8,15 @@ import android.widget.TextView;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import net.osmand.AndroidUtils;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
import net.osmand.plus.settings.preferences.EditTextPreferenceEx;
import net.osmand.plus.settings.preferences.ListPreferenceEx;
import java.io.Serializable;
import static net.osmand.plus.UiUtilities.CompoundButtonType.TOOLBAR;
import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.MAX_INTERVAL_TO_SEND_MINUTES;
import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.MINUTES;

2
OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;

2
OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import androidx.preference.Preference;

2
OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.Drawable;
import android.os.Bundle;

2
OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java → OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
public interface OnConfirmPreferenceChange {

2
OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java → OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
public interface OnPreferenceChanged {

2
OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.annotation.SuppressLint;
import android.app.Activity;

2
OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;

9
OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java → OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.annotation.SuppressLint;
import android.graphics.drawable.Drawable;
@ -25,14 +25,13 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
import net.osmand.plus.settings.ConfigureMenuRootFragment.ScreenType;
import net.osmand.plus.settings.fragments.ConfigureMenuRootFragment.ScreenType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static net.osmand.aidl.ConnectedApp.AIDL_LAYERS_PREFIX;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.CONTOUR_LINES;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_BUILDS_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID;
@ -55,12 +54,10 @@ import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_EDITS;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_NOTES;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.OVERLAY_MAP;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.RECORDING_LAYER;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.RENDERING_ITEMS_ID_SCHEME;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_CATEGORY_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_ITEMS_ID_SCHEME;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.TERRAIN;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.UNDERLAY_MAP;
import static net.osmand.plus.settings.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
import static net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
implements ReorderItemTouchHelperCallback.OnItemMoveCallback {

2
OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Context;

2
OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;

2
OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;

2
OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.content.Context;
import android.graphics.drawable.Drawable;

2
OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java → OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.settings;
package net.osmand.plus.settings.fragments;
import android.app.Activity;
import android.content.Context;