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

Rename Description to Label to prevent misunderstandings

Browse source
This commit is contained in:
misaochan 2017-12-31 02:34:36 +10:00 • committed by maskara
parent 27ac8ae0d7
commit 353be8cd67
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,9 +377,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
commonsButton.setOnClickListener(view -> openWebView(place.siteLinks.getCommonsLink())); commonsButton.setOnClickListener(view -> openWebView(place.siteLinks.getCommonsLink()));
icon.setImageResource(place.getLabel().getIcon()); icon.setImageResource(place.getLabel().getIcon());
description.setText(place.getLabel().getText());
title.setText(place.name); title.setText(place.name);
distance.setText(place.distance); distance.setText(place.distance);
description.setText(place.getLongDescription());
title.setText(place.name.toString()); title.setText(place.name.toString());
distance.setText(place.distance.toString()); distance.setText(place.distance.toString());

1
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -13,7 +13,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.pedrogomez.renderers.Renderer; import com.pedrogomez.renderers.Renderer;
import java.util.ArrayList; import java.util.ArrayList;

4
app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
View file

@ -33,8 +33,12 @@ public class NearbyAdapterFactoryTest {
private static final Place PLACE = new Place("name", Place.Label.AIRPORT, private static final Place PLACE = new Place("name", Place.Label.AIRPORT,
"desc", null, new LatLng(38.6270, -90.1994, 0), null); "desc", null, new LatLng(38.6270, -90.1994, 0), null);
private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN, private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN,
<<<<<<< 27ac8ae0d72011bc651affecf7b1da2100ec927e
"?", null, new LatLng(39.7392, -104.9903, 0), null); "?", null, new LatLng(39.7392, -104.9903, 0), null);
// ^ "?" is a special value for unknown class names from Wikidata query results // ^ "?" is a special value for unknown class names from Wikidata query results
=======
"desc", null, new LatLng(39.7392, -104.9903, 0), null);
>>>>>>> Rename Description to Label to prevent misunderstandings
private Place clickedPlace; private Place clickedPlace;
@Test @Test