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

Save plugin resources dir path

Browse source
This commit is contained in:
Vitaliy 2020-03-30 20:27:10 +03:00
parent 57669086a7
commit 568a7a27b4
3 changed files with 73 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
View file

@ -45,22 +45,25 @@ public class CustomOsmandPlugin extends OsmandPlugin {
private static final Log LOG = PlatformUtil.getLog(CustomOsmandPlugin.class);
public String pluginId;
public Map<String, String> names = new HashMap<>();
public Map<String, String> descriptions = new HashMap<>();
public Map<String, String> iconNames = new HashMap<>();
public Map<String, String> imageNames = new HashMap<>();
public Drawable icon;
public Drawable image;
private String pluginId;
private String resourceDirName;
private Map<String, String> names = new HashMap<>();
private Map<String, String> descriptions = new HashMap<>();
private Map<String, String> iconNames = new HashMap<>();
private Map<String, String> imageNames = new HashMap<>();
public List<String> rendererNames = new ArrayList<>();
public List<String> routerNames = new ArrayList<>();
private Drawable icon;
private Drawable image;
private List<String> rendererNames = new ArrayList<>();
private List<String> routerNames = new ArrayList<>();
public CustomOsmandPlugin(@NonNull OsmandApplication app, @NonNull JSONObject json) throws JSONException {
super(app);
pluginId = json.getString("pluginId");
readAdditionalDataFromJson(json);
readDependentFilesFromJson(json);
loadResources();
}
@Override
@ -211,6 +214,14 @@ public class CustomOsmandPlugin extends OsmandPlugin {
return description;
}
public String getResourceDirName() {
return resourceDirName;
}
public void setResourceDirName(String resourceDirName) {
this.resourceDirName = resourceDirName;
}
public void readAdditionalDataFromJson(JSONObject json) throws JSONException {
JSONObject iconJson = json.has("icon") ? json.getJSONObject("icon") : null;
if (iconJson != null) {
@ -287,6 +298,23 @@ public class CustomOsmandPlugin extends OsmandPlugin {
routerNames.add(renderer);
}
}
JSONObject iconNamesJson = json.has("iconNames") ? json.getJSONObject("iconNames") : null;
if (iconNamesJson != null) {
for (Iterator<String> it = iconNamesJson.keys(); it.hasNext(); ) {
String localeKey = it.next();
String name = iconNamesJson.getString(localeKey);
iconNames.put(localeKey, name);
}
}
JSONObject imageNamesJson = json.has("imageNames") ? json.getJSONObject("imageNames") : null;
if (imageNamesJson != null) {
for (Iterator<String> it = imageNamesJson.keys(); it.hasNext(); ) {
String localeKey = it.next();
String name = imageNamesJson.getString(localeKey);
imageNames.put(localeKey, name);
}
}
resourceDirName = json.has("pluginResDir") ? json.getString("pluginResDir") : null;
}
public void writeDependentFilesJson(JSONObject json) throws JSONException {
@ -301,6 +329,20 @@ public class CustomOsmandPlugin extends OsmandPlugin {
routerNamesJson.put(render);
}
json.put("routerNames", routerNamesJson);
JSONObject iconNamesJson = new JSONObject();
for (Map.Entry<String, String> entry : iconNames.entrySet()) {
iconNamesJson.put(entry.getKey(), entry.getValue());
}
json.put("iconNames", iconNamesJson);
JSONObject imageNamesJson = new JSONObject();
for (Map.Entry<String, String> entry : imageNames.entrySet()) {
imageNamesJson.put(entry.getKey(), entry.getValue());
}
json.put("imageNames", imageNamesJson);
json.put("pluginResDir", resourceDirName);
}
@Override
@ -313,27 +355,28 @@ public class CustomOsmandPlugin extends OsmandPlugin {
return routerNames;
}
public void addRouter(String fileName) {
routerNames.add(fileName);
}
public void addRenderer(String fileName) {
String renderer = RendererRegistry.formatRendererFileName(fileName);
rendererNames.add(renderer.replace('_', ' ').replace('-', ' '));
}
public void updateCustomItems(List<SettingsItem> items) {
for (SettingsItem item : items) {
if (item instanceof SettingsHelper.ResourcesSettingsItem) {
SettingsHelper.ResourcesSettingsItem resourcesSettingsItem = (SettingsHelper.ResourcesSettingsItem) item;
File pluginDir = resourcesSettingsItem.getPluginPath();
File pluginResDir = new File(pluginDir, resourcesSettingsItem.getFileName());
if (pluginResDir.exists() && pluginResDir.isDirectory()) {
File[] files = pluginResDir.listFiles();
for (File resFile : files) {
String path = resFile.getAbsolutePath();
if (icon == null) {
icon = getIconForFile(path, iconNames);
}
if (image == null) {
image = getIconForFile(path, imageNames);
}
public void loadResources() {
if (!Algorithms.isEmpty(resourceDirName)) {
File pluginDir = new File(app.getAppPath(null), IndexConstants.PLUGINS_DIR + pluginId);
File pluginResDir = new File(pluginDir, resourceDirName);
if (pluginResDir.exists() && pluginResDir.isDirectory()) {
File[] files = pluginResDir.listFiles();
for (File resFile : files) {
String path = resFile.getAbsolutePath();
if (icon == null) {
icon = getIconForFile(path, iconNames);
}
if (image == null) {
image = getIconForFile(path, imageNames);
}
}
}

4
OsmAnd/src/net/osmand/plus/SettingsHelper.java
View file

@ -398,7 +398,9 @@ public class SettingsHelper {
if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.RENDERING_STYLE) {
plugin.addRenderer(fileItem.getName());
} else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.ROUTING_CONFIG) {
plugin.getRouterNames().add(fileItem.getName());
plugin.addRouter(fileItem.getName());
} else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.OTHER) {
plugin.setResourceDirName(item.getFileName());
}
}
}

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

@ -846,7 +846,8 @@ public class ImportHelper {
@Override
public void onSettingsImportFinished(boolean succeed, @NonNull List<SettingsItem> items) {
CustomOsmandPlugin plugin = pluginItem.getPlugin();
plugin.updateCustomItems(items);
plugin.loadResources();
if (activity != null) {
plugin.onInstall(app, activity);
}