From 69c493bbb015665b2030a30face6ed1644e91de9 Mon Sep 17 00:00:00 2001 From: Bobby Donald Date: Tue, 4 Nov 2014 14:12:09 -0500 Subject: [PATCH 1/3] updated version numbers --- Apps/Motion/AndroidManifest.xml | 4 ++-- Apps/Writer/AndroidManifest.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Apps/Motion/AndroidManifest.xml b/Apps/Motion/AndroidManifest.xml index 1caa7165..426c1192 100644 --- a/Apps/Motion/AndroidManifest.xml +++ b/Apps/Motion/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="5" + android:versionName="1.1"> + android:versionCode="5" + android:versionName="1.1" > From 0b57d5f32a4a17c626b6927fe30d9f8c99b17afc Mon Sep 17 00:00:00 2001 From: Bobby Donald Date: Fri, 7 Nov 2014 13:27:04 -0500 Subject: [PATCH 2/3] preset now switched field --- Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java | 4 ++++ Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java index 73ad4939..aabd8348 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java @@ -586,6 +586,10 @@ public void onActivityResult(int reqCode, int resultCode, Intent data) { projNumB.setText("Project: " + projectNumber); w.make("Sensors Needed for Project " + projectNumber + " are Enabled", Waffle.IMAGE_CHECK); + /*change sensor field*/ + int field = data.getExtras().getInt(Presets.FIELD); + fields.setCurrentItem(field); + /*set rate*/ SharedPreferences ratePrefs = getSharedPreferences(MY_SAVED_PREFERENCES, 0); SharedPreferences.Editor editor2 = ratePrefs.edit(); diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java index 0c597136..12002705 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java @@ -12,6 +12,8 @@ public class Presets extends Activity{ public static final String PROJECT = "project"; public static final String LENGTH = "length"; public static final String RATE = "rate"; + public static final String FIELD = "field"; + @Override @@ -32,6 +34,7 @@ public void onClick(View v) { resultIntent.putExtra(LENGTH, 10); resultIntent.putExtra(PROJECT, "570"); setResult(Activity.RESULT_OK, resultIntent); + resultIntent.putExtra(FIELD, 0); finish(); } @@ -45,6 +48,7 @@ public void onClick(View v) { resultIntent.putExtra(RATE, 1000); resultIntent.putExtra(LENGTH, -1); resultIntent.putExtra(PROJECT, "13"); + resultIntent.putExtra(FIELD, 1); setResult(Activity.RESULT_OK, resultIntent); finish(); } From 7513c49d449cae717c43e4ad3fe60a7efda93ee5 Mon Sep 17 00:00:00 2001 From: Bobby Donald Date: Fri, 14 Nov 2014 21:50:03 -0500 Subject: [PATCH 3/3] constants instead of hardcoded values --- .../uml/cs/isense/motion/dialogs/Presets.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java index 12002705..69f08b55 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java @@ -14,6 +14,15 @@ public class Presets extends Activity{ public static final String RATE = "rate"; public static final String FIELD = "field"; + public static final String ACCEL_PROJECT= "570"; + public static final int ACCEL_PROJECT_RATE= 50; + public static final int ACCEL_PROJECT_LENGTH= 10; + public static final int ACCEL_CAROUSEL_POSITION = 1; + + public static final String GPS_PROJECT= "13"; + public static final int GPS_PROJECT_RATE = 1000; + public static final int GPS_PROJECT_LENGTH = -1; //-1 is push to stop + public static final int GPS_CAROUSEL_POSITION = 1; @Override @@ -30,11 +39,11 @@ public void onCreate(Bundle savedInstanceState) { @Override public void onClick(View v) { Intent resultIntent = new Intent(); - resultIntent.putExtra(RATE, 50); - resultIntent.putExtra(LENGTH, 10); - resultIntent.putExtra(PROJECT, "570"); + resultIntent.putExtra(RATE, ACCEL_PROJECT_RATE); + resultIntent.putExtra(LENGTH, ACCEL_PROJECT_LENGTH); + resultIntent.putExtra(PROJECT, ACCEL_PROJECT); setResult(Activity.RESULT_OK, resultIntent); - resultIntent.putExtra(FIELD, 0); + resultIntent.putExtra(FIELD, ACCEL_CAROUSEL_POSITION); finish(); } @@ -45,10 +54,10 @@ public void onClick(View v) { @Override public void onClick(View v) { Intent resultIntent = new Intent(); - resultIntent.putExtra(RATE, 1000); - resultIntent.putExtra(LENGTH, -1); - resultIntent.putExtra(PROJECT, "13"); - resultIntent.putExtra(FIELD, 1); + resultIntent.putExtra(RATE, GPS_PROJECT_RATE); + resultIntent.putExtra(LENGTH, GPS_PROJECT_LENGTH); + resultIntent.putExtra(PROJECT, GPS_PROJECT); + resultIntent.putExtra(FIELD, GPS_CAROUSEL_POSITION); setResult(Activity.RESULT_OK, resultIntent); finish(); }