From 75a457ae358aef3a0cc9900f6f05cf59ca924f09 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Wed, 26 Dec 2012 17:33:30 +0100
Subject: fix #2289: layout issues in upload coords feature

---
 main/res/layout/edit_waypoint_activity.xml         | 112 +++++++++++++++++
 main/res/layout/waypoint_new.xml                   | 138 ---------------------
 main/src/cgeo/geocaching/EditWaypointActivity.java |  12 +-
 3 files changed, 119 insertions(+), 143 deletions(-)
 create mode 100644 main/res/layout/edit_waypoint_activity.xml
 delete mode 100644 main/res/layout/waypoint_new.xml

diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
new file mode 100644
index 0000000..03847e3
--- /dev/null
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goHome" />
+
+        <View style="@style/action_bar_separator" />
+
+        <TextView style="@style/action_bar_title" />
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goManual"
+            android:src="@drawable/actionbar_manual" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dip"
+            android:orientation="vertical" >
+
+            <Button
+                android:id="@+id/buttonLatitude"
+                style="@style/button_full"
+                android:hint="@string/latitude" />
+
+            <Button
+                android:id="@+id/buttonLongitude"
+                style="@style/button_full"
+                android:hint="@string/longitude" />
+
+            <EditText
+                android:id="@+id/bearing"
+                style="@style/edittext_full"
+                android:hint="@string/waypoint_bearing"
+                android:inputType="numberDecimal" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <EditText
+                    android:id="@+id/distance"
+                    style="@style/edittext_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:hint="@string/waypoint_distance"
+                    android:inputType="numberDecimal" />
+
+                <Spinner
+                    android:id="@+id/distanceUnit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/distance_units" />
+            </LinearLayout>
+
+            <AutoCompleteTextView
+                android:id="@+id/name"
+                style="@style/edittext_full"
+                android:hint="@string/waypoint_name" />
+
+            <Spinner
+                android:id="@+id/type"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <EditText
+                android:id="@+id/note"
+                style="@style/edittext_full"
+                android:layout_height="wrap_content"
+                android:hint="@string/waypoint_note"
+                android:inputType="textMultiLine|textCapSentences"
+                android:minLines="5"
+                android:singleLine="false" />
+
+            <CheckBox
+                android:id="@+id/setAsCacheCoordsCheckBox"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_set_as_cache_coords" />
+
+            <CheckBox
+                android:id="@+id/uploadCoordsToWebsiteCheckBox"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_modify_on_website" />
+
+            <Button
+                android:id="@+id/add_waypoint"
+                style="@style/button_full"
+                android:text="@string/waypoint_save" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/waypoint_new.xml b/main/res/layout/waypoint_new.xml
deleted file mode 100644
index 466ef57..0000000
--- a/main/res/layout/waypoint_new.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
-
-        <View style="@style/action_bar_separator" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dip"
-            android:orientation="vertical" >
-
-            <Button
-                android:id="@+id/buttonLatitude"
-                style="@style/button_full"
-                android:hint="@string/latitude" />
-
-            <Button
-                android:id="@+id/buttonLongitude"
-                style="@style/button_full"
-                android:hint="@string/longitude" />
-
-            <EditText
-                android:id="@+id/bearing"
-                style="@style/edittext_full"
-                android:hint="@string/waypoint_bearing"
-                android:inputType="numberDecimal" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <EditText
-                    android:id="@+id/distance"
-                    style="@style/edittext_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:hint="@string/waypoint_distance"
-                    android:inputType="numberDecimal" />
-
-                <Spinner
-                    android:id="@+id/distanceUnit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/distance_units" />
-            </LinearLayout>
-
-            <AutoCompleteTextView
-                android:id="@+id/name"
-                style="@style/edittext_full"
-                android:hint="@string/waypoint_name" />
-
-            <Spinner
-                android:id="@+id/type"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <EditText
-                android:id="@+id/note"
-                style="@style/edittext_full"
-                android:layout_height="wrap_content"
-                android:hint="@string/waypoint_note"
-                android:inputType="textMultiLine|textCapSentences"
-                android:minLines="5"
-                android:singleLine="false" />
-
-            <LinearLayout
-                android:id="@+id/setAsCacheCoordsLayout"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone" >
-
-                <CheckBox
-                    android:id="@+id/setAsCacheCoordsCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/waypoint_set_as_cache_coords"
-                    android:textColor="?text_color" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/uploadCoordsToWebsiteLayout"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone" >
-
-                <CheckBox
-                    android:id="@+id/uploadCoordsToWebsiteCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/waypoint_modify_on_website"
-                    android:textColor="?text_color" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/add_waypoint"
-                style="@style/button_full"
-                android:text="@string/waypoint_save" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index aa04a5a..13c2d3e 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -106,7 +106,7 @@ public class EditWaypointActivity extends AbstractActivity {
         super.onCreate(savedInstanceState);
 
         setTheme();
-        setContentView(R.layout.waypoint_new);
+        setContentView(R.layout.edit_waypoint_activity);
         setTitle("waypoint");
 
         // get parameters
@@ -170,12 +170,14 @@ public class EditWaypointActivity extends AbstractActivity {
     }
 
     private void setCoordsCheckBoxesVisibility(IConnector con, cgCache cache) {
+        final View cacheCoords = findViewById(R.id.setAsCacheCoordsCheckBox);
+        final View uploadWebsite = findViewById(R.id.uploadCoordsToWebsiteCheckBox);
         if (cache != null && (cache.getType() == CacheType.MYSTERY || cache.getType() == CacheType.MULTI)) {
-            findViewById(R.id.setAsCacheCoordsLayout).setVisibility(View.VISIBLE);
-            findViewById(R.id.uploadCoordsToWebsiteLayout).setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE);
+            cacheCoords.setVisibility(View.VISIBLE);
+            uploadWebsite.setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE);
         } else {
-            findViewById(R.id.setAsCacheCoordsLayout).setVisibility(View.GONE);
-            findViewById(R.id.uploadCoordsToWebsiteLayout).setVisibility(View.GONE);
+            cacheCoords.setVisibility(View.GONE);
+            uploadWebsite.setVisibility(View.GONE);
         }
     }
 
-- 
cgit v1.1