mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Showing an overlay dialog when a nearby item is tapped

Browse source
This commit is contained in:
maskara 2017-05-14 11:33:39 +02:00
parent 3a92de0c21
commit cce8715fad
15 changed files with 609 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/assets/queries/nearby_query.txt Normal file
View file

@ -0,0 +1,43 @@
SELECT
(SAMPLE(?location) as ?location)
?item
(SAMPLE(COALESCE(?item_label_preferred_language, ?item_label_any_language)) as ?label)
(SAMPLE(?classId) as ?class)
(SAMPLE(COALESCE(?class_label_preferred_language, ?class_label_any_language, "?")) as ?class_label)
(SAMPLE(COALESCE(?icon0, ?icon1)) as ?icon)
(SAMPLE(COALESCE(?emoji0, ?emoji1)) as ?emoji)
(SAMPLE(?sitelink) as ?sitelink)
WHERE {
# Around given location...
SERVICE wikibase:around {
?item wdt:P625 ?location.
bd:serviceParam wikibase:center "Point(${LONG} ${LAT})"^^geo:wktLiteral.
bd:serviceParam wikibase:radius "${RADIUS}" . # Radius in kilometers.
}
# ... and without an image.
MINUS {?item wdt:P18 []}
# Get the label in the preferred language of the user, or any other language if no label is available in that language.
OPTIONAL {?item rdfs:label ?item_label_preferred_language. FILTER (lang(?item_label_preferred_language) = "${LANG}")}
OPTIONAL {?item rdfs:label ?item_label_any_language}
# Get the class label in the preferred language of the user, or any other language if no label is available in that language.
OPTIONAL {
?item p:P31/ps:P31 ?classId.
OPTIONAL {?classId rdfs:label ?class_label_preferred_language. FILTER (lang(?class_label_preferred_language) = "${LANG}")}
OPTIONAL {?classId rdfs:label ?class_label_any_language}
# Get icon
OPTIONAL { ?classId wdt:P2910 ?icon0. }
OPTIONAL { ?classId wdt:P279*/wdt:P2910 ?icon1. }
# Get emoji
OPTIONAL { ?classId wdt:P487 ?emoji0. }
OPTIONAL { ?classId wdt:P279*/wdt:P487 ?emoji1. }
OPTIONAL {
?sitelink schema:about ?item .
?sitelink schema:inLanguage "en"
}
}
}
GROUP BY ?item

88
app/src/main/java/fr/free/nrw/commons/nearby/NearbyBaseMarker.java Normal file
View file

@ -0,0 +1,88 @@
package fr.free.nrw.commons.nearby;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
import com.mapbox.mapboxsdk.annotations.Icon;
import com.mapbox.mapboxsdk.annotations.IconFactory;
import com.mapbox.mapboxsdk.geometry.LatLng;
import fr.free.nrw.commons.utils.UriDeserializer;
import fr.free.nrw.commons.utils.UriSerializer;
public class NearbyBaseMarker extends BaseMarkerOptions<NearbyMarker, NearbyBaseMarker> {
private Place place;
public NearbyBaseMarker() {
}
public NearbyBaseMarker place(Place place) {
this.place = place;
return getThis();
}
public NearbyBaseMarker(Parcel in) {
Gson gson = new GsonBuilder()
.registerTypeAdapter(Uri.class, new UriDeserializer())
.create();
position((LatLng) in.readParcelable(LatLng.class.getClassLoader()));
snippet(in.readString());
String iconId = in.readString();
Bitmap iconBitmap = in.readParcelable(Bitmap.class.getClassLoader());
Icon icon = IconFactory.recreate(iconId, iconBitmap);
icon(icon);
title(in.readString());
String gsonString = in.readString();
place(gson.fromJson(gsonString, Place.class));
}
@Override
public NearbyBaseMarker getThis() {
return this;
}
@Override
public NearbyMarker getMarker() {
return new NearbyMarker(this, place);
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
Gson gson = new GsonBuilder()
.registerTypeAdapter(Uri.class, new UriSerializer())
.create();
dest.writeParcelable(position, flags);
dest.writeString(snippet);
dest.writeString(icon.getId());
dest.writeParcelable(icon.getBitmap(), flags);
dest.writeString(title);
dest.writeString(gson.toJson(place));
}
public Place getPlace() {
return place;
}
public static final Parcelable.Creator<NearbyBaseMarker> CREATOR
= new Parcelable.Creator<NearbyBaseMarker>() {
public NearbyBaseMarker createFromParcel(Parcel in) {
return new NearbyBaseMarker(in);
}
public NearbyBaseMarker[] newArray(int size) {
return new NearbyBaseMarker[size];
}
};
}

36
app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
View file

@ -1,17 +1,10 @@
package fr.free.nrw.commons.nearby;
import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween;
import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.drawable.Icon;
import android.preference.PreferenceManager;
import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import fr.free.nrw.commons.location.LatLng;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -20,8 +13,12 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import fr.free.nrw.commons.location.LatLng;
import timber.log.Timber;
import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween;
import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
public class NearbyController {
private static final int MAX_RESULTS = 1000;
@ -40,7 +37,9 @@ public class NearbyController {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
List<Place> places = prefs.getBoolean("useWikidata", true)
? NearbyPlaces.getInstance().getFromWikidataQuery(
curLatLng, Locale.getDefault().getLanguage())
context,
curLatLng,
Locale.getDefault().getLanguage())
: NearbyPlaces.getInstance().getFromWikiNeedsPictures();
if (curLatLng != null) {
Timber.d("Sorting places by distance...");
@ -85,19 +84,24 @@ public class NearbyController {
* @param placeList list of nearby places in Place data type
* @return BaseMarkerOprions list that holds nearby places
*/
public static List<BaseMarkerOptions> loadAttractionsFromLocationToBaseMarkerOptions(
public static List<NearbyBaseMarker> loadAttractionsFromLocationToBaseMarkerOptions(
LatLng curLatLng,
List<Place> placeList) {
List<BaseMarkerOptions> baseMarkerOptionses = new ArrayList<>();
List<NearbyBaseMarker> baseMarkerOptionses = new ArrayList<>();
placeList = placeList.subList(0, Math.min(placeList.size(), MAX_RESULTS));
for (Place place: placeList) {
String distance = formatDistanceBetween(curLatLng, place.location);
place.setDistance(distance);
baseMarkerOptionses.add(new MarkerOptions()
.position(new com.mapbox.mapboxsdk.geometry
.LatLng(place.location.latitude,place.location.longitude))
.title(place.name)
.snippet(place.description));
NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
nearbyBaseMarker.title(place.name);
nearbyBaseMarker.position(
new com.mapbox.mapboxsdk.geometry.LatLng(
place.location.latitude,
place.location.longitude));
nearbyBaseMarker.place(place);
baseMarkerOptionses.add(nearbyBaseMarker);
}
return baseMarkerOptionses;
}

110
app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java Normal file
View file

@ -0,0 +1,110 @@
package fr.free.nrw.commons.nearby;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.ui.widget.OverlayDialog;
import fr.free.nrw.commons.utils.DialogUtil;
public class NearbyInfoDialog extends OverlayDialog {
private final static String ARG_TITLE = "placeTitle";
private final static String ARG_DESC = "placeDesc";
private final static String ARG_LATITUDE = "latitude";
private final static String ARG_LONGITUDE = "longitude";
private final static String ARG_ARTICLE_LINK = "articleLink";
private final static String ARG_WIKI_DATA_LINK = "wikiDataLink";
@BindView(R.id.link_preview_title)
TextView placeTitle;
@BindView(R.id.link_preview_extract)
TextView placeDescription;
@BindView(R.id.link_preview_go_button)
TextView goToButton;
private Unbinder unbinder;
private LatLng location;
private Uri articleLink;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.dialog_nearby_info, container, false);
unbinder = ButterKnife.bind(this, view);
initUi();
return view;
}
private void initUi() {
Bundle bundle = getArguments();
placeTitle.setText(bundle.getString(ARG_TITLE));
placeDescription.setText(bundle.getString(ARG_DESC));
location = new LatLng(bundle.getDouble(ARG_LATITUDE), bundle.getDouble(ARG_LONGITUDE));
getArticleLink(bundle);
}
private void getArticleLink(Bundle bundle) {
String articleLink = bundle.getString(ARG_ARTICLE_LINK);
articleLink = articleLink.replace("<", "").replace(">", "");
if (Utils.isNullOrWhiteSpace(articleLink) || articleLink == "\n") {
articleLink = bundle.getString(ARG_WIKI_DATA_LINK).replace("<", "").replace(">", "");
}
if (!Utils.isNullOrWhiteSpace(articleLink) && articleLink != "\n") {
this.articleLink = Uri.parse(articleLink);
} else {
goToButton.setVisibility(View.GONE);
}
}
public static void showYourself(FragmentActivity fragmentActivity, Place place) {
NearbyInfoDialog mDialog = new NearbyInfoDialog();
Bundle bundle = new Bundle();
bundle.putString(ARG_TITLE, place.name);
bundle.putString(ARG_DESC, place.description);
bundle.putDouble(ARG_LATITUDE, place.location.latitude);
bundle.putDouble(ARG_LONGITUDE, place.location.longitude);
bundle.putString(ARG_ARTICLE_LINK, place.siteLink.toString());
bundle.putString(ARG_WIKI_DATA_LINK, place.wikiDataLink.toString());
mDialog.setArguments(bundle);
DialogUtil.showSafely(fragmentActivity, mDialog);
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
@OnClick(R.id.link_preview_directions_button)
void onDirectionsClick() {
//Open map app at given position
Uri gmmIntentUri = Uri.parse("geo:0,0?q=" + location.latitude + "," + location.longitude);
Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
if (mapIntent.resolveActivity(getActivity().getPackageManager()) != null) {
startActivity(mapIntent);
}
}
@OnClick(R.id.link_preview_go_button)
void onReadArticleClick() {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, articleLink);
startActivity(browserIntent);
}
}

10
app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
View file

@ -28,8 +28,6 @@ import java.util.List;
import timber.log.Timber;
public class NearbyListFragment extends ListFragment {
//private NearbyAsyncTask nearbyAsyncTask;
private Gson gson;
private List<Place> placeList;
private LatLng curLatLng;
@ -98,12 +96,6 @@ public class NearbyListFragment extends ListFragment {
Timber.d("Item at position %d has coords: Lat: %f Long: %f", position, latitude, longitude);
//Open map app at given position
Uri gmmIntentUri = Uri.parse("geo:0,0?q=" + latitude + "," + longitude);
Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
if (mapIntent.resolveActivity(getActivity().getPackageManager()) != null) {
startActivity(mapIntent);
}
NearbyInfoDialog.showYourself(getActivity(), place);
}
}

26
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -2,6 +2,7 @@ package fr.free.nrw.commons.nearby;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
@ -11,7 +12,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.mapbox.mapboxsdk.Mapbox;
import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
@ -21,18 +22,17 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.services.android.telemetry.MapboxTelemetry;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.utils.UriDeserializer;
import java.lang.reflect.Type;
import java.util.List;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.utils.UriDeserializer;
public class NearbyMapFragment extends android.support.v4.app.Fragment {
//private NearbyAsyncTask nearbyAsyncTask;
private MapView mapView;
private Gson gson;
private List<Place> placeList;
private List<BaseMarkerOptions> baseMarkerOptionses;
private List<NearbyBaseMarker> baseMarkerOptionses;
private fr.free.nrw.commons.location.LatLng curLatLng;
public NearbyMapFragment() {
@ -79,9 +79,23 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
@Override
public void onMapReady(MapboxMap mapboxMap) {
mapboxMap.addMarkers(baseMarkerOptionses);
mapboxMap.setOnMarkerClickListener(new MapboxMap.OnMarkerClickListener() {
@Override
public boolean onMarkerClick(@NonNull Marker marker) {
if (marker instanceof NearbyMarker) {
NearbyMarker nearbyMarker = (NearbyMarker) marker;
Place place = nearbyMarker.getNearbyBaseMarker().getPlace();
NearbyInfoDialog.showYourself(getActivity(), place);
}
return false;
}
});
}
});
setHasOptionsMenu(false);
return mapView;
}

31
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMarker.java Normal file
View file

@ -0,0 +1,31 @@
package fr.free.nrw.commons.nearby;
import com.mapbox.mapboxsdk.annotations.Marker;
public class NearbyMarker extends Marker {
private Place place;
private NearbyBaseMarker nearbyBaseMarker;
/**
* Creates a instance of {@link Marker} using the builder of Marker.
*
* @param baseMarkerOptions The builder used to construct the Marker.
*/
public NearbyMarker(NearbyBaseMarker baseMarkerOptions, Place place) {
super(baseMarkerOptions);
this.place = place;
this.nearbyBaseMarker = baseMarkerOptions;
}
public NearbyBaseMarker getNearbyBaseMarker() {
return nearbyBaseMarker;
}
public Place getPlace() {
return place;
}
public void setNearbyBaseMarker(NearbyBaseMarker nearbyBaseMarker) {
this.nearbyBaseMarker = nearbyBaseMarker;
}
}

73
app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
View file

@ -1,11 +1,9 @@
package fr.free.nrw.commons.nearby;
import android.content.Context;
import android.net.Uri;
import android.os.StrictMode;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.location.LatLng;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@ -19,6 +17,9 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.utils.FileUtils;
import timber.log.Timber;
public class NearbyPlaces {
@ -28,44 +29,6 @@ public class NearbyPlaces {
private static final double MAX_RADIUS = 300.0;
private static final double RADIUS_MULTIPLIER = 1.618;
private static final String WIKIDATA_QUERY_URL = "https://query.wikidata.org/sparql?query=${QUERY}";
private static final String WIKIDATA_QUERY_TEMPLATE = "SELECT\n" +
" (SAMPLE(?location) as ?location)\n" +
" ?item\n" +
" (SAMPLE(COALESCE(?item_label_preferred_language, ?item_label_any_language)) as ?label)\n" +
" (SAMPLE(?classId) as ?class)\n" +
" (SAMPLE(COALESCE(?class_label_preferred_language, ?class_label_any_language, \"?\")) as ?class_label)\n" +
" (SAMPLE(COALESCE(?icon0, ?icon1)) as ?icon)\n" +
" (SAMPLE(COALESCE(?emoji0, ?emoji1)) as ?emoji)\n" +
"WHERE {\n" +
" # Around given location...\n" +
" SERVICE wikibase:around {\n" +
" ?item wdt:P625 ?location.\n" +
" bd:serviceParam wikibase:center \"Point(${LONG} ${LAT})\"^^geo:wktLiteral. \n" +
" bd:serviceParam wikibase:radius \"${RADIUS}\" . # Radius in kilometers.\n" +
" }\n" +
" \n" +
" # ... and without an image.\n" +
" MINUS {?item wdt:P18 []}\n" +
" \n" +
" # Get the label in the preferred language of the user, or any other language if no label is available in that language.\n" +
" OPTIONAL {?item rdfs:label ?item_label_preferred_language. FILTER (lang(?item_label_preferred_language) = \"${LANG}\")}\n" +
" OPTIONAL {?item rdfs:label ?item_label_any_language}\n" +
" \n" +
" # Get the class label in the preferred language of the user, or any other language if no label is available in that language.\n" +
" OPTIONAL {\n" +
" ?item p:P31/ps:P31 ?classId.\n" +
" OPTIONAL {?classId rdfs:label ?class_label_preferred_language. FILTER (lang(?class_label_preferred_language) = \"${LANG}\")}\n" +
" OPTIONAL {?classId rdfs:label ?class_label_any_language}\n" +
"\n" +
" # Get icon\n" +
" OPTIONAL { ?classId wdt:P2910 ?icon0. }\n" +
" OPTIONAL { ?classId wdt:P279*/wdt:P2910 ?icon1. }\n" +
" # Get emoji\n" +
" OPTIONAL { ?classId wdt:P487 ?emoji0. }\n" +
" OPTIONAL { ?classId wdt:P279*/wdt:P487 ?emoji1. }\n" +
" }\n" +
"}\n" +
"GROUP BY ?item\n";
private static NearbyPlaces singleton;
private double radius = INITIAL_RADIUS;
private List<Place> places;
@ -73,13 +36,15 @@ public class NearbyPlaces {
private NearbyPlaces(){
}
List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) {
List<Place> getFromWikidataQuery(Context context,
LatLng curLatLng,
String lang) {
List<Place> places = Collections.emptyList();
try {
// increase the radius gradually to find a satisfactory number of nearby places
while (radius < MAX_RADIUS) {
places = getFromWikidataQuery(curLatLng, lang, radius);
places = getFromWikidataQuery(context, curLatLng, lang, radius);
Timber.d("%d results at radius: %f", places.size(), radius);
if (places.size() >= MIN_RESULTS) {
break;
@ -97,10 +62,18 @@ public class NearbyPlaces {
return places;
}
private List<Place> getFromWikidataQuery(LatLng cur, String lang, double radius)
private List<Place> getFromWikidataQuery(Context context,
LatLng cur,
String lang,
double radius)
throws IOException {
List<Place> places = new ArrayList<>();
String query = WIKIDATA_QUERY_TEMPLATE.replace("${RADIUS}", "" + radius)
String query = FileUtils.readFromFile(context, "queries/nearby_query.txt");
Timber.d(query);
query = query.replace("${RADIUS}", "" + radius)
.replace("${LAT}", "" + String.format(Locale.ROOT, "%.3f", cur.latitude))
.replace("${LONG}", "" + String.format(Locale.ROOT, "%.3f", cur.longitude))
.replace("${LANG}", "" + lang);
@ -124,6 +97,8 @@ public class NearbyPlaces {
String point = fields[0];
String name = Utils.stripLocalizedString(fields[2]);
String type = Utils.stripLocalizedString(fields[4]);
String sitelink = Utils.stripLocalizedString(fields[7]);
String wikiDataLink = Utils.stripLocalizedString(fields[3]);
String icon = fields[5];
double latitude = 0;
@ -145,7 +120,9 @@ public class NearbyPlaces {
type, // list
type, // details
Uri.parse(icon),
new LatLng(latitude, longitude)
new LatLng(latitude, longitude),
Uri.parse(sitelink),
Uri.parse(wikiDataLink)
));
}
in.close();
@ -202,7 +179,9 @@ public class NearbyPlaces {
type, // list
type, // details
null,
new LatLng(latitude, longitude)
new LatLng(latitude, longitude),
null,
null
));
}
in.close();

6
app/src/main/java/fr/free/nrw/commons/nearby/Place.java
View file

@ -16,15 +16,19 @@ public class Place {
public Bitmap image;
public Bitmap secondaryImage;
public String distance;
public Uri siteLink;
public Uri wikiDataLink;
public Place(String name, String description, String longDescription,
Uri secondaryImageUrl, LatLng location) {
Uri secondaryImageUrl, LatLng location, Uri siteLink, Uri wikiDataLink) {
this.name = name;
this.description = description;
this.longDescription = longDescription;
this.secondaryImageUrl = secondaryImageUrl;
this.location = location;
this.siteLink = siteLink;
this.wikiDataLink = wikiDataLink;
}
public void setDistance(String distance) {

48
app/src/main/java/fr/free/nrw/commons/ui/widget/OverlayDialog.java Normal file
View file

@ -0,0 +1,48 @@
package fr.free.nrw.commons.ui.widget;
import android.app.Dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import fr.free.nrw.commons.R;
public abstract class OverlayDialog extends DialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setStyle(STYLE_NORMAL, R.style.borderless_dialog);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
setDialogLayoutToFullScreen();
super.onViewCreated(view, savedInstanceState);
}
private void setDialogLayoutToFullScreen() {
Window window = getDialog().getWindow();
WindowManager.LayoutParams wlp = window.getAttributes();
window.requestFeature(Window.FEATURE_NO_TITLE);
wlp.gravity = Gravity.BOTTOM;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.MATCH_PARENT;
window.setAttributes(wlp);
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Dialog dialog = super.onCreateDialog(savedInstanceState);
Window window = dialog.getWindow();
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
return dialog;
}
}

80
app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java Normal file
View file

@ -0,0 +1,80 @@
package fr.free.nrw.commons.utils;
import android.app.Activity;
import android.app.Dialog;
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import timber.log.Timber;
public class DialogUtil {
public static void dismissSafely(@Nullable Activity activity, @Nullable DialogFragment dialog) {
boolean isActivityDestroyed = false;
if (activity == null || dialog == null) {
Timber.d("dismiss called with null activity / dialog. Ignoring.");
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
if (activity.isFinishing() || isActivityDestroyed) {
return;
}
try {
dialog.dismiss();
} catch (IllegalStateException e) {
Timber.e(e, "Could not dismiss dialog.");
}
}
public static void showSafely(Activity activity, Dialog dialog) {
if (activity == null || dialog == null) {
Timber.d("Show called with null activity / dialog. Ignoring.");
return;
}
boolean isActivityDestroyed = false;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
if (activity.isFinishing() || isActivityDestroyed) {
Timber.e("Activity is not running. Could not show dialog. ");
return;
}
try {
dialog.show();
} catch (IllegalStateException e) {
Timber.e(e, "Could not show dialog.");
}
}
public static void showSafely(FragmentActivity activity, DialogFragment dialog) {
boolean isActivityDestroyed = false;
if (activity == null || dialog == null) {
Timber.d("show called with null activity / dialog. Ignoring.");
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
if (activity.isFinishing() || isActivityDestroyed) {
return;
}
try {
if (dialog.getDialog() == null || !dialog.getDialog().isShowing()) {
dialog.show(activity.getSupportFragmentManager(), dialog.getClass().getSimpleName());
}
} catch (IllegalStateException e) {
Timber.e(e, "Could not show dialog.");
}
}
}

33
app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java Normal file
View file

@ -0,0 +1,33 @@
package fr.free.nrw.commons.utils;
import android.content.Context;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
public class FileUtils {
public static String readFromFile(Context context, String fileName) {
String stringBuilder = "";
BufferedReader reader = null;
try {
reader = new BufferedReader(
new InputStreamReader(context.getAssets().open(fileName), "UTF-8"));
String mLine;
while ((mLine = reader.readLine()) != null) {
stringBuilder += mLine + "\n";
}
} catch (IOException e) {
//log the exception
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
//log the exception
}
}
}
return stringBuilder;
}
}

97
app/src/main/res/layout/dialog_nearby_info.xml Normal file
View file

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:behavior_peekHeight="@dimen/bottom_peak_height">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:minHeight="@dimen/bottom_peak_height"
android:background="@android:color/white"
android:animateLayoutChanges="true">
<LinearLayout
android:id="@+id/link_preview_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:minHeight="64dp">
<TextView
android:id="@+id/link_preview_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:paddingBottom="4dp"
android:textSize="20sp"
android:fontFamily="serif"
android:lineSpacingMultiplier="0.9"
android:maxLines="3"
android:ellipsize="end"
android:layout_marginLeft="12dp"
android:textColor="@android:color/black"
tools:text="Lorem ipsum" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@android:color/black"/>
<TextView
android:id="@+id/link_preview_extract"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textSize="16sp"
android:lineSpacingMultiplier="1.3"
android:textIsSelectable="true"
android:textColor="@android:color/black"
tools:text="Lorem ipsum"/>
<View
android:id="@+id/link_preview_bottom_padding"
android:layout_width="match_parent"
android:layout_height="70dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<TextView
android:id="@+id/link_preview_directions_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dp"
android:paddingBottom="16dp"
style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="@android:color/black"
android:text="GET DIRECTIONS"/>
<TextView
android:id="@+id/link_preview_go_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dp"
android:paddingBottom="16dp"
style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="@android:color/black"
android:text="READ ARTICLE"/>
</LinearLayout>
</FrameLayout>

1
app/src/main/res/values/dimens.xml
View file

@ -2,4 +2,5 @@
<dimen name="icon_size">120dp</dimen>
<dimen name="tiny_margin">4dp</dimen>
<dimen name="small_margin">8dp</dimen>
<dimen name="bottom_peak_height">240dp</dimen>
</resources>

6
app/src/main/res/values/styles.xml
View file

@ -45,4 +45,10 @@
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="borderless_dialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:background">@android:color/transparent</item>
</style>
</resources>