aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-08-13 20:19:05 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-08-13 20:19:05 +0200
commit42c7dfadfc865d42f1c4bdf1d4e8c5ac29803bec (patch)
tree3d07355609f283e0b281615139ba44f21eab17b7
parent60b4fb63eaf44509629d0230f65a9558a6c095d3 (diff)
parentde05fd8a05afe152ad39de83aa24baa16f243b7b (diff)
downloadcgeo-42c7dfadfc865d42f1c4bdf1d4e8c5ac29803bec.zip
cgeo-42c7dfadfc865d42f1c4bdf1d4e8c5ac29803bec.tar.gz
cgeo-42c7dfadfc865d42f1c4bdf1d4e8c5ac29803bec.tar.bz2
Merge pull request #4168 from schwabe/fix_1745
Fix #1745: Fix Waypoint description overlapping navigation icon
-rw-r--r--main/res/layout/waypoint_item.xml39
1 files changed, 25 insertions, 14 deletions
diff --git a/main/res/layout/waypoint_item.xml b/main/res/layout/waypoint_item.xml
index 4fe3576..4148dab 100644
--- a/main/res/layout/waypoint_item.xml
+++ b/main/res/layout/waypoint_item.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/waypoint"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -15,7 +16,20 @@
android:descendantFocusability="blocksDescendants"
android:orientation="horizontal" >
+
+
+ <ImageView
+ android:id="@+id/wpDefaultNavigation"
+ style="@style/action_bar_action"
+ android:layout_alignParentRight="true"
+ android:layout_gravity="right"
+ android:clickable="true"
+ android:focusable="false"
+ android:longClickable="true"
+ android:src="?actionbar_compass" />
+
<LinearLayout
+ android:layout_toLeftOf="@id/wpDefaultNavigation"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -28,7 +42,8 @@
android:layout_height="wrap_content"
android:focusable="false"
android:textColor="?text_color"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ tools:text="Description of the Cache with a lot of small words so the an incorrect"/>
<TextView
android:id="@+id/info"
@@ -43,18 +58,10 @@
android:singleLine="true"
android:textColor="?text_color_headline"
android:textSize="14sp"
- android:visibility="gone" />
+ android:visibility="gone"
+ tools:visiblity="visible"
+ tools:text="Info"/>
</LinearLayout>
-
- <ImageView
- android:id="@+id/wpDefaultNavigation"
- style="@style/action_bar_action"
- android:layout_alignParentRight="true"
- android:layout_gravity="right"
- android:clickable="true"
- android:focusable="false"
- android:longClickable="true"
- android:src="?actionbar_compass" />
</RelativeLayout>
<TextView
@@ -70,7 +77,9 @@
android:singleLine="true"
android:textColor="?text_color_headline"
android:textSize="14sp"
- android:visibility="gone" />
+ android:visibility="gone"
+ tools:visiblity="visible"
+ tools:text="1.2.3.4.5N 6.7.8.9.10S"/>
<TextView
android:id="@+id/note"
@@ -80,7 +89,9 @@
android:focusable="false"
android:textColor="?text_color"
android:textSize="14sp"
- android:visibility="gone" />
+ android:visibility="gone"
+ tools:visiblity="visible"
+ tools:text="Note"/>
<View
style="@style/separator_horizontal"