altosdroid: Add map types and map preloading UIs

This adds an ugly dialog to select which maps to preload, and also
adds the ability to display other map types.

Signed-off-by: Keith Packard <keithp@keithp.com>

7 files changed, 223 insertions, 17 deletions

diff --git a/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..bc9160df
--- /dev/null
+++ b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
diff --git a/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..4e427d89
--- /dev/null
+++ b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/res/layout/device_list.xml
index 93d65517..bf295e4c 100644
--- a/altosdroid/res/layout/device_list.xml
+++ b/altosdroid/res/layout/device_list.xml
@@ -32,6 +32,13 @@
         android:textColor="#fff"
         android:paddingLeft="5dp"
     />
+    <ListView android:id="@+id/new_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
+    />
     <TextView android:id="@+id/title_paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -44,13 +51,8 @@
     <ListView android:id="@+id/paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:stackFromBottom="true"
         android:layout_weight="1"
-    />
-    <ListView android:id="@+id/new_devices"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stackFromBottom="true"
-        android:layout_weight="2"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
     />
 </LinearLayout>
diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml
new file mode 100644
index 00000000..1d1fca32
--- /dev/null
+++ b/altosdroid/res/layout/map_preload.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <ScrollView android:layout_width="fill_parent"
+	      android:layout_height="wrap_content">
+    <LinearLayout android:layout_width="wrap_content"
+		  android:layout_height="wrap_content"
+                  android:orientation="vertical">
+      <TextView android:id="@+id/preload_site_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_site_label"
+		/>
+      <Spinner android:id="@+id/preload_site_list"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_site_label"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_latitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_latitude_label"
+		/>
+      <EditText android:id="@+id/preload_latitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_latitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_longitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_longitude_label"
+		/>
+      <EditText android:id="@+id/preload_longitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_longitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_types"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_types"
+		/>
+      <CheckBox android:id="@+id/preload_hybrid"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_hybrid"
+		/>
+      <CheckBox android:id="@+id/preload_satellite"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_satellite"
+		/>
+      <CheckBox android:id="@+id/preload_roadmap"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_roadmap"
+		/>
+      <CheckBox android:id="@+id/preload_terrain"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_terrain"
+		/>
+      <TextView android:id="@+id/preload_min_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_min_zoom"
+		/>
+      <Spinner android:id="@+id/preload_min_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_min_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_max_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_max_zoom"
+		/>
+      <Spinner android:id="@+id/preload_max_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_max_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_tile_radius_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_tile_radius"
+		/>
+      <Spinner android:id="@+id/preload_tile_radius"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_tile_radius"
+	       android:spinnerMode="dropdown"
+	       />
+      <Button android:id="@+id/preload_load"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/preload_load"
+	      />
+      <ProgressBar android:id="@+id/preload_progress"
+		   android:layout_width="match_parent"
+		   android:layout_height="wrap_content"
+		   style="@android:style/Widget.ProgressBar.Horizontal"
+		   />
+    </LinearLayout>
+  </ScrollView>
+</LinearLayout>
diff --git a/altosdroid/res/layout/map_type.xml b/altosdroid/res/layout/map_type.xml
new file mode 100644
index 00000000..610e6bbf
--- /dev/null
+++ b/altosdroid/res/layout/map_type.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <Button android:id="@+id/map_type_hybrid"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_hybrid"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_satellite"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_satellite"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_roadmap"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_roadmap"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_terrain"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_terrain"
+	   android:onClick="selectType"
+	   />
+</LinearLayout>
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index f005e881..2109ae04 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- 
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
 
-          http://www.apache.org/licenses/LICENSE-2.0
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/connect_scan"
@@ -32,4 +34,10 @@
     <item android:id="@+id/change_units"
 	  android:icon="@android:drawable/ic_menu_view"
 	  android:title="@string/change_units" />
+    <item android:id="@+id/preload_maps"
+	  android:icon="@android:drawable/ic_menu_mapmode"
+	  android:title="@string/preload_maps" />
+    <item android:id="@+id/map_type"
+	  android:icon="@android:drawable/ic_menu_mapmode"
+	  android:title="@string/map_type" />
 </menu>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 8a5b29b4..1af0dbb7 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -32,6 +32,11 @@
 	<string name="select_freq">Select radio frequency</string>
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
+	<string name="preload_maps">Load Maps</string>
+	<string name="map_type">Map Type</string>
+
+	<!-- MapTypeActivity -->
+	<string name="map_type">Map Type</string>
 
 	<!-- DeviceListActivity -->
 	<string name="scanning">scanning for devices…</string>
@@ -84,4 +89,19 @@
 	<string name="pad_lon_label">Pad Lon</string>
 	<string name="pad_alt_label">Pad Alt</string>
 
+	<!-- Map preload -->
+	<string name="preload_site_label">Known Launch Sites</string>
+	<string name="preload_latitude_label">Latitude</string>
+	<string name="preload_longitude_label">Longitude</string>
+
+	<string name="preload_types">Map Types</string>
+	<string name="preload_hybrid">Hybrid</string>
+	<string name="preload_satellite">Satellite</string>
+	<string name="preload_roadmap">Roadmap</string>
+	<string name="preload_terrain">Terrain</string>
+	<string name="preload_min_zoom">Minimum Zoom</string>
+	<string name="preload_max_zoom">Maximum Zoom</string>
+	<string name="preload_tile_radius">Tile Radius</string>
+	
+	<string name="preload_load">Load Map</string>
 </resources>