Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

G7 Classic Status page cleanup #3246

Merged
merged 7 commits into from
Mar 27, 2024
Merged

G7 Classic Status page cleanup #3246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ab3d36
G7 C_Status cleanup
Navid200 Dec 18, 2023
0fb3aa3
Merge branch 'NightscoutFoundation:master' into Navid_2023_12_18
Navid200 Dec 23, 2023
0c462fc
Use public shortTxId
Navid200 Dec 23, 2023
ffbdba5
Syntax
Navid200 Jan 5, 2024
7d0383c
Unknowns
Navid200 Jan 5, 2024
0547806
Merge branch 'NightscoutFoundation:master' into Navid_2023_12_18
Navid200 Feb 21, 2024
df8cd1c
Cleanup
Navid200 Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ public interface MicroStatus {

boolean xmitterBattery();


}
7 changes: 5 additions & 2 deletions app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatusImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* Created by jamorham on 29/09/2017.
*/

import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;

import androidx.databinding.BaseObservable;

import com.eveningoutpost.dexdrip.utils.DexCollectionType;
Expand All @@ -28,12 +30,13 @@ public String gs(String id) {
}

@Override
public boolean bluetooth() {
return DexCollectionType.hasBluetooth();
public boolean bluetooth() { // Dexcom with Bluetooth except G7
return DexCollectionType.hasBluetooth() && !getBestCollectorHardwareName().equals("G7");
}

@Override
public boolean xmitterBattery() {
return DexCollectionType.usesClassicTransmitterBattery();
}

}
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_system_status.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@

<Button
android:id="@+id/forget_device"
app:showIfTrue="@{ms.bluetooth()}"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
Loading