From 9706f68be21b87b831178b2146788ee58d10018b Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 5 Jul 2019 00:21:31 +0100 Subject: [PATCH] automation -> jetpack --- app/build.gradle | 2 +- .../general/automation/AutomationFragment.java | 11 ++++++----- .../automation/dialogs/ChooseActionDialog.java | 5 +++-- .../automation/dialogs/ChooseTriggerDialog.java | 11 ++++++----- .../general/automation/dialogs/EditActionDialog.java | 5 +++-- .../general/automation/dialogs/EditEventDialog.java | 11 ++++++----- .../general/automation/dialogs/EditTriggerDialog.java | 5 +++-- .../general/automation/elements/Comparator.java | 3 ++- .../general/automation/elements/ComparatorExists.java | 3 ++- .../general/automation/elements/InputDelta.java | 3 ++- .../plugins/general/automation/triggers/Trigger.java | 4 +++- .../automation/triggers/TriggerAutosensValue.java | 3 ++- .../general/automation/triggers/TriggerBg.java | 3 ++- .../general/automation/triggers/TriggerBolusAgo.java | 6 +++--- .../general/automation/triggers/TriggerCOB.java | 3 ++- .../general/automation/triggers/TriggerConnector.java | 6 ++++-- .../general/automation/triggers/TriggerDelta.java | 5 +++-- .../general/automation/triggers/TriggerIob.java | 3 ++- .../general/automation/triggers/TriggerLocation.java | 3 ++- .../automation/triggers/TriggerProfilePercent.java | 3 ++- .../automation/triggers/TriggerRecurringTime.java | 7 ++++--- .../automation/triggers/TriggerTempTarget.java | 3 ++- .../general/automation/triggers/TriggerTime.java | 3 ++- .../general/automation/triggers/TriggerWifiSsid.java | 3 ++- .../androidaps/services/LocationService.java | 2 +- 25 files changed, 70 insertions(+), 46 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b4f8670b47..bdb698b533 100644 --- a/app/build.gradle +++ b/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" diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.java index 0998d586a6..21a4f58fff 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java index aa154c02a7..b9b12edb52 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.java index 6cf37bbea7..efcb4a08a8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.java +++ b/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 { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.java index ff4718cda8..f6952f817c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java index a0e30f8b13..1fa4b607e1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.java index 844650ba02..6cfe072567 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java index c7fc6e2b1f..334adfcc01 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java index 040f96dff3..2bde0cb842 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java index c035bffe41..9a42f4ef89 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java index 3255ec9d43..f6ba6b6f67 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java index 98c8928dcf..da850b187d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java index 63f35f5b00..f2839593f4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java index 275050ad16..e1792d8bd3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java +++ b/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) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java index 1ded6c4da9..a794851236 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java index 8bcbefdf5c..d4e23e45a3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java index dcf6e187e4..00c3e21921 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java index 9db7b87b7d..eeb33dd4e5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java index 7ae897f907..1ff7572cc1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java index 694ca403c0..2124601e15 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java index 02e38c9b22..a145253b36 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java index 6cb3d60470..bda06ff22f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java index ae0658bdff..261783b99c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java index d768c4379a..cf48770735 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java +++ b/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; diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.java b/app/src/main/java/info/nightscout/androidaps/services/LocationService.java index 814449e710..4cb6f577e8 100644 --- a/app/src/main/java/info/nightscout/androidaps/services/LocationService.java +++ b/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;