Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

6

600SeriesAndroidUploader
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

88b21396

Commit 88b21396 authored 8 years ago by Volker Richert

Downloads
- Plain Diff

Merge branch 'feature/android_graphview' into develop

parents 547d9c2d 4b9e9205

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
app/build.gradle 1 addition, 2 deletions

app/build.gradle
app/src/main/java/info/nightscout/android/medtronic/MainActivity.java 167 additions, 216 deletions

.../java/info/nightscout/android/medtronic/MainActivity.java
app/src/main/java/info/nightscout/android/model/medtronicNg/PumpStatusEvent.java 0 additions, 2 deletions

...nightscout/android/model/medtronicNg/PumpStatusEvent.java
app/src/main/java/info/nightscout/android/settings/SettingsFragment.java 1 addition, 2 deletions

...va/info/nightscout/android/settings/SettingsFragment.java
app/src/main/res/layout/activity_main.xml 3 additions, 4 deletions

app/src/main/res/layout/activity_main.xml
app/src/main/res/values/arrays.xml 16 additions, 0 deletions

app/src/main/res/values/arrays.xml
app/src/main/res/values/strings.xml 1 addition, 0 deletions

app/src/main/res/values/strings.xml
app/src/main/res/xml/preferences.xml 9 additions, 0 deletions

app/src/main/res/xml/preferences.xml

with 199 additions and 226 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment