Merge pull request #1369 from misaochan/nearby-fixes

Additional fix for text wrap issue in Nearby

Author: neslihanturan

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

@@ -394,11 +394,9 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
             }
         });
 
-        // Remove texts if it doesnt fit
-        if (wikipediaButtonText.getLineCount() > 1
-                || wikidataButtonText.getLineCount() > 1
-                || commonsButtonText.getLineCount() > 1
-                || directionsButtonText.getLineCount() > 1) {
+        // Remove button text if they exceed 1 line or if internal layout has not been built
+        // Only need to check for directions button because it is the longest
+        if (directionsButtonText.getLineCount() > 1 || directionsButtonText.getLineCount() == 0) {
             wikipediaButtonText.setVisibility(View.GONE);
             wikidataButtonText.setVisibility(View.GONE);
             commonsButtonText.setVisibility(View.GONE);
@@ -583,7 +581,7 @@ private void showFAB() {
 
 
     /*
-    * Add amnchors back before making them visible again.
+    * Add anchors back before making them visible again.
     * */
     private void addAnchorToBigFABs(FloatingActionButton floatingActionButton, int anchorID) {
         CoordinatorLayout.LayoutParams params = new CoordinatorLayout.LayoutParams
@@ -594,7 +592,7 @@ private void addAnchorToBigFABs(FloatingActionButton floatingActionButton, int a
     }
 
     /*
-    * Add amnchors back before making them visible again. Big and small fabs have different anchor
+    * Add anchors back before making them visible again. Big and small fabs have different anchor
     * gravities, therefore the are two methods.
     * */
     private void addAnchorToSmallFABs(FloatingActionButton floatingActionButton, int anchorID) {
@@ -651,9 +649,6 @@ private void passInfoToSheet(Place place) {
                 DirectUpload directUpload = new DirectUpload(this, controller);
                 storeSharedPrefs();
                 directUpload.initiateGalleryUpload();
-
-                //TODO: App crashes after image upload completes
-                //TODO: Handle onRequestPermissionsResult
             }
         });
     }