androidx transition

app/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'io.fabric.tools:gradle:1.+'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.3'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
 apply plugin: 'com.android.application'
@@ -17,12 +17,16 @@ apply plugin: 'io.fabric'
 apply plugin: 'jacoco-android'
 apply plugin: 'com.jakewharton.butterknife'
 
+jacoco {
+    toolVersion = "0.8.3"
+}
+
 ext {
     supportLibraryVersion = "28.0.0"
     ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
-    butterknifeVersion = "8.8.1"
+    butterknifeVersion = "10.1.0"
 }
 
 
@@ -109,7 +113,7 @@ android {
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
 
         ndk {
@@ -219,14 +223,14 @@ dependencies {
     }
     libs "MilosKozak:danars-support-lib:master@zip"
 
-    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation "com.android.support:support-v13:${supportLibraryVersion}"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:support-v4:${supportLibraryVersion}"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.android.support:cardview-v7:${supportLibraryVersion}"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:recyclerview-v7:${supportLibraryVersion}"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.android.support:gridlayout-v7:${supportLibraryVersion}"
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation "com.android.support:design:${supportLibraryVersion}"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:percent:${supportLibraryVersion}"
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation "com.wdullaer:materialdatetimepicker:2.3.0"
     implementation "com.squareup:otto:1.3.7"
     implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
@@ -239,7 +243,7 @@ dependencies {
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation(name: "android-edittext-validator-v1.3.4-mod", ext: "aar")
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
 
@@ -279,29 +283,29 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-task unzip(type: Copy) {
+//task unzip(type: Copy) {
-    def zipPath = configurations.libs.find { it.name.startsWith("danars") }
+//    def zipPath = configurations.libs.find { it.name.startsWith("danars") }
-    def zipFile = file(zipPath)
+//    def zipFile = file(zipPath)
-    def outputDir = file("${buildDir}/unpacked/dist")
+//    def outputDir = file("${buildDir}/unpacked/dist")
 
-    from zipTree(zipFile)
+//    from zipTree(zipFile)
-    into outputDir
+//    into outputDir
-}
+//}
 
-task copyLibs(dependsOn: unzip, type: Copy) {
+//task copyLibs(dependsOn: unzip, type: Copy) {
-    def src = file("${buildDir}/unpacked/dist/danars-support-lib-master")
+//    def src = file("${buildDir}/unpacked/dist/danars-support-lib-master")
-    def target = file("src/main/jniLibs/")
+//    def target = file("src/main/jniLibs/")
 
-    from src
+//    from src
-    into target
+//    into target
-}
+//}
 
-task full_clean(type: Delete) {
+//task full_clean(type: Delete) {
-    delete file("src/main/jniLibs")
+//    delete file("src/main/jniLibs")
-}
+//}
 
-clean.dependsOn full_clean
+//clean.dependsOn full_clean
-preBuild.dependsOn copyLibs
+//preBuild.dependsOn copyLibs
 
 printf('--------------\n')
 printf('isMaster: %s\n', isMaster().toString())

app/src/main/AndroidManifest.xml

@@ -150,7 +150,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/info/nightscout/androidaps/MainActivity.java

@@ -7,16 +7,16 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.PowerManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.design.widget.NavigationView;
+import com.google.android.material.navigation.NavigationView;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;

app/src/main/java/info/nightscout/androidaps/MainApp.java

@@ -4,9 +4,9 @@ import android.app.Application;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.PluralsRes;
+import androidx.annotation.PluralsRes;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.crashlytics.android.Crashlytics;
 import com.google.firebase.analytics.FirebaseAnalytics;

app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.activities;
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.core.content.res.ResourcesCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.view.Menu;

app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.java

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.MotionEvent;

app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java

@@ -1,11 +1,9 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import javax.annotation.Nonnull;
-
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.Constraint;

app/src/main/java/info/nightscout/androidaps/data/Intervals.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java

@@ -1,10 +1,8 @@
 package info.nightscout.androidaps.data;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
 
-import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.Interval;
 
 /**

app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.interfaces.Interval;
 

app/src/main/java/info/nightscout/androidaps/data/Profile.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.data;
 
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/data/ProfileStore.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.ArrayMap;
+import androidx.collection.ArrayMap;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.db;
 import android.content.Context;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.CloseableIterator;

app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.db;
 
 import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;

app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.db.BgReading;
 

app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 

app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.interfaces;
 
 import android.os.SystemClock;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.interfaces;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.data.ProfileStore;
 

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java

@@ -10,8 +10,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/common/SubscriberFragment.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.common;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.configBuilder;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/DetailedBolusInfoStorage.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.configBuilder;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.squareup.otto.Subscribe;

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java

@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.LinearSmoothScroller;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import java.util.ArrayList;
 import java.util.Date;

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java

@@ -5,8 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/FillDialog.java

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.actions.dialogs;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/NewExtendedBolusDialog.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/NewTempBasalDialog.java

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.actions.dialogs;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.careportal;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.careportal.Dialogs;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.java

@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.food;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteBaseService;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java

@@ -8,9 +8,9 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.java

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.maintenance;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.maintenance;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.maintenance.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java

@@ -7,8 +7,8 @@ import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAckAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAnnouncement.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastCals.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastClearAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastDeviceStatus.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastFood.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastMbgs.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastProfile.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastSgvs.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastStatus.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastTreatment.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastUrgentAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.data;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/receivers/RestartReceiver.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.receivers;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.NotificationManager;
-import android.arch.core.util.Function;
+import androidx.arch.core.util.Function;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -12,14 +12,14 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.core.content.res.ResourcesCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.DisplayMetrics;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java

@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.general.overview.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by adrian on 09/02/17.

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
 import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.notifications;
 import android.app.IntentService;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.general.overview.notifications;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java

@@ -11,8 +11,8 @@ import android.media.AudioAttributes;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import org.slf4j.Logger;

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java

@@ -4,7 +4,7 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java

@@ -10,9 +10,9 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.wear;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.wear;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java

@@ -17,7 +17,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;

app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.insulin;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.utils.DecimalFormatter;
 

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.profile.local;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.profile.local;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.profile.ns;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java

@@ -5,7 +5,7 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java

@@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.pump.combo;
 
 import android.content.DialogInterface;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import org.json.JSONObject;
 import org.slf4j.Logger;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.combo;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java

@@ -7,8 +7,8 @@ import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.common.base.Joiner;
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class WarningOrErrorCode {
     @Nullable

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.LinkedList;

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java

@@ -5,7 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.dialogs;
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java

@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;