Master and fork

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.osmtracker"
-	android:versionName="0.6.12" android:versionCode="40" android:installLocation="auto">
+	android:versionName="0.7" android:versionCode="41" android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -34,7 +34,15 @@
 		<activity android:name="net.osmtracker.activity.About" android:label="@string/about" />
 		<activity android:name="net.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
 		<activity android:name="net.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
-
+		<activity android:name="net.osmtracker.activity.ButtonsPresets">
+			<intent-filter>
+				<action android:name="launch_buttons_presets"/>
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+		<activity android:name="net.osmtracker.activity.AvailableLayouts">
+		</activity>
+
 		<service android:name="net.osmtracker.service.gps.GPSLogger" android:exported="false">
 			<intent-filter>
 				<action android:name="osmtracker.intent.GPS_SERVICE" />

app/src/main/java/net/osmtracker/OSMTracker.java

@@ -41,6 +41,11 @@ public static final class Preferences {
 		public final static String KEY_OSM_OAUTH_SECRET = "osm.oauth.secret";
 		public final static String KEY_OSM_OAUTH_CLEAR_DATA = "osm.oauth.clear-data";
 
+		//keys for repository settings
+		public final static String KEY_GITHUB_USERNAME = "github_username";
+		public final static String KEY_REPOSITORY_NAME = "repository_name";
+		public final static String KEY_BRANCH_NAME = "branch_name";
+
 		// Default values
 		public final static String VAL_STORAGE_DIR = "/osmtracker";
 		public final static String VAL_VOICEREC_DURATION = "2";
@@ -82,6 +87,11 @@ public static final class Preferences {
 		public final static String VAL_UI_ORIENTATION = VAL_UI_ORIENTATION_NONE;
 
 		public final static String VAL_UI_MAP_TILE_MAPNIK = "MAPNIK";
+
+		//default values for repository settings
+		public final static String VAL_GITHUB_USERNAME = "labexp";
+		public final static String VAL_REPOSITORY_NAME = "osmtracker-android-layouts";
+		public final static String VAL_BRANCH_NAME = "master";
 
 	};
 

app/src/main/java/net/osmtracker/activity/Preferences.java

@@ -13,6 +13,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
+
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -21,9 +22,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
+
 
 /**
  * Manages preferences screen.
@@ -35,8 +34,6 @@ public class Preferences extends PreferenceActivity {
 
 	@SuppressWarnings("unused")
 	private static final String TAG = Preferences.class.getSimpleName();
-
-	final private int RC_READ_PERMISSION = 1;
 
 	/**
 	 * Directory containing user layouts, relative to storage dir.
@@ -46,17 +43,26 @@ public class Preferences extends PreferenceActivity {
 	/**
 	 * File extension for layout files
 	 */
-	private static final String LAYOUT_FILE_EXTENSION = ".xml";
-
+
+	public static final String LAYOUT_FILE_EXTENSION = ".xml";
+
+	/**
+	 * The suffix that must be added to the layout's name for getting its icons directory
+	 * Example: water_supply       <- layout name
+	 *          water_supply_icons <- icon directory
+	 */
+
+	public static final String ICONS_DIR_SUFFIX = "_icons";
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.preferences);
-		
+
 		// Set summary of some preferences to their actual values
 		// and register a change listener to set again the summary in case of change
 		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		
+
 		// External storage directory
 		EditTextPreference storageDirPref = (EditTextPreference) findPreference(OSMTracker.Preferences.KEY_STORAGE_DIR);
 		storageDirPref.setSummary(prefs.getString(OSMTracker.Preferences.KEY_STORAGE_DIR, OSMTracker.Preferences.VAL_STORAGE_DIR));
@@ -67,44 +73,14 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 				if (! ((String) newValue).startsWith(File.separator)) {
 					newValue = File.separator + (String) newValue;
 				}
-				
+
 				// Set summary with the directory value
 				preference.setSummary((String) newValue);
-
-				// Re-populate layout list preference
-				populateLayoutPreference((String) newValue);
-
-				// Set layout to default layout
-				((ListPreference) findPreference(OSMTracker.Preferences.KEY_UI_BUTTONS_LAYOUT)).setValue(OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT);
+
 				return true;
 			}
 		});
 
-		if (ContextCompat.checkSelfPermission(this,
-				Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-
-			// Should we show an explanation?
-			if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-					Manifest.permission.READ_EXTERNAL_STORAGE)) {
-
-				// Show an explanation to the user *asynchronously* -- don't block
-				// this thread waiting for the user's response! After the user
-				// sees the explanation, try again to request the permission.
-				// TODO: explain why we need permission.
-				Log.w(TAG, "we should explain why we need read permission");
-
-			} else {
-
-				// No explanation needed, we can request the permission.
-				ActivityCompat.requestPermissions(this,
-						new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, RC_READ_PERMISSION);
-			}
-
-		}  else {
-			populateLayoutPreference(storageDirPref.getText());
-		}
-
-
 		// Voice record duration
 		Preference pref = findPreference(OSMTracker.Preferences.KEY_VOICEREC_DURATION);
 		pref.setSummary(prefs.getString(OSMTracker.Preferences.KEY_VOICEREC_DURATION, OSMTracker.Preferences.VAL_VOICEREC_DURATION) + " " + getResources().getString(R.string.prefs_voicerec_duration_seconds));
@@ -116,13 +92,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 				return true;
 			}
 		});
-		
+
 		// Update GPS logging interval summary to the current value
 		pref = findPreference(OSMTracker.Preferences.KEY_GPS_LOGGING_INTERVAL);
 		pref.setSummary(
 				prefs.getString(OSMTracker.Preferences.KEY_GPS_LOGGING_INTERVAL, OSMTracker.Preferences.VAL_GPS_LOGGING_INTERVAL)
-				+ " " + getResources().getString(R.string.prefs_gps_logging_interval_seconds)
-				+ ". " + getResources().getString(R.string.prefs_gps_logging_interval_summary));
+						+ " " + getResources().getString(R.string.prefs_gps_logging_interval_seconds)
+						+ ". " + getResources().getString(R.string.prefs_gps_logging_interval_summary));
 		pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -151,7 +127,7 @@ public boolean onPreferenceClick(Preference preference) {
 		String displayValue = orientationListPreference.getEntries()[displayValueIndex].toString();
 		orientationListPreference.setSummary(displayValue + ".\n" 
 				+ getResources().getString(R.string.prefs_ui_orientation_summary));
-		
+
 		// Set a listener to update the preference display after a change is made
 		pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
@@ -161,7 +137,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 				// Pull the display string from the list preference rather than simply using the key value
 				int newValueIndex = orientationListPreference.findIndexOfValue((String)newValue);
 				String newPreferenceDisplayValue = orientationListPreference.getEntries()[newValueIndex].toString();
-				
+
 				preference.setSummary(newPreferenceDisplayValue
 						+ ".\n" + getResources().getString(R.string.prefs_ui_orientation_summary));
 				return true;
@@ -184,73 +160,12 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 				editor.remove(OSMTracker.Preferences.KEY_OSM_OAUTH_TOKEN);
 				editor.remove(OSMTracker.Preferences.KEY_OSM_OAUTH_SECRET);
 				editor.commit();
-				
+
 				preference.setEnabled(false);
 				return false;
 			}
 		});
-
-	}
-
-	/**
-	 * Populates the user layout list preference.
-	 * @param storageDir Where to find layout files
-	 */
-	private void populateLayoutPreference(String storageDir) {
-		// Populate layout lists reading available layouts from external storage
-		ListPreference lf = (ListPreference) findPreference(OSMTracker.Preferences.KEY_UI_BUTTONS_LAYOUT);
-		String[] entries;
-		String[] values;
-
-		// Check for presence of layout directory
-		File layoutsDir = new File(Environment.getExternalStorageDirectory(), storageDir + File.separator + LAYOUTS_SUBDIR + File.separator);
-		if (layoutsDir.exists() && layoutsDir.canRead()) {
-			// List each layout file
-			String[] layoutFiles = layoutsDir.list(new FilenameFilter() {
-				@Override
-				public boolean accept(File dir, String filename) {
-					return filename.endsWith(LAYOUT_FILE_EXTENSION);
-				}
-			});
-			// Create array of values for each layout file + the default one
-			entries = new String[layoutFiles.length+1];
-			values = new String[layoutFiles.length+1];
-			entries[0] = getResources().getString(R.string.prefs_ui_buttons_layout_defaut);
-			values[0] = OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT;
-			for (int i=0; i<layoutFiles.length; i++) {
-				entries[i+1] = layoutFiles[i].substring(0, layoutFiles[i].length()-LAYOUT_FILE_EXTENSION.length());
-				values[i+1] = layoutFiles[i];
-			}
-		} else {
-			// No layout found, populate values with just the default entry.
-			entries = new String[] {getResources().getString(R.string.prefs_ui_buttons_layout_defaut)};
-			values = new String[] {OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT};
-		}
-		lf.setEntries(entries);
-		lf.setEntryValues(values);
-	}
-
-	public void onRequestPermissionsResult(int requestCode,
-										   String permissions[], int[] grantResults) {
-		switch (requestCode) {
-			case RC_READ_PERMISSION: {
-				// If request is cancelled, the result arrays are empty.
-				if (grantResults.length > 0
-						&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
 
-					// permission was granted, yay!
-					EditTextPreference storageDirPref = (EditTextPreference) findPreference(OSMTracker.Preferences.KEY_STORAGE_DIR);
-					populateLayoutPreference(storageDirPref.getText());
-
-				} else {
-
-					// permission denied, boo! Disable the
-					// functionality that depends on this permission.
-					//TODO: add an informative message.
-					Log.w(TAG, "we should explain why we need read permission");
-				}
-			}
-		}
 	}
 
 }

app/src/main/java/net/osmtracker/activity/TrackLogger.java

@@ -1,6 +1,8 @@
 package net.osmtracker.activity;
 
 import java.io.File;
+
+import java.util.ArrayList;
 import java.util.Date;
 
 import net.osmtracker.OSMTracker;
@@ -12,17 +14,23 @@
 import net.osmtracker.receiver.MediaButtonReceiver;
 import net.osmtracker.service.gps.GPSLogger;
 import net.osmtracker.service.gps.GPSLoggerServiceConnection;
+import net.osmtracker.util.CustomLayoutsUtils;
 import net.osmtracker.util.FileSystemUtils;
 import net.osmtracker.util.ThemeValidator;
 import net.osmtracker.view.TextNoteDialog;
 import net.osmtracker.view.VoiceRecDialog;
 import net.osmtracker.db.TrackContentProvider;
 
 import android.Manifest;
+import android.annotation.TargetApi;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ComponentName;
+import android.content.ContentUris;
+import android.content.ContentValues;
+
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -34,6 +42,8 @@
 import android.location.LocationManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Build;
+
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StrictMode;
@@ -153,14 +163,20 @@ public class TrackLogger extends Activity {
 	private AudioManager mAudioManager;
 
 	private ComponentName mediaButtonReceiver;
-
+
+	private ArrayList<String> layoutNameTags = new ArrayList<String>();
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		
+
 		// Get the track id to work with
 		currentTrackId = getIntent().getExtras().getLong(TrackContentProvider.Schema.COL_TRACK_ID);
 		Log.v(TAG, "Starting for track id " + currentTrackId);
-
+
+		//save the initial layout file name in tags array
+		String layoutName = CustomLayoutsUtils.getCurrentLayoutName(getApplicationContext());
+		layoutNameTags.add(layoutName);
+
 		gpsLoggerServiceIntent = new Intent(this, GPSLogger.class);
 		gpsLoggerServiceIntent.putExtra(TrackContentProvider.Schema.COL_TRACK_ID, currentTrackId);
 
@@ -193,6 +209,40 @@ protected void onCreate(Bundle savedInstanceState) {
 		mediaButtonReceiver = new ComponentName(this, MediaButtonReceiver.class.getName());
 	}
 
+	/**
+	 * It takes the string array layoutNameTags and convert each position in the array, then, create a string with all the tags separated with a comma.
+	 * Also, the default layout is excluded and the 'osmtracker' tag is added by default.
+	 */
+	private void saveTagsForTrack(){
+		StringBuilder tags = new StringBuilder();
+		ArrayList<String> fixedTags = new ArrayList<String>();
+
+		//covert the file name to simple layout name
+		for(String layoutFileName : layoutNameTags){
+			//OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT -> 'default'
+			if(! layoutFileName.equals(OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT)){
+				fixedTags.add(CustomLayoutsUtils.convertFileName(layoutFileName));
+			}
+		}
+
+		fixedTags.add("osmtracker");
+
+		//create the string with all tags
+		for(String simpleName : fixedTags){
+			tags.append(simpleName).append(",");
+		}
+
+		//obtain the current track id and initialize the values variable
+		Uri trackUri = ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, currentTrackId);
+		ContentValues values = new ContentValues();
+
+		//set the values tag and update the table
+		values.put(TrackContentProvider.Schema.COL_TAGS, tags.toString());
+		getContentResolver().update(trackUri, values, null, null);
+	}
+
+
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 	@Override
 	protected void onResume() {
 
@@ -268,6 +318,12 @@ protected void onResume() {
 
 		mAudioManager.registerMediaButtonEventReceiver(mediaButtonReceiver);
 
+		//save the layout file name if it change, in tags array
+		String layoutName = CustomLayoutsUtils.getCurrentLayoutName(getApplicationContext());
+		if(! layoutNameTags.contains(layoutName)){
+			layoutNameTags.add(layoutName);
+		}
+
 		super.onResume();
 	}
 
@@ -376,6 +432,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		case R.id.tracklogger_menu_stoptracking:
 			// Start / Stop tracking	
 			if (gpsLogger.isTracking()) {
+				saveTagsForTrack();
+
 				Intent intent = new Intent(OSMTracker.INTENT_STOP_TRACKING);
 				sendBroadcast(intent);
 				((GpsStatusRecord) findViewById(R.id.gpsStatus)).manageRecordingIndicator(false);
@@ -763,5 +821,4 @@ public void onRequestPermissionsResult(int requestCode,
 		}
 	}
 
-
 }