From 81237e826759866bf9af9bfb5338631ac0177202 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 13 Dec 2017 20:20:38 +0300 Subject: [PATCH] Add icon to bottom sheet details --- .../java/fr/free/nrw/commons/nearby/NearbyActivity.java | 2 ++ .../java/fr/free/nrw/commons/nearby/NearbyMapFragment.java | 7 ++++++- app/src/main/res/layout/activity_nearby.xml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 9cd8f0758..bca4136b6 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -307,6 +307,8 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp checkGps(); } + + /** * This method should be the single point to load/refresh nearby places * diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index f041b82da..c1effcda2 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -15,6 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import android.widget.ImageView; import android.widget.TextView; import com.google.gson.Gson; @@ -55,6 +56,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { private TextView description; private TextView title; private TextView distance; + private ImageView icon; private boolean isFabOpen=false; @@ -154,6 +156,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { description = getActivity().findViewById(R.id.description); title = getActivity().findViewById(R.id.title); distance = getActivity().findViewById(R.id.category); + icon = getActivity().findViewById(R.id.icon); } private void setListeners() { @@ -332,7 +335,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { } private void passInfoToSheet(Place place) { - description.setText(place.getDescription().toString()); + //TODO set correct icon here + icon.setImageResource(place.getDescription().getIcon()); + description.setText(place.getDescription().getText()); title.setText(place.name.toString()); distance.setText(place.distance.toString()); } diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml index 66df5be4a..2330e5840 100644 --- a/app/src/main/res/layout/activity_nearby.xml +++ b/app/src/main/res/layout/activity_nearby.xml @@ -52,6 +52,8 @@ app:pressedTranslationZ="12dp" android:backgroundTint="@color/cardview_light_background" android:clickable="true" + app:srcCompat="@drawable/ic_list_white_24dp" + android:scaleType="center" />