diff --git a/app/build.gradle b/app/build.gradle index f2e7efcda6cae5190d9bf0b404850dfd26577158..0da5ebe89c0ea187f6d9e671f22c4c977a59dd8e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,12 @@ buildscript { dependencies { classpath 'io.fabric.tools:gradle:1.21.6' - classpath 'io.realm:realm-gradle-plugin:3.1.2' + classpath 'io.realm:realm-gradle-plugin:3.4.0' classpath 'org.ajoberstar:grgit:1.5.0' } } plugins { - id 'net.researchgate.release' version '2.4.0' + id 'net.researchgate.release' version '2.6.0' } apply plugin: 'com.android.application' diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java index 92c67dc40ba3a6d01e649e022ae972a38f6a0a08..a87d92401e7c4dc1bff7521505dfe7db35c74381 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java +++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java @@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc private void checkForUpdateNow() { new AppUpdater(this) .setUpdateFrom(UpdateFrom.JSON) - .setUpdateXML("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json") + .setUpdateJSON("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json") .showAppUpdated(true) // Show a dialog, even if there isn't an update .start(); } @@ -445,7 +445,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc private void checkForUpdateBackground(int checkEvery) { new AppUpdater(this) .setUpdateFrom(UpdateFrom.JSON) - .setUpdateXML("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json") + .setUpdateJSON("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json") .showEvery(checkEvery) // Only check for an update every `checkEvery` invocations .start(); } @@ -771,7 +771,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc String sgvString; if (pumpStatusData.isCgmActive()) { sgvString = MainActivity.strFormatSGV(pumpStatusData.getSgv()); - ; if (configurationStore.isMmolxl()) { Log.d(TAG, sgvString + " mmol/L"); } else { @@ -782,7 +781,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc } textViewBg.setText(sgvString); - textViewBgTime.setText(DateUtils.getRelativeTimeSpanString(pumpStatusData.getEventDate().getTime())); + textViewBgTime.setText(DateUtils.getRelativeTimeSpanString(pumpStatusData.getSgvDate().getTime())); textViewTrend.setText(MainActivity.renderTrendSymbol(pumpStatusData.getCgmTrend())); textViewIOB.setText(String.format(Locale.getDefault(), "%.2f", pumpStatusData.getActiveInsulin())); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8ed60ee8ad7a7e990026009f04a83bc022016cc3..9810c1ad7339738df8fb7cde34bbd38dbee7c78a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -134,7 +134,6 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> - android:gravity="bottom" <TextView android:id="@+id/textview_log" diff --git a/build.gradle b/build.gradle index 9293e06bf74252a9284ab30257171f36c7a34199..958eeb218133aa2d20df86abbece04f6df2ed49b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } }