gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted to use AndroidX support library using Android Studio Refactor tool.

Browse Source
This commit is contained in:
Graham Jones
2022-03-01 23:42:12 +00:00
parent 4b67646eea
commit 938b9c1f29
12 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@@ -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.

7
app/src/main/java/uk/org/openseizuredetector/AuthenticateActivity.java
View File

@@ -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;

7
app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java
View File

@@ -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.

6
app/src/main/java/uk/org/openseizuredetector/EditEventActivity.java
View File

@@ -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;

3
app/src/main/java/uk/org/openseizuredetector/ExportDataActivity.java
View File

@@ -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;

8
app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
View File

@@ -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;

5
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -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;

4
app/src/main/java/uk/org/openseizuredetector/OsdUtil.java
View File

@@ -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;

2
app/src/main/java/uk/org/openseizuredetector/RemoteDbActivity.java
View File

@@ -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;

8
app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java
View File

@@ -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

2
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -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;