added feature: boxes are ticked automatically when their corresponding input has data put into it, and unticked automatically when cleared

Author: Adam Howard

TODO.md

@@ -3,14 +3,12 @@ TODO
 
 * Add freeform 'notes', tweetsize or less
 	- the max size should depend on the size of a single text, varying on how much other data (QA, CP etc) we're sending.
-* Use a dialog to specify a list of phone numbers to share the entries with via SMS
-	- validate entered numbers are real phone numbers
-	- format the extant numbers so they look better
-	- add a way to an/all entry(ies)
+* For the Edit Numbers Dialog:
+	- format the extant numbers so they look better (eg font)
+	- add a way to delete an/all entry(ies)
 	- set a max number of recipients (5?), to prevent our app from being accused of spamming by the android watchdogs
-* Choose output format for data, eg CSV, JSON
 * Create a Log Review screen, which displays the ~5 most recent entries
-* Automatically tick a field when data is entered, and automatically untick it when it becomes blank
+
 
 
 Done
@@ -19,9 +17,12 @@ Done
 * Make the entry-time editable
 * Store entries locally
 	- probably in a file
-
+* Automatically tick a field when data is entered, and automatically untick it when it becomes blank
+* Use a dialog to specify a list of phone numbers to share the entries with via SMS
+	- validate entered numbers are real phone numbers
 
 Long-Term
 ---------
 
-* Sync data across instances
+* Sync data across instances
+* Allow users to choose output format for data, eg CSV, JSON

app/src/main/java/com/medavox/diabeticdiary/MainActivity.java

@@ -14,8 +14,10 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.telephony.SmsManager;
+import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -98,8 +100,30 @@ protected void onCreate(Bundle savedInstanceState) {
 
         for(int i = 0; i < inputs.length; i++) {
             inputs[i]  = (EditText) findViewById(inputIDs[i]);
+
+            //tick the box to include data when there is, and untick it when it's not
+            final CheckBox cb = checkBoxes[i];
+            inputs[i].addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+
+                @Override
+                public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+
+                @Override
+                public void afterTextChanged(Editable editable) {
+                    if(editable.length() == 0 && cb.isChecked()) {
+                        cb.setChecked(false);
+                    }
+                    else if(editable.length() > 0 && !cb.isChecked()) {
+                        cb.setChecked(true);
+                    }
+                }
+            });
         }
 
+
+
         //for BG input, only allow 2 digits before the decimal place, and 1 after
         //Log.i(TAG, "existing filters: "+inputs[0].getFilters().length);
         inputs[0].setFilters(new InputFilter[]{new DecimalDigitsInputFilter(2,1)});
@@ -171,18 +195,17 @@ public void clickRecordButton() {
         String csvFormatLine = sdf.format(new Date(instantOpened));
 
         //select which fields have been ticked
-        String out = "Diabetic Diary ENTRY @ "+ DateTime.get(instantOpened,
-                DateTime.TimeFormat.MINUTES)+" {";
+        String out = DateTime.get(instantOpened,
+                DateTime.TimeFormat.MINUTES, DateFormat.BRIEF_WITH_DAY)+": ";
         boolean anyTicked = false;
         for(int i = 0; i < checkBoxes.length; i++) {
             csvFormatLine += ",";
             if(checkBoxes[i].isChecked()) {
                 anyTicked = true;
-                out += names[i]+":"+inputs[i].getText()+"; ";
+                out += names[i]+":"+inputs[i].getText()+", ";
                 csvFormatLine += inputs[i].getText();
             }
         }
-        out += "}";
         //csvFormatLine = csvFormatLine.substring(1);
         Log.i(TAG, out);
 
@@ -418,8 +441,8 @@ public void onClick(View view) {
                 @Override
                 public void onClick(View view) {
                     SharedPreferences.Editor editor = sp.edit();
-                    //bizarrely, there doesn't seem to a method in ArrayAdapters
-                    // to get all the data out in one go
+                    //bizarrely, there doesn't seem to be a method in ArrayAdapters,
+                    // to get all the data out in one go. eg ArrayAdapter.getArray()
                     ArrayAdapter<String> adapter = (ArrayAdapter<String>)listView.getAdapter();
                     Set<String> newData = new HashSet<String>(adapter.getCount());
                     String numbersAsString = "";

app/src/main/res/layout/edit_numbers_dialog.xml

@@ -18,13 +18,14 @@
         android:orientation="horizontal">
 
         <EditText
-
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/number_edit_box"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="2"
-            android:inputType="phone"/>
+            android:inputType="phone"
+            android:maxLines="1"
+            android:maxLength="15"/>
 
         <Button
             android:id="@+id/add_number_button"

app/src/main/res/layout/edit_numbers_list_item.xml

@@ -2,5 +2,4 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-android:maxLines="1"
-android:maxLength="15"/>
+/>