#45 Only shows the TextView name of the page when we have one selected

posm · Apr 23, 2016 · 636f6ae · 636f6ae
1 parent a7b94b7
commit 636f6ae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/MapboxAndroidSDK/src/main/java/org/fieldpapers/model/FPAtlas.java b/MapboxAndroidSDK/src/main/java/org/fieldpapers/model/FPAtlas.java
@@ -176,8 +176,16 @@ private void findPage(ILatLng latLng) {
             Geometry pageGeom = page.geometry();
             if (pageGeom.contains(GEOMETRY_FACTORY.createPoint(coord))) {
                 foundPage(page);
+                return;
             }
         }
+        noPageFound();
+    }
+
+    private void noPageFound() {
+        if (activity != null && activity instanceof FPListener) {
+            ((FPListener)activity).onMapCenterPageChangeMessage(null);
+        }
     }
 
     private void foundPage(FPPage page) {

diff --git a/app/src/main/java/org/redcross/openmapkit/MapActivity.java b/app/src/main/java/org/redcross/openmapkit/MapActivity.java
@@ -813,7 +813,12 @@ private boolean isAppInstalled(String uri) {
 
     @Override
     public void onMapCenterPageChangeMessage(String msg) {
-        fieldPapersMsg.setText(msg);
+        if (msg != null) {
+            fieldPapersMsg.setText(msg);
+            fieldPapersMsg.setVisibility(View.VISIBLE);
+        } else {
+            fieldPapersMsg.setVisibility(View.GONE);
+        }
     }
 
 }
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
@@ -22,7 +22,8 @@
             android:id="@+id/fieldPapersMsg"
             android:background="@color/black"
             android:textColor="@color/osm_light_green"
-            android:paddingLeft="6dp" />
+            android:paddingLeft="6dp"
+            android:visibility="gone" />
 
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:tools="http://schemas.android.com/tools"