Merge 3835b82 into 85ed5be

Glucosio · Jul 19, 2018 · 9ae375b · 9ae375b
2 parents 85ed5be + 3835b82
commit 9ae375b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/app/src/main/java/org/glucosio/android/activity/A1cCalculatorActivity.java b/app/src/main/java/org/glucosio/android/activity/A1cCalculatorActivity.java
@@ -37,6 +37,8 @@
 import org.glucosio.android.R;
 import org.glucosio.android.presenter.A1CCalculatorPresenter;
 
+import java.text.NumberFormat;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnEditorAction;
@@ -79,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @OnTextChanged(value = R.id.activity_converter_a1c_glucose, callback = OnTextChanged.Callback.AFTER_TEXT_CHANGED)
     void glucoseValueChanged(@NonNull final Editable s) {
         convertedA1C = presenter.calculateA1C(s.toString());
-        A1CTextView.setText(String.valueOf(convertedA1C));
+        A1CTextView.setText(String.valueOf(NumberFormat.getInstance().format(convertedA1C)));
     }
 
     @SuppressWarnings("UnusedParameters")

diff --git a/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java b/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java
@@ -126,9 +126,9 @@ public void onNothingChosen(View labelledSpinner, AdapterView<?> adapterView) {
 
             String readingString;
             if (presenter.getUnitMeasurement().equals(Constants.Units.MG_DL)) {
-                readingString = String.valueOf(readingToEdit.getReading());
+                readingString = String.valueOf(numberFormat.format(readingToEdit.getReading()));
             } else {
-                readingString = String.valueOf(GlucosioConverter.glucoseToMmolL(readingToEdit.getReading()));
+                readingString = String.valueOf(numberFormat.format(GlucosioConverter.glucoseToMmolL(readingToEdit.getReading())));
             }
 
             readingTextView.setText(readingString);

diff --git a/app/src/main/java/org/glucosio/android/activity/MainActivity.java b/app/src/main/java/org/glucosio/android/activity/MainActivity.java
@@ -442,15 +442,9 @@ public void openBackupDialog() {
         builder.setItems(getResources().getStringArray(R.array.menu_backup_options), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
+                // Backup to Google Drive has been removed because it crashes
+                // It needs to be re-implemented using non-deprecated API
                 if (which == 0) {
-                    if (checkPlayServices()) {
-                        // TODO: Finish backup in next release
-                        Intent intent = new Intent(getApplicationContext(), BackupActivity.class);
-                        startActivity(intent);
-                    } else {
-                        dialog.dismiss();
-                    }
-                } else {
                     // Export to CSV
                     showExportCsvDialog();
                 }

diff --git a/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java b/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java
@@ -180,7 +180,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             case 1:
                 idTextView.setText(hb1acIdArray.get(position).toString());
                 if ("percentage".equals(presenter.getA1cUnitMeasurement())) {
-                    readingTextView.setText(hb1acReadingArray.get(position).toString() + " %");
+                    readingTextView.setText(numberFormat.format(hb1acReadingArray.get(position)) + " %");
                 } else {
                     double ifcc = GlucosioConverter.a1cNgspToIfcc(hb1acReadingArray.get(position));
                     String reading = numberFormat.format(ifcc);
@@ -194,16 +194,18 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             // Cholesterol
             case 2:
                 idTextView.setText(cholesterolIdArray.get(position).toString());
-                String reading = cholesterolTotalArray.get(position).toString();
+                String reading = numberFormat.format(cholesterolTotalArray.get(position));
                 readingTextView.setText(mContext.getString(R.string.mg_dL_value, reading));
                 datetimeTextView.setText(presenter.convertDate(cholesterolDateTimeArray.get(position)));
-                typeTextView.setText("LDL: " + cholesterolLDLArray.get(position) + " - " + "HDL: " + cholesterolHDLArray.get(position));
+                typeTextView.setText("LDL: " + numberFormat.format(cholesterolLDLArray.get(position)) +
+                        " - " + "HDL: " + numberFormat.format(cholesterolHDLArray.get(position)));
                 readingTextView.setTextColor(ContextCompat.getColor(mContext, R.color.glucosio_text_dark));
                 break;
             // Pressure
             case 3:
                 idTextView.setText(pressureIdArray.get(position).toString());
-                readingTextView.setText(pressureMaxArray.get(position).toString() + "/" + pressureMinArray.get(position).toString() + "  mm/Hg");
+                readingTextView.setText(numberFormat.format(pressureMaxArray.get(position)) + "/" +
+                        numberFormat.format(pressureMinArray.get(position)) + "  mm/Hg");
                 datetimeTextView.setText(presenter.convertDate(pressureDateTimeArray.get(position)));
                 typeTextView.setText("");
                 typeTextView.setVisibility(View.GONE);
@@ -212,7 +214,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             //Ketones
             case 4:
                 idTextView.setText(ketoneIdArray.get(position).toString());
-                readingTextView.setText(ketoneReadingArray.get(position).toString() + " mmol");
+                readingTextView.setText(numberFormat.format(ketoneReadingArray.get(position)) + " mmol");
                 datetimeTextView.setText(presenter.convertDate(ketoneDataTimeArray.get(position)));
                 typeTextView.setText("");
                 typeTextView.setVisibility(View.GONE);

diff --git a/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java b/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java
@@ -33,6 +33,7 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -118,7 +119,7 @@ public String getA1cMonth() {
     }
 
     public String getLastReading() {
-        return dB.getLastGlucoseReading().getReading() + "";
+        return String.valueOf(NumberFormat.getInstance().format(dB.getLastGlucoseReading().getReading()));
     }
 
     public String getLastDateTime() {

diff --git a/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java b/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java
@@ -44,7 +44,7 @@ public static double glucoseToMgDl(double mmolL) {
     }
 
     public static double glucoseToMmolL(double mgDl) {
-        return round(mgDl / MG_DL_TO_MMOL_CONSTANT, 1);
+        return round(mgDl / MG_DL_TO_MMOL_CONSTANT, 2);
     }
 
     public static double glucoseToA1C(double mgDl) {

diff --git a/app/src/main/java/org/glucosio/android/tools/ReadingTools.java b/app/src/main/java/org/glucosio/android/tools/ReadingTools.java
@@ -71,7 +71,7 @@ public static Number parseReading(String reading) {
 
     public static double safeParseDouble(String doubleValue) {
         try {
-            return Double.parseDouble(doubleValue);
+            return NumberFormat.getInstance().parse(doubleValue).doubleValue();
         } catch (Exception e) {
             return 0;
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -259,7 +259,6 @@
     </string-array>
 
     <string-array name="menu_backup_options" translatable="false">
-        <item>@string/menu_backup_backup</item>
         <item>@string/menu_backup_csv</item>
     </string-array>