From ad6789a26d40e7baf36bd1cfa691a1306b695ea5 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 17 Jan 2020 10:25:51 +0200 Subject: [PATCH] Move plugins settings screens to plugins packages --- OsmAnd/src/net/osmand/access/AccessibilityPlugin.java | 1 - .../settings => access}/AccessibilitySettingsFragment.java | 4 +++- .../src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 1 - .../{settings => audionotes}/MultimediaNotesFragment.java | 4 ++-- .../{settings => monitoring}/MonitoringSettingsFragment.java | 3 ++- .../net/osmand/plus/monitoring/OsmandMonitoringPlugin.java | 1 - .../osmand/plus/{settings => osmedit}/OsmEditingFragment.java | 4 +++- OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java | 1 - OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java | 4 ++++ 9 files changed, 14 insertions(+), 9 deletions(-) rename OsmAnd/src/net/osmand/{plus/settings => access}/AccessibilitySettingsFragment.java (97%) rename OsmAnd/src/net/osmand/plus/{settings => audionotes}/MultimediaNotesFragment.java (99%) rename OsmAnd/src/net/osmand/plus/{settings => monitoring}/MonitoringSettingsFragment.java (98%) rename OsmAnd/src/net/osmand/plus/{settings => osmedit}/OsmEditingFragment.java (95%) diff --git a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java index 23d1d25a34..d95064493d 100644 --- a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java +++ b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java @@ -8,7 +8,6 @@ import android.support.annotation.NonNull; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; -import net.osmand.plus.settings.AccessibilitySettingsFragment; import net.osmand.plus.settings.BaseSettingsFragment; import java.io.IOException; diff --git a/OsmAnd/src/net/osmand/plus/settings/AccessibilitySettingsFragment.java b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/settings/AccessibilitySettingsFragment.java rename to OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java index 1f7fc0c048..6e1868124f 100644 --- a/OsmAnd/src/net/osmand/plus/settings/AccessibilitySettingsFragment.java +++ b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.access; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; @@ -6,6 +6,8 @@ import android.support.v7.preference.PreferenceScreen; import net.osmand.plus.R; import net.osmand.plus.access.AccessibilityMode; import net.osmand.plus.access.RelativeDirectionStyle; +import net.osmand.plus.settings.BaseSettingsFragment; +import net.osmand.plus.settings.OnPreferenceChanged; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index f68060fc76..36e8bcc4f2 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -64,7 +64,6 @@ import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.mapcontextmenu.MapContextMenu; import net.osmand.plus.monitoring.OsmandMonitoringPlugin; import net.osmand.plus.myplaces.FavoritesActivity; -import net.osmand.plus.settings.MultimediaNotesFragment; import net.osmand.plus.settings.BaseSettingsFragment; import net.osmand.plus.views.MapInfoLayer; import net.osmand.plus.views.OsmandMapTileView; diff --git a/OsmAnd/src/net/osmand/plus/settings/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/MultimediaNotesFragment.java rename to OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java index d0bbb9bf2a..3abdb37e56 100644 --- a/OsmAnd/src/net/osmand/plus/settings/MultimediaNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.audionotes; import android.content.Intent; import android.hardware.Camera; @@ -12,7 +12,7 @@ import net.osmand.PlatformUtil; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; -import net.osmand.plus.audionotes.AudioVideoNotesPlugin; +import net.osmand.plus.settings.BaseSettingsFragment; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/settings/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/MonitoringSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java index 2ea96664ef..3d29e9bb13 100644 --- a/OsmAnd/src/net/osmand/plus/settings/MonitoringSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.monitoring; import android.content.Intent; import android.support.v4.app.FragmentManager; @@ -8,6 +8,7 @@ import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.myplaces.FavoritesActivity; +import net.osmand.plus.settings.BaseSettingsFragment; import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index fd53e92811..7a4aacb035 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -35,7 +35,6 @@ 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.MonitoringSettingsFragment; import net.osmand.plus.views.MapInfoLayer; import net.osmand.plus.views.OsmandMapLayer.DrawSettings; import net.osmand.plus.views.OsmandMapTileView; diff --git a/OsmAnd/src/net/osmand/plus/settings/OsmEditingFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java similarity index 95% rename from OsmAnd/src/net/osmand/plus/settings/OsmEditingFragment.java rename to OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java index f4b3962ec3..f2240fa74f 100644 --- a/OsmAnd/src/net/osmand/plus/settings/OsmEditingFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.osmedit; import android.content.Intent; import android.support.v4.app.FragmentManager; @@ -10,6 +10,8 @@ import android.widget.TextView; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.R; import net.osmand.plus.helpers.AndroidUiHelper; +import net.osmand.plus.settings.BaseSettingsFragment; +import net.osmand.plus.settings.OnPreferenceChanged; import net.osmand.plus.settings.bottomsheets.OsmLoginDataBottomSheet; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 389aea9377..0d3118a98d 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -41,7 +41,6 @@ import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo; import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.osmedit.OsmPoint.Action; import net.osmand.plus.settings.BaseSettingsFragment; -import net.osmand.plus.settings.OsmEditingFragment; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java index bda4c894b4..83fa92524f 100644 --- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java @@ -40,6 +40,7 @@ import android.widget.TextView; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; +import net.osmand.access.AccessibilitySettingsFragment; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandSettings; @@ -48,6 +49,9 @@ import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandActionBarActivity; import net.osmand.plus.activities.OsmandInAppPurchaseActivity; +import net.osmand.plus.audionotes.MultimediaNotesFragment; +import net.osmand.plus.monitoring.MonitoringSettingsFragment; +import net.osmand.plus.osmedit.OsmEditingFragment; import net.osmand.plus.profiles.SelectAppModesBottomSheetDialogFragment; import net.osmand.plus.profiles.SelectAppModesBottomSheetDialogFragment.AppModeChangedListener; import net.osmand.plus.settings.bottomsheets.BooleanPreferenceBottomSheet;