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

Move IPFSImageCard to plugin

Browse source
This commit is contained in:
Vitaliy 2021-02-03 16:40:24 +02:00
parent 9efab732f2
commit 2a4818f630
4 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
View file

@ -63,6 +63,7 @@ import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController;
import net.osmand.plus.mapcontextmenu.controllers.TransportStopController; import net.osmand.plus.mapcontextmenu.controllers.TransportStopController;
import net.osmand.plus.openplacereviews.AddPhotosBottomSheetDialogFragment; import net.osmand.plus.openplacereviews.AddPhotosBottomSheetDialogFragment;
import net.osmand.plus.openplacereviews.OPRConstants; import net.osmand.plus.openplacereviews.OPRConstants;
import net.osmand.plus.openplacereviews.OpenPlaceReviewsPlugin;
import net.osmand.plus.openplacereviews.OprStartFragment; import net.osmand.plus.openplacereviews.OprStartFragment;
import net.osmand.plus.osmedit.opr.OpenDBAPI; import net.osmand.plus.osmedit.opr.OpenDBAPI;
import net.osmand.plus.poi.PoiFiltersHelper; import net.osmand.plus.poi.PoiFiltersHelper;
@ -91,7 +92,7 @@ import java.util.Set;
import static net.osmand.plus.mapcontextmenu.builders.cards.ImageCard.GetImageCardsTask.GetImageCardsListener; import static net.osmand.plus.mapcontextmenu.builders.cards.ImageCard.GetImageCardsTask.GetImageCardsListener;
public class MenuBuilder implements UploadPhotosListener { public class MenuBuilder {
private static final Log LOG = PlatformUtil.getLog(MenuBuilder.class); private static final Log LOG = PlatformUtil.getLog(MenuBuilder.class);
private static final int PICK_IMAGE = 1231; private static final int PICK_IMAGE = 1231;
@ -173,25 +174,6 @@ public class MenuBuilder implements UploadPhotosListener {
} }
} }
@Override
public void uploadPhotosSuccess(final String response) {
app.runInUIThread(new Runnable() {
@Override
public void run() {
if (AndroidUtils.isActivityNotDestroyed(mapActivity)) {
try {
ImageCard imageCard = ImageCard.createCardOpr(mapActivity, new JSONObject(response));
if (imageCard != null) {
addImageCard(imageCard);
}
} catch (JSONException e) {
LOG.error(e);
}
}
}
});
}
public interface CollapseExpandListener { public interface CollapseExpandListener {
void onCollapseExpand(boolean collapsed); void onCollapseExpand(boolean collapsed);
} }
@ -512,7 +494,27 @@ public class MenuBuilder implements UploadPhotosListener {
} }
} }
} }
execute(new UploadPhotosAsyncTask(mapActivity, imagesUri, placeId, MenuBuilder.this)); UploadPhotosListener listener = new UploadPhotosListener() {
@Override
public void uploadPhotosSuccess(final String response) {
app.runInUIThread(new Runnable() {
@Override
public void run() {
if (AndroidUtils.isActivityNotDestroyed(mapActivity)) {
try {
ImageCard imageCard = OpenPlaceReviewsPlugin.createCardOpr(mapActivity, new JSONObject(response));
if (imageCard != null) {
addImageCard(imageCard);
}
} catch (JSONException e) {
LOG.error(e);
}
}
}
});
}
};
execute(new UploadPhotosAsyncTask(mapActivity, imagesUri, placeId, listener));
} }
} }
})); }));

8
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java
View file

@ -196,14 +196,6 @@ public abstract class ImageCard extends AbstractCard {
return imageCard; return imageCard;
} }
public static ImageCard createCardOpr(MapActivity mapActivity, JSONObject imageObject) {
ImageCard imageCard = null;
if (imageObject.has("cid")) {
imageCard = new IPFSImageCard(mapActivity, imageObject);
}
return imageCard;
}
public double getCa() { public double getCa() {
return ca; return ca;
} }

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java → OsmAnd/src/net/osmand/plus/openplacereviews/IPFSImageCard.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.mapcontextmenu.builders.cards; package net.osmand.plus.openplacereviews;
import android.view.View; import android.view.View;
@ -8,7 +8,7 @@ import androidx.core.content.ContextCompat;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.openplacereviews.OPRConstants; import net.osmand.plus.mapcontextmenu.builders.cards.ImageCard;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;

10
OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java
View file

@ -120,7 +120,7 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
try { try {
JSONObject imageObject = (JSONObject) images.get(i); JSONObject imageObject = (JSONObject) images.get(i);
if (imageObject != JSONObject.NULL) { if (imageObject != JSONObject.NULL) {
ImageCard imageCard = ImageCard.createCardOpr(mapActivity, imageObject); ImageCard imageCard = createCardOpr(mapActivity, imageObject);
if (imageCard != null) { if (imageCard != null) {
result.add(imageCard); result.add(imageCard);
} }
@ -137,6 +137,14 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
} }
} }
public static ImageCard createCardOpr(MapActivity mapActivity, JSONObject imageObject) {
ImageCard imageCard = null;
if (imageObject.has("cid")) {
imageCard = new IPFSImageCard(mapActivity, imageObject);
}
return imageCard;
}
private static String[] getIdFromResponse(String response) { private static String[] getIdFromResponse(String response) {
try { try {
JSONArray obj = new JSONObject(response).getJSONArray("objects"); JSONArray obj = new JSONObject(response).getJSONArray("objects");