diff --git a/app/build.gradle b/app/build.gradle index b951980..dc984bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,11 +31,11 @@ android { } dependencies { - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.0' implementation files('libs/mpandroidchartlibrary-2-0-7.jar') implementation 'com.getpebble:pebblekit:3.1.0@aar' // Unit testing dependencies - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' //implementation 'androidx.appcompat:appcompat:1.4.0' //implementation 'androidx.constraintlayout:constraintlayout:2.1.2' //implementation 'androidx.appcompat:appcompat:1.2.0' @@ -49,8 +49,8 @@ dependencies { testImplementation 'org.mockito:mockito-core:1.10.19' // Set this dependency if you want to use Hamcrest matching testImplementation 'org.hamcrest:hamcrest-library:1.1' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' //compile files('libs/JTransforms-3.1-with-dependencies.jar') implementation 'org.apache.commons:commons-math3:3.6.1' // google play services used for location finding for SMS alerts. diff --git a/app/src/main/java/uk/org/openseizuredetector/AuthenticateActivity.java b/app/src/main/java/uk/org/openseizuredetector/AuthenticateActivity.java index 57c5793..e5204a4 100644 --- a/app/src/main/java/uk/org/openseizuredetector/AuthenticateActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/AuthenticateActivity.java @@ -1,12 +1,11 @@ package uk.org.openseizuredetector; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; @@ -16,13 +15,9 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.ArrayList; -import java.util.HashMap; - public class AuthenticateActivity extends AppCompatActivity { private String TAG = "AuthenticateActivity"; private EditText mUnameEt; diff --git a/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java b/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java index 18deb89..518b018 100644 --- a/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java @@ -33,15 +33,14 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.ListView; @@ -50,7 +49,7 @@ import android.widget.Toast; import java.util.ArrayList; -import static android.support.v4.content.PermissionChecker.PERMISSION_GRANTED; +import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED; /** * Activity for scanning and displaying available Bluetooth LE devices. diff --git a/app/src/main/java/uk/org/openseizuredetector/EditEventActivity.java b/app/src/main/java/uk/org/openseizuredetector/EditEventActivity.java index 07e042d..74ecfbf 100644 --- a/app/src/main/java/uk/org/openseizuredetector/EditEventActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/EditEventActivity.java @@ -3,13 +3,10 @@ package uk.org.openseizuredetector; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; import android.widget.Button; -import android.widget.ListView; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; @@ -18,7 +15,6 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java b/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java index c64e459..d8b82fe 100644 --- a/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java @@ -2,9 +2,8 @@ package uk.org.openseizuredetector; import android.app.DatePickerDialog; import android.app.TimePickerDialog; -import android.content.Context; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java index cbd631e..e10ed0c 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java @@ -7,14 +7,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; -import android.net.Uri; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.IBinder; -import android.support.v4.view.MenuCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.core.view.MenuCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -40,7 +39,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 281f2e5..0097c34 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -32,14 +32,13 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.preference.PreferenceManager; -import android.support.v4.view.MenuCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.view.MenuCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java index 850703a..ddbe0b8 100644 --- a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java +++ b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java @@ -45,8 +45,8 @@ import android.os.Build; import android.os.Environment; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.text.format.Time; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/uk/org/openseizuredetector/RemoteDbActivity.java b/app/src/main/java/uk/org/openseizuredetector/RemoteDbActivity.java index a05712d..0060bbc 100644 --- a/app/src/main/java/uk/org/openseizuredetector/RemoteDbActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/RemoteDbActivity.java @@ -9,7 +9,7 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.webkit.WebSettings; diff --git a/app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java b/app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java index 29ddce1..c87e22a 100644 --- a/app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java @@ -5,23 +5,19 @@ package uk.org.openseizuredetector; import android.app.DatePickerDialog; import android.app.TimePickerDialog; import android.content.Context; -import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; -import android.system.Os; +import androidx.appcompat.app.AppCompatActivity; + import android.util.Log; import android.view.View; -import android.webkit.WebSettings; -import android.webkit.WebView; import android.widget.Button; import android.widget.DatePicker; import android.widget.TextView; import android.widget.TimePicker; import java.util.Calendar; -import java.util.HashMap; /** * ReportSeizureActivity - Allows the user to report a seizure manually, which is saved in the database for diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java index 9f473ca..256209e 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java @@ -58,7 +58,7 @@ import android.os.IBinder; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.preference.PreferenceManager; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.telephony.SmsManager; import android.util.Log; diff --git a/gradle.properties b/gradle.properties index 3544b85..658fe90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ +android.enableJetifier=true android.useAndroidX = true \ No newline at end of file