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

NightscoutFoundation · Jun 1, 2024 · a6fdfc4 · a6fdfc4
2 parents b02bb4d + 00bdee1
commit a6fdfc4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/app/src/main/res/layout/activity_snooze.xml b/app/src/main/res/layout/activity_snooze.xml
@@ -20,8 +20,7 @@
                 android:showDividers="middle">
                 <LinearLayout
                     android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight=".2"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:gravity="center_horizontal">
                     <Button
@@ -34,8 +33,7 @@
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:gravity="center_horizontal">
 
@@ -48,8 +46,7 @@
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:gravity="center_horizontal"
                     android:paddingTop="10dp">

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -6,7 +6,7 @@
         <item>Wifi Wixel / Parakeet</item>
         <item>Wifi Wixel + BT Wixel</item>
         <item>Wifi Wixel + xBridge Wixel</item>
-        <item>G5/G6/G7/1 Transmitter</item>
+        <item>G6/G7/1/1+ Transmitter</item>
         <item>Libre Bluetooth</item>
         <item>Libre Bluetooth + wifi</item>
         <item>Libre wifi</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -629,7 +629,7 @@
     <string name="turn_bluetooth_on">Turn Bluetooth on</string>
     <string name="reset_bluetooth">Reset Bluetooth by turning it off and on if we don\'t get anything in 20 minutes</string>
     <string name="bluetooth_watchdog">Bluetooth Watchdog</string>
-    <string name="reset_bluetooth_g5">Reset Bluetooth by turning it off and on as a way to keep the G5 data source working. Without this the G5 collector may fail.</string>
+    <string name="reset_bluetooth_g5">Reset Bluetooth by turning it off and on as a way to keep the data source working. Without this the collector may fail.</string>
     <string name="g5_bluetooth_watchdog">Dex Bluetooth Watchdog</string>
     <string name="close_gatt">If the Bluetooth watchdog activates often then you can try unchecking this option to see if it helps</string>
     <string name="older_bluetooth_wakelocks">Older Bluetooth wakelocks which can drain extra battery but might be needed for Bluetooth reception</string>
@@ -685,7 +685,7 @@
     <string name="show_total_insulin">Show treatment insulin total</string>
     <string name="total_insulin">Total Insulin</string>
     <string name="received_readings_percentage">Percentage of sensor readings received</string>
-    <string name="received_realtime_readings_percentage">Percentage of sensor readings received in realtime (non-backfilled). G5 Native mode ONLY</string>
+    <string name="received_realtime_readings_percentage">Percentage of sensor readings received in realtime (non-backfilled). Dex Native mode ONLY</string>
     <string name="capture_percentage">Packet capture percentage</string>
     <string name="realtime_capture_percentage">Realtime packet capture percentage</string>
     <string name="show_calibration_accuracy">Show calibration accuracy evaluation from last 3 days</string>
@@ -727,11 +727,11 @@
     <string name="low_level_value">Low level diagnostic/prototype value</string>
     <string name="transmitter_id">ID of your Dexcom Transmitter, e.g. 12AB3</string>
     <string name="advanced_g5_settings">Advanced Dexcom settings for rare situations</string>
-    <string name="g5_debug_settings">G5/G6/G7/Dex1 Debug Settings</string>
+    <string name="g5_debug_settings">Dex Debug Settings</string>
     <string name="g5_scan_constantly">Some devices work better when scanning constantly, others do not. If reading is reliable when this setting is not selected, you should have improved battery life. Normally best to keep this disabled</string>
-    <string name="scan_for_g5_constantly">Scan for G5 constantly</string>
+    <string name="scan_for_g5_constantly">Scan constantly</string>
     <string name="g5_force_ui_thread">This is crucial for some Android devices to properly connect, but can cause missed readings when other UI intensive activities are in use.</string>
-    <string name="force_g5_ui_thread">Force G5 to UI Thread</string>
+    <string name="force_g5_ui_thread">Force Dex to UI Thread</string>
     <string name="authentificate_before_reading">Authenticate before each read</string>
     <string name="g5_full_authentification">This will attempt a full authentication each read attempt. Needed for newer G5 transmitter firmware versions.</string>
     <string name="unbond_g5_before_read">Unbond G5 before each read</string>
@@ -1215,12 +1215,12 @@
     <string name="summary_send_bridge_battery_to_nightscout">Send your bridge battery level to Nightscout. Uncheck if your battery sensor is broken.</string>
     <string name="title_send_bridge_battery_to_nightscout">Upload bridge battery</string>
     <string name="summary_send_dexcom_transmitter_battery_to_nightscout">Send Dexcom transmitter battery statistics to Nightscout. Includes all of the data shown on the Collector Status screen.</string>
-    <string name="title_send_dexcom_transmitter_battery_to_nightscout">Upload OB1G5/G6/G7/1 transmitter battery</string>
+    <string name="title_send_dexcom_transmitter_battery_to_nightscout">Upload Dexcom battery</string>
     <string name="summary_send_treatments_to_nightscout">Send treatment data to Nightscout. Uncheck if your careportal is broken.</string>
     <string name="title_send_treatments_to_nightscout">Upload treatments</string>
     <string name="summary_warn_nightscout_failures">Display and sound a notification if Nightscout upload is failing.</string>
     <string name="title_warn_nightscout_failures">Alert on failures</string>
-    <string name="summary_nightscout_device_append_source_info">For G5, sends collector type (e.g. OB1) and reading backfill status (for native) to Nightscout.</string>
+    <string name="summary_nightscout_device_append_source_info">For Dex, sends collector type (e.g. OB1) and reading backfill status (for native) to Nightscout.</string>
     <string name="title_nightscout_device_append_source_info">Append source info to device name</string>
     <string name="summary_tap_to_send_historical_data">Tap to send historical data to Nightscout</string>
     <string name="title_back_fill_data">Back-fill data</string>
@@ -1368,7 +1368,7 @@
     <string name="summary_clfollow_download_meals">Download meals from CareLink</string>
     <string name="title_clfollow_download_notifications">Notifications</string>
     <string name="summary_clfollow_download_notifications">Download notifications from CareLink</string>
-    <string name="title_ob1_options">OB1 G5/G6/G7 Collector Settings</string>
+    <string name="title_ob1_options">OB1 Dex Collector Settings</string>
     <string name="summary_use_ob1_g5_collector_service">Complete re-write, should work on Android 4.4 - 9, supports native mode and more</string>
     <string name="title_use_ob1_g5_collector_service">Use the OB1 Collector</string>
     <string name="summary_ob1_g5_use_transmitter_alg">Use the transmitter\'s internal algorithm to calculate glucose values when possible.</string>
@@ -1383,14 +1383,14 @@
     <string name="title_ob1_g5_fallback_to_xdrip">Fallback to xDrip</string>
     <string name="summary_ob1_minimize_scanning">Use heuristics to minimize Bluetooth scanning + save power</string>
     <string name="title_ob1_minimize_scanning">Minimize Scanning</string>
-    <string name="summary_using_g6">I am using a G6, G7 or Dexcom 1 Sensor</string>
-    <string name="title_using_g6">G6/G7/Dex1 Support</string>
+    <string name="summary_using_g6">I am using a G6, G7, Dexcom 1 or One+ Sensor</string>
+    <string name="title_using_g6">G6/G7/Dex1/One+ Support</string>
     <string name="summary_ob1_g5_allow_resetbond">OB1 collector can unbond if it thinks the encryption has failed. If you get problems with it unpairing then disable this option. If you then totally lose connection, make sure this is enabled.</string>
     <string name="title_ob1_g5_allow_resetbond">Allow OB1 unbonding</string>
     <string name="summary_ob1_initiate_bonding_flag">OB1 collector can initiate bonding.</string>
     <string name="title_ob1_initiate_bonding_flag">Allow OB1 initiate bonding</string>
-    <string name="title_old_g5_options">Old G5 Collector Settings</string>
-    <string name="title_g5g6_battery_options">G5/G6/Dex1 battery options</string>
+    <string name="title_old_g5_options">Old Dex Collector Settings</string>
+    <string name="title_g5g6_battery_options">G6/Dex1 battery options</string>
     <string name="title_g5_battery_warning_level">Adjust battery warning level</string>
     <string name="title_plugins_and_features">Plugins and Features</string>
     <string name="title_color_heart_rate1">Heart rate monitor</string>