Merge pull request #1901 from marco-jacob/issue#1794retry

fixes #1794 - added gpx export dir setting with SimpleDirChooser

4 files changed, 107 insertions, 0 deletions

diff --git a/main/res/layout/gpx_export_dialog.xml b/main/res/layout/gpx_export_dialog.xml
index 86c0862..7c9345f 100644
--- a/main/res/layout/gpx_export_dialog.xml
+++ b/main/res/layout/gpx_export_dialog.xml
@@ -6,6 +6,7 @@
     android:padding="3dip" >

 

     <TextView

+        android:id="@id/info"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:text="@string/export_gpx_info" />

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 80a12ca..e660b27 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -714,6 +714,42 @@
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
 				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/init_gpx_exportdir" />
+			</RelativeLayout>
+			<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="10dip"
+					android:layout_marginRight="10dip"
+					android:layout_marginBottom="5dip"
+					android:layout_gravity="left"
+					android:padding="3dip"
+					android:textSize="14dip"
+					android:textColor="?text_color"
+					android:textColorLink="?text_color_link"
+					android:linksClickable="true"
+					android:autoLink="web"
+					android:text="@string/init_gpx_exportdir_description" />
+			<LinearLayout
+					android:id="@+id/init_gpx_export_group"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal" >
+				<Button style="@style/button_full"
+						android:id="@+id/select_gpx_exportdir"
+						android:text="@string/init_select_gpx_exportdir"
+						android:layout_width="wrap_content" />
+				<EditText style="@style/edittext_full"
+						android:id="@+id/gpx_exportdir"
+						android:singleLine="true"
+						android:lines="1"
+						android:scrollHorizontally="true"
+						android:inputType="textNoSuggestions" />
+			</LinearLayout>
+<!-- ** -->
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_altitude" />
 			</RelativeLayout>
 			<EditText style="@style/edittext_full"
diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml
new file mode 100644
index 0000000..491e0a2
--- /dev/null
+++ b/main/res/layout/simple_dir_chooser.xml
@@ -0,0 +1,49 @@
+<?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:orientation="vertical"
+    	android:background="?background_color">
+    <LinearLayout
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="vertical"
+	        android:layout_weight="2">
+		<RelativeLayout style="@style/separator_horizontal_layout" >
+			<View style="@style/separator_horizontal" />
+			<TextView style="@style/separator_horizontal_headline"
+					android:text="@string/simple_dir_chooser_title" />
+		</RelativeLayout>
+	    <EditText 
+		        style="@style/edittext_full"
+				android:id="@+id/simple_dir_chooser_path"
+				android:singleLine="true"
+				android:lines="0"
+				android:editable="false"
+				android:scrollHorizontally="true"
+				android:inputType="textNoSuggestions" />
+	</LinearLayout>
+   	<ListView 
+	        android:layout_height="fill_parent" 
+	        android:layout_width="wrap_content" 
+			android:layout_weight="100"
+	        android:id="@+id/android:list" />
+	<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:paddingTop="10dip"
+			android:layout_weight="1">
+	    <Button style="@style/button_full"
+				android:id="@+id/simple_dir_chooser_ok"
+				android:text="@android:string/ok"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+		<Button style="@style/button_full"
+				android:id="@+id/simple_dir_chooser_cancel"
+				android:text="@android:string/cancel"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+	</LinearLayout>
+</LinearLayout>
diff --git a/main/res/layout/simple_dir_item.xml b/main/res/layout/simple_dir_item.xml
new file mode 100644
index 0000000..ec4cd28
--- /dev/null
+++ b/main/res/layout/simple_dir_item.xml
@@ -0,0 +1,21 @@
+<?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:orientation="horizontal"
+		android:background="?background_color" >
+	<CheckBox android:text=""
+        android:id="@+id/CheckBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="false" />
+    <TextView 
+	    android:text="@+id/TextView01" 
+	    android:id="@+id/TextView01" 
+	    android:layout_width="wrap_content" 
+	    android:layout_height="wrap_content" 
+	    android:singleLine="true" 
+	    android:textStyle="bold" 
+	    android:layout_marginTop="5dip" 
+	    android:layout_marginLeft="5dip" />
+</LinearLayout>