From 6ca841fd18e53860c186b378085bcaca357d9cf4 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Thu, 28 Dec 2017 14:13:09 +0300 Subject: [PATCH] Remove texts when they dont fit to one line --- .../nrw/commons/nearby/NearbyMapFragment.java | 25 ++++++++++++++++++- .../main/res/layout/bottom_sheet_details.xml | 4 +++ 2 files changed, 28 insertions(+), 1 deletion(-) 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 f34ef1492..0702d9109 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 @@ -10,10 +10,12 @@ import android.support.design.widget.BottomSheetBehavior; import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.FloatingActionButton; +import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; @@ -64,6 +66,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { private TextView distance; private ImageView icon; + private TextView wikipediaButtonText; + private TextView wikidataButtonText; + private TextView commonsButtonText; + private TextView directionsButtonText; + private boolean isFabOpen=false; private Animation rotate_backward; private Animation fab_close; @@ -151,7 +158,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { fabPlus = getActivity().findViewById(R.id.fab_plus); fabCamera = getActivity().findViewById(R.id.fab_camera); fabGallery = getActivity().findViewById(R.id.fab_galery); - + fab_open = AnimationUtils.loadAnimation(getActivity(), R.anim.fab_open); fab_close = AnimationUtils.loadAnimation(getActivity(),R.anim.fab_close); rotate_forward = AnimationUtils.loadAnimation(getActivity(),R.anim.rotate_forward); @@ -170,6 +177,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { directionsButton = getActivity().findViewById(R.id.directionsButton); commonsButton = getActivity().findViewById(R.id.commonsButton); + wikidataButtonText = getActivity().findViewById(R.id.wikidataButtonText); + wikipediaButtonText = getActivity().findViewById(R.id.wikipediaButtonText); + directionsButtonText = getActivity().findViewById(R.id.directionsButtonText); + commonsButtonText = getActivity().findViewById(R.id.commonsButtonText); + } private void setListeners() { @@ -226,6 +238,17 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { } }); + + // Remove texts if it doesnt fit + if (wikipediaButtonText.getLineCount() > 1 + || wikidataButtonText.getLineCount() > 1 + || commonsButtonText.getLineCount() > 1 + || directionsButtonText.getLineCount() > 1) { + wikipediaButtonText.setVisibility(View.GONE); + wikidataButtonText.setVisibility(View.GONE); + commonsButtonText.setVisibility(View.GONE); + directionsButtonText.setVisibility(View.GONE); + } } private void setupMapView(Bundle savedInstanceState) { diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml index c563b6fd1..2cecf3cd7 100644 --- a/app/src/main/res/layout/bottom_sheet_details.xml +++ b/app/src/main/res/layout/bottom_sheet_details.xml @@ -75,6 +75,7 @@