diff --git a/Apps/Motion/AndroidManifest.xml b/Apps/Motion/AndroidManifest.xml index 9ed0861b..c901f4f1 100644 --- a/Apps/Motion/AndroidManifest.xml +++ b/Apps/Motion/AndroidManifest.xml @@ -19,7 +19,7 @@ diff --git a/Apps/Motion/ic_launcher-web.png b/Apps/Motion/ic_launcher-web.png deleted file mode 100644 index 4b2d9964..00000000 Binary files a/Apps/Motion/ic_launcher-web.png and /dev/null differ diff --git a/Apps/Motion/isense_graph-web.png b/Apps/Motion/isense_graph-web.png new file mode 100644 index 00000000..2f942c85 Binary files /dev/null and b/Apps/Motion/isense_graph-web.png differ diff --git a/Apps/Motion/res/drawable-hdpi/ic_launcher.png b/Apps/Motion/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 05860289..00000000 Binary files a/Apps/Motion/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/Apps/Motion/res/drawable-hdpi/isense_graph.png b/Apps/Motion/res/drawable-hdpi/isense_graph.png deleted file mode 100644 index 9fba6855..00000000 Binary files a/Apps/Motion/res/drawable-hdpi/isense_graph.png and /dev/null differ diff --git a/Apps/Motion/res/drawable-mdpi/ic_launcher.png b/Apps/Motion/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 4d4d94ee..00000000 Binary files a/Apps/Motion/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/Apps/Motion/res/drawable-mdpi/isense_graph.png b/Apps/Motion/res/drawable-mdpi/isense_graph.png deleted file mode 100644 index 9fba6855..00000000 Binary files a/Apps/Motion/res/drawable-mdpi/isense_graph.png and /dev/null differ diff --git a/Apps/Motion/res/drawable-xhdpi/ic_launcher.png b/Apps/Motion/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 41d58bcd..00000000 Binary files a/Apps/Motion/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/Apps/Motion/res/drawable-xxhdpi/ic_launcher.png b/Apps/Motion/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 2c1ce041..00000000 Binary files a/Apps/Motion/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/Apps/Motion/res/drawable/isense_graph.png b/Apps/Motion/res/drawable/isense_graph.png deleted file mode 100644 index 9fba6855..00000000 Binary files a/Apps/Motion/res/drawable/isense_graph.png and /dev/null differ diff --git a/Apps/Motion/res/mipmap-hdpi/isense_graph.png b/Apps/Motion/res/mipmap-hdpi/isense_graph.png new file mode 100644 index 00000000..f21ce02b Binary files /dev/null and b/Apps/Motion/res/mipmap-hdpi/isense_graph.png differ diff --git a/Apps/Motion/res/mipmap-mdpi/isense_graph.png b/Apps/Motion/res/mipmap-mdpi/isense_graph.png new file mode 100644 index 00000000..9bde97dd Binary files /dev/null and b/Apps/Motion/res/mipmap-mdpi/isense_graph.png differ diff --git a/Apps/Motion/res/mipmap-xhdpi/isense_graph.png b/Apps/Motion/res/mipmap-xhdpi/isense_graph.png new file mode 100644 index 00000000..0020ac0b Binary files /dev/null and b/Apps/Motion/res/mipmap-xhdpi/isense_graph.png differ diff --git a/Apps/Motion/res/mipmap-xxhdpi/isense_graph.png b/Apps/Motion/res/mipmap-xxhdpi/isense_graph.png new file mode 100644 index 00000000..e7062731 Binary files /dev/null and b/Apps/Motion/res/mipmap-xxhdpi/isense_graph.png differ diff --git a/Apps/Motion/res/mipmap-xxxhdpi/isense_graph.png b/Apps/Motion/res/mipmap-xxxhdpi/isense_graph.png new file mode 100644 index 00000000..90afe75e Binary files /dev/null and b/Apps/Motion/res/mipmap-xxxhdpi/isense_graph.png differ 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 de347dbf..26ed54c2 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java @@ -34,6 +34,7 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -68,7 +69,7 @@ import edu.uml.cs.isense.waffle.Waffle; -public class Motion extends ActionBarActivity { +public class Motion extends AppCompatActivity { public static final String DEFAULT_PROJ = "-1"; public static final int DEFAULT_RATE = 50; @@ -222,14 +223,9 @@ public void run() { startStop.setText("Hold to Start"); } - dataSetName = settings.getString(EnterName.Name_Key, ""); + dataSetName = settings.getString(EnterName.Name_Key, "Motion"); - if (dataSetName.length() == 0) { - Intent iEnterName = new Intent(this, EnterName.class); - startActivityForResult(iEnterName, RESULT_GOT_NAME); - } else { - nameB.setText(dataSetName); - } + nameB.setText(dataSetName); String projId = ProjectManager.getProject(mContext); diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/PresetScreen.java b/Apps/Motion/src/edu/uml/cs/isense/motion/PresetScreen.java index 083df484..e3765f0c 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/PresetScreen.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/PresetScreen.java @@ -111,6 +111,9 @@ public void onClick(View v) { editor.putString(Presets.LAST_PRESET, Presets.GPS); Intent resultIntent = new Intent(); + + resultIntent.putExtra(Presets.RATE, Presets.GPS_PROJECT_RATE); + resultIntent.putExtra(Presets.LENGTH, Presets.GPS_PROJECT_LENGTH); resultIntent.putExtra(Presets.PROJECT, "-1"); setResult(Activity.RESULT_OK, resultIntent); diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/RecordingService.java b/Apps/Motion/src/edu/uml/cs/isense/motion/RecordingService.java index 8a3a8509..6b2d876e 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/RecordingService.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/RecordingService.java @@ -1,6 +1,5 @@ package edu.uml.cs.isense.motion; -import android.annotation.SuppressLint; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -22,11 +21,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import java.util.Timer; import edu.uml.cs.isense.comm.API; import edu.uml.cs.isense.dfm.DataFieldManager; -import edu.uml.cs.isense.motion.dialogs.EnterName; import edu.uml.cs.isense.proj.ProjectManager; import edu.uml.cs.isense.queue.QDataSet.Type; @@ -82,7 +79,7 @@ public void onCreate() { builder.setContentText("Recording Data"); builder.setTicker("Started Recording"); builder.setSmallIcon(R.drawable.ic_stat_name); - Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher); + Bitmap bm = BitmapFactory.decodeResource(getResources(), R.mipmap.isense_graph); builder.setLargeIcon(bm); builder.setContentIntent(pendingIntent); builder.setOngoing(true); diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/About.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/About.java index d4252a2c..43da6440 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/About.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/About.java @@ -2,11 +2,12 @@ import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import edu.uml.cs.isense.motion.R; -public class About extends ActionBarActivity { +public class About extends AppCompatActivity { @Override public void onCreate(Bundle savedInstanceBundle) { diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ContributorKeyDialog.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ContributorKeyDialog.java index 6f35cec1..e30612b0 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ContributorKeyDialog.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ContributorKeyDialog.java @@ -8,6 +8,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -15,7 +16,7 @@ import edu.uml.cs.isense.motion.R; import edu.uml.cs.isense.waffle.Waffle; -public class ContributorKeyDialog extends ActionBarActivity { +public class ContributorKeyDialog extends AppCompatActivity { Button ok, cancel; EditText keyField; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DataActivity.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DataActivity.java index e13e870c..c02c2dc4 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DataActivity.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DataActivity.java @@ -4,12 +4,13 @@ import android.app.Activity; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import edu.uml.cs.isense.comm.Connection; import edu.uml.cs.isense.motion.R; -public class DataActivity extends ActionBarActivity { +public class DataActivity extends AppCompatActivity { private Button iSENSE_Button; private Button discard_Button; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DurationDialog.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DurationDialog.java index a7ca6e94..7842dfe0 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DurationDialog.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DurationDialog.java @@ -4,6 +4,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; @@ -14,7 +15,7 @@ import edu.uml.cs.isense.motion.Motion; import edu.uml.cs.isense.motion.R; -public class DurationDialog extends ActionBarActivity { +public class DurationDialog extends AppCompatActivity { Button ok, cancel; EditText input; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/MessageDialogTemplate.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/MessageDialogTemplate.java index 4145b484..73a55d3d 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/MessageDialogTemplate.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/MessageDialogTemplate.java @@ -5,12 +5,13 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; import edu.uml.cs.isense.motion.R; -public class MessageDialogTemplate extends ActionBarActivity { +public class MessageDialogTemplate extends AppCompatActivity { Button pos, neg; 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 04a104c4..27bfdd68 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 @@ -5,6 +5,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; @@ -13,7 +14,7 @@ import edu.uml.cs.isense.motion.Motion; import edu.uml.cs.isense.motion.R; -public class Presets extends ActionBarActivity { +public class Presets extends AppCompatActivity { public static final String PROJECT = "project"; public static final String LENGTH = "length"; public static final String RATE = "rate"; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RateDialog.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RateDialog.java index 59387f55..ccc914b5 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RateDialog.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RateDialog.java @@ -1,23 +1,18 @@ package edu.uml.cs.isense.motion.dialogs; -import android.app.Activity; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; -import android.widget.EditText; import android.widget.RadioButton; -import android.widget.Spinner; import edu.uml.cs.isense.motion.Motion; import edu.uml.cs.isense.motion.R; -public class RateDialog extends ActionBarActivity { +public class RateDialog extends AppCompatActivity { Button ok, cancel; - EditText input; - Spinner spinner; int rate; @Override diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RecordSettings.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RecordSettings.java index 66927454..3a879cd6 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RecordSettings.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RecordSettings.java @@ -1,16 +1,15 @@ package edu.uml.cs.isense.motion.dialogs; -import android.app.Activity; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.CheckedTextView; import edu.uml.cs.isense.motion.R; -public class RecordSettings extends ActionBarActivity { +public class RecordSettings extends AppCompatActivity { private boolean Xchecked = false, Ychecked = true, Zchecked = false, Magchecked = false; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ResetToDefaults.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ResetToDefaults.java index 7bdbd04a..01413c71 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ResetToDefaults.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ResetToDefaults.java @@ -1,13 +1,12 @@ package edu.uml.cs.isense.motion.dialogs; -import android.app.Activity; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import edu.uml.cs.isense.motion.R; -public class ResetToDefaults extends ActionBarActivity { +public class ResetToDefaults extends AppCompatActivity { Button reset, noreset; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/SaveModeDialog.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/SaveModeDialog.java index 0105467e..db6f6389 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/SaveModeDialog.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/SaveModeDialog.java @@ -3,11 +3,12 @@ import android.app.Activity; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import edu.uml.cs.isense.motion.R; -public class SaveModeDialog extends ActionBarActivity { +public class SaveModeDialog extends AppCompatActivity { Button ok, cancel; diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ViewData.java b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ViewData.java index da942471..64627b4b 100644 --- a/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ViewData.java +++ b/Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ViewData.java @@ -5,12 +5,13 @@ import android.net.Uri; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import edu.uml.cs.isense.motion.Motion; import edu.uml.cs.isense.motion.R; -public class ViewData extends ActionBarActivity { +public class ViewData extends AppCompatActivity { Button view, cancel; diff --git a/Apps/Pictures/AndroidManifest.xml b/Apps/Pictures/AndroidManifest.xml index 30890f8a..251a10fe 100644 --- a/Apps/Pictures/AndroidManifest.xml +++ b/Apps/Pictures/AndroidManifest.xml @@ -28,7 +28,7 @@ @@ -100,6 +100,10 @@ android:name="edu.uml.cs.isense.queue.QueueAlter" android:label="Alter Data Set" android:theme="@style/AppThemeDialog" /> + Other Project - Account + Login + Account Continuously Take Photos Time Interval (seconds): Press Here to Continuously Take Pictures diff --git a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Continuous.java b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Continuous.java index 19194c64..7949c68c 100644 --- a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Continuous.java +++ b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Continuous.java @@ -2,6 +2,7 @@ import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; @@ -9,7 +10,7 @@ import android.widget.EditText; import android.view.ViewGroup; -public class Continuous extends ActionBarActivity { +public class Continuous extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Pictures.java b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Pictures.java index 4f50b1be..0c43fcfa 100644 --- a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Pictures.java +++ b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Pictures.java @@ -35,6 +35,7 @@ import android.provider.Settings; import android.support.v4.content.CursorLoader; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Display; import android.view.Menu; @@ -62,7 +63,7 @@ import edu.uml.cs.isense.supplements.OrientationManager; import edu.uml.cs.isense.waffle.Waffle; -public class Pictures extends ActionBarActivity implements LocationListener { +public class Pictures extends AppCompatActivity implements LocationListener { private static final int CAMERA_PIC_REQUESTED = 101; private static final int LOGIN_REQUESTED = 102; private static final int NO_GPS_REQUESTED = 103; diff --git a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/dialogs/CameraPreview.java b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/dialogs/CameraPreview.java index 1fd0c897..225adabd 100644 --- a/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/dialogs/CameraPreview.java +++ b/Apps/Pictures/src/edu/uml/cs/isense/riverwalk/dialogs/CameraPreview.java @@ -63,7 +63,7 @@ private void setBestPictureSize() { int h = size.height, w = size.width; // If this height/width is better, use it - if (h >= mHeight || w >= mWidth) { + if (w * h > mHeight * mWidth) { mHeight = h; mWidth = w; continue; diff --git a/Apps/Writer/AndroidManifest.xml b/Apps/Writer/AndroidManifest.xml index a63e7938..77cd0863 100644 --- a/Apps/Writer/AndroidManifest.xml +++ b/Apps/Writer/AndroidManifest.xml @@ -18,7 +18,7 @@ = 11 - if (android.os.Build.VERSION.SDK_INT >= 11) { - ActionBar bar = getSupportActionBar(); - } datapointsLayout = (LinearLayout) findViewById(R.id.datapoints_ll); scrollView = (ScrollView) findViewById(R.id.datapoints_sv); @@ -472,7 +467,7 @@ public void run() { } else if (field.type == RProjectField.TYPE_TEXT) { //if no restrictions we get back a string "null" - if (field.restrictions == "null") { + if (field.restrictions.equals("[]")) { ViewGroup singlefield = new RelativeLayout(mContext); inflater.inflate(R.layout.field, singlefield); diff --git a/Apps/Writer/writer.png b/Apps/Writer/writer.png deleted file mode 100644 index 43279db6..00000000 Binary files a/Apps/Writer/writer.png and /dev/null differ