From 31b408bbb39af390dc6fb09151b1649e43265bd4 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 18 May 2020 16:34:33 +0300 Subject: [PATCH 01/32] Fix possible npe --- .../java/net/osmand/router/RouteExporter.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java index 02e571f4b5..2146bfe0f8 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java @@ -11,6 +11,7 @@ import net.osmand.binary.RouteDataBundle; import net.osmand.binary.StringBundle; import net.osmand.binary.StringBundleWriter; import net.osmand.binary.StringBundleXmlWriter; +import net.osmand.util.Algorithms; import org.xmlpull.v1.XmlSerializer; @@ -38,20 +39,22 @@ public class RouteExporter { RouteDataResources resources = new RouteDataResources(locations); final RouteDataBundle bundle = new RouteDataBundle(resources); - for (RouteSegmentResult sr : route) { - sr.collectTypes(resources); - } - for (RouteSegmentResult sr : route) { - sr.collectNames(resources); - } + if (!Algorithms.isEmpty(route)) { + for (RouteSegmentResult sr : route) { + sr.collectTypes(resources); + } + for (RouteSegmentResult sr : route) { + sr.collectNames(resources); + } - List routeItems = new ArrayList<>(); - for (RouteSegmentResult sr : route) { - RouteDataBundle itemBundle = new RouteDataBundle(resources); - sr.writeToBundle(itemBundle); - routeItems.add(itemBundle); + List routeItems = new ArrayList<>(); + for (RouteSegmentResult sr : route) { + RouteDataBundle itemBundle = new RouteDataBundle(resources); + sr.writeToBundle(itemBundle); + routeItems.add(itemBundle); + } + bundle.putBundleList("route", "segment", routeItems); } - bundle.putBundleList("route", "segment", routeItems); List typeList = new ArrayList<>(); Map rules = resources.getRules(); From 82db8409f5d3996b31c60dc72078b27c3d364b7b Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 18 May 2020 16:39:59 +0300 Subject: [PATCH 02/32] Fix possible IllegalArgumentException --- .../plus/download/ui/ImagesPagerAdapter.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/download/ui/ImagesPagerAdapter.java b/OsmAnd/src/net/osmand/plus/download/ui/ImagesPagerAdapter.java index af3cea834c..18fe293f60 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/ImagesPagerAdapter.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/ImagesPagerAdapter.java @@ -12,6 +12,7 @@ import com.squareup.picasso.Picasso; import net.osmand.PicassoUtils; import net.osmand.plus.OsmandApplication; +import net.osmand.util.Algorithms; import java.util.List; @@ -56,19 +57,24 @@ public class ImagesPagerAdapter extends PagerAdapter { imageView.setScaleType(ImageView.ScaleType.FIT_XY); final String imageUrl = imageUrls.get(position); - Picasso.get().load(imageUrl).into(imageView, new Callback() { - @Override - public void onSuccess() { - imageView.setVisibility(View.VISIBLE); - picassoUtils.setResultLoaded(imageUrl, true); - } + if (!Algorithms.isEmpty(imageUrl)) { + Picasso.get().load(imageUrl).into(imageView, new Callback() { + @Override + public void onSuccess() { + imageView.setVisibility(View.VISIBLE); + picassoUtils.setResultLoaded(imageUrl, true); + } + + @Override + public void onError(Exception e) { + imageView.setVisibility(View.INVISIBLE); + picassoUtils.setResultLoaded(imageUrl, false); + } + }); + } else { + imageView.setVisibility(View.INVISIBLE); + } - @Override - public void onError(Exception e) { - imageView.setVisibility(View.INVISIBLE); - picassoUtils.setResultLoaded(imageUrl, false); - } - }); return imageView; } } \ No newline at end of file From d90b2956c506e4621bff5d36642fc7d5e103d1db Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 18 May 2020 16:45:55 +0300 Subject: [PATCH 03/32] Fix possible IllegalStateException --- .../FavoritePointEditorFragmentNew.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java index 9534f06f1d..822b3cb170 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.os.Bundle; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -167,8 +166,9 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { @Override public void setCategory(String name, int color) { FavouritesDbHelper helper = getHelper(); - if (helper != null) { - FavoriteGroup group = helper.getGroup(FavoriteGroup.convertDisplayNameToGroupIdName(requireContext(), name)); + Context ctx = getContext(); + if (helper != null && ctx != null) { + FavoriteGroup group = helper.getGroup(FavoriteGroup.convertDisplayNameToGroupIdName(ctx, name)); this.group = group; super.setCategory(name, group != null ? group.getColor() : 0); } @@ -176,10 +176,13 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { @Override protected String getLastUsedGroup() { - OsmandApplication app = requireMyApplication(); - String lastCategory = app.getSettings().LAST_FAV_CATEGORY_ENTERED.get(); - if (!Algorithms.isEmpty(lastCategory) && !app.getFavorites().groupExists(lastCategory)) { - lastCategory = ""; + String lastCategory = ""; + OsmandApplication app = getMyApplication(); + if (app != null) { + lastCategory = app.getSettings().LAST_FAV_CATEGORY_ENTERED.get(); + if (!Algorithms.isEmpty(lastCategory) && !app.getFavorites().groupExists(lastCategory)) { + lastCategory = ""; + } } return lastCategory; } @@ -325,11 +328,14 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { private void doEditFavorite(FavouritePoint favorite, String name, String category, String description, @ColorInt int color, BackgroundType backgroundType, @DrawableRes int iconId, FavouritesDbHelper helper) { - requireMyApplication().getSettings().LAST_FAV_CATEGORY_ENTERED.set(category); - favorite.setColor(color); - favorite.setBackgroundType(backgroundType); - favorite.setIconId(iconId); - helper.editFavouriteName(favorite, name, category, description); + OsmandApplication app = getMyApplication(); + if (app != null) { + app.getSettings().LAST_FAV_CATEGORY_ENTERED.set(category); + favorite.setColor(color); + favorite.setBackgroundType(backgroundType); + favorite.setIconId(iconId); + helper.editFavouriteName(favorite, name, category, description); + } } private void doAddFavorite(String name, String category, String description, @ColorInt int color, From 93ce36c0ff61d0182dabb95a7d7cb02d108e5fb5 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 18 May 2020 18:02:55 +0300 Subject: [PATCH 04/32] Fix possible IllegalArgumentException and ClassCastException --- OsmAnd/res/layout/download_tiles.xml | 1 + .../plus/activities/DownloadTilesDialog.java | 40 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/OsmAnd/res/layout/download_tiles.xml b/OsmAnd/res/layout/download_tiles.xml index 371f92e6e8..9dbec76cfd 100644 --- a/OsmAnd/res/layout/download_tiles.xml +++ b/OsmAnd/res/layout/download_tiles.xml @@ -25,6 +25,7 @@ android:id="@+id/ZoomToDownload" style="@style/Widget.Styled.Slider" android:layout_width="fill_parent" + android:stepSize="1" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding" diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java index 42ae7eaf64..6749b1e118 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java @@ -51,11 +51,12 @@ public class DownloadTilesDialog { public void openDialog(){ BaseMapLayer mainLayer = mapView.getMainLayer(); - if(!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()){ + if (!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()) { Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show(); + return; } final ITileSource mapSource = ((MapTileLayer) mainLayer).getMap(); - if(mapSource == null || !mapSource.couldBeDownloadedFromInternet()){ + if (mapSource == null || !mapSource.couldBeDownloadedFromInternet()) { Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show(); return; } @@ -66,29 +67,28 @@ public class DownloadTilesDialog { // calculate pixel rectangle AlertDialog.Builder builder = new AlertDialog.Builder(ctx); - LayoutInflater inflater = (LayoutInflater)ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); View view = inflater.inflate(R.layout.download_tiles, null); - - - - ((TextView)view.findViewById(R.id.MinZoom)).setText(zoom+""); //$NON-NLS-1$ - ((TextView)view.findViewById(R.id.MaxZoom)).setText(max+""); //$NON-NLS-1$ + + ((TextView) view.findViewById(R.id.MinZoom)).setText(String.valueOf(zoom)); + ((TextView) view.findViewById(R.id.MaxZoom)).setText(String.valueOf(max)); + final Slider slider = (Slider) view.findViewById(R.id.ZoomToDownload); - slider.setValueTo(max - zoom); - int progress = (max - zoom) / 2; - slider.setValue(progress); - final TextView downloadText = ((TextView) view.findViewById(R.id.DownloadDescription)); final String template = ctx.getString(R.string.tiles_to_download_estimated_size); - - + updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) slider.getValue()); - slider.addOnChangeListener(new Slider.OnChangeListener() { - @Override - public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) { - updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) value); - } - }); + if (max > zoom) { + slider.setValueTo(max - zoom); + int progress = (max - zoom) / 2; + slider.setValue(progress); + slider.addOnChangeListener(new Slider.OnChangeListener() { + @Override + public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) { + updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) value); + } + }); + } builder.setPositiveButton(R.string.shared_string_download, new DialogInterface.OnClickListener(){ @Override From 1725c3869aad0c4c8ab471ec4e85adb7526d8ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 May 2020 05:44:19 +0000 Subject: [PATCH 05/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.6% (257 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 110 +++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 36 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 8321d65624..09a924dd61 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -101,8 +101,8 @@ OsmAnd offline navigering er midlertidig ikke tilgjengelig. Venstrekjøring For land hvor det kjøres på venstre side av veien. - Startpunkt ikke bestemt enda - Posisjon ennå ikke kjent + Startpunkt ikke bestemt enda. + Posisjon enda ikke kjent. Nettbaserte kart og hurtigbufrede fliskart Standardkart (vektor) Last ned og håndter offline-kart lagret på enheten. @@ -244,8 +244,8 @@ Kategori Nei takk Last ned basiskartet for verden for å få en oversikt som dekker hele verden ved lave zoomnivåer. - " -\n + " +\n \nTrykk lenge for alternativer" Karthåndtering. Aktiver @@ -265,7 +265,7 @@ Skriftstørrelse for kart Nettbasert navigering fungerer ikke frakoblet. Språk ikke støttet - Det valgte språket støttes ikke av den installerte motoren for Android TTS (tekst-til-tale). Vil du se etter en annen TTS-motor i markedet? Ellers vil det forhåndsinnstilte TTS-språket brukes. + Det valgte språket støttes ikke av Android TTS-motoren (tekst-til-tale). Det forhåndsinnstilte TTS-språket vil brukes. Vil du se etter en annen TTS-motor i markedet\? Manglende data Offline-vektorkart foreligger for dette stedet. \n\t @@ -428,7 +428,7 @@ Lagre nåværende spor som GPX-fil nå. Lagre gjeldende spor Loggeintervall under navigering - Velg loggingsintervall for opptak av spor under navigering. + Angi loggingsintervall for opptak av spor under navigering Et GPX-spor lagres automatisk i spor-mappen under navigering. Auto-opptak av spor under navigering Oppdater kart @@ -447,7 +447,7 @@ 3D-kartvisning Vis sist valgte interessepunktsoverlegg. Vis interessepunktoverlegg - Velg kilde for nettbaserte eller hurtigbufrede kart + Velg kilde for nettbaserte eller hurtiglagrede kart. Fliskartkilde Kartkilde Bruk Internett @@ -792,9 +792,9 @@ Færre detaljer Sorter etter avstand Sorter etter navn - " -\n -\nLangt trykk for å vise på kartet" + " +\n +\nTrykk lenge for å vise på kartet" Rutepunkter: %1$s Laster gater… Laster byer… @@ -1006,7 +1006,7 @@ Velg underlagskart Overleggskart… Overleggskart - Velg overleggskartet. + Velg overleggskartet Audio/video-notater OSM-redigering Dette programtillegget gir både et lag med koter og et lag med relieffskygger som kan vises oppå standardkartene til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap. @@ -1551,7 +1551,7 @@ Søk %1$s unna delt via OsmAnd Hesteruter - For å vise skikart må det spesielle offline-kartet lastes ned + For å vise skikart må det spesielle frakoblede kartet lastes ned. %1$s stopp før Koordinatsøk Avansert koordinatsøk @@ -1700,7 +1700,7 @@ \n - Ingen nettfrakoblet tilgang til interessepunkter fra Wikipedia \n \n OsmAnd utvikles aktivt, og prosjektet vårt og dets videre framdrift avhenger av finansielle bidrag for å drive utviklingen og testingen av nye funksjoner. Overvei å kjøpe OsmAnd+ eller støtte spesifikke nye funksjoner eller bidra med en generell donasjon på https://osmand.net. - Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org + Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org. Du har ingen GPX-filer enda Du kan også legge til GPX-filer i mappen Legg til mer… @@ -1780,7 +1780,7 @@ Sporpunkter Del notat Notater - For å vise sjøkart, må det spesielle offline-kartet lastes ned + For å vise sjøkart, må det spesielle frakoblede kartet lastes ned. Starte navigering langs spor\? Utløs en alternativ rute ved å velge veier å unngå Ingen v1.9-regler for ruteplanlegging @@ -1872,7 +1872,7 @@ Kabylsk Kinesisk (Hongkong) Bruk vist spor for navigering\? - Kunne ikke sikkerhetskopiere OSM-endringer + Kunne ikke sikkerhetskopiere OSM-endringer. * Trykk for å markere et punkt. \n * Langt trykk på kartet for å slette forrige punkt. \n * Langt trykk på et punkt for å vise og legge til beskrivelse. @@ -2210,7 +2210,7 @@ Nettbasert sporingsintervall Nettadresse for nettbasert sporing Tidsbuffer for nettbasert sporing - "Angi tidsbuffer for å beholde posisjoner som skal sendes når internettforbindelse mangler" + Angi tidsbuffer for å beholde posisjoner som skal sendes når internettforbindelse mangler Andre Opptegningfeilsøkingsinfo Vis opptegningsytelsen. @@ -2245,7 +2245,7 @@ Lagrer GPX-fil… Angi språk, last ned/gjeninnlast data. Kameraets fokusmetode - Velg fokusmodus for kameraet. + Kamerafokusmodus: Uendelig fokus Makrofokus (nærbilde) Kameraet prøver kontinuerlig å fokusere @@ -2616,13 +2616,13 @@ \n • Valgfri fartsavhengig zoom \n • Del din posisjon slik at dine venner kan finne deg \n - "Sykkel- og fotgjengerfunksjoner -\n • Visning av gang-, vandring- og sykkelstier, flott for utendørsaktiviteter -\n • Spesielle ruteplanleggings- og visningsmoduser for syklister og fotgjengere -\n • Visning av stoppesteder for offentlig transport (buss, trikk, tog) inkludert linjenavn (alternativ) -\n • Turopptak til lokal GPX-fil eller nettbasert tjeneste (alternativ) -\n • Hastighet- og høydevisning (alternativ) -\n • Visning av koter og relieffskygger (via programtillegg)" + Sykkel- og fotgjengerfunksjoner +\n • Visning av gang-, vandring- og sykkelstier, flott for utendørsaktiviteter +\n • Spesielle ruteplanleggings- og visningsmoduser for syklister og fotgjengere +\n • Visning av stoppesteder for offentlig transport (buss, trikk, tog) inkludert linjenavn (alternativ) +\n • Turopptak til lokal GPX-fil eller nettbasert tjeneste (alternativ) +\n • Hastighet- og høydevisning (alternativ) +\n • Visning av koter og relieffskygger (via programtillegg) Angi nettadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}. Bilder fra artikler kan lastes ned for frakoblet bruk. \nKan alltid endres i \'Utforsk\' → \'Alternativer\'. @@ -2684,7 +2684,8 @@ \n • Wikipedia på ditt foretrukne språk kan fortelle deg mye under en bytur \n • Stoppesteder for offentlig transport (buss, trikk, tog), inkludert linjenavn, hjelper til med å navigere i en ny by \n • GPS-navigering i fotgjengermodus lager ruten ved hjelp av gangstier -\n • Last opp og følg en GPX-rute eller ta opp og del din egen +\n • Last opp og følg en GPX-rute eller ta opp og del din egen +\n OsmAnd blir aktivt utviklet og er programvare med åpen kildekode. Alle kan komme med bidrag til programmet ved å rapportere feil, forbedre oversettelser eller ved koding av nye funksjoner. I tillegg er prosjektet avhengig av økonomiske bidrag til å finansiere koding og testing av nye funksjoner. \nOmtrentlig kartdekning og kvalitet: \n • Vest-Europa: **** @@ -2871,7 +2872,7 @@ Du bruker {0}-kart, muliggjort av OsmAnd. Ønsker du å ta i bruk fullversjonen av OsmAnd\? Kjør OsmAnd\? Guaraní - Trykk på denne knappen for å veksle mellom dag- og nattmodus i OsmAnd + Vekselvender mellom dag- og nattmodus i OsmAnd Dagmodus Nattmodus Veksle dag-/nattmodus @@ -2916,7 +2917,7 @@ Gå av på Sitt på stoppet Vis/skjul GPX-spor - Å trykke på denne knappen viser eller skjuler valgte GPX-spor på kartet + Knapp som viser eller skjuler valgte GPX-spor på kartet. Skjul GPX-spor Vis GPX-spor • Ny \'Anvisninger\'-skjerm: Viser hjem og arbeid som målknapper, snarvei til \"tidligere rute\", liste over aktive GPX-spor og markører, søkehistorikk @@ -3038,7 +3039,7 @@ Koordinat-miniprogram Del din tilbakemelding og legg til en vurdering på Google Play. Personvernspraksis - Hjelp oss å forbedre OsmAnd. + Hjelp oss å forbedre OsmAnd Tillat OsmAnd å samle inn og behandle anonym programbruksdata. Vi samler ikke inn eller lagrer data om din plassering, eller om plasseringer ser på på kartet. \n \nDu kan alltid endre ditt valg i Innstillinger > Personvern og sikkerhet. @@ -3263,10 +3264,10 @@ Vis relieffskygge Skjul relieffskygge Vis/skjul relieffskygge - Kan ikke starte tekst-til-tale-motor + Kan ikke starte tekst-til-tale-motor. Simuler posisjonen din ved bruk av et innspilt GPX-spor. OsmAnd-profil: %1$s - Profil-import: + Profil-import Hvit Brukes til å estimere ankomsttid for ukjente veityper, og for å begrense farten på alle veier (kan endre rute) Spor-lagringsmappe @@ -3311,7 +3312,7 @@ Vinter- og isveier Skriv inn sti til mappen Lim inn sti til mappen inneholdende OsmAnd-data - Internlagring, skjult fra bruker og andre programmer, kun tilgjengelig for OsmAnd + Internlagring for OsmAnd, (skjult fra bruker og andre programmer). Endre datalagringsmappe Snøpark Langrenn @@ -3322,7 +3323,7 @@ Filnavnet er tomt Vekk for sving Juster hvor lenge skjermen skal forbli påslått. - Bruk nærhetssensor. + Bruk nærhetssensor Vift hånden din over toppen av skjermen for å skru den på under navigasjon. Klasse 1 Klasse 2 @@ -3398,9 +3399,9 @@ Tøm %1$s\? Kartnedlastingsdialog Dialogvinduer og merknader - Kontroller oppsprettsvinduer, dialogvinduer og merknader som OsmAnd viser under bruk. + Kontroller oppsprettsvinduer, dialogvinduer og merknader. Foreslåtte kart - Disse kartene må brukes med programtillegg + Disse kartene kreves av programtillegget. Tillagte profiler Programtillegg legger til ny profil i OsmAnd Skru av @@ -3442,7 +3443,7 @@ Nettbasert sporing Loggingsnøyaktighet Du kan finne alle dine innspilte spor i %1$s, eller i OsmAnd-mappen. - Du finner alle dine notater i %1$sr + Du finner alle dine OSM-notater i %1$s. Videonotater Bildenotater Ruteomberegning @@ -3551,5 +3552,42 @@ Legg til/rediger interessepunkt Vis/skjul offentlig transport Legg til profil - + En knapp for å vise eller skjule offentlig transport på kartet. + Direkte-til-punkt + Tøm lagret data + Inkluder ytterligere data + Sporingsintervall + Tidsmellomlager + Kameralukker-lyd + Fortsett + %1$s — %2$s — %3$s + Standard kantonesisk + Sørlig min + Joruba + Waray-waray + Usbekisk + Lashkari + Tatarisk + Tadsjikisk + Skotsk + Siciliansk + Panjabi + Gurkhali + Napolitansk-kalabresisk + Burmesisk + Mongolsk + Minangkabau + Madagassisk + Kirgisisk + Kasakhisk + Javanesisk + Gujarati + Tsjuvasjisk + Tsjetsjensk + Bairisk + Basjkirsk + Aragonesisk + Langobardisk + Parkeringsposisjoner + Legg til / rediger profil \ No newline at end of file From 760d138ef76749331cba387290ce8a28d549bad5 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 19 May 2020 06:52:37 +0000 Subject: [PATCH 06/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.6% (257 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 09a924dd61..8625f290b2 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -2759,7 +2759,7 @@ Nautisk navigasjonsstil. Har bøyer, fyr, vannveier, skipsleder og merker, havner, sjømerketjenester, dybdekonturer. Skistil. Har bakker, heiser og andre skifunksjoner osv. Demper sekundære kartobjekter. Enkel kjørestil. Skånsomt nattmodus. Koter, kontrasterende oransje veier, dempede sekundære kartobjekter. - For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, koter med avanserte innstillinger, flere detaljer. Overflatevalg muliggjør skjelning av veikvalitet. Inget nattmodus. + For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, avanserte kotealternativer, flere detaljer. Justering av overflate gjør det mulig å skjelne veikvalitet. Ingen nattmodus. Gammel forvalgt \'Mapnik\'-stil. Lignende farger som \"Mapnik\". Høydetaljert kontraststil for turformål. Alle innstillingsmulighetene til forvalgsstilen med så høy detaljvisning som mulig, i særdeleshet veier, stier og andre måter å reise på. Klar \"reiseatlas\"-forskjell mellom alle ulike typer veier. Egnet for utendørs bruk, dag- og nattmodus. Stil for generell bruk. Renere opptegning i tett befolkede byer. Har koter, ruter, overflatekvalitet, tilgangsbegrensninger, veinummer, stiopptegning i henhold til SAC-skala, raftingsfunksjoner. From aa3fafd3e343ac4c6e3c7b792641e40c67ff51bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Mon, 18 May 2020 17:12:36 +0000 Subject: [PATCH 07/32] Translated using Weblate (Slovenian) Currently translated at 77.7% (2596 of 3339 strings) --- OsmAnd/res/values-sl/strings.xml | 86 ++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 40ffc8b539..2878167119 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -409,7 +409,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Zvok je vključen Zvok je izključen Izbrani jezik ni podprt - Vgrajeni sintetizator govora za Android zapisa izbranega jezika ne podpira (programnik pretvarjanja besedila v govor TTS). Ali želite v trgovini Market poiskati drug program\? Če drug jezik ne bo izbran, bo uporabljen sistemski. + Nameščeni sintetizator govora za Android (pretvarjanje besedila v govor TTS) ne podpira izbranega jezika. Uporabljen bo privzeti jezik. Ali želite v trgovini Market poiskati drug sintetizator govora\? Ali želite odpreti okno trgovine Market in namestiti jezikovni paket\? Sistemski Podpora nadaljnjemu razvoju @@ -525,7 +525,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Sporočilo Ime avtorja Opomba je dodana - Opombe ni mogoče dodati + Opombe ni mogoče dodati. ZD (λ) %1$.3f; ZŠ (β) %2$.3f Zahvaljujemo se vam za uporabo programa OsmAnd. Za pregled zemljevidov, iskanje naslovov in krajev, javnih prevozov in drugih podatkov prejmite krajevne datoteke z izbiro možnosti med \'Nastavitvami\' → \'Upravljanje s podatki\'. Spletni in shranjeni zemljevidi @@ -567,9 +567,8 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Možnosti izrisa Izbor nastavitev preklapljanja med dnevnim in nočnim načinom prikazovanja. Ni dovolj razpoložljivega prostora za prejem %1$s MB (prosto: %2$s). - Ali res želite prejeti datoteke ({0})? - Datoteke zahtevajo {1} MB pomnilnika. - (Na voljo je le {2} MB.) + Ali želite prejeti datoteke ({0})\? +\n Porabljeno bo {1} MB (od {2} MB) pomnilnika. Izvorna knjižnica na tej napravi ni podprta. Nalaganje izvornih knjižnic … Samodejno središči le med navigacijo @@ -651,7 +650,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Shrani trenutno sled Shrani trenutno sled v datoteko GPX. Interval beleženja med navigacijo - Izberite časovni razmik beleženja za shranjevanje sledi med navigacijo. + Določite časovni razmik beleženja za shranjevanje sledi med navigacijo Samodejno beleži sled med navigacijo Sledi GPX se med navigacijo samodejno shranjujejo v mapo za sledi. Cilj @@ -913,7 +912,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Začni ↦ Snemanje videa Snemanje zvoka - Izberite privzeto dejanje gradnika. + Privzeto dejanje gradnika: Privzeto dejanje gradnika Izberite zapis za video. Zapis za video @@ -992,7 +991,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Iskanje ulice v sosednjih krajih ali mestih Vmesni cilji so razvrščeni po vrsti na poti od trenutnega mesta do končnega cilja. Datoteka sprememb je ustvarjena %1$s - Ni mogoče ustvariti varnostne kopije sprememb za OSM + Ni mogoče ustvariti varnostne kopije sprememb za OSM. Varnostna kopija sprememb za OSM Cilj %1$s Razvrsti od vrat do vrat @@ -1141,13 +1140,13 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Prednostno vodi po avtocestah Prednostno bodo izbrane hitre ceste in avtoceste. Izogni se cestninam - Izbrane so poti, ki vodijo mimo cest s plačilom cestnine. + Izogne se cestam s plačljivo cestnino Izogni se neasfaltiranim cestam - Poti, ki vodijo po neasfaltiranih cestah, ne bodo izbrane. + Izogne se netlakovanim cestam Izogni se trajektom - Izbor poti ne bo upošteval možnosti prevoza s trajektom. + Izogne se trajektom Izogni se avtocestam - Izbor poti ne bo upošteval avtocest. + Izogne se avtocestam Omejitev teže vozila Vodenje po poteh z omejitvijo dovoljene teže vozila. Tovorno vozilo @@ -1424,7 +1423,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Omogočeno Zemljevidi smučišč Pomorski zemljevid - Za prikaz zemljevidov smučišč je treba prejeti posebne datoteke za delovanje brez povezave + Za prikaz zemljevidov smučišč je potrebno prejeti poseben zemljevid. Za izris pomorskih zemljevidov je treba najprej prejeti datoteke za delovanje brez povezave. Urejanje skupine Omogoči @@ -1761,7 +1760,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Mesto Popravi spremembo OSM Določiti je treba ustrezno vrsto točke POI ali pa podatek preskočiti. - Menijski gumb zažene nadzorno ploščo in ne menija. + Menijski gumb zažene nadzorno ploščo in ne menija Dostop prek zemljevida Vsebina je kopirana v odložišče Shrani v pomnilnik @@ -1777,9 +1776,9 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Ponovno odpri opombo Zapri opombo Opomba je ustvarjena - Opombe ni mogoče ustvariti + Opombe ni mogoče ustvariti. Opomba je zaprta - Opombe ni mogoče zapreti + Opombe ni mogoče zapreti. Uveljavi Barva GPX Širina GPX @@ -1791,7 +1790,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Ob meniju je na voljo možnost upravljanja programa prek prilagodljive nadzorne plošče. Možnost je mogoče izbrati med nastavitvami. Opomba OSM z dodatnimi zapisi Izogni se stopnicam - Izogni se stopnicam. + Izogne se stopnicam Izogni se mejnim prehodom V bližini Skrij @@ -1882,9 +1881,10 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d Izbor označbe na zemljevidu Druge označbe Ni dovolj prostora! - Možnost zahteva {3} MB začasnega in {1} MB trajnega pomnilnika. - Na voljo je le {2} MB prostora. - Ali res želite prejeti datoteke ({0})\? Prejem zahteva {3} MB začasnega in {1} MB stalnega prostora (na napravi je na voljo {2} MB). +\n Možnost začasno zahteva {3} MB in trajno {1} MB pomnilnika. +\n (Na voljo je le {2} MB prostora.) + Ali želite prejeti datoteke ({0})\? +\n Prejem začasno zahteva {3} MB in trajno {1} MB prostora (na voljo jw {2} MB.) Opombo OSM je mogoče poslati brezimno, ali pa prek profila OpenStreetMap.org. Pošlji Opombo OSM Pošlji anonimno @@ -1925,7 +1925,9 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d V imenu datoteke je nedovoljen znak Ni nobene določene označbe Ni vmesnih točk - Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta. Del prihodka se vrne v skupnost OSM in se izplačuje za vsako opravljeno dejavnost oziroma podporo. Če sta vam OsmAnd in OSM všeč in bi želeli projekt podpreti, je to dober način za začetek sodelovanja. + Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta. +\nDel prihodka se vrne v skupnost OSM in se izplačuje za vsako opravljeno dejavnost oziroma podporo. +\nČe sta vam OsmAnd in OSM všeč in bi želeli projekt podpreti, je to dober način za začetek sodelovanja. Tanko Srednje Krepko @@ -2534,7 +2536,7 @@ Koda predstavlja območje: %1$s x %2$s Prag usmerjenosti zemljevida Vse označbe zemljevida so premaknjene med zgodovino Označbe zemljevida so premaknjene med zgodovino - Sporočila ni mogoče spremeniti + Sporočila ni mogoče spremeniti. Spremeni sporočilo Spremeni sporočilo OSM Dodaj kopijo začetne točke kot ciljno. @@ -2594,7 +2596,7 @@ Koda predstavlja območje: %1$s x %2$s Prikaz vodilnih črt od trenutnega mesta do mest dejavnih označb. Pokaži eno ali dve črti, ki določata smer do dejavnih označb. Izbor načina za prikaz razdalje do dejavnih označb. - Izbor števila prikazanih oznak smeri. + Določite število oznak smeri: Preimenuj označbo Označba je dosežena Vmesne točke so dodane med označbe zemljevida. @@ -2750,7 +2752,7 @@ Koda predstavlja območje: %1$s x %2$s Zahvaljujemo se vam za odziv Svet Na iskalni niz ni zadetkov iskanja\? -\nPošljite nam odziv in podatke. +\nPošljite nam odziv in podatke Ali želite poslati iskalno poizvedbo\? Točka %1$s je izbrisana. Uredi točko @@ -2968,7 +2970,7 @@ Koda predstavlja območje: %1$s x %2$s \n• Odstranjena je analitika Facebook in Firebase iz brezplačne različice (OsmAnd + je ne vključuje) Izstopi na postaji Vstopi na postaji - S pritiskom na gumb dejanja se pokažejo ali skrijejo sledi GPX na zemljevidu + Gumb za prikaz ali skritje izbrane sledi GPX na zemljevidu. Vrsta ceste Površina Gladkost @@ -2981,8 +2983,7 @@ Koda predstavlja območje: %1$s x %2$s Način %s Izogibanje vrstam transporta … Pešačenje - Najdaljša dovoljena dolžina oznake »%s« je 255 znakov. -\nPred nadaljevanjem je treba ime oznake skrajšati. + Skrajšajte dolžino oznake »%s« na manj kot 255 znakov. Dolžina vrednosti »%s« Izogni se tlakovcem vseh vrst Izogni se tlakovcem vseh vrst @@ -3063,7 +3064,7 @@ Koda predstavlja območje: %1$s x %2$s Za osebne avtomobile, motorje, tovornjake ... Za gorska kolesa, kolesa z motorjem, ježo s konji Za hojo, pohodništvo, tek ... - Uporaba vseh vrst javnega prevoza ... + Vrste javnega prevoza Za potovanje z ladjo, jadranje, veslanje ... Za letala, jadralna padala ... Hoja po azimutu @@ -3079,15 +3080,24 @@ Koda predstavlja območje: %1$s x %2$s Nov profil Med zadnjim zagonom programa OsmAnd je prišlo do napake. S posredovanjem sporočila o napaki pomagate pri izboljšanju programa. Štopanje NLP (brisača obvezna) - • Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo -\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil -\n• Dodan je gradnik za prikaz trenutnih koordinat + • Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo +\n +\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil +\n +\n• Dodan je gradnik za prikaz trenutnih koordinat +\n \n• Dodana je možnost za prikaz kompasa in krožnega merila -\n• Popravljeno je delovanje beleženja poti v ozadju -\n• Izboljšan je način prejemanja zemljevidov v ozadju -\n• Ponovno je omogočena možnost »Ohrani prikaz na zaslonu« -\n• Popravljena je možnost izbora jezika na Wikipediji -\n• Popravljeno je delovanje gumba kompasa med navigacijo +\n +\n• Popravljeno je delovanje beleženja poti v ozadju +\n +\n• Izboljšan je način prejemanja zemljevidov v ozadju +\n +\n• Ponovno je omogočena možnost »Ohrani prikaz na zaslonu« +\n +\n• Popravljena je možnost izbora jezika na Wikipediji +\n +\n• Popravljeno je delovanje gumba kompasa med navigacijo +\n \n• Dodane so številne druge posodobitve \n \n @@ -3182,7 +3192,7 @@ Koda predstavlja območje: %1$s x %2$s Izven urejenih smučišč Storitev prejemanja posodobitev OsmAnd Temno rdeča - Pritisnite znova, da spremenite usmerjenost zemljevida. + Pritisnite znova, da spremenite usmerjenost zemljevida Program se je sesul! Ocena 1 Ocena 2 @@ -3254,7 +3264,7 @@ Koda predstavlja območje: %1$s x %2$s Medpomnilnik Logcat Nastavitve vstavka Urejanja OSM - Programnika za izgovorjavo besedila ni mogoče začeti + Programnika za izgovorjavo besedila ni mogoče začeti. Povrni Ali želite počistiti %1$s\? Predlagani zemljevidi From 3088cc1fe13653e345b7dc0cf12e866ceab91d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 May 2020 06:40:19 +0000 Subject: [PATCH 08/32] Translated using Weblate (Danish) Currently translated at 96.2% (3213 of 3339 strings) --- OsmAnd/res/values-da/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index ec5bdea64b..a1ca94cb83 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2339,13 +2339,13 @@ Repræsenterer område: %1$s x %2$s \n • Valgfri visning af hastighedsgrænse med påmindelse ved overskridelse \n • Valgfri hastighedsafhængig zoom   \n • Del placering, så dine venner kan finde dig - Cykel og fodgænger-funktioner -\n  • Visning af gang-, vandre- og cykelstier, fantastisk til udendørsaktiviteter -\n  • Særlige navigations- og visningstilstande for cyklister og fodgængere -\n  • Valgfrie stoppesteder for offentlig transport (bus, sporvogn, tog), herunder også linjenavne -\n  • Valgfri ruteoptagelse til lokal GPX-fil eller online tjeneste -\n  • Valgfri hastigheds og højdevisning -\n  • Visning af højdekurver og relieflag (med ekstra udvidelse) + Cykel og fodgænger-funktioner +\n • Visning af gang-, vandre- og cykelstier, fantastisk til udendørsaktiviteter +\n • Særlige navigations- og visningstilstande for cyklister og fodgængere +\n • Valgfrie stoppesteder for offentlig transport (bus, sporvogn, tog), herunder også linjenavne +\n • Valgfri ruteoptagelse til lokal GPX-fil eller online tjeneste +\n • Valgfri hastigheds og højdevisning +\n • Visning af højdekurver og relieflag (med ekstra udvidelse) Anslået kortdækning og kvalitet: \n • Vesteuropa: **** \n • Østeuropa: *** From 5bbb7c2935fc58751549cde1385ca6544ce37d06 Mon Sep 17 00:00:00 2001 From: Viktar Palsciuk Date: Mon, 18 May 2020 14:57:15 +0000 Subject: [PATCH 09/32] Translated using Weblate (Belarusian) Currently translated at 94.3% (3149 of 3339 strings) --- OsmAnd/res/values-be/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 6380e7fdb8..0220584acd 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -3538,4 +3538,7 @@ Дадаць / рэдагаваць улюбёнае Аднавіць прадвызначаны парадак элементаў Вярнуцца да рэдагавання + Паказаць грамадскі транспарт + Кнопка, каб паказаць ці схаваць грамадскі транспарт на карце. + Дадаць профіль \ No newline at end of file From 813857c52d4f389f0d1f911bf8e25bb7a4535ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 May 2020 06:53:18 +0000 Subject: [PATCH 10/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.6% (257 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 8625f290b2..ee700c28a8 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -2759,7 +2759,7 @@ Nautisk navigasjonsstil. Har bøyer, fyr, vannveier, skipsleder og merker, havner, sjømerketjenester, dybdekonturer. Skistil. Har bakker, heiser og andre skifunksjoner osv. Demper sekundære kartobjekter. Enkel kjørestil. Skånsomt nattmodus. Koter, kontrasterende oransje veier, dempede sekundære kartobjekter. - For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, avanserte kotealternativer, flere detaljer. Justering av overflate gjør det mulig å skjelne veikvalitet. Ingen nattmodus. + For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, avanserte kotealternativer, flere detaljer. Justering av overflate gjør det mulig å skjelne veikvalitet. Inget nattmodus. Gammel forvalgt \'Mapnik\'-stil. Lignende farger som \"Mapnik\". Høydetaljert kontraststil for turformål. Alle innstillingsmulighetene til forvalgsstilen med så høy detaljvisning som mulig, i særdeleshet veier, stier og andre måter å reise på. Klar \"reiseatlas\"-forskjell mellom alle ulike typer veier. Egnet for utendørs bruk, dag- og nattmodus. Stil for generell bruk. Renere opptegning i tett befolkede byer. Har koter, ruter, overflatekvalitet, tilgangsbegrensninger, veinummer, stiopptegning i henhold til SAC-skala, raftingsfunksjoner. From ed593545b7bc4101e7462e03f325c630d8760a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 18 May 2020 22:59:02 +0000 Subject: [PATCH 11/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 40.2% (1530 of 3804 strings) --- OsmAnd/res/values-nb/phrases.xml | 211 +++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml index fbdde985e2..e70fcd1ae7 100644 --- a/OsmAnd/res/values-nb/phrases.xml +++ b/OsmAnd/res/values-nb/phrases.xml @@ -1358,4 +1358,215 @@ Dyrefor Drikkevarer og mat Mat + Ventilasjonssjakt + Pumpestasjon + Utgangseffekt + Spenning + Akvakultur: Muslinger + Akvakultur: Fisk + Akvakultur: Reker + Akvakultur + Type: Telefonkiosk + Solarium + Smultring + Sushi + Hamburger + Pizza + Dessert + Delikatesser + Pølsevogn + Bingo + Spilleautomater + Lotteri + Type + Elektronikkreparasjon: TV + Musikkskole + Elektronikkreparasjon: Telefon + Elektronikkreparasjon: Apparater + Elektronikkreparasjon: Datamaskiner + Vin: Serveres + Vin: Detaljhandel + Vin: Ja + Ja + Fraktstasjon + Dyrehold + Motorsykkelbekledning: Nei + Motorsykkelbekledning + Dekk: Nei + Dekk + Deler: Nei + Deler + Salg: Brukt + Salg: Ja, brukt + Salg: Nei + Senger + Reservasjon: Kun medlemmer + Reservasjon: Nei + Retning: Alle + Retning: Utgang + Retning: Inngang + Retning: Nedover + Retning: Vest + Retning: Vestlig sørvest + Retning: Sørvest + Retning: Sørlig sørvest + Retning: Sør + Retning: Sørlig sørøst + Retning: Sørøst + Retning: Østlig sørøst + Retning: Øst + Retning: Østlig nordøst + Retning: Nordøst + Finansdepartementet + Nettverk + Kano: Nei + Kano: Ja + Kajakker: Nei + Kajakker: Ja + Seilbåter: Nei + Seilbåter: Ja + Husbåter: Nei + Husbåter: Ja + Motorbåt: Nei + Leire + Fjellheim + VHF-kanal + Familie + Gemenskap + Flaskevann + Trenger vedlikehold + Ødelagt + Lukket + Åpen + Ampere + Sykkel: Nei + Sykkel: Ja + Bil: Nei + Bil: Ja + Leilighet + Husnummer + Gate + Kartstørrelse: Region + Kartstørrelse: By + Kartstørrelse: Sted + Klatrelengde + Blandet: Nei + Is: Ja + Buldring: Nei + Buldring: Ja + Sport: Nei + Sport: Ja + Postnummer + Middels + Høy + Lav + Middels + Høy + Lav + Middels + Høy + Lav + Middels + Høy + Lav + Middels + CHAdeMO + Tesla standard + Tesla superlader + Nybilsalg + Bremser + Keramikk + Dekk + Batterier + Bildeler + Diagnostikk + Oljeskift + Gulvbutikk + Gjennomsnittlig helling + Laveste punkt + Topp-punkt + Tidevann + Vanskelighetsgrad + Ruiner + Minefelt + Sluttdato + Barn + Akademisk + Ventilgruppe + Ventil + Måling + Industriell + Kun + Ja + Buss + Tog + Ja + Landemerke + Fare + Plassering + Fare: Forgiftelse + Fare: Minefelt + Fare: Snøskred + Fare: Oversvømmelse + Energikilde: Biomasse + Ja + Ja + Ja + Drosjetilgang: Nei + Drosjetilgang: Anvist plass + Drosjekontor + Kjøretøytilgang: Nei + Kjøretøytilgang: Privat + Kjøretøytilgang: Ja + Fotjengertilgang: Ja + Hestetilgang: Mål + Sykkeltilgang: Kunder + Sykkeltilgang: Mål + Sykkeltilgang: Tre av + Sykkeltilgang: Privat + Mopedtilgang: Nei + Motorsykkeltilgang: Nei + Bakeri + Ja + Ja + Ja + Mål + Minibank: Ja + Kontantuttak + Nei + Ja + Fotbad + Jordvarme + Varm kilde + Kontantuttaksgrense + Utendørs + Type + Bowlinghall + Sikkerhetsforretning + Fjellberging + Spøkelsessykkel + Antall utbrudd + Inaktiv + Siste utbrudd + Skjold + SMS + Undertrykk + Under trykk + Grunnvann + Rør + Nettverk for påfyll av drikkevann + Drikkevannspåfylling: Nei + Drikkevannspåfylling: Ja + Vann-nivå: Nedsenket + Hindring + Vann-nivå: Under vanlig vann-nivå + Vann-nivå: Over vanlig vann-nivå + Vann-nivå: Flyter + Vann-nivå: Oversvømmelse + Vann-nivå: Overskylt + Vann-nivå: Dekker + Vann-nivå: Tørt + Vann-nivå: Delvis nedsenket + Uriktig + Trykk \ No newline at end of file From 23cc86d447c0b3c162248052899ab2ce42a1afa0 Mon Sep 17 00:00:00 2001 From: Franco Date: Mon, 18 May 2020 23:24:51 +0000 Subject: [PATCH 12/32] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (3804 of 3804 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 14f4ee7cb4..72bf1710fc 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -3830,4 +3830,5 @@ Agua subterránea Tubería Presión + Estado de la bomba: sin palanca \ No newline at end of file From 4bb815e7681d45d3448954e2e9fdb93df5428bcf Mon Sep 17 00:00:00 2001 From: Eduardo Addad de Oliveira Date: Mon, 18 May 2020 23:14:47 +0000 Subject: [PATCH 13/32] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3804 of 3804 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index 1a6f184275..ff4221d368 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -3823,4 +3823,5 @@ Água subterrânea Tubo Pressão + Status da bomba: falta de feixe \ No newline at end of file From bebc83637c7099b8e30579f3f6297bf9c39a1c62 Mon Sep 17 00:00:00 2001 From: Rami Lehtinen Date: Mon, 18 May 2020 18:27:30 +0000 Subject: [PATCH 14/32] Translated using Weblate (Finnish) Currently translated at 37.7% (1435 of 3804 strings) --- OsmAnd/res/values-fi/phrases.xml | 60 +++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fi/phrases.xml b/OsmAnd/res/values-fi/phrases.xml index 6fb92b9925..80c5afa4fb 100644 --- a/OsmAnd/res/values-fi/phrases.xml +++ b/OsmAnd/res/values-fi/phrases.xml @@ -133,7 +133,7 @@ Juustokauppa Suklaakauppa Kahvikauppa - Posti + ostoskeskus Virvoitusjuomakauppa Lihakauppa Herkkukauppa @@ -1390,4 +1390,62 @@ Talon numero Asunto Video + Tuolihissi + Ajoneuvoramppi + Palolampi + Sivilisaatio: roomalainen + Sivilisaatio: antiikin kreikkalainen + Sivilisaatio: esihistoriallinen + Tyyppi: pyramidi + Tyyppi: sarkofagi + Tyyppi: mausoleumi + Tyyppi: sotahauta + Ramppi matkatavaroille: ei + Ramppi polkupyörille: ei + Ramppi (rattaat): ei + Ramppi (rattaat): kyllä + Ramppi pyörätuoleille: ei + Ramppi: ei + Kaide: ei + Portaat + Tuote: liha + Tuote: puuhiili + Tuote: olut + Tuote: nahka + polttouuni + Tuote: tiili + Varjoleikki + Baletti + Marionetti + Kamarimusiikki + Komedia + Ooppera + Draama + Musikaali + Filharmoninen + työtön + Vähäosaisten + Maahanmuuttajat + Koditon + Nuorten + Mielenterveysongelmista kärsivät potilaat + Orvot + Lapset + Seniorit + Päivähoito + Työpaja + Ruokapankki + Avustettu asuminen + Ryhmäkoti + Palvelut pakolaisille + Virtalähde (pistorasia): NEMA 5-15 + Virtalähde (pistorasia): CEE 7/5 + Virtalähde (pistorasia): CEE 7/4 + Virtalähde (pistorasia): CEE 17 sininen + Virtalähde: ei + Septitankin tyhjennys asema: ei + Septitankin tyhjennys asema: kyllä + Asuntovaunut: ei + Vain ryhmä: ei + Ainoastaan ryhmä: kyllä \ No newline at end of file From 7f591d10a589872c379b240a0cf56e6e8a110b1c Mon Sep 17 00:00:00 2001 From: Verdulo Date: Mon, 18 May 2020 21:57:50 +0000 Subject: [PATCH 15/32] Translated using Weblate (Esperanto) Currently translated at 100.0% (3804 of 3804 strings) --- OsmAnd/res/values-eo/phrases.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml index 8888986831..26b6cbd469 100644 --- a/OsmAnd/res/values-eo/phrases.xml +++ b/OsmAnd/res/values-eo/phrases.xml @@ -2508,9 +2508,9 @@ Pumpila speco: gravita (sifona) Pumpila aspekto: historia Pumpila speco: India Mk II aŭ III - Pumpila stato: laboranta - Pumpila stato: difektita - Pumpila ŝtato: blokita + Stato de pumpilo: funkcianta + Stato de pumpilo: difektita + Stato de pumpilo: ŝlosita Troika (Тройка) Troika (Тройка) kartoj malakceptataj optika @@ -3816,4 +3816,5 @@ grundakvo tubo Premo de hidranto + Stato de pumpilo: levilo mankas \ No newline at end of file From a626f4d0230c2fb8d3763d9e2f7e617b9f09b042 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Tue, 19 May 2020 03:24:13 +0000 Subject: [PATCH 16/32] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (3804 of 3804 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index f420892033..511db44856 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -2222,7 +2222,7 @@ 醫療專業：精神科 醫療專業：神經科 防波堤 - "歷史時期：村民 (新時代 I, II, 西元前 1580 年 – 西元 133 年)" + "歷史時期：村民（新時代 I, II, 西元前1580年 – 西元133年）" 歷史時期：城市（新時代 III，西元 133 年 - 西元 374 年） 燃料類型 燃料類型 (avia) @@ -3822,4 +3822,5 @@ 地下水 管線 壓力 + 幫浦狀態：無桿 \ No newline at end of file From e686e63aae9be84a25fbd11e4b43c0321ee95d51 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 19 May 2020 06:54:36 +0000 Subject: [PATCH 17/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.7% (258 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index ee700c28a8..8381980c43 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -2063,7 +2063,7 @@ Legg til minst et punkt. GPX-filnavn: Navigering: sett på pause/gjenoppta - Trykk på denne knappen for å sette på pause eller gjenoppta navigeringen. + Knapp for å ta en pause i eller gjenoppta navigeringen. Høyrekjøring Trykk på denne knappen for å starte eller avslutte navigeringen. Lagre spor som er tatt opp i månedlige mapper From f70c9ce375d86dc5781de273e1c4feb76e69b9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 May 2020 06:55:17 +0000 Subject: [PATCH 18/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.8% (262 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 8381980c43..5a3d7126ab 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1802,7 +1802,7 @@ Nettbasert sporing (GPX kreves) Start nettbasert sporing Stopp nettbasert sporing - Start GPX-logging + Fortsett GPX-logging Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se https://osmand.net). Ingen GPX-filer valgt. Velg en ved lang-trykking. Oppdelingsintervall From fa34e31c0e0ab4b452db51ec4eef1275b94fbc87 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 19 May 2020 06:55:39 +0000 Subject: [PATCH 19/32] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 7.8% (262 of 3339 strings) --- OsmAnd/res/values-nb/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 5a3d7126ab..2d21918809 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -752,7 +752,7 @@ Kjør programmet i sikker modus (med tregere Android i stedet for egen kode). Sikker modus Programmet kjører i sikker modus (skru det av i \'Innstillinger\'). - Avbryt musikk ved talemeldinger (ikke bare senk volumet). + Talemeldinger stopper midlertidig musikkavspilling. Avbryt musikk Offentlig Optimaliser kart for @@ -1667,7 +1667,7 @@ Mellomtjenervert Angi din mellomtjeners vertsnavn (f.eks. 127.0.0.1). Mellomtjener-port - Stopp GPX-logging + Ta en pause i GPX-logging Start nytt segment Ingen nedlastinger funnet, sjekk din internettforbindelse. Underspor: %1$s @@ -1882,7 +1882,7 @@ Tildelt minne %1$s MB (Android-grense %2$s MB, Dalvik %3$s MB). Tildelt minne Finn bilen der den er parkert - En merknad om å hente bilen har blitt lagt til i kalenderen din. Den vil finnes der til du sletter den manuelt. + Et varsel om å hente bilen er lagt til i kalenderen din og kan redigeres eller fjernes der. Angi tidsgrense for parkering Slett parkeringsmarkøren\? Velg parkeringstype From 254f416092630127e99ebe0b49a3e5362e919d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 May 2020 07:58:42 +0000 Subject: [PATCH 20/32] New strings reworked --- OsmAnd/res/values/strings.xml | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 190461e9ee..742a740f3e 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,31 +11,31 @@ Thx - Hardy --> World overview map (detailed) - Profiles selected for this action not found. - Change application profile + Could not find any such profiles. + Change app profile Add profile - Taping action button will switch between selected profiles. + The action button switches between selected profiles. Back to editing Restore default items order Add / Edit Favorite Parking positions - Create/Edit POI - A button to show or hide public transport on the map. - Show/hide public transport + Create / Edit POI + Button showing or hiding public transport on the map. + Show / hide public transport Show public transport Hide public transport • New offline Slope maps\n\n • Full customization of Favorites and GPX Waypoints – custom colors, icons, shapes\n\n - • Customize items order in Context Menu, Configure Map, Drawer\n\n + • Customize items order in \"Context Menu\", \"Configure Map\" and \"Drawer\"\n\n • Wikipedia as a separate layer in Configure map, select only needed languages\n\n - • Create your own POI filter/maps with total flexibility\n\n + • Create your own POI filter / maps with total flexibility\n\n • Added options to restore settings for custom profiles\n\n - • Full GPX routes from Navigation support traffic lanes and complete turn instructions\n\n + • Full GPX routes from navigation support traffic lanes and complete turn instructions\n\n • Fix UI sizes on tablets\n\n • Fix bugs with RTL\n\n Navigation profiles - The guide to a map\'s symbology + The guide to a map\'s symbology. OsmAnd purchases Subscription - OsmAnd Live Favorites @@ -48,9 +48,9 @@ OsmAnd tracker Unsupported action %1$s Extra maps - Combine POI types from different categories. Tap \"Switch\" to select all, tap the left side for category selection. + Combine POI types from different categories. Tapping \"Switch\" selects all, and the left side selects category. Search for POI types - Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings. + Your Google Play account is charged after confirmation, and for the same period (month/three month/year) upon renewal, (unless canceled from its settings). %1$s / %2$s Custom color Lombard @@ -100,7 +100,7 @@ You can move items only inside this category. You can access these actions by tapping the “%1$s” button. Main actions - \'Main actions\' only contains 4 buttons. + Only has four buttons. Hiding settings resets them to their original state. These items are hidden from the menu, but the represented options or plugins will continue to work. Hidden @@ -111,7 +111,7 @@ Drawer UI Customization Drawer items, context menu - Customize the quantity of items in Drawer, Configure Map and Context Menu.\n\nYou can turn off unused plugins, to hide all their controls from the application. %1$s. + Customize the quantity of items in \"Drawer\", \"Configure Map\" and \"Context Menu\".\n\nTurn off unused plugins to hide all their controls. %1$s. Min Square Octagon @@ -123,7 +123,7 @@ A button to show or hide terrain layer on the map. Show terrain Hide terrain - Show/hide terrain + Show / hide terrain Slopes %1$s of %2$s The route will be recalculated if the distance from the route to the current location is more than selected value. @@ -173,9 +173,9 @@ Some items already exist Select the data to be imported. Please provide a name for the profile - Disable recalculation + No recalculation Open settings - Plugin disabled + Plugin off This plugin is a separate app, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd. Menu %1$s — %2$s — %3$s @@ -201,7 +201,7 @@ Reset to default will reset sort order to the default state after installation. Use system screen timeout Disabled by default, if OsmAnd running on foreground, the screen doesn’t time out.\n\nIf enabled OsmAnd will use system timeout settings. - Accessibility mode disabled in your system. + Accessibility mode turned off in your Android. Rearrange categories Change the sort order of the list, hide unnecessary categories. You can import or export all changes with profiles. You can add a new custom category by selecting one or a few needed categories. @@ -216,7 +216,7 @@ Routing Rendering style Include additional data - The imported profile contains additional data. Click Import to import only profile data or select additional data to import. + The imported profile contains additional data. Click \"Import\" to import only profile data, or select additional data. You can select additional data to export along with the profile. Permission is required to use this option. Check and share detailed logs of the app @@ -271,7 +271,7 @@ Icon shown at rest. %1$s %2$s %1$s: %2$s - Tapping %1$s will discard all your changes. + Tapping %1$s discards all your changes. Reset all profile settings to installation defaults. Reset all profile settings? Position icon while moving @@ -1343,7 +1343,7 @@ Delete filter New filter Please enter a name for the new filter, this will be added to your \'Categories\' tab. - Subscription charged per month. Cancel it on Google Play at any time. + Subscription charged per selected period. Cancel it on Google Play at any time. Donation to the OSM community Part of your donation is sent to OSM contributors. The subscription cost remains the same. Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally. From f96866c45091173da9f3a8fbd194846c9ce52395 Mon Sep 17 00:00:00 2001 From: Nazar-Kutz Date: Tue, 19 May 2020 12:02:51 +0300 Subject: [PATCH 21/32] Fix AutoCompleteTextView crashes --- OsmAnd/res/layout/fragment_edit_poi.xml | 6 +++--- OsmAnd/res/layout/point_editor_fragment.xml | 4 ++-- OsmAnd/res/layout/quick_action_add_favorite.xml | 6 +++--- OsmAnd/res/layout/quick_action_add_gpx.xml | 6 +++--- OsmAnd/res/layout/quick_action_add_poi_layout.xml | 6 +++--- OsmAnd/res/layout/subscription_fragment.xml | 6 +++--- .../net/osmand/plus/widgets/AutoCompleteTextViewEx.java | 8 +------- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index 30d2261406..b93c6743f5 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -95,12 +95,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:completionThreshold="1" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:importantForAutofill="noExcludeDescendants" android:imeOptions="actionSend" android:inputType="text" - tools:text="@string/lorem_ipsum" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + tools:text="@string/lorem_ipsum" /> diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml index 561043aba0..216ea4b75b 100644 --- a/OsmAnd/res/layout/point_editor_fragment.xml +++ b/OsmAnd/res/layout/point_editor_fragment.xml @@ -169,9 +169,9 @@ android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginRight="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding_half" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding_half" /> diff --git a/OsmAnd/res/layout/quick_action_add_favorite.xml b/OsmAnd/res/layout/quick_action_add_favorite.xml index 0fdcad888f..8739da7579 100644 --- a/OsmAnd/res/layout/quick_action_add_favorite.xml +++ b/OsmAnd/res/layout/quick_action_add_favorite.xml @@ -195,11 +195,11 @@ android:layout_marginTop="@dimen/content_padding_half" android:focusable="false" android:text="@string/shared_string_favorites" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" android:layout_marginEnd="@dimen/content_padding" - android:layout_marginStart="@dimen/content_padding_half" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:layout_marginStart="@dimen/content_padding_half" /> diff --git a/OsmAnd/res/layout/quick_action_add_gpx.xml b/OsmAnd/res/layout/quick_action_add_gpx.xml index 3ecb76c9be..0114d17b36 100644 --- a/OsmAnd/res/layout/quick_action_add_gpx.xml +++ b/OsmAnd/res/layout/quick_action_add_gpx.xml @@ -194,12 +194,12 @@ android:layout_marginRight="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding_half" android:focusable="false" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:text="@string/shared_string_favorites" - android:drawableRight="@drawable/ic_action_arrow_drop_down" android:editable="false" android:layout_marginStart="@dimen/content_padding_half" - android:layout_marginEnd="@dimen/content_padding" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:layout_marginEnd="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/quick_action_add_poi_layout.xml b/OsmAnd/res/layout/quick_action_add_poi_layout.xml index a5731f30d6..9ef2b0e03d 100644 --- a/OsmAnd/res/layout/quick_action_add_poi_layout.xml +++ b/OsmAnd/res/layout/quick_action_add_poi_layout.xml @@ -89,14 +89,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:completionThreshold="1" - android:drawableTint="@color/osmand_orange" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + osmand:drawableTint="@color/osmand_orange" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:hint="@string/poi_dialog_poi_type" android:imeOptions="actionSend" android:inputType="text" android:layout_marginLeft="-4dp" tools:text="@string/lorem_ipsum" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" android:layout_marginStart="-4dp" /> diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml index a195b8d4b8..59b6f9b1b8 100644 --- a/OsmAnd/res/layout/subscription_fragment.xml +++ b/OsmAnd/res/layout/subscription_fragment.xml @@ -179,14 +179,14 @@ android:id="@+id/selectCountryEdit" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" android:paddingLeft="2dp" android:paddingRight="0dp" android:text="Ukraine" android:paddingStart="2dp" - android:paddingEnd="0dp" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:paddingEnd="0dp" /> Date: Tue, 19 May 2020 12:53:20 +0200 Subject: [PATCH 22/32] Fix #8980 --- .../src/net/osmand/plus/OsmandSettings.java | 91 +++++++++++-------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 59e5e1ede7..664e426a41 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -728,32 +728,47 @@ public class OsmandSettings { registeredPreferences.put(id, this); } - public CommonPreference makeGlobal() { + // Methods to possibly override + protected abstract T getValue(Object prefs, T defaultValue); + + protected abstract boolean setValue(Object prefs, T val); + + public abstract T parseString(String s); + + protected String toString(T o) { + return o == null ? null : o.toString(); + } + + + // common methods + + public final CommonPreference makeGlobal() { global = true; return this; } - public CommonPreference cache() { + public final CommonPreference cache() { cache = true; return this; } - public CommonPreference makeProfile() { + public final CommonPreference makeProfile() { global = false; return this; } - protected Object getPreferences() { + protected final Object getPreferences() { return global ? globalPreferences : profilePreferences; } - public void setModeDefaultValue(ApplicationMode mode, T defValue) { + public final void setModeDefaultValue(ApplicationMode mode, T defValue) { if (defaultValues == null) { defaultValues = new LinkedHashMap(); } defaultValues.put(mode, defValue); } + // TODO final @Override public boolean setModeValue(ApplicationMode mode, T obj) { if (global) { @@ -770,6 +785,7 @@ public class OsmandSettings { return valueSaved; } + // TODO final public T getProfileDefaultValue(ApplicationMode mode) { if (global) { return defaultValue; @@ -784,28 +800,27 @@ public class OsmandSettings { return defaultValue; } - public boolean hasDefaultValues() { + public final boolean hasDefaultValues() { return defaultValues != null && !defaultValues.isEmpty(); } - public boolean hasDefaultValueForMode(ApplicationMode mode) { + public final boolean hasDefaultValueForMode(ApplicationMode mode) { return defaultValues != null && defaultValues.containsKey(mode); } + // TODO final protected T getDefaultValue() { return getProfileDefaultValue(currentMode); } @Override - public void overrideDefaultValue(T newDefaultValue) { + public final void overrideDefaultValue(T newDefaultValue) { this.defaultValue = newDefaultValue; } - protected abstract T getValue(Object prefs, T defaultValue); - protected abstract boolean setValue(Object prefs, T val); - + // TODO final @Override public T getModeValue(ApplicationMode mode) { if (global) { @@ -815,6 +830,7 @@ public class OsmandSettings { return getValue(getProfilePreferences(mode), defaultV); } + // TODO final @Override public T get() { if (cache && cachedValue != null && cachedPreference == getPreferences()) { @@ -826,18 +842,18 @@ public class OsmandSettings { } @Override - public String getId() { + public final String getId() { return id; } @Override - public void resetToDefault() { + public final void resetToDefault() { T o = getProfileDefaultValue(currentMode); set(o); } @Override - public void resetModeToDefault(ApplicationMode mode) { + public final void resetModeToDefault(ApplicationMode mode) { if (global) { resetToDefault(); } else { @@ -846,6 +862,7 @@ public class OsmandSettings { } } + // TODO final @Override public boolean set(T obj) { Object prefs = getPreferences(); @@ -858,7 +875,7 @@ public class OsmandSettings { return false; } - public boolean isSet() { + public final boolean isSet() { return settingsAPI.contains(getPreferences(), getId()); } @@ -866,10 +883,11 @@ public class OsmandSettings { return settingsAPI.contains(getProfilePreferences(mode), getId()); } - public boolean isGlobal() { + public final boolean isGlobal() { return global; } + // TODO final @Override public boolean writeToJson(JSONObject json, ApplicationMode appMode) throws JSONException { if (appMode != null) { @@ -889,7 +907,7 @@ public class OsmandSettings { } return false; } - + // TODO final @Override public void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException { if (appMode != null) { @@ -904,15 +922,15 @@ public class OsmandSettings { } @Override - public String asString() { + public final String asString() { T o = get(); - return o != null ? o.toString() : null; + return toString(o); } @Override - public String asStringModeValue(ApplicationMode m) { + public final String asStringModeValue(ApplicationMode m) { T v = getModeValue(m); - return v != null ? v.toString() : null; + return toString(v); } } @@ -1195,6 +1213,12 @@ public class OsmandSettings { return settingsAPI.edit(prefs).putString(getId(), val.writeToJsonString(idScheme)).commit(); } + + @Override + protected String toString(ContextMenuItemsSettings o) { + return o.writeToJsonString(idScheme); + } + @Override public ContextMenuItemsSettings parseString(String s) { return readValue(s); @@ -1356,13 +1380,8 @@ public class OsmandSettings { } @Override - public String asString() { - return get().name(); - } - - @Override - public String asStringModeValue(ApplicationMode m) { - return getModeValue(m).name(); + protected String toString(E o) { + return o.name(); } @Override @@ -1581,14 +1600,10 @@ public class OsmandSettings { } @Override - public String asString() { - return appModeToString(get()); + protected String toString(ApplicationMode o) { + return appModeToString(o); } - @Override - public String asStringModeValue(ApplicationMode m) { - return appModeToString(m); - } @Override public ApplicationMode parseString(String s) { @@ -1626,14 +1641,10 @@ public class OsmandSettings { } @Override - public String asString() { - return appModeToString(get()); + protected String toString(ApplicationMode o) { + return appModeToString(o); } - @Override - public String asStringModeValue(ApplicationMode m) { - return appModeToString(m); - } @Override public ApplicationMode parseString(String s) { From f907be3ee1eb6520de6f682e72b26fb7e950b038 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 19 May 2020 13:13:32 +0200 Subject: [PATCH 23/32] Change package name settings --- OsmAnd/res/xml/global_settings.xml | 2 +- OsmAnd/res/xml/monitoring_settings.xml | 2 +- OsmAnd/res/xml/navigation_settings_new.xml | 6 +++--- .../net/osmand/access/AccessibilityPlugin.java | 2 +- .../access/AccessibilitySettingsFragment.java | 4 ++-- OsmAnd/src/net/osmand/plus/OsmandPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 6 +++--- .../osmand/plus/activities/MapActivity.java | 16 ++++++++-------- .../plus/activities/MapActivityActions.java | 2 +- .../plus/audionotes/AudioVideoNotesPlugin.java | 2 +- .../audionotes/MultimediaNotesFragment.java | 2 +- .../DevelopmentSettingsFragment.java | 2 +- .../development/OsmandDevelopmentPlugin.java | 2 +- .../PluginInstalledBottomSheetDialog.java | 2 +- .../net/osmand/plus/helpers/ImportHelper.java | 2 +- .../net/osmand/plus/helpers/IntentHelper.java | 4 ++-- .../mapcontextmenu/MapContextMenuFragment.java | 2 +- .../monitoring/MonitoringSettingsFragment.java | 2 +- .../monitoring/OsmandMonitoringPlugin.java | 2 +- .../plus/osmedit/OsmEditingFragment.java | 4 ++-- .../osmand/plus/osmedit/OsmEditingPlugin.java | 2 +- .../AppModesBottomSheetDialogFragment.java | 2 +- .../profiles/ConfigureProfileMenuAdapter.java | 2 +- .../plus/profiles/EditProfilesFragment.java | 2 +- .../SelectMultipleProfilesBottomSheet.java | 4 +--- ...SelectProfileBottomSheetDialogFragment.java | 6 +++--- .../profiles/SelectProfileMenuAdapter.java | 2 +- .../RouteOptionsBottomSheet.java | 2 +- .../BasePreferenceBottomSheet.java | 2 +- .../BooleanPreferenceBottomSheet.java | 6 +++--- .../ChangeDataStorageBottomSheet.java | 6 +++--- .../ChangeGeneralProfilesPrefBottomSheet.java | 2 +- .../EditTextPreferenceBottomSheet.java | 2 +- .../MultiSelectPreferencesBottomSheet.java | 2 +- .../bottomsheets/OsmLoginDataBottomSheet.java | 2 +- ...RecalculateRouteInDeviationBottomSheet.java | 8 ++++---- .../ResetProfilePrefsBottomSheet.java | 2 +- .../bottomsheets/SelectFolderBottomSheet.java | 2 +- .../SingleSelectPreferenceBottomSheet.java | 2 +- .../{ => fragments}/ApplyQueryType.java | 2 +- .../{ => fragments}/BaseSettingsFragment.java | 3 +-- .../ConfigureMenuItemsFragment.java | 18 +++++++++--------- .../ConfigureMenuRootFragment.java | 2 +- .../ConfigureProfileFragment.java | 2 +- .../CoordinatesFormatFragment.java | 2 +- .../{ => fragments}/DataStorageFragment.java | 10 +++++----- .../{ => fragments}/DataStorageHelper.java | 10 +++++----- .../{ => fragments}/DataStorageMemoryItem.java | 2 +- .../{ => fragments}/DataStorageMenuItem.java | 2 +- ...ialogsAndNotificationsSettingsFragment.java | 2 +- .../DuplicatesSettingsAdapter.java | 2 +- .../ExportImportSettingsAdapter.java | 2 +- .../ExportProfileBottomSheet.java | 4 ++-- .../GeneralProfileSettingsFragment.java | 2 +- .../GlobalSettingsFragment.java | 2 +- .../ImportCompleteFragment.java | 8 ++++---- .../ImportDuplicatesFragment.java | 4 ++-- .../ImportSettingsFragment.java | 4 ++-- .../ImportedSettingsItemsAdapter.java | 4 ++-- .../LiveMonitoringFragment.java | 7 +------ .../{ => fragments}/MainSettingsFragment.java | 2 +- .../MapDuringNavigationFragment.java | 2 +- .../{ => fragments}/NavigationFragment.java | 2 +- .../OnConfirmPreferenceChange.java | 2 +- .../{ => fragments}/OnPreferenceChanged.java | 2 +- .../ProfileAppearanceFragment.java | 2 +- .../{ => fragments}/ProxySettingsFragment.java | 2 +- .../RearrangeMenuItemsAdapter.java | 9 +++------ .../RouteParametersFragment.java | 2 +- .../{ => fragments}/ScreenAlertsFragment.java | 2 +- .../{ => fragments}/TurnScreenOnFragment.java | 2 +- .../VehicleParametersFragment.java | 2 +- .../VoiceAnnouncesFragment.java | 2 +- 73 files changed, 121 insertions(+), 132 deletions(-) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ApplyQueryType.java (58%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/BaseSettingsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ConfigureMenuItemsFragment.java (96%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ConfigureMenuRootFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ConfigureProfileFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/CoordinatesFormatFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DataStorageFragment.java (98%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DataStorageHelper.java (97%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DataStorageMemoryItem.java (98%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DataStorageMenuItem.java (98%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DialogsAndNotificationsSettingsFragment.java (97%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/DuplicatesSettingsAdapter.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ExportImportSettingsAdapter.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ExportProfileBottomSheet.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/GeneralProfileSettingsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/GlobalSettingsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ImportCompleteFragment.java (95%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ImportDuplicatesFragment.java (98%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ImportSettingsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ImportedSettingsItemsAdapter.java (97%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/LiveMonitoringFragment.java (96%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/MainSettingsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/MapDuringNavigationFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/NavigationFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/OnConfirmPreferenceChange.java (77%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/OnPreferenceChanged.java (66%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ProfileAppearanceFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ProxySettingsFragment.java (98%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/RearrangeMenuItemsAdapter.java (97%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/RouteParametersFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/ScreenAlertsFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/TurnScreenOnFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/VehicleParametersFragment.java (99%) rename OsmAnd/src/net/osmand/plus/settings/{ => fragments}/VoiceAnnouncesFragment.java (99%) diff --git a/OsmAnd/res/xml/global_settings.xml b/OsmAnd/res/xml/global_settings.xml index 4effc59467..7367f562d0 100644 --- a/OsmAnd/res/xml/global_settings.xml +++ b/OsmAnd/res/xml/global_settings.xml @@ -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" /> extends MenuBottomSheetDialogFragment implements AbstractProfileMenuAdapter.ButtonPressedListener, AbstractProfileMenuAdapter.ProfilePressedListener { diff --git a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java index f738528cbe..f8f3599cd7 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java index c2766ca4ba..1581f89e2b 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java b/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java index 3929703cbf..23068084d8 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java index 458cec3aa2..c7d7ec843c 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java index 4dc2ba6153..1a5601ee28 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java index 344ea910da..93e20dfc88 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java index 67c16d9d22..e07637a863 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java index 55458a72d9..2107c4c7ab 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java index b1b31e5d8e..efc1b4500d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java index 4895924bb6..9daa2211a9 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java index b9c3724c5f..82adb0ab84 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java index 09973463c5..96c13cd3b5 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java index 24bea5af6a..ab5e49899b 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java index 377652f4a7..e957624aa2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java index 58300c6d95..580cd20834 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java index e370d885e4..6a3cc193b2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java index a1aa1fa964..fc95d584df 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java similarity index 58% rename from OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java index 8100f0b0ce..64bd6759c9 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; public enum ApplyQueryType { NONE, SNACK_BAR, BOTTOM_SHEET diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java index b91b53bb0b..0a67e28669 100644 --- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java similarity index 96% rename from OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java index 40fc694680..9ca91b6f02 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java index f8c84a2e75..50e71ed671 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.app.Activity; import android.content.Intent; diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java index 833819167b..87af22d4c5 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.content.Context; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java index 98dd6fb34a..d89e6d9f0b 100644 --- a/OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.content.Context; import android.net.Uri; diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java index 147928ec6a..6fc4028afc 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java index 80e446caa0..bcf9f9e1f2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java @@ -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"; diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java index 3fcf9b3069..f7f955f89a 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; public class DataStorageMemoryItem { public final static int EXTENSIONS = 0; diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java index 630529164f..f965b95fb1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.os.Parcel; import android.os.Parcelable; diff --git a/OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java index e6309bb14a..5fc75b9685 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.view.LayoutInflater; import android.view.View; diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java index d3aed385f0..09ebbf1fba 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.view.LayoutInflater; import android.view.View; diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java index a9394e6808..c9cabba67d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.content.res.ColorStateList; import android.view.LayoutInflater; diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java index 5ec9fdc822..b8ff7fe426 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java index 6360aeccac..57950c5cac 100644 --- a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.content.Context; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java index 102616c8f1..94a2ef6289 100644 --- a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.app.Activity; import android.content.Context; diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java similarity index 95% rename from OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java index e3779b707b..9931e76f26 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java @@ -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(); diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java index 9808881c46..c4c78b4a51 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java @@ -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 { diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java index e859ae5927..5a3e78d9fc 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java index 3059f6d01d..996716c4af 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java similarity index 96% rename from OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java index 4c6ead83e3..6483f2ad00 100644 --- a/OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java index 0bf4a223ba..9aa456b3f2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java index 94e1afd4c9..201407aaa0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import androidx.preference.Preference; diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java index ba5f216c6b..692c228c85 100644 --- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.graphics.drawable.Drawable; import android.os.Bundle; diff --git a/OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java b/OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java similarity index 77% rename from OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java index ff377f4a23..5f87d8cb3d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; public interface OnConfirmPreferenceChange { diff --git a/OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java b/OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java similarity index 66% rename from OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java index a3552b80ab..8edb28af74 100644 --- a/OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; public interface OnPreferenceChanged { diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java index 5473eeecd6..6f9ea0d2d7 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java index ef48ee3019..2210042b05 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; diff --git a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java index 52a2e4f3ea..b56aa69ce2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java @@ -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 implements ReorderItemTouchHelperCallback.OnItemMoveCallback { diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java index 799bb38de9..e515c9be16 100644 --- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.app.Activity; import android.content.Context; diff --git a/OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java index 5a9047f3b7..9e99073fd7 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java @@ -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; diff --git a/OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java index f497904d49..9f5e1ed24b 100644 --- a/OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; diff --git a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java index 93e91d73b4..efe0027620 100644 --- a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java rename to OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java index fb02fc5160..7df29977b0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java @@ -1,4 +1,4 @@ -package net.osmand.plus.settings; +package net.osmand.plus.settings.fragments; import android.app.Activity; import android.content.Context; From 523196b307acfa3711a865938de00b56e3209029 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 19 May 2020 13:16:09 +0200 Subject: [PATCH 24/32] Change package name settings --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index a3b0b49908..04e5c878d8 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -339,7 +339,7 @@ public class OsmandSettings { } } - publicvoid migrateHomeWorkParkingToFavorites() { + public void migrateHomeWorkParkingToFavorites() { FavouritesDbHelper favorites = ctx.getFavorites(); LatLon homePoint = null; @@ -4217,7 +4217,8 @@ public class OsmandSettings { DRIVING_REGION_AUTOMATIC }; - String[] appModeBeanPrefsIds = new String[] { + String[] + appModeBeanPrefsIds = new String[] { ICON_COLOR.getId(), ICON_RES_NAME.getId(), PARENT_APP_MODE.getId(), From f5f971874f8bffbb6471d905f699874519957f4f Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 19 May 2020 13:28:19 +0200 Subject: [PATCH 25/32] Move settings to backend --- .../osmand/access/AccessibilityPlugin.java | 2 +- .../src/net/osmand/access/NavigationInfo.java | 2 +- OsmAnd/src/net/osmand/aidl/ConnectedApp.java | 2 +- OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java | 4 ++-- .../core/android/MapRendererContext.java | 4 ++-- .../src/net/osmand/data/FavouritePoint.java | 4 ++-- .../src/net/osmand/data/PointDescription.java | 2 +- .../src/net/osmand/plus/AppInitializer.java | 2 ++ .../src/net/osmand/plus/ApplicationMode.java | 1 + .../net/osmand/plus/ContextMenuAdapter.java | 5 ++-- .../net/osmand/plus/CustomOsmandPlugin.java | 17 ++++++------- .../osmand/plus/GeocodingLookupService.java | 2 +- .../net/osmand/plus/GpxSelectionHelper.java | 2 +- .../net/osmand/plus/NavigationService.java | 1 + .../osmand/plus/OsmAndAppCustomization.java | 1 + .../src/net/osmand/plus/OsmAndFormatter.java | 7 +++--- .../osmand/plus/OsmAndLocationProvider.java | 1 + .../net/osmand/plus/OsmandApplication.java | 2 ++ .../net/osmand/plus/OsmandBackupAgent.java | 1 + OsmAnd/src/net/osmand/plus/OsmandPlugin.java | 1 + .../net/osmand/plus/TargetPointsHelper.java | 1 + .../ActionBarPreferenceActivity.java | 2 +- .../plus/activities/DayNightHelper.java | 2 +- .../activities/FavoritesListFragment.java | 2 +- .../activities/FavoritesSearchFragment.java | 2 +- .../activities/FavoritesTreeFragment.java | 2 +- .../osmand/plus/activities/MapActivity.java | 8 +++---- .../plus/activities/MapActivityActions.java | 2 +- .../plus/activities/MapActivityLayers.java | 4 ++-- .../plus/activities/SavingTrackHelper.java | 2 +- .../plus/activities/SettingsBaseActivity.java | 6 ++--- .../activities/SettingsGeneralActivity.java | 8 +++---- .../SettingsNavigationActivity.java | 8 +++---- .../osmand/plus/activities/TrackActivity.java | 2 +- .../activities/actions/AppModeDialog.java | 2 +- .../plus/activities/actions/OsmAndAction.java | 2 +- .../activities/actions/OsmAndDialogs.java | 2 +- .../activities/search/GeoIntentActivity.java | 2 +- .../activities/search/SearchActivity.java | 2 +- .../search/SearchAddressFragment.java | 2 +- .../search/SearchBuildingByNameActivity.java | 1 - .../search/SearchByNameAbstractActivity.java | 2 +- .../search/SearchCityByNameActivity.java | 3 +-- .../search/SearchHistoryFragment.java | 2 +- .../activities/search/SearchPOIActivity.java | 2 +- .../search/SearchStreet2ByNameActivity.java | 2 +- .../search/SearchStreetByNameActivity.java | 2 +- .../audionotes/AudioVideoNotesPlugin.java | 4 ++-- .../osmand/plus/audionotes/NotesFragment.java | 2 +- .../SortByMenuBottomSheetDialogFragment.java | 4 ++-- .../plus/base/BaseOsmAndDialogFragment.java | 2 +- .../osmand/plus/base/BaseOsmAndFragment.java | 2 +- .../plus/base/BottomSheetDialogFragment.java | 2 +- .../osmand/plus/base/FailSafeFuntions.java | 2 +- .../plus/base/MapViewTrackingUtilities.java | 2 +- .../chooseplan/ChoosePlanDialogFragment.java | 2 +- .../chooseplan/OsmLiveCancelledDialog.java | 4 ++-- .../dashboard/DashChooseAppDirFragment.java | 2 +- .../DashDashboardOrDrawerFragment.java | 2 +- .../plus/dashboard/DashErrorFragment.java | 2 +- .../osmand/plus/dashboard/DashboardOnMap.java | 2 +- .../dashboard/tools/DashFragmentData.java | 2 +- .../DashboardSettingsDialogFragment.java | 4 ++-- .../dashboard/tools/TransactionBuilder.java | 2 +- .../SettingsDevelopmentActivity.java | 2 +- .../plus/development/TestVoiceActivity.java | 2 +- .../osmand/plus/dialogs/ConfigureMapMenu.java | 6 ++--- .../CrashBottomSheetDialogFragment.java | 2 +- ...islikeOsmAndBottomSheetDialogFragment.java | 2 +- .../dialogs/HelpArticleDialogFragment.java | 2 +- .../osmand/plus/dialogs/RasterMapMenu.java | 4 ++-- .../RateUsBottomSheetDialogFragment.java | 2 +- .../SelectMapViewQuickActionsBottomSheet.java | 2 +- ...endAnalyticsBottomSheetDialogFragment.java | 4 ++-- .../plus/download/DownloadActivity.java | 2 +- .../plus/download/DownloadIndexesThread.java | 4 ++-- .../download/DownloadOsmandIndexesHelper.java | 2 +- .../download/DownloadValidationManager.java | 2 +- .../ui/DataStoragePlaceDialogFragment.java | 2 +- .../download/ui/SearchDialogFragment.java | 2 +- .../download/ui/UpdatesIndexFragment.java | 2 +- .../firstusage/FirstUsageWizardFragment.java | 2 +- .../osmand/plus/helpers/DiscountHelper.java | 3 +-- .../net/osmand/plus/helpers/GpxUiHelper.java | 2 +- .../net/osmand/plus/helpers/ImportHelper.java | 14 +++++------ .../net/osmand/plus/helpers/IntentHelper.java | 2 +- .../net/osmand/plus/helpers/LockHelper.java | 4 ++-- .../osmand/plus/helpers/WaypointHelper.java | 4 ++-- .../plus/inapp/InAppPurchaseHelper.java | 4 ++-- .../liveupdates/LiveUpdatesAlarmReceiver.java | 2 +- .../plus/liveupdates/LiveUpdatesFragment.java | 2 +- .../plus/liveupdates/LiveUpdatesHelper.java | 2 +- .../LiveUpdatesSettingsDialogFragment.java | 2 +- .../PerformLiveUpdateAsyncTask.java | 2 +- .../liveupdates/SubscriptionFragment.java | 2 +- .../plus/mapcontextmenu/CollapsableView.java | 2 +- .../MapContextMenuFragment.java | 2 +- .../plus/mapcontextmenu/MenuBuilder.java | 2 +- .../builders/AmenityMenuBuilder.java | 4 ++-- .../cards/dialogs/ContextMenuCardDialog.java | 2 +- .../controllers/MapMarkerMenuController.java | 2 +- .../other/DestinationReachedMenuFragment.java | 2 +- .../other/RoutePreferencesMenu.java | 2 +- .../plus/mapcontextmenu/other/ShareMenu.java | 2 +- .../MapillaryAutoCompleteAdapter.java | 2 +- .../mapillary/MapillaryFiltersFragment.java | 2 +- .../plus/mapillary/MapillaryPlugin.java | 2 +- ...rdinateInputBottomSheetDialogFragment.java | 2 +- .../CoordinateInputDialogFragment.java | 2 +- .../DirectionIndicationDialogFragment.java | 6 ++--- .../mapmarkers/MapMarkersDialogFragment.java | 2 +- .../OptionsBottomSheetDialogFragment.java | 2 +- .../plus/mapmarkers/PlanRouteFragment.java | 6 ++--- .../MeasurementToolFragment.java | 2 +- .../plus/monitoring/DashTrackFragment.java | 2 +- .../plus/monitoring/LiveMonitoringHelper.java | 2 +- .../MonitoringSettingsFragment.java | 6 ++--- .../monitoring/OsmandMonitoringPlugin.java | 2 +- .../SettingsMonitoringActivity.java | 4 ++-- .../plus/myplaces/AvailableGPXFragment.java | 2 +- .../plus/myplaces/FavoritesActivity.java | 2 +- .../myplaces/SplitSegmentDialogFragment.java | 2 +- .../TrackActivityFragmentAdapter.java | 2 +- .../plus/myplaces/TrackPointFragment.java | 2 +- .../plus/myplaces/TrackSegmentFragment.java | 2 +- .../plus/osmedit/EditPoiDialogFragment.java | 2 +- .../plus/osmedit/OpenstreetmapRemoteUtil.java | 2 +- .../net/osmand/plus/osmedit/OsmBugsLayer.java | 2 +- .../plus/osmedit/OsmBugsRemoteUtil.java | 2 +- .../osmand/plus/osmedit/OsmEditingPlugin.java | 2 +- .../osmand/plus/osmedit/OsmEditsFragment.java | 2 +- .../net/osmand/plus/osmedit/OsmNotesMenu.java | 6 ++--- .../dialogs/SendPoiDialogFragment.java | 2 +- .../parkingpoint/ParkingPositionPlugin.java | 4 ++-- .../net/osmand/plus/poi/PoiFiltersHelper.java | 2 +- ...lectAppModesBottomSheetDialogFragment.java | 2 +- .../plus/quickaction/QuickActionRegistry.java | 2 +- .../actions/DayNightModeAction.java | 4 ++-- .../actions/NavAutoZoomMapAction.java | 2 +- .../actions/ShowHideGpxTracksAction.java | 10 +------- .../actions/SwitchProfileAction.java | 2 +- .../plus/rastermaps/MapOverlayAction.java | 5 ++-- .../plus/rastermaps/MapSourceAction.java | 3 +-- .../plus/rastermaps/MapUnderlayAction.java | 5 ++-- .../rastermaps/OsmandRasterMapsPlugin.java | 6 ++--- .../plus/render/MapRenderRepositories.java | 4 ++-- .../osmand/plus/render/MapVectorLayer.java | 3 +-- .../RegionAddressRepositoryBinary.java | 2 +- .../AvoidRoadsBottomSheetDialogFragment.java | 2 +- .../ChooseRouteFragment.java | 2 +- .../MapRouteInfoMenu.java | 6 ++--- .../RouteDetailsFragment.java | 2 +- .../RouteOptionsBottomSheet.java | 2 +- .../RoutingOptionsHelper.java | 2 +- .../osmand/plus/routing/RouteProvider.java | 4 ++-- .../osmand/plus/routing/RoutingHelper.java | 2 +- .../plus/routing/TransportRoutingHelper.java | 3 +-- .../net/osmand/plus/routing/VoiceRouter.java | 2 +- .../QuickSearchCoordinatesFragment.java | 2 +- .../search/QuickSearchCustomPoiFragment.java | 2 +- .../search/QuickSearchDialogFragment.java | 2 +- .../search/QuickSearchPoiFilterFragment.java | 3 +-- .../backend}/OsmandSettings.java | 7 +++++- .../backend}/SettingsHelper.java | 11 +++++++-- .../BooleanPreferenceBottomSheet.java | 6 ++--- .../ChangeDataStorageBottomSheet.java | 2 +- ...ecalculateRouteInDeviationBottomSheet.java | 2 +- .../fragments/BaseSettingsFragment.java | 4 ++-- .../fragments/ConfigureMenuItemsFragment.java | 2 +- .../fragments/ConfigureProfileFragment.java | 4 ++-- .../fragments/DataStorageFragment.java | 2 +- .../settings/fragments/DataStorageHelper.java | 2 +- .../fragments/ExportProfileBottomSheet.java | 6 ++--- .../GeneralProfileSettingsFragment.java | 4 ++-- .../fragments/GlobalSettingsFragment.java | 2 +- .../fragments/ImportCompleteFragment.java | 2 +- .../fragments/ImportDuplicatesFragment.java | 8 +++---- .../fragments/ImportSettingsFragment.java | 24 +++++++++---------- .../fragments/MainSettingsFragment.java | 4 ++-- .../MapDuringNavigationFragment.java | 4 ++-- .../fragments/ProfileAppearanceFragment.java | 2 +- .../fragments/RouteParametersFragment.java | 4 ++-- .../fragments/VehicleParametersFragment.java | 2 +- .../fragments/VoiceAnnouncesFragment.java | 4 ++-- .../preferences/ListPreferenceEx.java | 2 +- .../MultiSelectBooleanPreference.java | 2 +- .../plus/srtmplugin/ContourLinesAction.java | 3 +-- .../plus/srtmplugin/ContourLinesMenu.java | 2 +- .../osmand/plus/srtmplugin/SRTMPlugin.java | 6 ++--- .../plus/srtmplugin/TerrainFragment.java | 8 +++---- .../osmand/plus/srtmplugin/TerrainLayer.java | 4 ++-- .../plus/transport/TransportLinesMenu.java | 4 ++-- .../net/osmand/plus/views/AidlMapLayer.java | 2 +- .../osmand/plus/views/FavouritesLayer.java | 2 +- .../src/net/osmand/plus/views/GPXLayer.java | 2 +- .../osmand/plus/views/MapControlsLayer.java | 9 +++---- .../net/osmand/plus/views/MapInfoLayer.java | 2 +- .../osmand/plus/views/MapMarkersLayer.java | 2 +- .../plus/views/MapQuickActionLayer.java | 3 +-- .../net/osmand/plus/views/MapTileLayer.java | 2 +- .../osmand/plus/views/OsmandMapTileView.java | 2 +- .../osmand/plus/views/RulerControlLayer.java | 6 ++--- .../plus/views/TransportStopsLayer.java | 2 +- .../mapwidgets/MapInfoWidgetsFactory.java | 6 ++--- .../views/mapwidgets/MapWidgetRegistry.java | 4 ++-- .../mapwidgets/RouteInfoWidgetsFactory.java | 4 ++-- .../voice/AbstractPrologCommandPlayer.java | 4 ++-- .../plus/voice/MediaCommandPlayerImpl.java | 2 +- .../plus/voice/TTSCommandPlayerImpl.java | 2 +- .../SelectWikiLanguagesBottomSheet.java | 2 +- .../WikiArticleBaseDialogFragment.java | 2 +- ...pediaOptionsBottomSheetDialogFragment.java | 4 ++-- .../plus/wikipedia/WikipediaPoiMenu.java | 3 +-- .../WikivoyageShowPicturesDialogFragment.java | 2 +- .../plus/wikivoyage/WikivoyageUtils.java | 2 +- .../wikivoyage/WikivoyageWebViewClient.java | 2 +- .../WikivoyageArticleDialogFragment.java | 4 ++-- .../explore/SavedArticlesRvAdapter.java | 2 +- .../explore/WikivoyageExploreActivity.java | 2 +- ...oyageOptionsBottomSheetDialogFragment.java | 4 ++-- 220 files changed, 343 insertions(+), 342 deletions(-) rename OsmAnd/src/net/osmand/plus/{ => settings/backend}/OsmandSettings.java (99%) rename OsmAnd/src/net/osmand/plus/{ => settings/backend}/SettingsHelper.java (99%) diff --git a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java index 4112f08cd5..b9ea4a62cf 100644 --- a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java +++ b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.settings.fragments.BaseSettingsFragment; diff --git a/OsmAnd/src/net/osmand/access/NavigationInfo.java b/OsmAnd/src/net/osmand/access/NavigationInfo.java index c21dcbfb3c..3e087e27ae 100644 --- a/OsmAnd/src/net/osmand/access/NavigationInfo.java +++ b/OsmAnd/src/net/osmand/access/NavigationInfo.java @@ -15,7 +15,7 @@ import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.access.RelativeDirectionStyle; diff --git a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java index c10e7a38b0..a8b709972e 100644 --- a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java +++ b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java @@ -15,7 +15,7 @@ import net.osmand.AndroidUtils; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.views.AidlMapLayer; diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 810a9a3d27..51ac2ee738 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -55,9 +55,9 @@ import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.SQLiteTileSource; -import net.osmand.plus.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.audionotes.AudioVideoNotesPlugin; import net.osmand.plus.dialogs.ConfigureMapMenu; diff --git a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java index 9c0a56af4b..03d88fa11c 100644 --- a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java +++ b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java @@ -24,8 +24,8 @@ import net.osmand.core.jni.QStringStringHash; import net.osmand.core.jni.ResolvedMapStyle; import net.osmand.core.jni.SwigUtilities; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.render.RendererRegistry; import net.osmand.render.RenderingRuleProperty; import net.osmand.render.RenderingRuleStorageProperties; diff --git a/OsmAnd/src/net/osmand/data/FavouritePoint.java b/OsmAnd/src/net/osmand/data/FavouritePoint.java index e6c16a9f8a..3f7d74b412 100644 --- a/OsmAnd/src/net/osmand/data/FavouritePoint.java +++ b/OsmAnd/src/net/osmand/data/FavouritePoint.java @@ -9,8 +9,8 @@ import androidx.annotation.StringRes; import net.osmand.GPXUtilities.WptPt; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.BooleanPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.parkingpoint.ParkingPositionPlugin; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java index 5f8b838c8a..f77b841e1d 100644 --- a/OsmAnd/src/net/osmand/data/PointDescription.java +++ b/OsmAnd/src/net/osmand/data/PointDescription.java @@ -10,7 +10,7 @@ import com.google.openlocationcode.OpenLocationCode; import net.osmand.LocationConvert; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java index 670d83510d..89847f80da 100644 --- a/OsmAnd/src/net/osmand/plus/AppInitializer.java +++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java @@ -53,6 +53,8 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.TransportRoutingHelper; import net.osmand.plus.search.QuickSearchHelper; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.views.corenative.NativeCoreContext; import net.osmand.plus.voice.CommandPlayer; import net.osmand.plus.voice.CommandPlayerException; diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java index 17633b0720..efe816fb2e 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java @@ -11,6 +11,7 @@ import net.osmand.plus.profiles.LocationIcon; import net.osmand.plus.profiles.NavigationIcon; import net.osmand.plus.profiles.ProfileIconColors; import net.osmand.plus.routing.RouteProvider.RouteService; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index 5642823f87..4777ec73d8 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -36,8 +36,9 @@ import net.osmand.plus.activities.actions.AppModeDialog; import net.osmand.plus.dialogs.ConfigureMapMenu; import net.osmand.plus.dialogs.HelpArticleDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; -import net.osmand.plus.OsmandSettings.ContextMenuItemsPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.ContextMenuItemsPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java index 60964c99ad..cac124bd99 100644 --- a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java @@ -17,14 +17,15 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.map.ITileSource; import net.osmand.map.WorldRegion; -import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem; -import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem; -import net.osmand.plus.SettingsHelper.PluginSettingsItem; -import net.osmand.plus.SettingsHelper.PoiUiFilterSettingsItem; -import net.osmand.plus.SettingsHelper.ProfileSettingsItem; -import net.osmand.plus.SettingsHelper.QuickActionsSettingsItem; -import net.osmand.plus.SettingsHelper.SettingsCollectListener; -import net.osmand.plus.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.AvoidRoadsSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.MapSourcesSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.PluginSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.PoiUiFilterSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.ProfileSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.QuickActionsSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsCollectListener; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.DownloadIndexesThread; import net.osmand.plus.download.DownloadResources; diff --git a/OsmAnd/src/net/osmand/plus/GeocodingLookupService.java b/OsmAnd/src/net/osmand/plus/GeocodingLookupService.java index 203d2c6e34..73dcee0c5e 100644 --- a/OsmAnd/src/net/osmand/plus/GeocodingLookupService.java +++ b/OsmAnd/src/net/osmand/plus/GeocodingLookupService.java @@ -1,13 +1,13 @@ package net.osmand.plus; import android.os.AsyncTask; -import android.os.Build; import net.osmand.Location; import net.osmand.ResultMatcher; import net.osmand.binary.GeocodingUtilities.GeocodingResult; import net.osmand.binary.RouteDataObject; import net.osmand.data.LatLon; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java index ee2e00b632..2de7234303 100644 --- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java +++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java @@ -22,7 +22,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.plus.GPXDatabase.GpxDataItem; import net.osmand.plus.MapMarkersHelper.MapMarkersGroup; -import net.osmand.plus.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; import net.osmand.plus.activities.SavingTrackHelper; import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType; diff --git a/OsmAnd/src/net/osmand/plus/NavigationService.java b/OsmAnd/src/net/osmand/plus/NavigationService.java index 7a2959a2a3..23ddc99d2a 100644 --- a/OsmAnd/src/net/osmand/plus/NavigationService.java +++ b/OsmAnd/src/net/osmand/plus/NavigationService.java @@ -22,6 +22,7 @@ import android.widget.Toast; import net.osmand.PlatformUtil; import net.osmand.plus.notifications.OsmandNotification; +import net.osmand.plus.settings.backend.OsmandSettings; public class NavigationService extends Service implements LocationListener { diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index 69015288be..7e9094ea7f 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -30,6 +30,7 @@ import net.osmand.plus.helpers.ImportHelper; import net.osmand.plus.helpers.WaypointHelper; import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.routing.RouteCalculationResult; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index d4b0d83cab..46e5ddf953 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -13,9 +13,10 @@ import net.osmand.osm.AbstractPoiType; import net.osmand.osm.MapPoiTypes; import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; -import net.osmand.plus.OsmandSettings.AngularConstants; -import net.osmand.plus.OsmandSettings.MetricsConstants; -import net.osmand.plus.OsmandSettings.SpeedConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants; import net.osmand.util.Algorithms; import java.text.DateFormatSymbols; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java index 0aa2b84e3c..063351eb3c 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java @@ -40,6 +40,7 @@ import net.osmand.data.QuadPoint; import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper.RouteSegmentSearchResult; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.router.RouteSegmentResult; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 2c650364b8..bac35247c8 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -69,6 +69,8 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.TransportRoutingHelper; import net.osmand.plus.search.QuickSearchHelper; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.voice.CommandPlayer; import net.osmand.plus.wikivoyage.data.TravelDbHelper; import net.osmand.router.GeneralRouter; diff --git a/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java b/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java index 34e9448c9f..702aa95d44 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java +++ b/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java @@ -9,6 +9,7 @@ import android.os.ParcelFileDescriptor; import net.osmand.plus.mapmarkers.MapMarkersDbHelper; import net.osmand.plus.osmedit.OsmBugsDbHelper; +import net.osmand.plus.settings.backend.OsmandSettings; import java.io.IOException; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java index 39562c99df..d10e4e6b7f 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java @@ -41,6 +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.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.plus.skimapsplugin.SkiMapsPlugin; import net.osmand.plus.srtmplugin.SRTMPlugin; diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java index 046456a172..55a779883d 100644 --- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java +++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java @@ -13,6 +13,7 @@ import net.osmand.plus.GeocodingLookupService.AddressLookupRequest; import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java index 06b1338aea..df340fe7b4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java @@ -18,7 +18,7 @@ import androidx.core.view.ViewCompat; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; public abstract class ActionBarPreferenceActivity extends AppCompatPreferenceActivity { diff --git a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java index f9802a05a1..205424a062 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java @@ -10,7 +10,7 @@ import net.osmand.PlatformUtil; import net.osmand.StateChangedListener; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.DayNightMode; +import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode; import net.osmand.util.SunriseSunset; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java index 71a8f7d345..f5db5a3ce4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java @@ -26,7 +26,7 @@ import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.UpdateLocationViewCache; diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java index ab730d7485..192176ca42 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java @@ -45,7 +45,7 @@ import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.myplaces.FavoritesActivity; diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index 5fec572258..71084c00e2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -44,7 +44,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.FavouritesDbHelper.FavoritesListener; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.FavoriteImageDrawable; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 05a9f821ef..8a65f81d7a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -77,7 +77,7 @@ import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; @@ -173,9 +173,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; -import static net.osmand.plus.OsmandSettings.GENERIC_EXTERNAL_DEVICE; -import static net.osmand.plus.OsmandSettings.PARROT_EXTERNAL_DEVICE; -import static net.osmand.plus.OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE; +import static net.osmand.plus.settings.backend.OsmandSettings.GENERIC_EXTERNAL_DEVICE; +import static net.osmand.plus.settings.backend.OsmandSettings.PARROT_EXTERNAL_DEVICE; +import static net.osmand.plus.settings.backend.OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE; public class MapActivity extends OsmandActionBarActivity implements DownloadEvents, OnRequestPermissionsResultCallback, IRouteInformationListener, AMapPointUpdateListener, diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 0fabc3b3ec..21f4207643 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -47,7 +47,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index eef820706b..ae8af82440 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -27,8 +27,8 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode; diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java index ddf23106c7..67d7f79141 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java @@ -19,7 +19,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.Version; import net.osmand.plus.monitoring.OsmandMonitoringPlugin; import net.osmand.plus.notifications.OsmandNotification.NotificationType; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java index a6477240f0..525b9e0d02 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java @@ -25,9 +25,9 @@ import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.profiles.AppProfileArrayAdapter; import net.osmand.plus.profiles.ProfileDataObject; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 70e70efb15..2d6c08e34d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -41,10 +41,10 @@ import net.osmand.data.PointDescription; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.AngularConstants; -import net.osmand.plus.OsmandSettings.DrivingRegion; -import net.osmand.plus.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants; +import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.base.MapViewTrackingUtilities; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 92e7d13dc1..1cdca6db8f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -35,10 +35,10 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.AutoZoomMap; -import net.osmand.plus.OsmandSettings.OsmandPreference; -import net.osmand.plus.OsmandSettings.SpeedConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.AutoZoomMap; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java index 6659ca3ad2..c76a93d066 100644 --- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java @@ -34,7 +34,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.LockableViewPager; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.mapmarkers.CoordinateInputDialogFragment; import net.osmand.plus.measurementtool.NewGpxData; diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java index e906e13d1a..48221d3ca5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java @@ -21,7 +21,7 @@ import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndAction.java b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndAction.java index 4f968c28f8..1f6dff7b4d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndAction.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndAction.java @@ -1,7 +1,7 @@ package net.osmand.plus.activities.actions; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.views.OsmandMapTileView; diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java index 75337741d3..6c0f975b2b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java @@ -13,7 +13,7 @@ import androidx.appcompat.app.AlertDialog; import net.osmand.CallbackWithObject; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java index 4de0ac2514..1e8ff552b4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java @@ -18,7 +18,7 @@ import net.osmand.plus.AppInitializer.AppInitializeListener; import net.osmand.plus.AppInitializer.InitEvents; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandListActivity; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index fdae526aff..7d4faf5640 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -26,7 +26,7 @@ import net.osmand.data.LatLon; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.FavoritesListActivity; import net.osmand.plus.activities.FavoritesListFragment; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java index 9be37bf7cd..77864a482d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java @@ -22,7 +22,7 @@ import androidx.fragment.app.Fragment; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.FileNameTranslationHelper; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java index 039bee172e..4e034c3f37 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java @@ -10,7 +10,6 @@ import net.osmand.data.City; import net.osmand.data.LatLon; import net.osmand.data.Street; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation; import net.osmand.plus.resources.RegionAddressRepository; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java index 4549a2e4e2..670ac1b157 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java @@ -46,7 +46,7 @@ import net.osmand.data.MapObject; import net.osmand.data.PointDescription; import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandListActivity; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java index 1c19ad1453..db13416044 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java @@ -19,10 +19,9 @@ import net.osmand.data.LatLon; import net.osmand.data.Postcode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.resources.RegionAddressRepository; -import net.osmand.util.Algorithms; import net.osmand.util.MapUtils; import java.util.Collection; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 6c86fad82d..536ef96541 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -30,7 +30,7 @@ import net.osmand.data.PointDescription; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.UpdateLocationViewCache; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 0fb0e12d54..6f446d40b1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -49,7 +49,7 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.R.color; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java index 7ced4b3ec7..b84970bdc9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java @@ -7,7 +7,7 @@ import net.osmand.data.City; import net.osmand.data.MapObject.MapObjectComparator; import net.osmand.data.Street; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation; import net.osmand.plus.resources.RegionAddressRepository; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java index af51ce19c6..0aa220df52 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java @@ -18,7 +18,7 @@ import net.osmand.data.MapObject.MapObjectComparator; import net.osmand.data.Street; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation; import net.osmand.plus.resources.RegionAddressRepository; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 334a2345c9..d8d32df458 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -53,8 +53,8 @@ import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java index f0df427d22..9ebd955757 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java @@ -34,7 +34,7 @@ import net.osmand.GPXUtilities.WptPt; import net.osmand.PlatformUtil; import net.osmand.data.PointDescription; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings.NotesSortByMode; +import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.ActionBarProgressActivity; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java index 797667b886..de1208a735 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java @@ -3,8 +3,8 @@ package net.osmand.plus.audionotes; import android.os.Bundle; import android.view.View; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.NotesSortByMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/base/BaseOsmAndDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/BaseOsmAndDialogFragment.java index 4119d6658f..78ec9484cf 100644 --- a/OsmAnd/src/net/osmand/plus/base/BaseOsmAndDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/base/BaseOsmAndDialogFragment.java @@ -12,7 +12,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.DialogFragment; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java b/OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java index d71b367f37..52c5b92b29 100644 --- a/OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java +++ b/OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java @@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandActionBarActivity; diff --git a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java index 0d08572610..adc82783a6 100644 --- a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java @@ -18,7 +18,7 @@ import androidx.fragment.app.DialogFragment; import net.osmand.plus.OnDialogFragmentResultListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; public abstract class BottomSheetDialogFragment extends DialogFragment { diff --git a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java index e6b256c208..c86b6078ff 100644 --- a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java +++ b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java @@ -14,7 +14,7 @@ import net.osmand.GPXUtilities.GPXFile; import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java index 955d2f418d..fc85123928 100644 --- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java +++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java @@ -20,7 +20,7 @@ import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.dashboard.DashboardOnMap; import net.osmand.plus.mapcontextmenu.MapContextMenu; diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java index c4290f8355..1e3b650a8f 100644 --- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java @@ -36,7 +36,7 @@ import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java index 037dccbcac..788b605eec 100644 --- a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java +++ b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java @@ -23,8 +23,8 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BaseOsmAndDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java index a1ecc88c0f..9f37cd1b41 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java @@ -32,7 +32,7 @@ import androidx.fragment.app.FragmentActivity; import net.osmand.AndroidUtils; import net.osmand.ValueHolder; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.ProgressImplementation; import net.osmand.plus.R; import net.osmand.plus.download.DownloadActivity; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashDashboardOrDrawerFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashDashboardOrDrawerFragment.java index faf607415f..0ea4ac1f35 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashDashboardOrDrawerFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashDashboardOrDrawerFragment.java @@ -5,7 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dashboard.tools.DashFragmentData; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java index 047c645165..bfc835d510 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java @@ -14,7 +14,7 @@ import androidx.core.view.ViewCompat; import com.google.android.material.snackbar.Snackbar; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandActionBarActivity; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index c4297a6fc9..dce1bf9a87 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -55,7 +55,7 @@ import net.osmand.plus.ContextMenuAdapter.OnRowItemClick; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java index c791b6228c..12e5fadece 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java @@ -2,7 +2,7 @@ package net.osmand.plus.dashboard.tools; import androidx.annotation.NonNull; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dashboard.DashBaseFragment; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java index 4370eead93..8b7e47a941 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java @@ -24,8 +24,8 @@ import androidx.fragment.app.FragmentActivity; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/TransactionBuilder.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/TransactionBuilder.java index c012f58c94..b4c37dcc41 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/tools/TransactionBuilder.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/TransactionBuilder.java @@ -5,7 +5,7 @@ import android.util.Log; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dashboard.DashBaseFragment; diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java index 83095b45b6..3cfd370057 100644 --- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java +++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java @@ -14,7 +14,7 @@ import android.preference.PreferenceScreen; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.SettingsBaseActivity; diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java index b5dd85813f..674b9e067d 100644 --- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java +++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java @@ -19,7 +19,7 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.OsmandActionBarActivity; import net.osmand.plus.routing.data.StreetName; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index b42acc9789..4c3378c77e 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -37,9 +37,9 @@ import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.ListStringPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.ListStringPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/CrashBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/CrashBottomSheetDialogFragment.java index 6533e6d77b..e6d5b2edb4 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/CrashBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/CrashBottomSheetDialogFragment.java @@ -10,7 +10,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.MenuBottomSheetDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/DislikeOsmAndBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/DislikeOsmAndBottomSheetDialogFragment.java index 2e9a1de3a5..4cd7275db1 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/DislikeOsmAndBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/DislikeOsmAndBottomSheetDialogFragment.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java index 06a272263d..88bfd6f59d 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java @@ -17,7 +17,7 @@ import androidx.fragment.app.DialogFragment; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java index 70392ce7b3..44d50db194 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java @@ -10,8 +10,8 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.LayerTransparencySeekbarMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivityLayers; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialogFragment.java index 30c4fbeac9..2dcd62c6bd 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialogFragment.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.base.MenuBottomSheetDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java index 59207bb935..b74f5f96f2 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java @@ -25,7 +25,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.MenuBottomSheetDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java index e67b1bc076..f84ac5239e 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java @@ -18,8 +18,8 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java index 5e726d7530..68db4aa339 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java @@ -45,7 +45,7 @@ import net.osmand.data.PointDescription; import net.osmand.map.WorldRegion; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.LocalIndexInfo; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java index 4761b85586..4b0dd632aa 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java @@ -21,8 +21,8 @@ import net.osmand.PlatformUtil; import net.osmand.map.WorldRegion; import net.osmand.map.WorldRegion.RegionParams; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.base.BasicProgressAsyncTask; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java index 2aaba913ac..4256dfce0f 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java @@ -18,7 +18,7 @@ import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadValidationManager.java b/OsmAnd/src/net/osmand/plus/download/DownloadValidationManager.java index 4196d9ecdb..92fa82079f 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadValidationManager.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadValidationManager.java @@ -14,7 +14,7 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents; diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java index f6b2ce314d..dceeac1862 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java @@ -24,7 +24,7 @@ import net.osmand.AndroidUtils; import net.osmand.IProgress; import net.osmand.plus.OnDismissDialogFragmentListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.BottomSheetDialogFragment; import net.osmand.plus.dashboard.DashChooseAppDirFragment; diff --git a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java index 822fac1a16..a6486f8594 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java @@ -40,7 +40,7 @@ import net.osmand.data.Amenity; import net.osmand.map.OsmandRegions; import net.osmand.map.WorldRegion; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.download.CityItem; import net.osmand.plus.download.DownloadActivity; diff --git a/OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java index 2ca0da41e4..65baa93718 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java @@ -24,7 +24,7 @@ import net.osmand.Collator; import net.osmand.OsmAndCollator; import net.osmand.map.OsmandRegions; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.OsmAndListFragment; import net.osmand.plus.chooseplan.ChoosePlanDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java index a64fde836c..9fa4c1efe0 100644 --- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java +++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java @@ -36,7 +36,7 @@ import net.osmand.plus.AppInitializer.AppInitializeListener; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java index e7481eefb1..61ae82399f 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java @@ -18,7 +18,6 @@ import android.view.View; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; import net.osmand.AndroidNetworkUtils; import net.osmand.osm.AbstractPoiType; @@ -27,7 +26,7 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java index 3099ca7118..356f8c9870 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java @@ -80,7 +80,7 @@ import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java index 94bb1a916e..9716ebadf4 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java @@ -41,13 +41,13 @@ import net.osmand.plus.GPXDatabase; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper; -import net.osmand.plus.SettingsHelper.CheckDuplicatesListener; -import net.osmand.plus.SettingsHelper.PluginSettingsItem; -import net.osmand.plus.SettingsHelper.ProfileSettingsItem; -import net.osmand.plus.SettingsHelper.SettingsCollectListener; -import net.osmand.plus.SettingsHelper.SettingsImportListener; -import net.osmand.plus.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.CheckDuplicatesListener; +import net.osmand.plus.settings.backend.SettingsHelper.PluginSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.ProfileSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsCollectListener; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsImportListener; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; import net.osmand.plus.activities.ActivityResultListener; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.TrackActivity; diff --git a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java index 90957eb2a2..904778aeaa 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java @@ -14,7 +14,7 @@ import net.osmand.map.TileSourceManager; import net.osmand.plus.ApplicationMode; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dashboard.DashboardOnMap.DashboardType; diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java index 41ac51bda8..34d31e1489 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java @@ -16,8 +16,8 @@ import androidx.annotation.Nullable; import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.routing.VoiceRouter.VoiceMessageListener; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 167d3558b2..664786140b 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -20,8 +20,8 @@ import net.osmand.osm.PoiType; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java index 98a26a33f6..2fe36e624d 100644 --- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java +++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java @@ -22,8 +22,8 @@ import net.osmand.AndroidNetworkUtils.OnRequestsResultListener; import net.osmand.AndroidNetworkUtils.RequestResponse; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.inapp.InAppPurchases.InAppPurchase; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesAlarmReceiver.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesAlarmReceiver.java index 4cefc941c2..9cc47eda82 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesAlarmReceiver.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesAlarmReceiver.java @@ -8,7 +8,7 @@ import android.os.AsyncTask; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java index ee4d486aaf..f96ebf4ff6 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java @@ -35,7 +35,7 @@ import androidx.fragment.app.FragmentManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.LocalIndexHelper; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java index aa44f127d1..ec4afd6861 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java @@ -8,7 +8,7 @@ import android.os.AsyncTask; import androidx.annotation.NonNull; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.OsmandActionBarActivity; import net.osmand.plus.helpers.FileNameTranslationHelper; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java index bd585b316d..d3f8f2ed4e 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java @@ -23,7 +23,7 @@ import androidx.fragment.app.DialogFragment; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.download.AbstractDownloadActivity; import net.osmand.plus.liveupdates.LiveUpdatesHelper.TimeOfDay; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java index 0b6201b6b8..c95ac1a2a6 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.download.AbstractDownloadActivity; import net.osmand.plus.download.DownloadActivityType; diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java index 01509b5609..a2afb3d933 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java @@ -24,7 +24,7 @@ import androidx.fragment.app.Fragment; import net.osmand.AndroidNetworkUtils; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.OsmandInAppPurchaseActivity; import net.osmand.plus.base.BaseOsmAndDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java index 19c0d0983f..5daa14ba27 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java @@ -4,7 +4,7 @@ import android.view.View; import androidx.annotation.NonNull; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.mapcontextmenu.MenuBuilder.CollapseExpandListener; public class CollapsableView { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 3ee7a0b9ed..99da51fc51 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -57,7 +57,7 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.LockableScrollView; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.DialogButtonType; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java index 2263c43838..fe5efc2b7b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java @@ -44,7 +44,7 @@ import net.osmand.osm.PoiCategory; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java index 4791e401d0..eda5de7c16 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java @@ -28,8 +28,8 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java index 90beeae69c..5ec1d34d25 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.mapillary.MapillaryImageDialog; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java index 01a646d08a..5641f125ec 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java @@ -13,7 +13,7 @@ import androidx.core.content.ContextCompat; import net.osmand.data.PointDescription; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.MapMarkerDialogHelper; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java index d0af66e0c3..4670bb533d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java @@ -17,7 +17,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.data.LatLon; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java index afab462022..1117ae10a8 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java @@ -25,7 +25,7 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.SettingsBaseActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/ShareMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/ShareMenu.java index c32a8281b4..7323e52b5d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/ShareMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/ShareMenu.java @@ -12,7 +12,7 @@ import androidx.core.view.ViewCompat; import net.osmand.data.LatLon; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.actions.ShareDialog; diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java index 111db7c38a..e2154ff24d 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java @@ -23,7 +23,7 @@ import androidx.annotation.Nullable; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import org.json.JSONArray; diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java index dc17ec9050..60abf651ba 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java @@ -29,7 +29,7 @@ import androidx.core.content.ContextCompat; import net.osmand.map.TileSourceManager; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 16e7a76882..28ee511f9a 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -24,7 +24,7 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java index a1b1d669ea..cf769223f1 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java @@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java index 319eef1ae5..2059bcf25e 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java @@ -66,7 +66,7 @@ import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java index 2aef9c49e8..ee5a632281 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java @@ -31,9 +31,9 @@ import com.github.ksoichiro.android.observablescrollview.ScrollState; import net.osmand.AndroidUtils; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.MapMarkersMode; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.MapMarkersMode; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java index 99032425ec..4d5dc5d0e3 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java @@ -33,7 +33,7 @@ import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarkersSortByDef; import net.osmand.plus.MapMarkersHelper.OnGroupSyncedListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java index e6394f2422..487ee2073c 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java @@ -14,7 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import net.osmand.AndroidUtils; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.BottomSheetDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java index 37f36cb86a..dbc455a189 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java @@ -44,7 +44,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; @@ -66,8 +66,8 @@ import net.osmand.util.MapUtils; import java.util.ArrayList; import java.util.List; -import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT; -import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT; +import static net.osmand.plus.settings.backend.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT; +import static net.osmand.plus.settings.backend.OsmandSettings.MIDDLE_TOP_CONSTANT; public class PlanRouteFragment extends BaseOsmAndFragment implements OsmAndLocationListener { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index 575a7818e4..c5cd900530 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -50,7 +50,7 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java index 34260adb63..fd87a792ea 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java @@ -22,7 +22,7 @@ import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.SavingTrackHelper; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java b/OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java index 47a016ebd6..169507b35a 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java @@ -7,7 +7,7 @@ import net.osmand.data.LatLon; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.MapUtils; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java index a3730cdfaa..5a0a21f0e9 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java @@ -13,7 +13,7 @@ import androidx.preference.Preference; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.FontCache; @@ -31,8 +31,8 @@ import net.osmand.plus.widgets.style.CustomTypefaceSpan; import java.util.HashMap; import java.util.LinkedHashMap; -import static net.osmand.plus.OsmandSettings.MONTHLY_DIRECTORY; -import static net.osmand.plus.OsmandSettings.REC_DIRECTORY; +import static net.osmand.plus.settings.backend.OsmandSettings.MONTHLY_DIRECTORY; +import static net.osmand.plus.settings.backend.OsmandSettings.REC_DIRECTORY; import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.MINUTES; import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.SECONDS; import static net.osmand.plus.myplaces.FavoritesActivity.TAB_ID; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index afd68a0046..cc66038e5e 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -31,7 +31,7 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java index 578234c258..009620097f 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java @@ -38,8 +38,8 @@ import net.osmand.plus.activities.SettingsBaseActivity; import java.util.Map; -import static net.osmand.plus.OsmandSettings.MONTHLY_DIRECTORY; -import static net.osmand.plus.OsmandSettings.REC_DIRECTORY; +import static net.osmand.plus.settings.backend.OsmandSettings.MONTHLY_DIRECTORY; +import static net.osmand.plus.settings.backend.OsmandSettings.REC_DIRECTORY; public class SettingsMonitoringActivity extends SettingsBaseActivity { diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index 61e1284f59..237eb3fc7a 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -66,7 +66,7 @@ import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java index 2988ce6a44..b48ce8f00f 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java @@ -27,7 +27,7 @@ import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.FavoritesTreeFragment; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java index 8076b358ce..c7b3d0ba18 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java @@ -38,7 +38,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.TrackActivity; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java index ec49b0998b..25d9d7450a 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java @@ -49,7 +49,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.TrackActivity; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java index b9ff8b8a35..274dd3a379 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java @@ -59,7 +59,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarkersGroup; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index bab87752af..71e229030c 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -56,7 +56,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java index ce527c5ca0..f221f2580d 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java @@ -67,7 +67,7 @@ import net.osmand.osm.edit.OSMSettings; import net.osmand.osm.edit.Way; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java index 88b30c09ca..490870b518 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java @@ -21,7 +21,7 @@ import net.osmand.osm.io.Base64; import net.osmand.osm.io.NetworkUtils; import net.osmand.osm.io.OsmBaseStorage; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java index 03a5f6a6ab..7f07f303ce 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java @@ -26,7 +26,7 @@ import net.osmand.data.QuadTree; import net.osmand.data.RotatedTileBox; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.osmedit.OsmBugsUtil.OsmBugResult; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java index cc4132107b..8d1238e324 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java @@ -5,7 +5,7 @@ import net.osmand.PlatformUtil; import net.osmand.osm.io.Base64; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.osmedit.OsmPoint.Action; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 52138cfd53..157188fbb1 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -30,7 +30,7 @@ import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.EnumAdapter; import net.osmand.plus.activities.EnumAdapter.IEnumWithResource; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java index 6812af21c0..4a7334bd0f 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java @@ -40,7 +40,7 @@ import net.osmand.osm.edit.Entity; import net.osmand.osm.edit.Node; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.activities.ActionBarProgressActivity; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java index 9ac5b4c3da..65a2dfe3ee 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java @@ -13,9 +13,9 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java index f2cc831475..7af0286ae4 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java @@ -18,7 +18,7 @@ import androidx.fragment.app.DialogFragment; import net.osmand.osm.PoiType; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dialogs.ProgressDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 02f5f3df15..c0461e6931 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -28,8 +28,8 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java index 9d8f4940d0..f67b6075e0 100644 --- a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java +++ b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java @@ -13,7 +13,7 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.api.SQLiteAPI; import net.osmand.plus.api.SQLiteAPI.SQLiteConnection; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java index 8a3cbd7f65..b90454cb12 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java @@ -10,7 +10,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java index ceca652233..045501de6b 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java @@ -15,7 +15,7 @@ import com.google.gson.reflect.TypeToken; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.quickaction.actions.DayNightModeAction; import net.osmand.plus.quickaction.actions.FavoriteAction; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java index f683603672..0be5c0f715 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.DayNightMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/NavAutoZoomMapAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/NavAutoZoomMapAction.java index a0e2d1d76d..8ea131d22e 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/NavAutoZoomMapAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/NavAutoZoomMapAction.java @@ -7,7 +7,7 @@ import android.widget.TextView; import android.widget.Toast; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java index a0b1ad1d55..34ce197220 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java @@ -4,19 +4,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import android.widget.Toast; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import net.osmand.CallbackWithObject; -import net.osmand.GPXUtilities.GPXFile; -import net.osmand.IndexConstants; + import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickActionType; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java index a969b85cb9..8888113c4c 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java @@ -12,7 +12,7 @@ import com.google.gson.reflect.TypeToken; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.profiles.SelectMultipleProfilesBottomSheet; diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java b/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java index 26604717bb..575196f8a2 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java @@ -15,15 +15,14 @@ import com.google.gson.reflect.TypeToken; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.LayerTransparencySeekbarMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickActionType; import net.osmand.plus.quickaction.SwitchableAction; -import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/MapSourceAction.java b/OsmAnd/src/net/osmand/plus/rastermaps/MapSourceAction.java index 6858369543..b11a8ec812 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/MapSourceAction.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/MapSourceAction.java @@ -15,14 +15,13 @@ import com.google.gson.reflect.TypeToken; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickActionType; import net.osmand.plus.quickaction.SwitchableAction; -import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java b/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java index 329214fa3d..12f6f909cf 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java @@ -15,15 +15,14 @@ import com.google.gson.reflect.TypeToken; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.LayerTransparencySeekbarMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickActionType; import net.osmand.plus.quickaction.SwitchableAction; -import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index b64a4138b1..9194949691 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -34,9 +34,9 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.LayerTransparencySeekbarMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java index c5bfc2e9f3..048de5ddb9 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java +++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java @@ -42,8 +42,8 @@ import net.osmand.map.MapTileDownloader; import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.development.OsmandDevelopmentPlugin; import net.osmand.plus.render.OsmandRenderer.RenderingContext; diff --git a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java index dce4b64c56..e156d0fa7d 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java +++ b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java @@ -6,10 +6,9 @@ import net.osmand.core.jni.MapLayerConfiguration; import net.osmand.core.jni.PointI; import net.osmand.data.LatLon; import net.osmand.data.QuadPointDouble; -import net.osmand.data.QuadRect; import net.osmand.data.RotatedTileBox; import net.osmand.map.ITileSource; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.views.BaseMapLayer; import net.osmand.plus.views.MapTileLayer; diff --git a/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java index 7fa8057507..6da4f7ecab 100644 --- a/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java +++ b/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java @@ -18,7 +18,7 @@ import net.osmand.data.MapObject; import net.osmand.data.QuadRect; import net.osmand.data.QuadTree; import net.osmand.data.Street; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResource; import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResourceType; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java index d60a2a53cc..9d7a8f3ab1 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java @@ -20,7 +20,7 @@ import androidx.fragment.app.Fragment; import net.osmand.AndroidUtils; import net.osmand.data.LatLon; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java index 4ecc22f17b..692ffa5991 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java @@ -43,7 +43,7 @@ import net.osmand.plus.LockableViewPager; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivityActions; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java index d56ca34ed3..8ffcc49b10 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java @@ -53,9 +53,9 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java index 3b628dae68..9bcb3fbea5 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java @@ -56,7 +56,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup; import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java index 93e20dfc88..b159b2f602 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java @@ -22,7 +22,7 @@ import net.osmand.StateChangedListener; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.actions.OsmAndDialogs; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java index 610e2a3958..3fed04affc 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java @@ -26,7 +26,7 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 52876bd44c..2d121ccecf 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -21,8 +21,8 @@ import net.osmand.data.WptLocationPoint; import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index c11b5edb04..1b31087baa 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -14,7 +14,7 @@ import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java index 47084fb1f6..e2f196cf48 100644 --- a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java @@ -16,7 +16,7 @@ import net.osmand.osm.edit.Node; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.render.NativeOsmandLibrary; import net.osmand.plus.routing.RouteCalculationParams.RouteCalculationResultListener; @@ -32,7 +32,6 @@ import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment; import net.osmand.router.TransportRoutePlanner.TransportRoutingContext; import net.osmand.router.TransportRoutingConfiguration; import net.osmand.router.NativeTransportRoutingResult; -import net.osmand.util.Algorithms; import net.osmand.util.MapUtils; import java.io.IOException; diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index ebaa8a0baf..2a91d08cc2 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -10,7 +10,7 @@ import net.osmand.data.PointDescription; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper; import net.osmand.plus.routing.AlarmInfo.AlarmInfoType; import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo; diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java index f57cd3b951..613d7be98f 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java @@ -44,7 +44,7 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.UpdateLocationViewCache; diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java index 4bdfcf9642..8f1d0791e4 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java @@ -34,7 +34,7 @@ import net.osmand.AndroidUtils; import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.poi.PoiFiltersHelper; diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java index 4637f95455..47913d028b 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java @@ -75,7 +75,7 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java index 1170e2c616..d932d50557 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java @@ -38,7 +38,7 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiFilter; import net.osmand.osm.PoiType; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.dialogs.DirectionsDialogs; @@ -47,7 +47,6 @@ import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.widgets.TextViewEx; import net.osmand.util.Algorithms; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/OsmandSettings.java rename to OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java index 04e5c878d8..24b01d96dc 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand.plus.settings.backend; import android.annotation.SuppressLint; @@ -36,8 +36,13 @@ import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.osm.io.NetworkUtils; +import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode.ApplicationModeBean; import net.osmand.plus.ApplicationMode.ApplicationModeBuilder; +import net.osmand.plus.FavouritesDbHelper; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; +import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.access.AccessibilityMode; import net.osmand.plus.access.RelativeDirectionStyle; import net.osmand.plus.api.SettingsAPI; diff --git a/OsmAnd/src/net/osmand/plus/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/SettingsHelper.java rename to OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java index 6a0fa5d8ba..6c053f9c08 100644 --- a/OsmAnd/src/net/osmand/plus/SettingsHelper.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand.plus.settings.backend; import android.annotation.SuppressLint; import android.content.Context; @@ -20,10 +20,17 @@ import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.map.WorldRegion; import net.osmand.osm.MapPoiTypes; import net.osmand.osm.PoiCategory; +import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode.ApplicationModeBean; import net.osmand.plus.ApplicationMode.ApplicationModeBuilder; +import net.osmand.plus.CustomOsmandPlugin; import net.osmand.plus.CustomOsmandPlugin.SuggestedDownloadItem; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.CustomRegion; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandPlugin; +import net.osmand.plus.R; +import net.osmand.plus.SQLiteTileSource; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.helpers.AvoidSpecificRoads; import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo; import net.osmand.plus.poi.PoiUIFilter; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java index 2107c4c7ab..a68867e4c0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java @@ -16,9 +16,9 @@ import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.BooleanPreference; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java index efc1b4500d..334cc42aa8 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java @@ -12,7 +12,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java index e957624aa2..d016a7fee5 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java @@ -17,7 +17,7 @@ import net.osmand.AndroidUtils; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java index 0a67e28669..1148f23720 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java @@ -54,8 +54,8 @@ import net.osmand.PlatformUtil; import net.osmand.access.AccessibilitySettingsFragment; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java index 9ca91b6f02..c668564a6d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java @@ -28,7 +28,7 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java index 87af22d4c5..65aca889b1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java @@ -35,8 +35,8 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper; -import net.osmand.plus.SettingsHelper.SettingsCollectListener; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsCollectListener; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java index 6fc4028afc..93719a83ab 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java @@ -24,7 +24,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.ProgressImplementation; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java index bcf9f9e1f2..b270175d86 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java @@ -6,7 +6,7 @@ import android.os.Build; import net.osmand.IndexConstants; import net.osmand.ValueHolder; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import java.io.File; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java index b8ff7fe426..d686a1a6a7 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java @@ -30,9 +30,9 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; -import net.osmand.plus.SettingsHelper; -import net.osmand.plus.SettingsHelper.FileSettingsItem; -import net.osmand.plus.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.FileSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java index 57950c5cac..0c04b79741 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java @@ -23,8 +23,8 @@ import androidx.preference.SwitchPreferenceCompat; import net.osmand.data.PointDescription; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.DrivingRegion; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java index 94a2ef6289..741054dd7b 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java @@ -12,7 +12,7 @@ import androidx.preference.SwitchPreferenceCompat; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.SettingsGeneralActivity; import net.osmand.plus.dialogs.SendAnalyticsBottomSheetDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java index 9931e76f26..273e0f3de2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java @@ -21,7 +21,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BaseOsmAndFragment; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java index c4c78b4a51..2a1526a82c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java @@ -29,10 +29,10 @@ import net.osmand.plus.AppInitializer; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper; -import net.osmand.plus.SettingsHelper.ImportAsyncTask; -import net.osmand.plus.SettingsHelper.ImportType; -import net.osmand.plus.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.ImportAsyncTask; +import net.osmand.plus.settings.backend.SettingsHelper.ImportType; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.BaseOsmAndFragment; import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java index 5a3e78d9fc..832e4791fc 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java @@ -34,18 +34,18 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; -import net.osmand.plus.SettingsHelper; -import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem; -import net.osmand.plus.SettingsHelper.FileSettingsItem; -import net.osmand.plus.SettingsHelper.FileSettingsItem.FileSubtype; -import net.osmand.plus.SettingsHelper.ImportAsyncTask; -import net.osmand.plus.SettingsHelper.ImportType; -import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem; -import net.osmand.plus.SettingsHelper.PoiUiFilterSettingsItem; -import net.osmand.plus.SettingsHelper.ProfileSettingsItem; -import net.osmand.plus.SettingsHelper.QuickActionsSettingsItem; -import net.osmand.plus.SettingsHelper.SettingsItem; -import net.osmand.plus.SettingsHelper.SettingsItemType; +import net.osmand.plus.settings.backend.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper.AvoidRoadsSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.FileSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.FileSettingsItem.FileSubtype; +import net.osmand.plus.settings.backend.SettingsHelper.ImportAsyncTask; +import net.osmand.plus.settings.backend.SettingsHelper.ImportType; +import net.osmand.plus.settings.backend.SettingsHelper.MapSourcesSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.PoiUiFilterSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.ProfileSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.QuickActionsSettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItemType; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BaseOsmAndFragment; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java index 9aa456b3f2..27ab212c3f 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java @@ -17,8 +17,8 @@ import net.osmand.CallbackWithObject; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper.SettingsItem; -import net.osmand.plus.SettingsHelper.SettingsItemType; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; +import net.osmand.plus.settings.backend.SettingsHelper.SettingsItemType; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java index 201407aaa0..e44f338ee1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java @@ -2,8 +2,8 @@ package net.osmand.plus.settings.fragments; import androidx.preference.Preference; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.AutoZoomMap; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.AutoZoomMap; import net.osmand.plus.R; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java index 6f9ea0d2d7..27b5cd0962 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java @@ -41,7 +41,7 @@ import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.R; -import net.osmand.plus.SettingsHelper; +import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.DialogButtonType; import net.osmand.plus.profiles.LocationIcon; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java index e515c9be16..10cfd2adcc 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java @@ -25,8 +25,8 @@ import net.osmand.StateChangedListener; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.BooleanPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.SettingsBaseActivity; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java index efe0027620..b38fffa8e1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java @@ -9,7 +9,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.SettingsBaseActivity; import net.osmand.plus.routing.RouteProvider.RouteService; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java index 7df29977b0..fdf9e788dc 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java @@ -21,7 +21,7 @@ import androidx.preference.SwitchPreferenceCompat; import net.osmand.AndroidUtils; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.Version; @@ -33,7 +33,7 @@ import net.osmand.plus.settings.preferences.ListPreferenceEx; import java.util.Set; -import static net.osmand.plus.OsmandSettings.VOICE_PROVIDER_NOT_USE; +import static net.osmand.plus.settings.backend.OsmandSettings.VOICE_PROVIDER_NOT_USE; import static net.osmand.plus.UiUtilities.CompoundButtonType.TOOLBAR; import static net.osmand.plus.activities.SettingsNavigationActivity.MORE_VALUE; diff --git a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java index de1aaafe54..e6bdd34f07 100644 --- a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java +++ b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java @@ -8,7 +8,7 @@ import androidx.preference.DialogPreference; import androidx.preference.PreferenceDataStore; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmandSettings.PreferencesDataStore; +import net.osmand.plus.settings.backend.OsmandSettings.PreferencesDataStore; public class ListPreferenceEx extends DialogPreference { diff --git a/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java b/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java index f1a5135cb9..896e1864d1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java +++ b/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java @@ -6,7 +6,7 @@ import android.util.AttributeSet; import androidx.preference.MultiSelectListPreference; import androidx.preference.PreferenceDataStore; -import net.osmand.plus.OsmandSettings.PreferencesDataStore; +import net.osmand.plus.settings.backend.OsmandSettings.PreferencesDataStore; import java.util.HashSet; import java.util.Set; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java index 676746ab48..9c4ae901f7 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java @@ -8,12 +8,11 @@ import android.widget.TextView; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickActionType; -import net.osmand.plus.srtmplugin.SRTMPlugin; import net.osmand.render.RenderingRuleProperty; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java index 97d27e8526..94a33cf6a8 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java @@ -7,7 +7,7 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.SettingsActivity; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java index fb96b6bcdb..00ce824d6e 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java @@ -20,9 +20,9 @@ import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.TerrainMode; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.SettingsActivity; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java index d76917cf73..bdd4b1a8b1 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java @@ -35,8 +35,8 @@ import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.TerrainMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; @@ -53,8 +53,8 @@ import org.apache.commons.logging.Log; import java.io.IOException; import java.util.List; -import static net.osmand.plus.OsmandSettings.TerrainMode.HILLSHADE; -import static net.osmand.plus.OsmandSettings.TerrainMode.SLOPE; +import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.HILLSHADE; +import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.SLOPE; import static net.osmand.plus.download.DownloadActivityType.HILLSHADE_FILE; import static net.osmand.plus.download.DownloadActivityType.SLOPE_FILE; import static net.osmand.plus.srtmplugin.SRTMPlugin.TERRAIN_MAX_ZOOM; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java index 952ac4a498..f55613d1bc 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java @@ -14,7 +14,7 @@ import net.osmand.data.QuadTree; import net.osmand.data.RotatedTileBox; import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.TerrainMode; +import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode; import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.api.SQLiteAPI.SQLiteConnection; @@ -31,7 +31,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.os.AsyncTask; -import static net.osmand.plus.OsmandSettings.TerrainMode.HILLSHADE; +import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.HILLSHADE; public class TerrainLayer extends MapTileLayer { diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java index 11dd094575..76d3969e1d 100644 --- a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java +++ b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java @@ -19,8 +19,8 @@ import androidx.core.content.ContextCompat; import net.osmand.CallbackWithObject; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java index b6eb8dd177..58a38d40b0 100644 --- a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java @@ -24,7 +24,7 @@ import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.mapcontextmenu.MapContextMenu; diff --git a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java index 402fd70fb8..b02268af15 100644 --- a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java @@ -25,7 +25,7 @@ import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.views.ContextMenuLayer.ApplyMovedObjectCallback; diff --git a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java index dbdfc9765b..cb9dfbf04b 100644 --- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java @@ -41,7 +41,7 @@ import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.MapMarkersHelper.MapMarkersGroup; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints; diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index e110df60dd..f6643e7902 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -8,12 +8,9 @@ import android.animation.ObjectAnimator; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.pm.PackageManager; -import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.PointF; -import android.graphics.PorterDuff; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.view.MotionEvent; @@ -46,9 +43,9 @@ import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.CommonPreference; -import net.osmand.plus.OsmandSettings.LayerTransparencySeekbarMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index b9b4336ed5..aa1c4506af 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java index 2f11363cb8..afb6d3fc19 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java @@ -36,7 +36,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java index d79ba54367..44c56e83dd 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java @@ -18,7 +18,6 @@ import android.widget.ImageView; import androidx.annotation.DimenRes; import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; import androidx.core.util.Pair; import androidx.fragment.app.Fragment; @@ -30,7 +29,7 @@ import net.osmand.data.LatLon; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java b/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java index 76c4e26466..46e8a1f3fb 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java @@ -16,7 +16,7 @@ import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.mapillary.MapillaryPlugin; import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index af1e61053f..3a9c022a9f 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -42,7 +42,7 @@ import net.osmand.map.MapTileDownloader.IMapDownloaderCallback; import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.TwoFingerTapDetector; diff --git a/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java b/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java index 4286e1ac75..43131febe2 100644 --- a/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java @@ -29,9 +29,9 @@ import net.osmand.data.QuadPoint; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.AngularConstants; -import net.osmand.plus.OsmandSettings.RulerMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants; +import net.osmand.plus.settings.backend.OsmandSettings.RulerMode; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java index 5b104e9638..4160328bcd 100644 --- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java @@ -25,7 +25,7 @@ import net.osmand.data.RotatedTileBox; import net.osmand.data.TransportStop; import net.osmand.osm.edit.Node; import net.osmand.osm.edit.Way; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.render.RenderingIcons; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java index 52ca3c70b9..61fffdb814 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java @@ -5,7 +5,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Typeface; @@ -49,8 +48,8 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider.GPSInfo; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.RulerMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.RulerMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; @@ -60,7 +59,6 @@ import net.osmand.plus.helpers.WaypointDialogHelper; import net.osmand.plus.helpers.WaypointHelper; import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper; import net.osmand.plus.render.OsmandRenderer; -import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.render.TextRenderer; import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu; import net.osmand.plus.routepreparationmenu.ShowAlongTheRouteBottomSheet; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java index ce189d7cfa..e5fa0daca8 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java @@ -16,8 +16,8 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index 93fb650cd7..aa9a8d09cc 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -34,8 +34,8 @@ import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java index 04449bf62b..391d1f74ae 100644 --- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java +++ b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java @@ -11,8 +11,8 @@ import net.osmand.PlatformUtil; import net.osmand.StateChangedListener; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.MetricsConstants; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; import net.osmand.plus.R; import net.osmand.plus.api.AudioFocusHelper; diff --git a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java index d0a72beb78..f3c9734a82 100644 --- a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java @@ -8,7 +8,7 @@ import android.os.Build; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.routing.VoiceRouter; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index bb10ad4527..4c2559dbf3 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -17,7 +17,7 @@ import androidx.appcompat.app.AlertDialog; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.SettingsActivity; import net.osmand.plus.routing.VoiceRouter; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java index 179cedef05..a02131c3e7 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java @@ -16,7 +16,7 @@ import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java index a5db2651e9..302140ba03 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.wikivoyage.WikiBaseDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java index d70f7bc427..41edcb0a02 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java @@ -9,8 +9,8 @@ import androidx.appcompat.widget.PopupMenu; import androidx.fragment.app.Fragment; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.WikiArticleShowImages; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java index ad2f4c1519..ab1990aa3d 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java @@ -1,7 +1,6 @@ package net.osmand.plus.wikipedia; import android.os.Bundle; -import android.text.TextUtils; import android.widget.ArrayAdapter; import androidx.annotation.NonNull; @@ -11,7 +10,7 @@ import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.download.DownloadActivityType; diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java index 1e08145c82..07c748cd28 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java @@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings.WikiArticleShowImages; +import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages; import net.osmand.plus.R; import net.osmand.plus.base.BottomSheetDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageUtils.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageUtils.java index 42bb7f8f5a..af4f368b66 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageUtils.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageUtils.java @@ -3,7 +3,7 @@ package net.osmand.plus.wikivoyage; import com.squareup.picasso.NetworkPolicy; import com.squareup.picasso.RequestCreator; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; public class WikivoyageUtils { diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java index 46f4b79750..b9fb48a1c3 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java @@ -16,7 +16,7 @@ import net.osmand.GPXUtilities; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.wikipedia.WikiArticleHelper; import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment; diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java index 7886783081..60cf378a9b 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java @@ -30,7 +30,7 @@ import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.TrackActivity; import net.osmand.plus.development.OsmandDevelopmentPlugin; @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import static net.osmand.plus.OsmandSettings.WikiArticleShowImages.OFF; +import static net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages.OFF; public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragment { diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java index 109c8796b4..bc8025cba9 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java @@ -18,7 +18,7 @@ import com.squareup.picasso.RequestCreator; import net.osmand.PicassoUtils; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.widgets.tools.CropCircleTransformation; diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java index 15fe591895..600e9946e2 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java @@ -30,7 +30,7 @@ import net.osmand.AndroidUtils; import net.osmand.plus.LockableViewPager; import net.osmand.plus.OnDialogFragmentResultListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.TabActivity; import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents; diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java index 4c32edf4f2..3b67249cf7 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java @@ -15,8 +15,8 @@ import androidx.appcompat.widget.PopupMenu; import net.osmand.PicassoUtils; import net.osmand.plus.OnDialogFragmentResultListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.WikiArticleShowImages; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; From 38a5eaf50c571cb2e591ffa176b9c9d0dbfe3704 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 19 May 2020 14:44:48 +0300 Subject: [PATCH 26/32] Add ability to delete quick action in editing screen --- .../quickaction/CreateEditActionDialog.java | 31 ++++++++++++++++ .../quickaction/QuickActionListFragment.java | 35 +++++++++++-------- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java b/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java index 547d23e3ec..9fdc94c8df 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java @@ -1,6 +1,7 @@ package net.osmand.plus.quickaction; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -9,6 +10,8 @@ import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -31,6 +34,8 @@ import net.osmand.plus.activities.MapActivity; import java.util.List; +import static net.osmand.plus.quickaction.QuickActionListFragment.showConfirmActionDeleteDialog; + /** * Created by rosty on 12/27/16. */ @@ -168,6 +173,32 @@ public class CreateEditActionDialog extends DialogFragment implements CallbackWi dismiss(); } }); + if (!isNew) { + Menu menu = toolbar.getMenu(); + menu.clear(); + + MenuItem item = menu.add(R.string.shared_string_delete).setIcon(R.drawable.ic_action_delete_dark); + item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + Context ctx = getContext(); + if (ctx != null) { + DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + quickActionRegistry.deleteQuickAction(action); + quickActionRegistry.notifyUpdates(); + + dialog.dismiss(); + dismiss(); + } + }; + showConfirmActionDeleteDialog(ctx, action, !isLightContent, listener); + } + return true; + } + }); + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + } } private void setupHeader(View root, Bundle savedInstanceState){ diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java index 23eeb0174d..5c6781fbc5 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java @@ -184,26 +184,24 @@ public class QuickActionListFragment extends BaseOsmAndFragment implements Quick quickActionRegistry.updateQuickActions(adapter.getQuickActions()); } - void createAndShowDeleteDialog(final int itemPosition, final String itemName) { - AlertDialog.Builder builder = new AlertDialog.Builder(UiUtilities.getThemedContext(getContext(), !isLightContent)); + static void showConfirmActionDeleteDialog(Context ctx, QuickAction action, boolean nightMode, DialogInterface.OnClickListener listener) { + OsmandApplication app = (OsmandApplication) ctx.getApplicationContext(); + + AlertDialog.Builder builder = new AlertDialog.Builder(UiUtilities.getThemedContext(ctx, nightMode)); builder.setTitle(R.string.quick_actions_delete); - builder.setMessage(getResources().getString(R.string.quick_actions_delete_text, itemName)); - builder.setIcon(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_delete_dark)); - builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - adapter.deleteItem(itemPosition); - dialog.dismiss(); - } - }); + builder.setMessage(app.getString(R.string.quick_actions_delete_text, ctx.getString(action.getNameRes()))); + builder.setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_delete_dark)); + builder.setPositiveButton(R.string.shared_string_yes, listener); builder.setNegativeButton(R.string.shared_string_no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); } }); AlertDialog dialog = builder.show(); - int activeColorPrimaryResId = isLightContent ? R.color.active_color_primary_light : R.color.active_color_primary_dark; - dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(ContextCompat.getColor(getContext(), activeColorPrimaryResId)); - dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(getContext(), activeColorPrimaryResId)); + int activeColorId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light; + int activeColor = ContextCompat.getColor(ctx, activeColorId); + dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(activeColor); + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(activeColor); } @Override @@ -257,7 +255,16 @@ public class QuickActionListFragment extends BaseOsmAndFragment implements Quick itemVH.closeBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - createAndShowDeleteDialog(holder.getAdapterPosition(), getResources().getString(item.getNameRes())); + Context ctx = getContext(); + if (ctx != null) { + DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + adapter.deleteItem(holder.getAdapterPosition()); + dialog.dismiss(); + } + }; + showConfirmActionDeleteDialog(ctx, item, !isLightContent, listener); + } } }); From e32f08e44c8ad928b34da86deb5e61c63bd902d0 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 19 May 2020 14:56:13 +0300 Subject: [PATCH 27/32] Remove poi filters loading from settings --- OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 3 ++- .../net/osmand/plus/settings/backend/OsmandSettings.java | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 8a65f81d7a..2ed292151a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -77,7 +77,6 @@ import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper.TargetPoint; @@ -135,6 +134,7 @@ 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.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType; import net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment; @@ -1450,6 +1450,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven public void updateApplicationModeSettings() { changeKeyguardFlags(); updateMapSettings(); + app.getPoiFilters().loadSelectedPoiFilters(); mapViewTrackingUtilities.updateSettings(); //app.getRoutingHelper().setAppMode(settings.getApplicationMode()); if (mapLayers.getMapInfoLayer() != null) { diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java index 24b01d96dc..2df53ec929 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java @@ -28,7 +28,6 @@ import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.StateChangedListener; import net.osmand.ValueHolder; -import net.osmand.aidl.OsmandAidlApi; import net.osmand.data.FavouritePoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; @@ -586,11 +585,6 @@ public class OsmandSettings { currentMode = val; profilePreferences = getProfilePreferences(currentMode); - OsmandAidlApi aidlApi = ctx.getAidlApi(); - if (aidlApi != null) { - ctx.poiFilters.loadSelectedPoiFilters(); - } - fireEvent(oldMode); } return valueSaved; From 644f396422439e6489834e20eb2d5b3abc4d3101 Mon Sep 17 00:00:00 2001 From: Nazar-Kutz Date: Tue, 19 May 2020 16:04:26 +0300 Subject: [PATCH 28/32] Fix Coordinate Input screen crash --- .../CoordinateInputDialogFragment.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java index 2059bcf25e..f37a4c1693 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java @@ -43,6 +43,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.PopupMenu; import androidx.core.content.ContextCompat; @@ -642,20 +643,17 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm itemTv.setText((String) item); itemIv.setVisibility(View.GONE); itemBottomSpace.setVisibility(View.VISIBLE); - } else if (item instanceof Integer) { + } else if (item instanceof Drawable) { itemTopSpace.setVisibility(View.GONE); itemTv.setVisibility(View.GONE); itemIv.setVisibility(View.VISIBLE); itemBottomSpace.setVisibility(View.GONE); - Drawable icon = null; + Drawable icon = DrawableCompat.wrap((Drawable) item); if (lightTheme) { - Drawable drawable = AppCompatResources.getDrawable(ctx, (Integer) item); - if (drawable != null) { - icon = DrawableCompat.wrap(drawable); - DrawableCompat.setTintList(icon, numberColorStateList); - } + DrawableCompat.setTintList(icon, numberColorStateList); } else { - icon = getColoredIcon((Integer) item, R.color.keyboard_item_divider_control_color_dark); + int color = ContextCompat.getColor(ctx, R.color.keyboard_item_divider_control_color_dark); + DrawableCompat.setTint(icon, color); } itemIv.setImageDrawable(icon); } @@ -663,6 +661,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm } private Object getItemObjectById(@IdRes int id) { + Context ctx = requireContext(); if (id == R.id.keyboard_item_0) { return "0"; } else if (id == R.id.keyboard_item_1) { @@ -686,11 +685,15 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm } else if (id == R.id.keyboard_item_clear) { return getString(R.string.shared_string_clear); } else if (id == R.id.keyboard_item_next_field) { - return R.drawable.ic_keyboard_next_field; + Drawable normal = AppCompatResources.getDrawable(ctx, R.drawable.ic_action_next_field_stroke); + Drawable pressed = AppCompatResources.getDrawable(ctx, R.drawable.ic_action_next_field_fill); + return AndroidUtils.createPressedStateListDrawable(normal, pressed); } else if (id == R.id.keyboard_item_backspace) { - return R.drawable.ic_keyboard_backspace; + Drawable normal = AppCompatResources.getDrawable(ctx, R.drawable.ic_action_backspace_stroke); + Drawable pressed = AppCompatResources.getDrawable(ctx, R.drawable.ic_action_backspace_fill); + return AndroidUtils.createPressedStateListDrawable(normal, pressed); } else if (id == R.id.keyboard_item_hide) { - return R.drawable.ic_action_keyboard_hide; + return AppCompatResources.getDrawable(ctx, R.drawable.ic_action_keyboard_hide); } return -1; } From 91836683940da376719608ec5291fc151f86b9fa Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 19 May 2020 16:09:43 +0300 Subject: [PATCH 29/32] Move OsmAndAppCustomization to settings package --- OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java | 2 +- OsmAnd/src/net/osmand/aidl/OsmandAidlService.java | 2 +- OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java | 2 +- OsmAnd/src/net/osmand/plus/ApplicationMode.java | 1 + OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java | 1 + OsmAnd/src/net/osmand/plus/OsmandApplication.java | 1 + OsmAnd/src/net/osmand/plus/TargetPointsHelper.java | 2 +- .../src/net/osmand/plus/activities/MapActivity.java | 2 +- .../src/net/osmand/plus/activities/TrackActivity.java | 2 +- .../plus/audionotes/MultimediaNotesFragment.java | 2 +- .../net/osmand/plus/dashboard/DashBaseFragment.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/LockHelper.java | 2 +- .../mapcontextmenu/builders/WptPtMenuBuilder.java | 2 +- .../net/osmand/plus/monitoring/DashTrackFragment.java | 2 +- .../plus/monitoring/MonitoringSettingsFragment.java | 2 +- .../net/osmand/plus/myplaces/FavoritesActivity.java | 2 +- .../net/osmand/plus/osmedit/OsmEditingFragment.java | 2 +- .../plus/osmedit/SettingsOsmEditingActivity.java | 2 +- .../net/osmand/plus/render/MapRenderRepositories.java | 2 +- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 2 +- OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java | 2 +- .../backend}/OsmAndAppCustomization.java | 11 ++++++++--- .../src/net/osmand/plus/views/MapControlsLayer.java | 2 +- 23 files changed, 30 insertions(+), 22 deletions(-) rename OsmAnd/src/net/osmand/plus/{ => settings/backend}/OsmAndAppCustomization.java (98%) diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 51ac2ee738..5e0e67a03b 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -52,7 +52,7 @@ import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java index ea16a30d2f..8763156abe 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java @@ -86,7 +86,7 @@ import net.osmand.aidl.search.SearchParams; import net.osmand.aidl.search.SearchResult; import net.osmand.aidl.tiles.ASqliteDbFile; import net.osmand.data.LatLon; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java index 9ce3378677..1953e185fd 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java @@ -87,7 +87,7 @@ import net.osmand.aidlapi.search.SearchParams; import net.osmand.aidlapi.search.SearchResult; import net.osmand.aidlapi.tiles.ASqliteDbFile; import net.osmand.data.LatLon; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java index efe816fb2e..f11cc43804 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java @@ -11,6 +11,7 @@ import net.osmand.plus.profiles.LocationIcon; import net.osmand.plus.profiles.NavigationIcon; import net.osmand.plus.profiles.ProfileIconColors; import net.osmand.plus.routing.RouteProvider.RouteService; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index 4777ec73d8..b522ccde4f 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -36,6 +36,7 @@ import net.osmand.plus.activities.actions.AppModeDialog; import net.osmand.plus.dialogs.ConfigureMapMenu; import net.osmand.plus.dialogs.HelpArticleDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.ContextMenuItemsPreference; import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index bac35247c8..e10caf5bc5 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -69,6 +69,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.TransportRoutingHelper; import net.osmand.plus.search.QuickSearchHelper; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.voice.CommandPlayer; diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java index 55a779883d..bfe17bda39 100644 --- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java +++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java @@ -12,7 +12,7 @@ import net.osmand.data.PointDescription; import net.osmand.plus.GeocodingLookupService.AddressLookupRequest; import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RoutingHelper; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 2ed292151a..605c860ab0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -72,7 +72,7 @@ import net.osmand.plus.HuaweiDrmHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener; import net.osmand.plus.OnDismissDialogFragmentListener; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java index c76a93d066..64c137e347 100644 --- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java @@ -32,7 +32,7 @@ import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.LockableViewPager; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java index 196bc1eed2..7052c64ffc 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java @@ -25,7 +25,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index 43107ab3f2..7a48d799ee 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; import com.google.android.material.snackbar.Snackbar; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java index 34d31e1489..85fdc3535a 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java @@ -14,7 +14,7 @@ import android.os.PowerManager.WakeLock; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java index a25a1d8326..341ef3ecfe 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java @@ -16,7 +16,7 @@ import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java index fd87a792ea..7b1a4cb26a 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java @@ -18,7 +18,7 @@ import net.osmand.GPXUtilities; import net.osmand.GPXUtilities.GPXFile; import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java index 5a0a21f0e9..26453aac8c 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java @@ -11,7 +11,7 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java index b48ce8f00f..e56916bff0 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java @@ -23,7 +23,7 @@ import androidx.viewpager.widget.ViewPager; import net.osmand.PlatformUtil; import net.osmand.data.PointDescription; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java index c809265048..4c5ed73b07 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java @@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.AndroidUiHelper; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java index 7b876200ac..ea259db512 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java @@ -15,7 +15,7 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java index 048de5ddb9..1f2750cff5 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java +++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java @@ -39,7 +39,7 @@ import net.osmand.data.QuadPointDouble; import net.osmand.data.QuadRect; import net.osmand.data.RotatedTileBox; import net.osmand.map.MapTileDownloader; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 1b31087baa..0a57f3fd1f 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -10,7 +10,7 @@ import net.osmand.data.LatLon; import net.osmand.data.QuadPoint; import net.osmand.plus.ApplicationMode; import net.osmand.plus.NavigationService; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 2a91d08cc2..79b259a9b1 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -8,7 +8,7 @@ import net.osmand.Location; import net.osmand.binary.RouteDataObject; import net.osmand.data.PointDescription; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener; +import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java similarity index 98% rename from OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java rename to OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java index 7e9094ea7f..5a60254c19 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand.plus.settings.backend; import android.app.Activity; import android.content.Intent; @@ -21,6 +21,12 @@ import net.osmand.JsonUtils; import net.osmand.PlatformUtil; import net.osmand.aidl.ConnectedApp; import net.osmand.data.LocationPoint; +import net.osmand.plus.ApplicationMode; +import net.osmand.plus.ContextMenuAdapter; +import net.osmand.plus.ContextMenuItem; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandPlugin; +import net.osmand.plus.Version; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.PluginsActivity; import net.osmand.plus.activities.SettingsActivity; @@ -30,7 +36,6 @@ import net.osmand.plus.helpers.ImportHelper; import net.osmand.plus.helpers.WaypointHelper; import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.routing.RouteCalculationResult; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.util.Algorithms; @@ -601,7 +606,7 @@ public class OsmAndAppCustomization { } private void notifySettingsCustomized() { - app.uiHandler.post(new Runnable() { + app.runInUIThread(new Runnable() { @Override public void run() { diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index f6643e7902..1519e2deba 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -38,7 +38,7 @@ import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; import net.osmand.plus.ApplicationMode; -import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; From 1eda59acc7a35cb9cd3bc7c30561fbce7bf396d2 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 19 May 2020 16:22:41 +0300 Subject: [PATCH 30/32] Move ApplicationMode to settings package --- .../net/osmand/access/AccessibilitySettingsFragment.java | 2 +- OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java | 2 +- OsmAnd/src/net/osmand/plus/AppInitializer.java | 1 + OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java | 1 + OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java | 1 + OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java | 1 + OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 1 + OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java | 1 + OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java | 1 + OsmAnd/src/net/osmand/plus/OsmandApplication.java | 1 + OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java | 1 + OsmAnd/src/net/osmand/plus/OsmandPlugin.java | 1 + OsmAnd/src/net/osmand/plus/TargetPointsHelper.java | 1 + OsmAnd/src/net/osmand/plus/UiUtilities.java | 2 +- OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java | 2 +- OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 2 +- .../src/net/osmand/plus/activities/MapActivityActions.java | 2 +- .../net/osmand/plus/activities/SettingsBaseActivity.java | 2 +- .../net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- .../osmand/plus/activities/SettingsNavigationActivity.java | 2 +- .../net/osmand/plus/activities/actions/AppModeDialog.java | 2 +- .../net/osmand/plus/activities/actions/OsmAndDialogs.java | 2 +- OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java | 2 +- OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java | 2 +- .../net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 2 +- .../net/osmand/plus/audionotes/MultimediaNotesFragment.java | 2 +- OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java | 2 +- .../plus/dialogs/PluginInstalledBottomSheetDialog.java | 2 +- .../plus/dialogs/SelectMapViewQuickActionsBottomSheet.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java | 2 +- .../src/net/osmand/plus/mapcontextmenu/MapContextMenu.java | 2 +- .../other/DestinationReachedMenuFragment.java | 2 +- .../plus/mapcontextmenu/other/RoutePreferencesMenu.java | 2 +- OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 2 +- .../plus/mapmarkers/DirectionIndicationDialogFragment.java | 2 +- .../net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java | 2 +- .../src/net/osmand/plus/mapmarkers/PlanRouteFragment.java | 2 +- .../plus/measurementtool/MeasurementEditingContext.java | 2 +- .../plus/measurementtool/MeasurementToolFragment.java | 2 +- .../SnapToRoadBottomSheetDialogFragment.java | 2 +- .../osmand/plus/monitoring/MonitoringSettingsFragment.java | 2 +- .../net/osmand/plus/monitoring/OsmandMonitoringPlugin.java | 2 +- .../osmand/plus/monitoring/SettingsMonitoringActivity.java | 2 +- .../osmand/plus/openseamapsplugin/NauticalMapsPlugin.java | 2 +- .../net/osmand/plus/parkingpoint/ParkingPositionPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java | 2 +- .../net/osmand/plus/poi/RearrangePoiFiltersFragment.java | 2 +- .../osmand/plus/profiles/AbstractProfileMenuAdapter.java | 2 +- .../plus/profiles/AppModesBottomSheetDialogFragment.java | 2 +- .../ConfigureAppModesBottomSheetDialogFragment.java | 2 +- .../osmand/plus/profiles/ConfigureProfileMenuAdapter.java | 2 +- .../src/net/osmand/plus/profiles/EditProfilesFragment.java | 2 +- .../profiles/SelectAppModesBottomSheetDialogFragment.java | 2 +- .../osmand/plus/profiles/SelectCopyAppModeBottomSheet.java | 2 +- .../osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java | 2 +- .../net/osmand/plus/profiles/SelectProfileMenuAdapter.java | 2 +- .../plus/quickaction/actions/SwitchProfileAction.java | 2 +- .../osmand/plus/routepreparationmenu/MapRouteInfoMenu.java | 2 +- .../plus/routepreparationmenu/MapRouteInfoMenuFragment.java | 2 +- .../plus/routepreparationmenu/RouteOptionsBottomSheet.java | 2 +- .../plus/routepreparationmenu/RoutingOptionsHelper.java | 2 +- .../routepreparationmenu/ShowAlongTheRouteBottomSheet.java | 2 +- .../src/net/osmand/plus/routing/RouteCalculationParams.java | 4 +--- .../src/net/osmand/plus/routing/RouteCalculationResult.java | 5 +---- OsmAnd/src/net/osmand/plus/routing/RouteProvider.java | 2 +- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 2 +- .../src/net/osmand/plus/routing/TransportRoutingHelper.java | 2 +- OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java | 2 +- .../net/osmand/plus/search/QuickSearchDialogFragment.java | 2 +- .../osmand/plus/{ => settings/backend}/ApplicationMode.java | 6 +++--- .../plus/settings/backend/OsmAndAppCustomization.java | 1 - .../net/osmand/plus/settings/backend/OsmandSettings.java | 5 ++--- .../net/osmand/plus/settings/backend/SettingsHelper.java | 5 ++--- .../settings/bottomsheets/BasePreferenceBottomSheet.java | 2 +- .../settings/bottomsheets/BooleanPreferenceBottomSheet.java | 2 +- .../bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java | 2 +- .../bottomsheets/EditTextPreferenceBottomSheet.java | 2 +- .../bottomsheets/MultiSelectPreferencesBottomSheet.java | 2 +- .../plus/settings/bottomsheets/OsmLoginDataBottomSheet.java | 2 +- .../RecalculateRouteInDeviationBottomSheet.java | 2 +- .../settings/bottomsheets/ResetProfilePrefsBottomSheet.java | 2 +- .../bottomsheets/SingleSelectPreferenceBottomSheet.java | 2 +- .../plus/settings/fragments/BaseSettingsFragment.java | 2 +- .../plus/settings/fragments/ConfigureMenuItemsFragment.java | 2 +- .../plus/settings/fragments/ConfigureMenuRootFragment.java | 2 +- .../plus/settings/fragments/ConfigureProfileFragment.java | 2 +- .../plus/settings/fragments/CoordinatesFormatFragment.java | 2 +- .../plus/settings/fragments/DuplicatesSettingsAdapter.java | 4 ++-- .../settings/fragments/ExportImportSettingsAdapter.java | 4 ++-- .../plus/settings/fragments/ExportProfileBottomSheet.java | 2 +- .../settings/fragments/GeneralProfileSettingsFragment.java | 2 +- .../plus/settings/fragments/GlobalSettingsFragment.java | 2 +- .../plus/settings/fragments/ImportDuplicatesFragment.java | 2 +- .../plus/settings/fragments/ImportSettingsFragment.java | 2 +- .../plus/settings/fragments/LiveMonitoringFragment.java | 2 +- .../plus/settings/fragments/MainSettingsFragment.java | 2 +- .../osmand/plus/settings/fragments/NavigationFragment.java | 2 +- .../plus/settings/fragments/ProfileAppearanceFragment.java | 2 +- .../plus/settings/fragments/RouteParametersFragment.java | 2 +- .../plus/settings/fragments/ScreenAlertsFragment.java | 2 +- .../plus/settings/fragments/TurnScreenOnFragment.java | 2 +- .../plus/settings/fragments/VehicleParametersFragment.java | 2 +- .../plus/settings/fragments/VoiceAnnouncesFragment.java | 2 +- .../osmand/plus/settings/preferences/ListPreferenceEx.java | 2 +- OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java | 2 +- .../src/net/osmand/plus/transport/TransportLinesMenu.java | 2 +- OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java | 2 +- OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java | 2 +- .../net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java | 2 +- .../plus/views/mapwidgets/RouteInfoWidgetsFactory.java | 2 +- .../net/osmand/plus/voice/AbstractPrologCommandPlayer.java | 2 +- .../src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java | 2 +- .../src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java | 2 +- .../src/net/osmand/plus/voice/MediaCommandPlayerImpl.java | 2 +- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- .../plus/wikipedia/SelectWikiLanguagesBottomSheet.java | 2 +- OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java | 2 +- 121 files changed, 126 insertions(+), 123 deletions(-) rename OsmAnd/src/net/osmand/plus/{ => settings/backend}/ApplicationMode.java (99%) diff --git a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java index 05e8156675..3f99fddd46 100644 --- a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java +++ b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java @@ -19,7 +19,7 @@ import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 5e0e67a03b..582d6972ee 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -43,7 +43,7 @@ import net.osmand.data.PointDescription; import net.osmand.plus.AppInitializer; import net.osmand.plus.AppInitializer.AppInitializeListener; import net.osmand.plus.AppInitializer.InitEvents; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.FavouritesDbHelper; diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java index 89847f80da..3338594403 100644 --- a/OsmAnd/src/net/osmand/plus/AppInitializer.java +++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java @@ -53,6 +53,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.TransportRoutingHelper; import net.osmand.plus.search.QuickSearchHelper; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.views.corenative.NativeCoreContext; diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index b522ccde4f..7263f119bd 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -36,6 +36,7 @@ import net.osmand.plus.activities.actions.AppModeDialog; import net.osmand.plus.dialogs.ConfigureMapMenu; import net.osmand.plus.dialogs.HelpArticleDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.ContextMenuItemsPreference; diff --git a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java index 3147dc1def..5fce920b91 100644 --- a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java +++ b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java @@ -14,6 +14,7 @@ import net.osmand.binary.GeocodingUtilities.GeocodingResult; import net.osmand.binary.RouteDataObject; import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResource; import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResourceType; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.router.GeneralRouter.GeneralRouterProfile; import net.osmand.router.RoutePlannerFrontEnd; import net.osmand.router.RoutingConfiguration; diff --git a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java index cac124bd99..2c232ea8e8 100644 --- a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java @@ -17,6 +17,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.map.ITileSource; import net.osmand.map.WorldRegion; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.settings.backend.SettingsHelper.AvoidRoadsSettingsItem; import net.osmand.plus.settings.backend.SettingsHelper.MapSourcesSettingsItem; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index 46e5ddf953..2076943954 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -13,6 +13,7 @@ import net.osmand.osm.AbstractPoiType; import net.osmand.osm.MapPoiTypes; import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants; import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java index 063351eb3c..577258a5f4 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java @@ -40,6 +40,7 @@ import net.osmand.data.QuadPoint; import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper.RouteSegmentSearchResult; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.router.RouteSegmentResult; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java index 95cf5eead9..8e4ae960c2 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java @@ -19,6 +19,7 @@ import net.osmand.Location; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder; +import net.osmand.plus.settings.backend.ApplicationMode; import java.util.ArrayList; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index e10caf5bc5..4f1962166c 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -69,6 +69,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper; import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.TransportRoutingHelper; import net.osmand.plus.search.QuickSearchHelper; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.SettingsHelper; diff --git a/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java b/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java index 702aa95d44..1464c48840 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java +++ b/OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java @@ -9,6 +9,7 @@ import android.os.ParcelFileDescriptor; import net.osmand.plus.mapmarkers.MapMarkersDbHelper; import net.osmand.plus.osmedit.OsmBugsDbHelper; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import java.io.IOException; diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java index d10e4e6b7f..24cc0e2eea 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java @@ -41,6 +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.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.plus.skimapsplugin.SkiMapsPlugin; diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java index bfe17bda39..07ef8df985 100644 --- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java +++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java @@ -12,6 +12,7 @@ import net.osmand.data.PointDescription; import net.osmand.plus.GeocodingLookupService.AddressLookupRequest; import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RoutingHelper; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java index 0c6cfe70c4..9f16bbc9a0 100644 --- a/OsmAnd/src/net/osmand/plus/UiUtilities.java +++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java @@ -3,7 +3,6 @@ package net.osmand.plus; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; -import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; @@ -47,6 +46,7 @@ import net.osmand.AndroidUtils; import net.osmand.Location; import net.osmand.PlatformUtil; import net.osmand.data.LatLon; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.views.DirectionDrawable; import net.osmand.plus.widgets.TextViewEx; diff --git a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java index 205424a062..f9ca2afca4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java @@ -8,7 +8,7 @@ import java.util.TimeZone; import net.osmand.Location; import net.osmand.PlatformUtil; import net.osmand.StateChangedListener; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode; import net.osmand.util.SunriseSunset; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 605c860ab0..933cf09a48 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -66,7 +66,7 @@ import net.osmand.map.MapTileDownloader.IMapDownloaderCallback; import net.osmand.plus.AppInitializer; import net.osmand.plus.AppInitializer.AppInitializeListener; import net.osmand.plus.AppInitializer.InitEvents; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem; import net.osmand.plus.HuaweiDrmHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 21f4207643..c5ad4ec536 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -37,7 +37,7 @@ import net.osmand.data.PointDescription; import net.osmand.data.QuadRect; import net.osmand.data.RotatedTileBox; import net.osmand.map.ITileSource; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuItem; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java index 525b9e0d02..37504315f1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java @@ -23,7 +23,7 @@ import androidx.appcompat.app.AlertDialog.Builder; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 2d6c08e34d..384678f7bc 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -39,7 +39,7 @@ import net.osmand.IProgress; import net.osmand.IndexConstants; import net.osmand.data.PointDescription; import net.osmand.osm.io.NetworkUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 1cdca6db8f..6cec61b52b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -30,7 +30,7 @@ import androidx.core.content.ContextCompat; import com.google.android.material.slider.Slider; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmAndFormatter; diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java index 48221d3ca5..44222d5586 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java @@ -19,7 +19,7 @@ import androidx.core.content.ContextCompat; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java index 6c0f975b2b..99267cba2a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import net.osmand.CallbackWithObject; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java b/OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java index 8182f70e18..d19f0c9259 100644 --- a/OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java +++ b/OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java @@ -2,7 +2,7 @@ package net.osmand.plus.api; import android.content.Context; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; public interface AudioFocusHelper { diff --git a/OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java b/OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java index 1730f135a9..18a161912a 100644 --- a/OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java +++ b/OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java @@ -2,7 +2,7 @@ package net.osmand.plus.api; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index d8d32df458..2ccf8171a4 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -47,7 +47,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.DataTileManager; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuItem; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java index 7052c64ffc..1741f768b3 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java @@ -24,7 +24,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index dce1bf9a87..f07bebc68e 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -49,7 +49,7 @@ import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.ValueHolder; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.OnRowItemClick; import net.osmand.plus.ContextMenuItem; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java index ac4deae391..0ef7154d2b 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java @@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java index b74f5f96f2..4c5f199824 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java @@ -23,7 +23,7 @@ import androidx.core.widget.NestedScrollView; import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java index 12f2684add..ddf15618b5 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java +++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java @@ -26,7 +26,7 @@ import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.QuadPoint; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java index 296204e59c..4cb07d6543 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java @@ -26,7 +26,7 @@ import net.osmand.aidl.search.SearchParams; import net.osmand.data.FavouritePoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; diff --git a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java index 904778aeaa..b2e398c08c 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java @@ -11,7 +11,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.map.TileSourceManager; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 664786140b..239715e192 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -17,7 +17,7 @@ import net.osmand.data.LocationPoint; import net.osmand.data.PointDescription; import net.osmand.data.WptLocationPoint; import net.osmand.osm.PoiType; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java index d6952651fb..64f18db5e5 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java @@ -22,7 +22,7 @@ import net.osmand.data.FavouritePoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.TransportStop; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.MapMarkersHelper.MapMarker; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java index 4670bb533d..0bd0ca59d2 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java @@ -16,7 +16,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java index 1117ae10a8..7775d91119 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java @@ -21,7 +21,7 @@ import androidx.appcompat.widget.PopupMenu; import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; import net.osmand.GPXUtilities; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 28ee511f9a..ba204f970e 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -19,7 +19,7 @@ import androidx.fragment.app.FragmentActivity; import net.osmand.AndroidUtils; import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java index ee5a632281..485f294c94 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java @@ -30,7 +30,7 @@ import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCal import com.github.ksoichiro.android.observablescrollview.ScrollState; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.MapMarkersMode; import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java index de2cf32c7f..025205cbca 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java @@ -4,7 +4,7 @@ import android.util.Pair; import net.osmand.Location; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.GPXUtilities.TrkSegment; import net.osmand.GPXUtilities.WptPt; import net.osmand.plus.MapMarkersHelper; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java index dbc455a189..a73e8a812f 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java @@ -38,7 +38,7 @@ import net.osmand.TspAnt; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndFormatter; diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java index 0d3ff89dd4..388cd91d72 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java @@ -10,7 +10,7 @@ import net.osmand.GPXUtilities.TrkSegment; import net.osmand.GPXUtilities.WptPt; import net.osmand.Location; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.measurementtool.command.MeasurementCommandManager; import net.osmand.plus.routing.RouteCalculationParams; diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index c5cd900530..9cdbbe1037 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -46,7 +46,7 @@ import net.osmand.GPXUtilities.TrkSegment; import net.osmand.GPXUtilities.WptPt; import net.osmand.IndexConstants; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java index d3919b1b30..832bccd686 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java @@ -16,7 +16,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java index 26453aac8c..eeaa98ff8c 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java @@ -10,7 +10,7 @@ import android.text.SpannableStringBuilder; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index cc66038e5e..9ae44d87b1 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -25,7 +25,7 @@ import com.google.android.material.slider.Slider; import net.osmand.AndroidUtils; import net.osmand.Location; import net.osmand.ValueHolder; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.NavigationService; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java index 009620097f..d048bbedd5 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java @@ -27,7 +27,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java index e015e6e0a9..7eb775c3a4 100644 --- a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java @@ -2,7 +2,7 @@ package net.osmand.plus.openseamapsplugin; import android.graphics.drawable.Drawable; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index c0461e6931..1b51b80e19 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -21,7 +21,7 @@ import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint.SpecialPointType; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuItem; diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java index f67b6075e0..0037c5634b 100644 --- a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java +++ b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java @@ -11,7 +11,7 @@ import net.osmand.osm.AbstractPoiType; import net.osmand.osm.MapPoiTypes; import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java index ffa91d2d5c..c6daaa6bc1 100644 --- a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java +++ b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java @@ -30,7 +30,7 @@ import com.google.android.material.appbar.AppBarLayout; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/profiles/AbstractProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/AbstractProfileMenuAdapter.java index 813456d831..36752715f1 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/AbstractProfileMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/AbstractProfileMenuAdapter.java @@ -3,7 +3,7 @@ package net.osmand.plus.profiles; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; public abstract class AbstractProfileMenuAdapter extends RecyclerView.Adapter { protected ProfilePressedListener profilePressedListener; diff --git a/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java index 926973bfdc..8b61d67462 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java @@ -8,7 +8,7 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/profiles/ConfigureAppModesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/ConfigureAppModesBottomSheetDialogFragment.java index 4520fafe69..ab59432b01 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/ConfigureAppModesBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/ConfigureAppModesBottomSheetDialogFragment.java @@ -1,6 +1,6 @@ package net.osmand.plus.profiles; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java index f8f3599cd7..23189180a0 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java @@ -13,7 +13,7 @@ import androidx.appcompat.view.ContextThemeWrapper; import androidx.recyclerview.widget.RecyclerView; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.settings.fragments.BaseSettingsFragment; diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java index 1581f89e2b..192357d12c 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java @@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.appbar.AppBarLayout; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java index b90454cb12..c7a49a7ab5 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectAppModesBottomSheetDialogFragment.java @@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyAppModeBottomSheet.java b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyAppModeBottomSheet.java index f3c09b373d..e7a923e26c 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyAppModeBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyAppModeBottomSheet.java @@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java index 27475596df..efe1b00a2e 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java @@ -13,7 +13,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java index 1a5601ee28..684479fc6f 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java index 8888113c4c..4405d65027 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/SwitchProfileAction.java @@ -10,7 +10,7 @@ import androidx.appcompat.widget.SwitchCompat; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java index 8ffcc49b10..12c3a5b5d2 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java @@ -44,7 +44,7 @@ import net.osmand.data.FavouritePoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.FavouritesDbHelper.FavoritesListener; import net.osmand.plus.GeocodingLookupService; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java index fb59e8e148..5b1705157f 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java @@ -19,7 +19,7 @@ import net.osmand.AndroidUtils; import net.osmand.Location; import net.osmand.data.QuadRect; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.TargetPointsHelper.TargetPoint; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java index b159b2f602..cf5edfd4f3 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java @@ -19,7 +19,7 @@ import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; import net.osmand.GPXUtilities; import net.osmand.StateChangedListener; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java index 3fed04affc..0ba3112d26 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java @@ -21,7 +21,7 @@ import net.osmand.GPXUtilities; import net.osmand.IndexConstants; import net.osmand.Location; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java index cddb0cd0a5..c6df9e64a1 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java @@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment; import net.osmand.AndroidUtils; import net.osmand.ValueHolder; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.DialogListItemAdapter; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java index 72abccd60d..fbc361c4d5 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java @@ -2,13 +2,11 @@ package net.osmand.plus.routing; import net.osmand.Location; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.routing.RouteProvider.GPXRouteParams; -import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback; import net.osmand.router.RouteCalculationProgress; -import net.osmand.router.RoutingContext; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java index 30da3fa575..6ac55e7592 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java @@ -3,7 +3,6 @@ package net.osmand.plus.routing; import android.content.Context; import androidx.annotation.Nullable; -import net.osmand.IndexConstants; import net.osmand.Location; import net.osmand.PlatformUtil; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; @@ -12,12 +11,11 @@ import net.osmand.binary.RouteDataObject; import net.osmand.data.LatLon; import net.osmand.data.LocationPoint; import net.osmand.data.QuadRect; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.routing.AlarmInfo.AlarmInfoType; import net.osmand.router.ExitInfo; -import net.osmand.router.RouteExporter; import net.osmand.router.RouteSegmentResult; import net.osmand.router.RoutingContext; import net.osmand.router.TurnType; @@ -26,7 +24,6 @@ import net.osmand.util.MapUtils; import org.apache.commons.logging.Log; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 2d121ccecf..2605e8a6c9 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -19,7 +19,7 @@ import net.osmand.data.LatLon; import net.osmand.data.LocationPoint; import net.osmand.data.WptLocationPoint; import net.osmand.osm.io.NetworkUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 0a57f3fd1f..f7c7c3cffb 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -8,7 +8,7 @@ import net.osmand.ValueHolder; import net.osmand.binary.RouteDataObject; import net.osmand.data.LatLon; import net.osmand.data.QuadPoint; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.NavigationService; import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmAndFormatter; diff --git a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java index e2f196cf48..1cd8547156 100644 --- a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java @@ -13,7 +13,7 @@ import net.osmand.binary.BinaryMapIndexReader; import net.osmand.data.LatLon; import net.osmand.data.QuadRect; import net.osmand.osm.edit.Node; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 79b259a9b1..b4cabfb389 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -7,7 +7,7 @@ import android.media.SoundPool; import net.osmand.Location; import net.osmand.binary.RouteDataObject; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java index 47913d028b..ea561bbc95 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java @@ -68,7 +68,7 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiType; import net.osmand.plus.AppInitializer; import net.osmand.plus.AppInitializer.AppInitializeListener; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.LockableViewPager; import net.osmand.plus.OsmAndFormatter; diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/ApplicationMode.java rename to OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java index f11cc43804..894a4a7492 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand.plus.settings.backend; import androidx.annotation.DrawableRes; @@ -7,12 +7,12 @@ import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; import net.osmand.StateChangedListener; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; import net.osmand.plus.profiles.LocationIcon; import net.osmand.plus.profiles.NavigationIcon; import net.osmand.plus.profiles.ProfileIconColors; import net.osmand.plus.routing.RouteProvider.RouteService; -import net.osmand.plus.settings.backend.OsmAndAppCustomization; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; import java.util.ArrayList; diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java index 5a60254c19..b23edbbea1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndAppCustomization.java @@ -21,7 +21,6 @@ import net.osmand.JsonUtils; import net.osmand.PlatformUtil; import net.osmand.aidl.ConnectedApp; import net.osmand.data.LocationPoint; -import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java index 2df53ec929..b3d5dce45a 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java @@ -35,9 +35,8 @@ import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.osm.io.NetworkUtils; -import net.osmand.plus.ApplicationMode; -import net.osmand.plus.ApplicationMode.ApplicationModeBean; -import net.osmand.plus.ApplicationMode.ApplicationModeBuilder; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBuilder; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java index 6c053f9c08..2abbd10e22 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java @@ -20,9 +20,8 @@ import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.map.WorldRegion; import net.osmand.osm.MapPoiTypes; import net.osmand.osm.PoiCategory; -import net.osmand.plus.ApplicationMode; -import net.osmand.plus.ApplicationMode.ApplicationModeBean; -import net.osmand.plus.ApplicationMode.ApplicationModeBuilder; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBuilder; import net.osmand.plus.CustomOsmandPlugin; import net.osmand.plus.CustomOsmandPlugin.SuggestedDownloadItem; import net.osmand.plus.CustomRegion; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java index e07637a863..6a71538ff1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java @@ -8,7 +8,7 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.DialogPreference.TargetFragment; import androidx.preference.Preference; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.settings.fragments.ApplyQueryType; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java index a68867e4c0..88df995e44 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java index 9daa2211a9..0701038e86 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java @@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java index 82adb0ab84..247f3ae740 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java @@ -12,7 +12,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java index 96c13cd3b5..71881876b3 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java index ab5e49899b..37e993cf43 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java @@ -12,7 +12,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java index d016a7fee5..4c658406ce 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.slider.Slider; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java index 580cd20834..225bec203c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java @@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java index fc95d584df..c7ee2da9df 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java @@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java index 1148f23720..aef82939d1 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java @@ -52,7 +52,7 @@ import com.google.android.material.snackbar.Snackbar; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.access.AccessibilitySettingsFragment; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java index c668564a6d..f4ed5187ca 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java @@ -24,7 +24,7 @@ import com.google.android.material.appbar.AppBarLayout; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java index 50e71ed671..c30afeba9c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java @@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java index 65aca889b1..e65a351041 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java @@ -31,7 +31,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java index d89e6d9f0b..51b5d817a0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java @@ -18,7 +18,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.Location; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.R; import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java index 09ebbf1fba..dc78f5755c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java @@ -13,8 +13,8 @@ import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.map.ITileSource; -import net.osmand.plus.ApplicationMode; -import net.osmand.plus.ApplicationMode.ApplicationModeBean; +import net.osmand.plus.settings.backend.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java index c9cabba67d..cf2b8d6a11 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java @@ -16,8 +16,8 @@ import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.map.ITileSource; -import net.osmand.plus.ApplicationMode.ApplicationModeBean; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java index d686a1a6a7..d7f2796b9e 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java @@ -26,7 +26,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java index 0c04b79741..9e07badc98 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java @@ -22,7 +22,7 @@ import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreferenceCompat; import net.osmand.data.PointDescription; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java index 741054dd7b..95ac579399 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java @@ -10,7 +10,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreferenceCompat; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java index 2a1526a82c..6224105fa9 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java @@ -26,7 +26,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout; import net.osmand.AndroidUtils; import net.osmand.map.ITileSource; import net.osmand.plus.AppInitializer; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.settings.backend.SettingsHelper; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java index 832e4791fc..99f1af5f37 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java @@ -30,7 +30,7 @@ import net.osmand.PlatformUtil; import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.plus.AppInitializer; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java index 6483f2ad00..282fb204e3 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java @@ -11,7 +11,7 @@ import androidx.core.content.ContextCompat; import androidx.preference.Preference; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.settings.preferences.EditTextPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java index 27ab212c3f..6aac50bc9c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java @@ -14,7 +14,7 @@ import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java index 692c228c85..6f666952f5 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java @@ -6,7 +6,7 @@ import android.os.Bundle; import androidx.preference.Preference; import androidx.preference.SwitchPreferenceCompat; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java index 27b5cd0962..87ab84b3d2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java @@ -39,7 +39,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java index 10cfd2adcc..f46330f949 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java @@ -22,7 +22,7 @@ import androidx.preference.PreferenceViewHolder; import com.google.android.material.slider.Slider; import net.osmand.StateChangedListener; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java index 9e99073fd7..d2c83917e0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java @@ -15,7 +15,7 @@ import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreferenceCompat; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java index 9f5e1ed24b..a4ebc2215c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java @@ -12,7 +12,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.settings.preferences.ListPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java index b38fffa8e1..590be355fa 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java @@ -7,7 +7,7 @@ import android.widget.ImageView; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java index fdf9e788dc..2d3ff2eb5e 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java @@ -20,7 +20,7 @@ import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreferenceCompat; import net.osmand.AndroidUtils; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java index e6bdd34f07..27e0c5a9c0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java +++ b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java @@ -7,7 +7,7 @@ import android.util.AttributeSet; import androidx.preference.DialogPreference; import androidx.preference.PreferenceDataStore; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings.PreferencesDataStore; public class ListPreferenceEx extends DialogPreference { diff --git a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java index a854a7c42d..413b4d9c36 100644 --- a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java @@ -2,7 +2,7 @@ package net.osmand.plus.skimapsplugin; import android.graphics.drawable.Drawable; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java index 00ce824d6e..985433eb2d 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java @@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat; import net.osmand.AndroidUtils; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.DialogListItemAdapter; diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java index 76d3969e1d..aff1e354e4 100644 --- a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java +++ b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java @@ -17,7 +17,7 @@ import androidx.appcompat.widget.SwitchCompat; import androidx.core.content.ContextCompat; import net.osmand.CallbackWithObject; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 1519e2deba..153159c44a 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -37,7 +37,7 @@ import net.osmand.core.android.MapRendererContext; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationSimulation; diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java index 0e006404d9..44e092b5e5 100644 --- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java @@ -20,7 +20,7 @@ import net.osmand.PlatformUtil; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java index e5fa0daca8..2124c17b75 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java @@ -12,7 +12,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index aa9a8d09cc..66467d6cf7 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -29,7 +29,7 @@ import net.osmand.Location; import net.osmand.binary.RouteDataObject; import net.osmand.data.LatLon; import net.osmand.data.RotatedTileBox; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.MapMarkersHelper.MapMarker; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider; diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java index 391d1f74ae..74c0de1508 100644 --- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java +++ b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java @@ -9,7 +9,7 @@ import androidx.core.app.NotificationManagerCompat; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.StateChangedListener; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants; diff --git a/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java index cd4511724e..80fd5381ab 100644 --- a/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java @@ -3,7 +3,7 @@ package net.osmand.plus.voice; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.routing.VoiceRouter; diff --git a/OsmAnd/src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java index 4b61f4053d..e0c0018605 100644 --- a/OsmAnd/src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java @@ -4,7 +4,7 @@ import android.app.Activity; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.routing.VoiceRouter; diff --git a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java index f3c9734a82..7b9d7a4972 100644 --- a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java @@ -6,7 +6,7 @@ import android.media.MediaPlayer; import android.os.Build; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.routing.VoiceRouter; diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 4c2559dbf3..e8e21d21b6 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -15,7 +15,7 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; import net.osmand.PlatformUtil; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java index a02131c3e7..44a3042657 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java @@ -14,7 +14,7 @@ import androidx.core.os.LocaleListCompat; import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java index ab1990aa3d..cde895b1c3 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPoiMenu.java @@ -6,7 +6,7 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import net.osmand.CallbackWithObject; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuItem; import net.osmand.plus.OsmandApplication; From 296431b29e2df658b5c873a5cac32ec8b3bd755b Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 19 May 2020 16:27:41 +0300 Subject: [PATCH 31/32] Fix fragments location in prefs xml --- OsmAnd/res/xml/configure_profile.xml | 4 ++-- OsmAnd/res/xml/general_profile_settings.xml | 2 +- OsmAnd/res/xml/global_settings.xml | 4 ++-- OsmAnd/res/xml/navigation_settings_new.xml | 6 +++--- OsmAnd/res/xml/settings_main_screen.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/xml/configure_profile.xml b/OsmAnd/res/xml/configure_profile.xml index d86a80620f..9fb131486e 100644 --- a/OsmAnd/res/xml/configure_profile.xml +++ b/OsmAnd/res/xml/configure_profile.xml @@ -16,7 +16,7 @@ android:persistent="false" android:summary="@string/general_settings_profile_descr" android:title="@string/general_settings_2" - app:fragment="net.osmand.plus.settings.GeneralProfileSettingsFragment" + app:fragment="net.osmand.plus.settings.fragments.GeneralProfileSettingsFragment" tools:icon="@drawable/ic_action_settings" /> + app:fragment="net.osmand.plus.settings.fragments.CoordinatesFormatFragment" /> + app:fragment="net.osmand.plus.settings.fragments.MapDuringNavigationFragment" /> Date: Tue, 19 May 2020 16:41:56 +0300 Subject: [PATCH 32/32] Revert string changes --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 742a740f3e..c59d5301a9 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -50,7 +50,7 @@ Extra maps Combine POI types from different categories. Tapping \"Switch\" selects all, and the left side selects category. Search for POI types - Your Google Play account is charged after confirmation, and for the same period (month/three month/year) upon renewal, (unless canceled from its settings). + Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings. %1$s / %2$s Custom color Lombard