Re-integrate 0.9 branch

Mannivu · Sep 1, 2014 · 82fe1c0 · 82fe1c0
1 parent 45c4267
commit 82fe1c0
Show file tree

Hide file tree

Showing 429 changed files with 25,538 additions and 5,497 deletions.
diff --git a/.classpath b/.classpath
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
  <classpathentry kind="src" path="src"/>
  <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
  <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
  <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK/library"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/Android/android-sdk/extras/android/support/v4/android-support-v4.jar"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
  <classpathentry combineaccessrules="false" kind="src" path="/actionbarsherlock"/>
  <classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.project b/.project
@@ -1,40 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>OSMEditor</name>
- <comment></comment>
- <projects>
- <project>actionbarsherlock</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sourceforge.texlipse.builder.TexlipseBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>OSMEditor</name>
+ <comment></comment>
+ <projects>
+ <project>actionbarsherlock</project>
+ <project>ActionBarSherlock</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sourceforge.texlipse.builder.TexlipseBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[vespucci.main]
+file_filter = res/values-<lang>/strings.xml
+lang_map = cs: cs-rCZ
+source_file = res/values/strings.xml
+source_lang = en
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -4,7 +4,7 @@
  xmlns:tools="https://schemas.android.com/tools"
  package="de.blau.android"
  android:versionName="@string/app_version"
- android:versionCode="19"
+ android:versionCode="32"
  android:installLocation="auto"
  >
 
@@ -20,24 +20,29 @@
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- cache tiles -->
 
- <!-- minSdkVersion is set to 7 to match ActionBarSherlock, but should be able to be set to 4 when ABS supports it -->
- <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" />
+
 
  <application
  android:name="de.blau.android.Application"
  android:label="@string/app_name"
- android:icon="@drawable/osm_logo"
- >
+ android:icon="@drawable/osm_logo" 
+ android:debuggable="false"
+ android:largeHeap="true" 
+ android:allowBackup="true" >
  <activity
  android:name="Main"
  android:theme="@style/Theme.customMain"
  android:configChanges="orientation|screenSize|keyboardHidden"
+ android:launchMode="singleTask"
  >
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
  <category android:name="android.intent.category.LAUNCHER" />
+ <!-- harmless addition for samsung multi window support -->
+ <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
  </intent-filter>
  </activity>
  <activity
@@ -77,6 +82,29 @@
  <data android:scheme="vespucci" />
  </intent-filter>
  </activity>
+ <activity
+ android:name="de.blau.android.GeoUrlActivity"
+ tools:ignore="ExportedActivity"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="geo" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name="de.blau.android.RemoteControlUrlActivity"
+ tools:ignore="ExportedActivity"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="http" android:host="127.0.0.1" android:port="8111"/>
+ <data android:scheme="https" android:host="127.0.0.1" android:port="8111"/>
+ </intent-filter>
+ </activity>
  <activity android:name="LicenseViewer" android:theme="@style/Theme.Sherlock.NoActionBar" />
  <activity
  android:name="org.acra.CrashReportDialog"
@@ -99,5 +127,11 @@
  </service>
  <!-- Service for GPS tracking -->
  <service android:name=".services.TrackerService" android:label="TrackerService" />
+ <!-- harmless addition for samsung multi window support -->
+ <uses-library android:required="false" android:name="com.sec.android.app.multiwindow"> </uses-library>
+ <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
  </application>
+ <!-- moving this here seems to fix some weird problems -->
+ <!-- minSdkVersion is set to 7 to match ActionBarSherlock, but should be able to be set to 4 when ABS supports it -->
+ <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" />
 </manifest> 
diff --git a/BUILDING.txt b/BUILDING.txt
@@ -3,7 +3,7 @@ ActionBarSherlock
 
 You will need the ActionBarSherlock library, which in turn requires the "android support" library.
 
-The code was tested with ABS 4.1.0 and support library revision 10.
+The code was tested with ABS 4.4.0 and support library revision 10.
 
 You can find the android support lib in your SDK folder in one of:
 
@@ -27,4 +27,10 @@ the ABS issue.
 JOSM Presets
 ------------
 Original:
-https://josm.openstreetmap.de/svn/trunk/data/defaultpresets.xml
+https://josm.openstreetmap.de/svn/trunk/data/defaultpresets.xml
+
+
+Android 2.2 Emulator
+--------------------
+
+Vespucci will hang on start up in getSystemService explicitly disabling Accelerometer, Magnetic field and Orientation sensors will workaround the issue. 
diff --git a/TRANSLATIONS.txt b/TRANSLATIONS.txt
@@ -0,0 +1,39 @@
+All the translatable text in Vespucci has been concentrated into one file per language called 'strings.xml'.
+
+There are strings elsewhere in Vespucci that would be nice to be translated, but it is currently technically difficult to make them available. The background layer descriptions are one example.
+
+== transifex ==
+
+The translations are managed on transifex: https://www.transifex.com/projects/p/vespucci/
+
+NOTE: for building we assume for now that the SVN repository contains the current language files, if you are adding or changing strings it is your responsibility to retrieve current translations and check them in.
+
+Currently transfex polls the strings.xml in the 0.9 branch for changes, once the branch is merged into trunk that should change to the trunk version. 
+
+=== setting up transifex locally and retrieving translations ===
+
+==== install ====
+
+get the transifex tx tool see https://support.transifex.com/customer/portal/articles/995605-installation
+
+the repository already includes a suitable .tx directory with config file, if that does not work for you do the following
+
+ in your OSMEditor directory execute
+
+ tx init
+
+ tx set --auto-local -r vespucci.main "res\values-<lang>\strings.xml" --source-lang en --source-file res\values\strings.xml --execute
+ (my installation is on a windows machine on *IX "\" -> "/")
+
+ edit .tx/config and add
+
+ lang_map = cs: cs-rCZ 
+
+ to the [vespucci.main] section
+
+ ===== retrieving current translations ====
+
+ tx pull -a
+
+ will retrieve all translations configured above, skipping up to date translation files and creating new directories and strings.xml files for new languages.
+
diff --git a/assets/Color-profile.xml b/assets/Color-profile.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<profile name="Color">
+<!-- Vespucci internal -->
+<feature name="gps_accuracy" internal="true" updateWidth="false" widthFactor="2.0" editable="true" color="280000ff" style="FILL_AND_STROKE" cap="ROUND" join="ROUND" strokewidth="0.0" />
+<feature name="problem_node_thin" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="ffff00ff" style="STROKE" cap="BUTT" join="MITER" strokewidth="1.0" typefacestyle="0" textsize="12.0"/>
+<feature name="problem_way" internal="true" updateWidth="true" widthFactor="1.5" editable="true" color="ffff00ff" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way_direction" internal="true" updateWidth="true" widthFactor="0.8" editable="true" color="ffb9121b" style="STROKE" cap="SQUARE" join="MITER" />
+<feature name="selected_way" internal="true" updateWidth="true" widthFactor="2.0" editable="true" color="fffcfa74" style="STROKE" cap="ROUND" join="ROUND" />
+<feature name="way_tolerance" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="28bd8d46" style="STROKE" cap="BUTT" join="MITER" strokewidth="40.0" />
+<feature name="oneway_direction" internal="true" updateWidth="true" widthFactor="0.5" editable="true" color="ff0000bb" style="STROKE" cap="SQUARE" join="MITER" />
+<feature name="gps_track" internal="true" updateWidth="true" widthFactor="1.0" editable="true" color="ff0000ff" style="STROKE" cap="ROUND" join="ROUND" />
+<feature name="selected_node" internal="true" updateWidth="true" widthFactor="1.5" editable="true" color="fff6e497" style="FILL" cap="BUTT" join="MITER" />
+<feature name="selected_node_tagged" internal="true" updateWidth="true" widthFactor="2.0" editable="true" color="fff6e497" style="FILL" cap="BUTT" join="MITER" />
+<feature name="selected_node_thin" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="fff6e497" style="STROKE" cap="BUTT" join="MITER" strokewidth="1.0" typefacestyle="0" textsize="12.0"/>
+<feature name="problem_node" internal="true" updateWidth="true" widthFactor="1.0" editable="true" color="ffff00ff" style="FILL" cap="BUTT" join="MITER" />
+<feature name="problem_node_tagged" internal="true" updateWidth="true" widthFactor="1.5" editable="true" color="ffff00ff" style="FILL" cap="BUTT" join="MITER" />
+<feature name="node_tolerance" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="28bd8d46" style="FILL" cap="BUTT" join="MITER" strokewidth="40.0" />
+<feature name="infotext" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="ff000000" style="FILL" cap="BUTT" join="MITER" strokewidth="0.0" typefacestyle="0" textsize="12.0" />
+<feature name="viewbox" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="7d0f0f0f" style="FILL" cap="BUTT" join="MITER" strokewidth="0.0" />
+<feature name="gps_pos" internal="true" updateWidth="true" widthFactor="2.0" editable="true" color="ff0000ff" style="FILL" cap="ROUND" join="ROUND" />
+<feature name="gps_pos_follow" internal="true" updateWidth="false" widthFactor="2.0" editable="true" color="ff0000ff" style="STROKE" cap="ROUND" join="ROUND" strokewidth="4.0"/>
+
+<!-- OSM way based features -->
+<feature name="way" internal="true" updateWidth="true" widthFactor="1.0" editable="true" color="ff000000" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-boundary" internal="false" updateWidth="true" widthFactor="0.6" editable="true" color="ff000000" style="STROKE" cap="BUTT" join="MITER">
+ <dash phase="1.0">
+ <interval length="6.0" />
+ <interval length="2.0" />
+ </dash>
+</feature>
+<feature name="way-landuse" internal="false" updateWidth="true" widthFactor="0.5" editable="true" color="ff71BE80" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-natural" internal="false" updateWidth="true" widthFactor="0.5" editable="true" color="ff71BE80" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-waterway" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ff0000ff" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-natural-water" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ff0000ff" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-building" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffcc9999" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-footway" internal="false" updateWidth="true" widthFactor="0.6" editable="true" color="ff888888" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-track" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffc69c49" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-motorway" internal="false" updateWidth="true" widthFactor="2.0" editable="true" color="ff809BC0" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-motorway_link" internal="false" updateWidth="true" widthFactor="2.0" editable="true" color="ff809BC0" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-trunk" internal="false" updateWidth="true" widthFactor="1.5" editable="true" color="ff7FC97F" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-trunk_link" internal="false" updateWidth="true" widthFactor="1.5" editable="true" color="ff7FC97F" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-primary" internal="false" updateWidth="true" widthFactor="1.5" editable="true" color="ffE46D71" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-primary_link" internal="false" updateWidth="true" widthFactor="1.5" editable="true" color="ffE46D71" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-secondary" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffFDBF6F" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-secondary_link" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffFDBF6F" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-tertiary" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffFCFA74" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-tertiary_link" internal="false" updateWidth="true" widthFactor="1.0" editable="true" color="ffFCFA74" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-highway-service" internal="false" updateWidth="true" widthFactor="0.7" editable="true" color="ff000000" style="STROKE" cap="BUTT" join="MITER" />
+<feature name="way-power" internal="false" updateWidth="true" widthFactor="0.6" editable="true" color="ffaa0000" style="STROKE" cap="BUTT" join="MITER">
+ <dash phase="1.0">
+ <interval length="2.0" />
+ <interval length="2.0" />
+ </dash>
+</feature>
+<feature name="way-railway" internal="false" updateWidth="true" widthFactor="0.7" editable="true" color="ff999999" style="STROKE" cap="BUTT" join="MITER">
+ <dash phase="1.0">
+ <interval length="4.0" />
+ <interval length="4.0" />
+ </dash>
+</feature>
+<feature name="way-addr:interpolation" internal="false" updateWidth="true" widthFactor="0.6" editable="true" color="ff000000" style="STROKE" cap="BUTT" join="MITER">
+ <dash phase="1.0">
+ <interval length="2.0" />
+ <interval length="2.0" />
+ </dash>
+</feature>
+<!-- OSM node based features -->
+<feature name="node" internal="true" updateWidth="true" widthFactor="1.0" editable="true" color="ffb9121b" style="FILL" cap="BUTT" join="MITER" />
+<feature name="node_tagged" internal="true" updateWidth="true" widthFactor="1.5" editable="true" color="ffb9121b" style="FILL" cap="BUTT" join="MITER" />
+<feature name="node_thin" internal="true" updateWidth="false" widthFactor="1.0" editable="true" color="ffb9121b" style="STROKE" cap="BUTT" join="MITER" strokewidth="1.0" typefacestyle="0" textsize="12.0"/>
+</profile>