automation -> jetpack

app/build.gradle

@@ -252,7 +252,7 @@ dependencies {
     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'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation("com.google.android:flexbox:0.3.0") {
         exclude group: "com.android.support"

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.java

@@ -3,11 +3,6 @@ package info.nightscout.androidaps.plugins.general.automation;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +15,12 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
 import java.util.HashSet;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java

@@ -1,14 +1,15 @@
 package info.nightscout.androidaps.plugins.general.automation.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.java

@@ -1,14 +1,15 @@
 package info.nightscout.androidaps.plugins.general.automation.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,9 +19,11 @@ import butterknife.OnClick;
 import butterknife.Unbinder;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerAutosensValue;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta;
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBolusAgo;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCOB;
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerIob;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerLocation;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent;
@@ -28,8 +31,6 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerRec
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTempTarget;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTime;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerWifiSsid;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerAutosensValue;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBolusAgo;
 
 public class ChooseTriggerDialog extends DialogFragment {
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.java

@@ -1,14 +1,15 @@
 package info.nightscout.androidaps.plugins.general.automation.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java

@@ -2,17 +2,18 @@ package info.nightscout.androidaps.plugins.general.automation.dialogs;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputEditText;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textfield.TextInputEditText;
 import com.squareup.otto.Subscribe;
 
 import butterknife.BindView;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.java

@@ -1,13 +1,14 @@
 package info.nightscout.androidaps.plugins.general.automation.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.support.annotation.StringRes;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
+import androidx.annotation.StringRes;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.support.annotation.StringRes;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
+import androidx.annotation.StringRes;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java

@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.support.annotation.StringRes;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
@@ -10,6 +9,8 @@ import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
+import androidx.annotation.StringRes;
+
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java

@@ -1,12 +1,14 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java

@@ -1,9 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;
@@ -11,7 +12,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.Date;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -68,7 +68,7 @@ public class TriggerBolusAgo extends Trigger {
 
         double minutesAgo = (double) (DateUtil.now() - lastBolusTime) / (60 * 1000);
         if (L.isEnabled(L.AUTOMATION))
-            log.debug("LastBolus min ago: "+minutesAgo);
+            log.debug("LastBolus min ago: " + minutesAgo);
 
         boolean doRun = comparator.getValue().check((minutesAgo), getValue());
         if (doRun) {

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java

@@ -1,9 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.annotation.StringRes;
+
-import android.support.v4.app.FragmentManager;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONArray;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java

@@ -1,9 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;
@@ -21,10 +22,10 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta;
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType;
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.JsonHelper;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java

@@ -1,9 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 import android.location.Location;
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java

@@ -2,14 +2,15 @@ package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 import android.app.Activity;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
+
 import com.dpro.widgets.WeekdaysPicker;
 import com.google.common.base.Optional;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java

@@ -2,12 +2,13 @@ package info.nightscout.androidaps.plugins.general.automation.triggers;
 
 import android.app.Activity;
 import android.graphics.Typeface;
-import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers;
 
-import android.support.v4.app.FragmentManager;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.FragmentManager;
+
 import com.google.common.base.Optional;
 
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/services/LocationService.java

@@ -8,7 +8,7 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;