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

Remove texts when they dont fit to one line

Browse source
This commit is contained in:
neslihanturan 2017-12-28 14:13:09 +03:00
parent a369af982e
commit ffea5e370c
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,10 +10,12 @@ import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.animation.Animation; import android.view.animation.Animation;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.widget.ImageView; import android.widget.ImageView;
@ -64,6 +66,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private TextView distance; private TextView distance;
private ImageView icon; private ImageView icon;
private TextView wikipediaButtonText;
private TextView wikidataButtonText;
private TextView commonsButtonText;
private TextView directionsButtonText;
private boolean isFabOpen=false; private boolean isFabOpen=false;
private Animation rotate_backward; private Animation rotate_backward;
private Animation fab_close; private Animation fab_close;
@ -170,6 +177,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
directionsButton = getActivity().findViewById(R.id.directionsButton); directionsButton = getActivity().findViewById(R.id.directionsButton);
commonsButton = getActivity().findViewById(R.id.commonsButton); 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() { 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) { private void setupMapView(Bundle savedInstanceState) {

4
app/src/main/res/layout/bottom_sheet_details.xml
View file

@ -75,6 +75,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/directionsButtonText"
android:paddingTop="8dp" android:paddingTop="8dp"
android:duplicateParentState="true" android:duplicateParentState="true"
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
@ -101,6 +102,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/wikidataButtonText"
android:paddingTop="8dp" android:paddingTop="8dp"
android:duplicateParentState="true" android:duplicateParentState="true"
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
@ -129,6 +131,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/wikipediaButtonText"
android:paddingTop="8dp" android:paddingTop="8dp"
android:duplicateParentState="true" android:duplicateParentState="true"
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
@ -158,6 +161,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/commonsButtonText"
android:paddingTop="8dp" android:paddingTop="8dp"
android:duplicateParentState="true" android:duplicateParentState="true"
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"