Skip to content

Commit 353be8c

Browse files
misaochanmaskara
authored andcommitted
Rename Description to Label to prevent misunderstandings
1 parent 27ac8ae commit 353be8c

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,9 @@ private void passInfoToSheet(Place place) {
377377
commonsButton.setOnClickListener(view -> openWebView(place.siteLinks.getCommonsLink()));
378378

379379
icon.setImageResource(place.getLabel().getIcon());
380-
description.setText(place.getLabel().getText());
381380
title.setText(place.name);
382381
distance.setText(place.distance);
382+
description.setText(place.getLongDescription());
383383
title.setText(place.name.toString());
384384
distance.setText(place.distance.toString());
385385

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import android.widget.LinearLayout;
1414
import android.widget.TextView;
1515

16-
import com.mapbox.mapboxsdk.geometry.LatLng;
1716
import com.pedrogomez.renderers.Renderer;
1817

1918
import java.util.ArrayList;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ public class NearbyAdapterFactoryTest {
3333
private static final Place PLACE = new Place("name", Place.Label.AIRPORT,
3434
"desc", null, new LatLng(38.6270, -90.1994, 0), null);
3535
private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN,
36+
<<<<<<< 27ac8ae0d72011bc651affecf7b1da2100ec927e
3637
"?", null, new LatLng(39.7392, -104.9903, 0), null);
3738
// ^ "?" is a special value for unknown class names from Wikidata query results
39+
=======
40+
"desc", null, new LatLng(39.7392, -104.9903, 0), null);
41+
>>>>>>> Rename Description to Label to prevent misunderstandings
3842
private Place clickedPlace;
3943
4044
@Test

0 commit comments

Comments
 (0)