Plugin card fragment showing and hiding fix
This commit is contained in:
GaidamakUA
parent
b5e1d66531
commit
98a6e1a07a
1 changed files with 143 additions and 113 deletions
|
|
@ -1,24 +1,23 @@
|
|||
package net.osmand.plus;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.support.v4.app.Fragment;
|
||||
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.Location;
|
||||
import net.osmand.PlatformUtil;
|
||||
import net.osmand.access.AccessibilityPlugin;
|
||||
import net.osmand.plus.dashboard.tools.DashFragmentData;
|
||||
import net.osmand.plus.myplaces.FavoritesActivity;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.activities.TabActivity.TabItem;
|
||||
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
|
||||
import net.osmand.plus.dashboard.tools.DashFragmentData;
|
||||
import net.osmand.plus.development.OsmandDevelopmentPlugin;
|
||||
import net.osmand.plus.distancecalculator.DistanceCalculatorPlugin;
|
||||
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
|
||||
import net.osmand.plus.myplaces.FavoritesActivity;
|
||||
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
|
||||
import net.osmand.plus.osmedit.OsmEditingPlugin;
|
||||
import net.osmand.plus.osmo.OsMoPlugin;
|
||||
|
|
@ -30,58 +29,58 @@ import net.osmand.plus.views.OsmandMapTileView;
|
|||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.support.v4.app.Fragment;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public abstract class OsmandPlugin {
|
||||
|
||||
private static List<OsmandPlugin> allPlugins = new ArrayList<OsmandPlugin>();
|
||||
private static List<OsmandPlugin> allPlugins = new ArrayList<OsmandPlugin>();
|
||||
private static final Log LOG = PlatformUtil.getLog(OsmandPlugin.class);
|
||||
|
||||
|
||||
private static final String SRTM_PLUGIN_COMPONENT_PAID = "net.osmand.srtmPlugin.paid"; //$NON-NLS-1$
|
||||
private static final String SRTM_PLUGIN_COMPONENT = "net.osmand.srtmPlugin";
|
||||
private boolean active;
|
||||
private boolean active;
|
||||
private String installURL = null;
|
||||
|
||||
public abstract String getId();
|
||||
|
||||
|
||||
public abstract String getDescription();
|
||||
|
||||
|
||||
public abstract String getName();
|
||||
|
||||
|
||||
public abstract int getAssetResourceName();
|
||||
|
||||
public int getLogoResourceId() {
|
||||
return R.drawable.ic_extension_dark;
|
||||
}
|
||||
|
||||
|
||||
public abstract Class<? extends Activity> getSettingsActivity();
|
||||
|
||||
|
||||
public String getVersion() {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Initialize plugin runs just after creation
|
||||
*/
|
||||
public boolean init(OsmandApplication app, Activity activity) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public void setActive(boolean active) {
|
||||
this.active = active;
|
||||
}
|
||||
|
||||
|
||||
public boolean isActive() {
|
||||
return active;
|
||||
}
|
||||
|
||||
|
||||
public boolean needsInstallation() {
|
||||
return installURL != null;
|
||||
}
|
||||
|
||||
|
||||
public void setInstallURL(String installURL) {
|
||||
this.installURL = installURL;
|
||||
}
|
||||
|
|
@ -90,9 +89,12 @@ public abstract class OsmandPlugin {
|
|||
return installURL;
|
||||
}
|
||||
|
||||
public void disable(OsmandApplication app) {};
|
||||
public void disable(OsmandApplication app) {
|
||||
}
|
||||
|
||||
;
|
||||
|
||||
|
||||
|
||||
public static void initPlugins(OsmandApplication app) {
|
||||
OsmandSettings settings = app.getSettings();
|
||||
Set<String> enabledPlugins = settings.getEnabledPlugins();
|
||||
|
|
@ -113,7 +115,7 @@ public abstract class OsmandPlugin {
|
|||
allPlugins.add(new AccessibilityPlugin(app));
|
||||
allPlugins.add(new OsmEditingPlugin(app));
|
||||
allPlugins.add(new OsmandDevelopmentPlugin(app));
|
||||
|
||||
|
||||
activatePlugins(app, enabledPlugins);
|
||||
}
|
||||
|
||||
|
|
@ -133,25 +135,25 @@ public abstract class OsmandPlugin {
|
|||
|
||||
private static void checkMarketPlugin(OsmandApplication app, OsmandPlugin srtm, boolean paid, String id, String id2) {
|
||||
boolean marketEnabled = Version.isMarketEnabled(app);
|
||||
boolean pckg = isPackageInstalled(id, app) ||
|
||||
isPackageInstalled(id2, app);
|
||||
if((Version.isDeveloperVersion(app) || !Version.isProductionVersion(app)) && !paid) {
|
||||
boolean pckg = isPackageInstalled(id, app) ||
|
||||
isPackageInstalled(id2, app);
|
||||
if ((Version.isDeveloperVersion(app) || !Version.isProductionVersion(app)) && !paid) {
|
||||
// for test reasons
|
||||
marketEnabled = false;
|
||||
}
|
||||
if(pckg || (!marketEnabled && !paid)) {
|
||||
if(pckg && !app.getSettings().getPlugins().contains("-"+srtm.getId())) {
|
||||
if (pckg || (!marketEnabled && !paid)) {
|
||||
if (pckg && !app.getSettings().getPlugins().contains("-" + srtm.getId())) {
|
||||
srtm.setActive(true);
|
||||
}
|
||||
allPlugins.add(srtm);
|
||||
} else {
|
||||
if(marketEnabled) {
|
||||
if (marketEnabled) {
|
||||
srtm.setInstallURL(Version.marketPrefix(app) + id);
|
||||
allPlugins.add(srtm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static boolean enablePlugin(Activity activity, OsmandApplication app, OsmandPlugin plugin, boolean enable) {
|
||||
if (enable) {
|
||||
if (!plugin.init(app, activity)) {
|
||||
|
|
@ -165,169 +167,197 @@ public abstract class OsmandPlugin {
|
|||
plugin.setActive(false);
|
||||
}
|
||||
app.getSettings().enablePlugin(plugin.getId(), enable);
|
||||
if(activity instanceof MapActivity) {
|
||||
if (activity instanceof MapActivity) {
|
||||
final MapActivity mapActivity = (MapActivity) activity;
|
||||
plugin.updateLayers(mapActivity.getMapView(), mapActivity);
|
||||
mapActivity.getDashboard().refreshDashboardFragments();
|
||||
if (!enable && plugin.getCardFragment() != null) {
|
||||
Fragment fragment = mapActivity.getSupportFragmentManager()
|
||||
.findFragmentByTag(plugin.getCardFragment().tag);
|
||||
LOG.debug("fragment=" + fragment);
|
||||
mapActivity.getSupportFragmentManager().beginTransaction()
|
||||
.remove(fragment).commit();
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {};
|
||||
|
||||
|
||||
public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
|
||||
}
|
||||
|
||||
;
|
||||
|
||||
/**
|
||||
* Register layers calls when activity is created and before @mapActivityCreate
|
||||
*
|
||||
* @param activity
|
||||
*/
|
||||
public void registerLayers(MapActivity activity) { }
|
||||
public void registerLayers(MapActivity activity) {
|
||||
}
|
||||
|
||||
public void mapActivityCreate(MapActivity activity) { }
|
||||
|
||||
public void mapActivityResume(MapActivity activity) { }
|
||||
|
||||
public void mapActivityPause(MapActivity activity) { }
|
||||
|
||||
public void mapActivityDestroy(MapActivity activity) { }
|
||||
|
||||
public boolean destinationReached() { return true; }
|
||||
|
||||
|
||||
public void registerLayerContextMenuActions(OsmandMapTileView mapView, ContextMenuAdapter adapter, MapActivity mapActivity) {}
|
||||
|
||||
public void registerMapContextMenuActions(MapActivity mapActivity, double latitude, double longitude, ContextMenuAdapter adapter, Object selectedObj) {}
|
||||
|
||||
public void registerOptionsMenuItems(MapActivity mapActivity, ContextMenuAdapter helper) {}
|
||||
public void mapActivityCreate(MapActivity activity) {
|
||||
}
|
||||
|
||||
public void mapActivityResume(MapActivity activity) {
|
||||
}
|
||||
|
||||
public void mapActivityPause(MapActivity activity) {
|
||||
}
|
||||
|
||||
public void mapActivityDestroy(MapActivity activity) {
|
||||
}
|
||||
|
||||
public boolean destinationReached() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public void registerLayerContextMenuActions(OsmandMapTileView mapView, ContextMenuAdapter adapter, MapActivity mapActivity) {
|
||||
}
|
||||
|
||||
public void registerMapContextMenuActions(MapActivity mapActivity, double latitude, double longitude, ContextMenuAdapter adapter, Object selectedObj) {
|
||||
}
|
||||
|
||||
public void registerOptionsMenuItems(MapActivity mapActivity, ContextMenuAdapter helper) {
|
||||
}
|
||||
|
||||
public DashFragmentData getCardFragment() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public void updateLocation(Location location) {
|
||||
}
|
||||
|
||||
public void addMyPlacesTab(FavoritesActivity favoritesActivity, List<TabItem> mTabs, Intent intent) {
|
||||
}
|
||||
|
||||
public void contextMenuFragment(Activity activity, Fragment fragment, Object info, ContextMenuAdapter adapter) {
|
||||
}
|
||||
|
||||
public void optionsMenuFragment(Activity activity, Fragment fragment, ContextMenuAdapter optionsMenuAdapter) {
|
||||
}
|
||||
|
||||
public List<String> indexingFiles(IProgress progress) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public DashFragmentData getCardFragment() {return null;}
|
||||
|
||||
public void updateLocation(Location location) {}
|
||||
|
||||
public void addMyPlacesTab(FavoritesActivity favoritesActivity, List<TabItem> mTabs, Intent intent) { }
|
||||
|
||||
public void contextMenuFragment(Activity activity, Fragment fragment, Object info, ContextMenuAdapter adapter) {}
|
||||
|
||||
public void optionsMenuFragment(Activity activity, Fragment fragment, ContextMenuAdapter optionsMenuAdapter) {}
|
||||
|
||||
public List<String> indexingFiles(IProgress progress) { return null;}
|
||||
|
||||
public boolean mapActivityKeyUp(MapActivity mapActivity, int keyCode) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
public void onMapActivityExternalResult(int requestCode, int resultCode, Intent data) {
|
||||
}
|
||||
|
||||
|
||||
public static void refreshLayers(OsmandMapTileView mapView, MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getAvailablePlugins()) {
|
||||
plugin.updateLayers(mapView, activity);
|
||||
}
|
||||
}
|
||||
|
||||
public static List<OsmandPlugin> getAvailablePlugins(){
|
||||
|
||||
public static List<OsmandPlugin> getAvailablePlugins() {
|
||||
return allPlugins;
|
||||
}
|
||||
|
||||
public static List<OsmandPlugin> getEnabledPlugins(){
|
||||
|
||||
public static List<OsmandPlugin> getEnabledPlugins() {
|
||||
ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
|
||||
for(OsmandPlugin p : allPlugins) {
|
||||
if(p.isActive()) {
|
||||
for (OsmandPlugin p : allPlugins) {
|
||||
if (p.isActive()) {
|
||||
lst.add(p);
|
||||
}
|
||||
}
|
||||
return lst;
|
||||
}
|
||||
|
||||
public static List<OsmandPlugin> getNotEnabledPlugins(){
|
||||
public static List<OsmandPlugin> getNotEnabledPlugins() {
|
||||
ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
|
||||
for(OsmandPlugin p : allPlugins) {
|
||||
if(!p.isActive()) {
|
||||
for (OsmandPlugin p : allPlugins) {
|
||||
if (!p.isActive()) {
|
||||
lst.add(p);
|
||||
}
|
||||
}
|
||||
return lst;
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static <T extends OsmandPlugin> T getEnabledPlugin(Class<T> clz) {
|
||||
for(OsmandPlugin lr : getEnabledPlugins()) {
|
||||
if(clz.isInstance(lr)){
|
||||
for (OsmandPlugin lr : getEnabledPlugins()) {
|
||||
if (clz.isInstance(lr)) {
|
||||
return (T) lr;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static <T extends OsmandPlugin> T getPlugin(Class<T> clz) {
|
||||
for(OsmandPlugin lr : getAvailablePlugins()) {
|
||||
if(clz.isInstance(lr)){
|
||||
for (OsmandPlugin lr : getAvailablePlugins()) {
|
||||
if (clz.isInstance(lr)) {
|
||||
return (T) lr;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static List<String> onIndexingFiles(IProgress progress) {
|
||||
List<String> l = new ArrayList<String>();
|
||||
List<String> l = new ArrayList<String>();
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
List<String> ls = plugin.indexingFiles(progress);
|
||||
if(ls != null && ls.size() > 0) {
|
||||
if (ls != null && ls.size() > 0) {
|
||||
l.addAll(ls);
|
||||
}
|
||||
}
|
||||
return l;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public static void onMapActivityCreate(MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.mapActivityCreate(activity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void onMapActivityResume(MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.mapActivityResume(activity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void onMapActivityPause(MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.mapActivityPause(activity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void onMapActivityDestroy(MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.mapActivityDestroy(activity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void onMapActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.onMapActivityExternalResult(requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static boolean onDestinationReached() {
|
||||
boolean b = true;
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
if(!plugin.destinationReached()){
|
||||
if (!plugin.destinationReached()) {
|
||||
b = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void createLayers(OsmandMapTileView mapView, MapActivity activity) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.registerLayers(activity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void registerMapContextMenu(MapActivity map, double latitude, double longitude, ContextMenuAdapter adapter, Object selectedObj) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.registerMapContextMenuActions(map, latitude, longitude, adapter, selectedObj);
|
||||
|
|
@ -339,20 +369,20 @@ public abstract class OsmandPlugin {
|
|||
plugin.registerLayerContextMenuActions(mapView, adapter, mapActivity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void registerOptionsMenu(MapActivity map, ContextMenuAdapter helper) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.registerOptionsMenuItems(map, helper);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void onContextMenuActivity(Activity activity, Fragment fragment, Object info, ContextMenuAdapter adapter) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.contextMenuFragment(activity, fragment, info, adapter);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public static void onOptionsMenuActivity(Activity activity, Fragment fragment, ContextMenuAdapter optionsMenuAdapter) {
|
||||
for (OsmandPlugin plugin : getEnabledPlugins()) {
|
||||
plugin.optionsMenuFragment(activity, fragment, optionsMenuAdapter);
|
||||
|
|
@ -369,30 +399,30 @@ public abstract class OsmandPlugin {
|
|||
}
|
||||
|
||||
private static boolean isPackageInstalled(String packageInfo,
|
||||
OsmandApplication app) {
|
||||
if(packageInfo == null) {
|
||||
OsmandApplication app) {
|
||||
if (packageInfo == null) {
|
||||
return false;
|
||||
}
|
||||
boolean installed = false;
|
||||
try{
|
||||
try {
|
||||
installed = app.getPackageManager().getPackageInfo(packageInfo, 0) != null;
|
||||
} catch ( NameNotFoundException e){
|
||||
} catch (NameNotFoundException e) {
|
||||
}
|
||||
return installed;
|
||||
}
|
||||
|
||||
public static boolean onMapActivityKeyUp(MapActivity mapActivity, int keyCode) {
|
||||
for(OsmandPlugin p : getEnabledPlugins()){
|
||||
if(p.mapActivityKeyUp(mapActivity, keyCode))
|
||||
for (OsmandPlugin p : getEnabledPlugins()) {
|
||||
if (p.mapActivityKeyUp(mapActivity, keyCode))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static void updateLocationPlugins(net.osmand.Location location) {
|
||||
for(OsmandPlugin p : getEnabledPlugins()){
|
||||
for (OsmandPlugin p : getEnabledPlugins()) {
|
||||
p.updateLocation(location);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isDevelopment() {
|
||||
|
|
@ -400,9 +430,9 @@ public abstract class OsmandPlugin {
|
|||
}
|
||||
|
||||
public static void addMyPlacesTabPlugins(FavoritesActivity favoritesActivity, List<TabItem> mTabs, Intent intent) {
|
||||
for(OsmandPlugin p : getEnabledPlugins()){
|
||||
for (OsmandPlugin p : getEnabledPlugins()) {
|
||||
p.addMyPlacesTab(favoritesActivity, mTabs, intent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue