diff --git a/app/release/app-release-4.1.4.apk b/app/release/app-release-4.1.5.apk similarity index 68% rename from app/release/app-release-4.1.4.apk rename to app/release/app-release-4.1.5.apk index d8c8fe2..182c867 100644 Binary files a/app/release/app-release-4.1.4.apk and b/app/release/app-release-4.1.5.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a247ce7..0599cf6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="119" + android:versionName="4.1.5"> diff --git a/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java b/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java index 82e1002..6da630f 100644 --- a/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java @@ -22,6 +22,7 @@ import android.view.View; import android.widget.Button; import android.widget.DatePicker; import android.widget.EditText; +import android.widget.ProgressBar; import android.widget.TimePicker; import android.os.ParcelFileDescriptor; @@ -208,7 +209,12 @@ public class ExportDataActivity extends AppCompatActivity // mDateTxt.getText().toString(), mTimeTxt.getText().toString(), mDuration)); Log.d(TAG, String.format("EndDate=%s %s, Duration=%3.1f hrs", mDateTxt.getText().toString(), mTimeTxt.getText().toString(), mDuration)); + ProgressBar pb = (ProgressBar) findViewById(R.id.exportPb); + pb.setIndeterminate(true); + pb.setVisibility(View.VISIBLE); + mExportBtn.setEnabled(false); + mExportBtn.setVisibility(View.INVISIBLE); this.openFile(); } @@ -268,8 +274,7 @@ public class ExportDataActivity extends AppCompatActivity openFileDescriptor(uri, "w"); FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor()); - // fileOutputStream.write(("Overwritten at " + System.currentTimeMillis() + - // "\n").getBytes()); + fileOutputStream.write(("# dataTime, alarmState, hr, o2sat, accel*125\n").getBytes()); JSONArray dataObj; try { dataObj = new JSONArray(datapointsJsonStr); @@ -319,6 +324,17 @@ public class ExportDataActivity extends AppCompatActivity mUtil.showToast(getString(R.string.error_exporting_data)); Log.e(TAG, "exportToFile() - IOException: " + e.toString()); } + runOnUiThread(new Runnable() { + public void run() { + ProgressBar pb = (ProgressBar) findViewById(R.id.exportPb); + pb.setIndeterminate(true); + pb.setVisibility(View.INVISIBLE); + mExportBtn.setEnabled(true); + mExportBtn.setVisibility(View.VISIBLE); + + } + }); + }); } diff --git a/app/src/main/res/layout/activity_dbquery.xml b/app/src/main/res/layout/activity_dbquery.xml index a073818..23d97a4 100644 --- a/app/src/main/res/layout/activity_dbquery.xml +++ b/app/src/main/res/layout/activity_dbquery.xml @@ -3,17 +3,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> + + android:textStyle="bold" /> + + android:text="End Date/Time (dd-mm-yyyy hh:mm)" /> + +