From 323cb915d693946fa9abd8eb512b10ef3dacaf8f Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 17 Dec 2020 14:26:26 +0100 Subject: [PATCH] Change String -> CharSequence to make compatible --- OsmAnd/src/net/osmand/access/AccessibilityPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/OsmandPlugin.java | 2 +- .../src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 2 +- .../net/osmand/plus/development/OsmandDevelopmentPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 2 +- .../src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java | 2 +- .../net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java | 2 +- .../src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java | 2 +- .../src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java index eb806a5a33..fefc2d9dda 100644 --- a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java +++ b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java @@ -56,7 +56,7 @@ public class AccessibilityPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.osmand_accessibility_description); } diff --git a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java index 13ac0aecc1..9f3003e925 100644 --- a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java @@ -100,7 +100,7 @@ public class CustomOsmandPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { String description = JsonUtils.getLocalizedResFromMap(app, descriptions, null); return description != null ? Html.fromHtml(description) : null; } diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java index 3fad53c815..01203b6f72 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java @@ -94,7 +94,7 @@ public abstract class OsmandPlugin { public abstract String getName(); - public abstract String getDescription(); + public abstract CharSequence getDescription(); @Nullable public Drawable getAssetResourceImage() { diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index c42e4de8aa..b7f15624b4 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -581,7 +581,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.audionotes_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java index e5d7b3e11d..10997d0f07 100644 --- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java +++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java @@ -37,7 +37,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.osmand_development_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 7883e2c5f0..770f973592 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -83,7 +83,7 @@ public class MapillaryPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.plugin_mapillary_descr); } diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index 7429caadd6..16c60911df 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -117,7 +117,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.record_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java index 7eb775c3a4..2db924aea3 100644 --- a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java @@ -42,7 +42,7 @@ public class NauticalMapsPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(net.osmand.plus.R.string.plugin_nautical_descr); } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 90da6cc65d..a9a3262216 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -378,7 +378,7 @@ public class OsmEditingPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.osm_editing_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 464e719a49..26a9a6d0a7 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -168,7 +168,7 @@ public class ParkingPositionPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.osmand_parking_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index e96edba607..d1696c82a1 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -89,7 +89,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.osmand_rastermaps_plugin_description); } diff --git a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java index 413b4d9c36..6fab6a62d5 100644 --- a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java @@ -21,7 +21,7 @@ public class SkiMapsPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(net.osmand.plus.R.string.plugin_ski_descr); } diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java index a8dc02135b..b6f22610e0 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java @@ -119,7 +119,7 @@ public class SRTMPlugin extends OsmandPlugin { } @Override - public String getDescription() { + public CharSequence getDescription() { return app.getString(R.string.srtm_plugin_description); }