Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

Author: jamorham

README.md

@@ -20,11 +20,11 @@
 
 xDrip+ is an unofficial and independent Android app which works as data hub and processor between many different devices.
 
-It supports wireless connections to G4, G5, G6, G7, Medtrum A6, Libre via NFC and Bluetooth, 630G, 640G, 670G pumps, CareSens Air and Eversense CGM via companion apps. Bluetooth Glucose Meters such as the Contour Next One, AccuChek Guide, Verio Flex & Diamond Mini as well as devices like the Pendiq 2.0 Insulin Pen.
+It supports wireless connections to G6, G7, Medtrum A6, Libre via NFC and Bluetooth, 630G, 640G, 670G pumps, CareSens Air and Eversense CGM via companion apps. Bluetooth Glucose Meters such as the Contour Next One, AccuChek Guide, Verio Flex & Diamond Mini as well as devices like the Pendiq 2.0 Insulin Pen.
 
 Heart-rate and step counter data is processed from Android Wear, Garmin, Fitbit and Pebble smart-watches and watch-faces for those that show glucose values and graphs.
 
-On some Android Wear watches, it is possible for the G5 or G6 to talk directly to the watch so it can display values even when out of range of the phone.
+On some Android Wear watches, it is possible for the G6 to talk directly to the watch so it can display values even when out of range of the phone.
 
 The app contains sophisticated charting, customization and data entry features as well as a predictive simulation model.
 

app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java

@@ -191,7 +191,7 @@ public void run() {
                 if (!isFinishing()) {
                     new AlertDialog.Builder(AlertList.this)
                             .setTitle("Warning !")
-                            .setMessage("No active Low Alert exists, without this there will be no alert on low glucose! Please add or enable a low alert.")
+                            .setMessage("No low alert is active. You won’t be notified of low glucose—please add or enable one.")
                             .setCancelable(false)
                             .setPositiveButton(
                                     "Ok",

app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java

@@ -390,15 +390,15 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
         List<AlertType> highAlerts = AlertType.getAll(true);
 
         if(threshold < MIN_ALERT || threshold > MAX_ALERT) {
-            Toast.makeText(getApplicationContext(), "threshold has to be between " +unitsConvert2Disp(doMgdl, MIN_ALERT) + " and " + unitsConvert2Disp(doMgdl, MAX_ALERT),Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), "Threshold must be between " +unitsConvert2Disp(doMgdl, MIN_ALERT) + " and " + unitsConvert2Disp(doMgdl, MAX_ALERT) + ".", Toast.LENGTH_LONG).show();
             return false;
         }
         // We want to make sure that for each threashold there is only one alert. Otherwise, which file should we play.
         for (AlertType lowAlert : lowAlerts) {
             if(lowAlert.threshold == threshold  && overlapping(lowAlert, allDay, startTime, endTime) && lowAlert.active) {
                 if(uuid == null || ! uuid.equals(lowAlert.uuid)){ //new alert or not myself
                     Toast.makeText(getApplicationContext(),
-                            "Each alert should have it's own threshold. Please choose another threshold.",Toast.LENGTH_LONG).show();
+                            "Each alert needs a unique threshold. Please choose a different one.",Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -407,7 +407,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             if(highAlert.threshold == threshold  && overlapping(highAlert, allDay, startTime, endTime) && highAlert.active) {
                 if(uuid == null || ! uuid.equals(highAlert.uuid)){ //new alert or not myself
                     Toast.makeText(getApplicationContext(),
-                            "Each alert should have it's own threshold. Please choose another threshold.",Toast.LENGTH_LONG).show();
+                            "Each alert needs a unique threshold. Please choose a different one.",Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -418,7 +418,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             for (AlertType lowAlert : lowAlerts) {
                 if(threshold < lowAlert.threshold  && overlapping(lowAlert, allDay, startTime, endTime) && lowAlert.active) {
                     Toast.makeText(getApplicationContext(),
-                            "High alert threshold has to be higher than all low alerts. Please choose another threshold.",Toast.LENGTH_LONG).show();
+                            "High alerts must be set above all low alerts. Please adjust the threshold.",Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -427,7 +427,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             for (AlertType highAlert : highAlerts) {
                 if(threshold > highAlert.threshold  && overlapping(highAlert, allDay, startTime, endTime) && highAlert.active) {
                     Toast.makeText(getApplicationContext(),
-                            "Low alert threshold has to be lower than all high alerts. Please choose another threshold.",Toast.LENGTH_LONG).show();
+                            "Low alerts must be set below all high alerts. Please adjust the threshold.",Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -536,7 +536,7 @@ public void onClick(View v) {
                     allDay = true;
                 }
                 if (timeStart == timeEnd && (allDay==false)) {
-                    Toast.makeText(getApplicationContext(), "start time and end time of alert can not be equal",Toast.LENGTH_LONG).show();
+                    Toast.makeText(getApplicationContext(), "Alert start and end times cannot be equal.", Toast.LENGTH_LONG).show();
                     return;
                 }
                 boolean disabled = checkboxDisabled.isChecked();
@@ -592,7 +592,7 @@ public void onClick(View v) {
         buttonalertMp3.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-                builder.setTitle("What type of Alert?")
+                builder.setTitle("What type of sound?")
                         .setItems(R.array.alertType, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 if (which == 0) {
@@ -928,7 +928,7 @@ public void testAlert() {
             allDay = true;
         }
         if (timeStart == timeEnd && (!allDay)) {
-            Toast.makeText(getApplicationContext(), "start time and end time of alert can not be equal",Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), "Alert start and end times cannot be equal.", Toast.LENGTH_LONG).show();
             return;
         }
         if(!verifyThreshold(threshold, allDay, timeStart, timeEnd)) {

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java

@@ -271,11 +271,17 @@ private double bgScale() {
 
 
     static public boolean isXLargeTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
+        if (Pref.getBooleanDefaultFalse("enlarge_fonts_on_large_screens")) {
+            return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
+        }
+        return false;
     }
 
     static public boolean isLargeTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+        if (Pref.getBooleanDefaultFalse("enlarge_fonts_on_large_screens")) {
+            return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+        }
+        return false;
     }
 
     public static double mmolConvert(double mgdl) {

app/src/main/res/values/strings.xml

@@ -250,8 +250,8 @@
     <string name="pref_was_greater_than_max">%1$s was set to a value greater than maximum allowed.  It has been changed to maximum.</string>
     <string name="setting_pref_to_min">Set to min</string>
     <string name="pref_was_less_than_min">%1$s was set to a value less than minimum allowed.  It has been changed to minimum.</string>
-    <string name="extrapolate_data_to_try_to_predict_lows">Extrapolate data to try to predict lows</string>
-    <string name="alarm_at_forecasted_low_mins">Alarm at Forecasted Low mins</string>
+    <string name="extrapolate_data_to_try_to_predict_lows">Considering the current value and trend, calculate what the next few readings will be if the trend persists (extrapolate).  This ignores insulin or carbs on board.</string>
+    <string name="alarm_at_forecasted_low_mins">Time threshold [min]</string>
     <string name="title_forecast_low_threshold">Threshold</string>
     <string name="other_xdrip_plus_alerts">Other xDrip+ alerts</string>
     <string name="xdrip_plus_display_settings">xDrip+ Display Settings</string>
@@ -339,6 +339,10 @@
     <string name="pebble_and_android_wear_options">Options for different Watches</string>
     <string name="customize_colours">Customize Colors</string>
     <string name="xdrip_plus_color_settings">xDrip+ Color Settings</string>
+    <string name="summary_font_settings">Customize Fonts</string>
+    <string name="title_font_settings">Font Settings</string>
+    <string name="summary_enlarge_fonts_on_large_screens">Automatically enlarge the font size on large screens, such as tablets</string>
+    <string name="title_enlarge_fonts_on_large_screens">Enlarge fonts on larger displays</string>
     <string name="glucose_values_and_lines">Glucose Values and Lines</string>
     <string name="high_glucose_values">High Glucose Values</string>
     <string name="in_range_glucose_values">In-range Glucose Values</string>
@@ -454,7 +458,7 @@
     <string name="persistent_high_sound">Alert Sound</string>
     <string name="forecast_lows">Forecast Lows</string>
     <string name="raise_alarm_on_forecast_low">Raise alarm on Forecast Low</string>
-    <string name="notify_when_predicted_low_time_reaches_threshold">Notify when predicted low time reaches threshold</string>
+    <string name="notify_when_predicted_low_time_reaches_threshold">Notify when forecasted low time reaches time threshold</string>
     <string name="predicted_low_sound">Alert Sound</string>
     <string name="choose_sound_used_for_predicted_low_alarm">Choose the sound used for the alarm.</string>
     <string name="notify_when_parakeet_device_stops_checking_in">Notify when Parakeet device stops checking in</string>

app/src/main/res/xml/xdrip_plus_prefs.xml

@@ -309,6 +309,17 @@
                 </PreferenceCategory>
             </PreferenceScreen>
 
+            <PreferenceScreen
+                android:key="xdrip_font_settings"
+                android:summary="@string/summary_font_settings"
+                android:title="@string/title_font_settings">
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="enlarge_fonts_on_large_screens"
+                    android:summary="@string/summary_enlarge_fonts_on_large_screens"
+                    android:title="@string/title_enlarge_fonts_on_large_screens" />
+            </PreferenceScreen>
+
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="force_english"