Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Target Pie & AS3.3/tools - updated libs, migrate to androidx + appcompat
fattiredf601f5736b7
diff --git a/build.gradle b/build.gradleindex 9ce378c..93d7c01 100644--- a/build.gradle+++ b/build.gradle@@ -4,8 +4,7 @@ buildscript {jcenter()}dependencies {- classpath 'com.android.tools.build:gradle:3.3.0-alpha03'-+ classpath 'com.android.tools.build:gradle:3.3.0-alpha12'}}@@ -36,20 +35,17 @@ allprojects {// these are common variables used in */build.gradleversion_number = getVersionName()group_info = "haven"- signal_version = "2.3.0"- buildToolsVersion = "27.0.3"- compileSdkVersion = 27+ buildToolsVersion = "28.0.3"minSdkVersion = 16- targetSdkVersion = 27- appcompat = 'com.android.support:appcompat-v7:27.1.1'+ targetSdkVersion = 28}}android {- compileSdkVersion 27- buildToolsVersion '27.0.3'+ compileSdkVersion 28+ buildToolsVersion = '28.0.3'packagingOptions {exclude 'META-INF/LICENSE.txt'@@ -73,7 +69,7 @@ android {versionName getVersionName()archivesBaseName = "Haven-$versionName"minSdkVersion 16- targetSdkVersion 27+ targetSdkVersion 28compileOptions {sourceCompatibility JavaVersion.VERSION_1_8targetCompatibility JavaVersion.VERSION_1_8@@ -107,30 +103,31 @@ android {}dependencies {- implementation 'com.android.support:support-v4:27.1.1'- implementation 'com.android.support:appcompat-v7:27.1.1'- implementation 'com.android.support:design:27.1.1'- implementation 'com.android.support:cardview-v7:27.1.1'- implementation 'com.android.support.constraint:constraint-layout:1.1.2'+ implementation 'androidx.appcompat:appcompat:1.0.0'+ implementation 'androidx.cardview:cardview:1.0.0'+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'+ implementation 'androidx.preference:preference:1.0.0'+ implementation 'androidx.multidex:multidex:2.0.0'+ implementation 'androidx.annotation:annotation:1.0.0'+ implementation 'com.google.android.material:material:1.0.0-rc02'+ implementation 'com.wdullaer:materialdatetimepicker:3.6.4'implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'implementation 'com.github.satyan:sugar:1.5'implementation 'net.the4thdimension:audio-wife:1.0.3'- implementation 'com.github.apl-devs:appintro:v4.2.3'- implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'- implementation 'com.nanohttpd:nanohttpd-webserver:2.2.0'+ implementation 'com.github.apl-devs:appintro:master' /* use master until androidx ver is released */+ implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1'+ implementation 'org.nanohttpd:nanohttpd-webserver:2.3.1'implementation 'me.angrybyte.picker:picker:1.3.1'implementation 'com.github.stfalcon:frescoimageviewer:0.5.0'- implementation 'com.facebook.fresco:fresco:1.9.0'+ implementation 'com.facebook.fresco:fresco:1.10.0'implementation 'com.github.derlio.waveform:library:1.0.3@aar'implementation 'org.firezenk:audiowaves:1.1@aar'implementation 'com.maxproj.simplewaveform:app:1.0.0'- implementation 'com.takisoft.fix:preference-v7:27.1.0.0'- implementation 'com.wdullaer:materialdatetimepicker:3.5.2'- implementation 'com.googlecode.libphonenumber:libphonenumber:8.8.10'- implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {+ implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.14'+ implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {transitive = true}- implementation 'com.asksira.android:cameraviewplus:0.9.4'+ implementation 'com.asksira.android:cameraviewplus:0.9.5'implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'implementation 'io.github.silvaren:easyrs:0.5.3'implementation 'org.jcodec:jcodec:0.2.3'diff --git a/gradle.properties b/gradle.propertiesnew file mode 100644index 0000000..cb0bf91--- /dev/null+++ b/gradle.properties@@ -0,0 +1,5 @@++android.enableJetifier=true+android.useAndroidX=true+android.enableR8=true+android.enableD8=truediff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xmlindex f8a36e6..4b70a04 100644--- a/src/main/AndroidManifest.xml+++ b/src/main/AndroidManifest.xml@@ -8,6 +8,7 @@<uses-permission android:name="android.permission.RECORD_AUDIO" /><uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.SEND_SMS" />+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /><uses-featureandroid:name="android.hardware.camera"@@ -120,7 +121,7 @@</receiver><provider- android:name="android.support.v4.content.FileProvider"+ android:name="androidx.core.content.FileProvider"android:authorities="org.havenapp.main.fileprovider"android:grantUriPermissions="true"android:exported="false">diff --git a/src/main/java/org/havenapp/main/HavenApp.java b/src/main/java/org/havenapp/main/HavenApp.javaindex 439c097..ccaf214 100644--- a/src/main/java/org/havenapp/main/HavenApp.java+++ b/src/main/java/org/havenapp/main/HavenApp.java@@ -17,9 +17,6 @@package org.havenapp.main;-import android.support.multidex.MultiDexApplication;-import android.support.v7.app.AppCompatDelegate;-import android.text.TextUtils;import android.util.Log;import com.facebook.drawee.backends.pipeline.Fresco;@@ -29,10 +26,12 @@ import com.orm.SchemaGenerator;import com.orm.SugarContext;import com.orm.SugarDb;+import org.havenapp.main.service.WebServer;+import java.io.IOException;-import org.havenapp.main.service.SignalSender;-import org.havenapp.main.service.WebServer;+import androidx.appcompat.app.AppCompatDelegate;+import androidx.multidex.MultiDexApplication;public class HavenApp extends MultiDexApplication {diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 0552150..64ac80d 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -26,15 +26,6 @@ import android.graphics.drawable.Drawable;import android.os.Build;import android.os.Bundle;import android.os.Handler;-import android.support.design.widget.FloatingActionButton;-import android.support.design.widget.Snackbar;-import android.support.v4.content.ContextCompat;-import android.support.v4.graphics.drawable.DrawableCompat;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.LinearLayoutManager;-import android.support.v7.widget.RecyclerView;-import android.support.v7.widget.Toolbar;-import android.support.v7.widget.helper.ItemTouchHelper;import android.telephony.SmsManager;import android.text.TextUtils;import android.util.Log;@@ -42,6 +33,8 @@ import android.view.Menu;import android.view.MenuItem;import android.view.View;+import com.google.android.material.floatingactionbutton.FloatingActionButton;+import com.google.android.material.snackbar.Snackbar;import com.mikepenz.aboutlibraries.Libs;import com.mikepenz.aboutlibraries.LibsBuilder;@@ -57,6 +50,15 @@ import java.util.Date;import java.util.List;import java.util.StringTokenizer;+import androidx.annotation.NonNull;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;+import androidx.core.content.ContextCompat;+import androidx.core.graphics.drawable.DrawableCompat;+import androidx.recyclerview.widget.ItemTouchHelper;+import androidx.recyclerview.widget.LinearLayoutManager;+import androidx.recyclerview.widget.RecyclerView;+public class ListActivity extends AppCompatActivity {private RecyclerView recyclerView;@@ -94,7 +96,7 @@ public class ListActivity extends AppCompatActivity {ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {@Override- public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {+ public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {return false;}diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 84c4cb9..3884979 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -25,9 +25,6 @@ import android.os.Build;import android.os.Bundle;import android.os.CountDownTimer;import android.os.Environment;-import android.support.v4.app.ActivityCompat;-import android.support.v4.content.ContextCompat;-import android.support.v7.app.AppCompatActivity;import android.util.Log;import android.view.View;import android.view.WindowManager;@@ -46,6 +43,10 @@ import java.io.File;import java.io.FileOutputStream;import java.io.IOException;+import androidx.appcompat.app.AppCompatActivity;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import static org.havenapp.main.Utils.getTimerText;public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex d603013..2f3edf2 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -19,7 +19,6 @@package org.havenapp.main;-import android.app.Activity;import android.content.Context;import android.content.SharedPreferences;import android.content.SharedPreferences.Editor;@@ -29,6 +28,8 @@ import org.havenapp.main.sensors.motion.LuminanceMotionDetector;import java.io.File;import java.util.Date;+import androidx.appcompat.app.AppCompatActivity;+public class PreferenceManager {@@ -98,7 +99,7 @@ public class PreferenceManager {public PreferenceManager(Context context) {this.context = context;- this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, Activity.MODE_PRIVATE);+ this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, AppCompatActivity.MODE_PRIVATE);this.prefsEditor = appSharedPrefs.edit();}diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javaindex 4f560bc..554bb55 100644--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -20,14 +20,9 @@ package org.havenapp.main;import android.content.Intent;import android.os.Bundle;-import android.support.annotation.NonNull;-import android.support.v7.app.AppCompatActivity;import android.view.View;--import java.io.File;-import java.util.ArrayList;--import info.guardianproject.netcipher.proxy.OrbotHelper;+import androidx.annotation.NonNull;+import androidx.appcompat.app.AppCompatActivity;public class SettingsActivity extends AppCompatActivity {diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex 2c43a0e..eb4afbe 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -16,14 +16,6 @@ import android.os.Bundle;import android.os.Environment;import android.os.PowerManager;import android.provider.Settings;-import android.support.annotation.NonNull;-import android.support.v14.preference.SwitchPreference;-import android.support.v4.app.ActivityCompat;-import android.support.v4.content.ContextCompat;-import android.support.v7.preference.EditTextPreference;-import android.support.v7.preference.ListPreference;-import android.support.v7.preference.Preference;-import android.support.v7.preference.SwitchPreferenceCompat;import android.text.TextUtils;import android.view.MenuItem;import android.view.View;@@ -31,7 +23,6 @@ import android.widget.Switch;import android.widget.Toast;import com.google.i18n.phonenumbers.PhoneNumberUtil;-import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;import org.havenapp.main.service.SignalSender;@@ -43,8 +34,19 @@ import org.havenapp.main.ui.MicrophoneConfigureActivity;import java.io.File;import java.util.Locale;+import androidx.annotation.NonNull;+import androidx.appcompat.app.AppCompatActivity;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import androidx.preference.EditTextPreference;+import androidx.preference.ListPreference;+import androidx.preference.Preference;+import androidx.preference.PreferenceFragmentCompat;+import androidx.preference.SwitchPreference;+import androidx.preference.SwitchPreferenceCompat;import info.guardianproject.netcipher.proxy.OrbotHelper;+public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, TimePickerDialog.OnTimeSetListener {private PreferenceManager preferences;@@ -52,9 +54,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedprivate AppCompatActivity mActivity;@Override- public void onCreatePreferencesFix(Bundle bundle, String s) {+ public void onCreatePreferences(Bundle bundle, String s) {addPreferencesFromResource(R.xml.settings);- mActivity = getActivity();+ mActivity = (AppCompatActivity) getActivity();preferences = new PreferenceManager(mActivity);setHasOptionsMenu(true);app = (HavenApp) mActivity.getApplication();@@ -239,7 +241,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedpreferences.activateHeartbeat(heartbeatMonitorActive);- mActivity.setResult(Activity.RESULT_OK);+ mActivity.setResult(AppCompatActivity.RESULT_OK);mActivity.finish();}diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javaindex c6415e7..74ccba0 100644--- a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java@@ -1,6 +1,5 @@package org.havenapp.main.sensors;-import android.app.Activity;import android.content.ComponentName;import android.content.Context;import android.content.Intent;@@ -13,13 +12,14 @@ import android.os.IBinder;import android.os.Message;import android.os.Messenger;import android.os.RemoteException;-import android.util.FloatMath;import android.util.Log;import org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;+import androidx.appcompat.app.AppCompatActivity;+/*** Created by n8fr8 on 3/10/17.*/@@ -86,7 +86,7 @@ public class AccelerometerMonitor implements SensorEventListener {context.bindService(new Intent(context,MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);- sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ sensorMgr = (SensorManager) context.getSystemService(AppCompatActivity.SENSOR_SERVICE);accelerometer = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);if (accelerometer == null) {diff --git a/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.javaindex 88abda0..c521361 100644--- a/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java@@ -1,6 +1,5 @@package org.havenapp.main.sensors;-import android.app.Activity;import android.content.ComponentName;import android.content.Context;import android.content.Intent;@@ -19,6 +18,8 @@ import org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;+import androidx.appcompat.app.AppCompatActivity;+/*** Created by n8fr8 on 3/10/17.*/@@ -65,7 +66,7 @@ public class AmbientLightMonitor implements SensorEventListener {context.bindService(new Intent(context,MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);- sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ sensorMgr = (SensorManager) context.getSystemService(AppCompatActivity.SENSOR_SERVICE);//noinspection RedundantCastsensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_LIGHT);diff --git a/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.javaindex 2d66442..1c5f5bc 100644--- a/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java@@ -1,6 +1,5 @@package org.havenapp.main.sensors;-import android.app.Activity;import android.content.ComponentName;import android.content.Context;import android.content.Intent;@@ -19,6 +18,8 @@ import org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;+import androidx.appcompat.app.AppCompatActivity;+/*** Created by n8fr8 on 3/10/17.*/@@ -71,7 +72,7 @@ public class BarometerMonitor implements SensorEventListener {context.bindService(new Intent(context,MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);- sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ sensorMgr = (SensorManager) context.getSystemService(AppCompatActivity.SENSOR_SERVICE);sensor = sensorMgr.getDefaultSensor(Sensor.TYPE_PRESSURE);if (sensor == null) {diff --git a/src/main/java/org/havenapp/main/sensors/BumpMonitor.java b/src/main/java/org/havenapp/main/sensors/BumpMonitor.javaindex 8938eb8..991c249 100644--- a/src/main/java/org/havenapp/main/sensors/BumpMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/BumpMonitor.java@@ -1,7 +1,6 @@package org.havenapp.main.sensors;import android.annotation.TargetApi;-import android.app.Activity;import android.content.ComponentName;import android.content.Context;import android.content.Intent;@@ -19,6 +18,8 @@ import android.util.Log;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;+import androidx.appcompat.app.AppCompatActivity;+/*** Use the Significant Motion trigger sensor on API 18+*@@ -49,7 +50,7 @@ public class BumpMonitor {context.bindService(new Intent(context,MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);- sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ sensorMgr = (SensorManager) context.getSystemService(AppCompatActivity.SENSOR_SERVICE);bumpSensor = sensorMgr.getDefaultSensor(Sensor.TYPE_SIGNIFICANT_MOTION);if (bumpSensor == null) {diff --git a/src/main/java/org/havenapp/main/sensors/media/VideoEncoder.java b/src/main/java/org/havenapp/main/sensors/media/VideoEncoder.javaindex b88854c..75aefbf 100644--- a/src/main/java/org/havenapp/main/sensors/media/VideoEncoder.java+++ b/src/main/java/org/havenapp/main/sensors/media/VideoEncoder.java@@ -8,7 +8,6 @@ import android.media.MediaCodecList;import android.media.MediaFormat;import android.media.MediaMuxer;import android.os.Build;-import android.support.annotation.RequiresApi;import android.util.Log;import java.io.File;@@ -17,6 +16,9 @@ import java.nio.ByteBuffer;import java.util.ArrayList;import java.util.Arrays;+import androidx.annotation.RequiresApi;++/*** Generates a series of video frames, encodes them, decodes them, and tests for* significant divergence from the original.diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.javaindex 9b49af3..ea35105 100644--- a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java@@ -16,14 +16,12 @@ import android.content.Intent;import android.content.ServiceConnection;import android.graphics.Bitmap;import android.graphics.Matrix;-import android.hardware.Camera;import android.os.Environment;import android.os.Handler;import android.os.IBinder;import android.os.Message;import android.os.Messenger;import android.os.RemoteException;-import android.support.v8.renderscript.RenderScript;import android.util.Log;import android.view.Surface;@@ -45,6 +43,8 @@ import java.util.concurrent.LinkedBlockingQueue;import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;+import androidx.renderscript.RenderScript;+import io.github.silvaren.easyrs.tools.Nv21Image;public class CameraViewHolder {diff --git a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.javaindex d047751..0fdac73 100644--- a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java+++ b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java@@ -8,26 +8,18 @@ package org.havenapp.main.sensors.motion;import android.graphics.Bitmap;-import android.graphics.BitmapFactory;import android.graphics.Color;-import android.graphics.ImageFormat;import android.graphics.Matrix;-import android.graphics.Rect;-import android.graphics.YuvImage;import android.os.Handler;-import android.support.v8.renderscript.RenderScript;-import android.util.Log;import com.google.android.cameraview.CameraView;import org.havenapp.main.sensors.media.ImageCodec;-import org.havenapp.main.sensors.motion.IMotionDetector;-import org.havenapp.main.sensors.motion.LuminanceMotionDetector;-import java.io.ByteArrayOutputStream;import java.util.ArrayList;import java.util.List;+import androidx.renderscript.RenderScript;import io.github.silvaren.easyrs.tools.Nv21Image;/**diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex e8dd975..2542bbd 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -23,7 +23,6 @@ import android.os.IBinder;import android.os.Message;import android.os.Messenger;import android.os.PowerManager;-import android.support.v4.app.NotificationCompat;import android.telephony.SmsManager;import android.text.TextUtils;@@ -43,6 +42,8 @@ import java.util.ArrayList;import java.util.Date;import java.util.StringTokenizer;+import androidx.core.app.NotificationCompat;+@SuppressLint("HandlerLeak")public class MonitorService extends Service {@@ -146,7 +147,7 @@ public class MonitorService extends Service {PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);wakeLock = powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK,- "MyWakelockTag");+ "haven:MyWakelockTag");wakeLock.acquire();}diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.javaindex ae6efb4..5f94376 100644--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java@@ -1,6 +1,5 @@package org.havenapp.main.ui;-import android.app.Activity;import android.graphics.Canvas;import android.graphics.Color;import android.graphics.Paint;@@ -10,12 +9,7 @@ import android.hardware.SensorEvent;import android.hardware.SensorEventListener;import android.hardware.SensorManager;import android.os.Bundle;-import android.os.Message;-import android.os.RemoteException;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.Toolbar;import android.util.Log;-import android.view.Menu;import android.view.MenuItem;import android.widget.TextView;@@ -23,11 +17,11 @@ import com.maxproj.simplewaveform.SimpleWaveform;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;-import org.havenapp.main.model.EventTrigger;import java.util.LinkedList;-import me.angrybyte.numberpicker.listener.OnValueChangeListener;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;import me.angrybyte.numberpicker.view.ActualNumberPicker;public class AccelConfigureActivity extends AppCompatActivity implements SensorEventListener {@@ -185,7 +179,7 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorEtry {- SensorManager sensorMgr = (SensorManager) getSystemService(Activity.SENSOR_SERVICE);+ SensorManager sensorMgr = (SensorManager) getSystemService(AppCompatActivity.SENSOR_SERVICE);Sensor sensor = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);if (sensor == null) {diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.javaindex 15cacfb..9e40c51 100644--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java@@ -19,10 +19,10 @@ package org.havenapp.main.ui;import android.Manifest;import android.content.pm.PackageManager;import android.os.Bundle;-import android.support.v4.app.ActivityCompat;-import android.support.v4.content.ContextCompat;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.Toolbar;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;import android.view.MenuItem;import android.view.View;import android.widget.SeekBar;diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex 7d98350..90698b8 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -8,10 +8,8 @@*/package org.havenapp.main.ui;-import android.os.Bundle;-import android.support.v4.app.Fragment;import android.hardware.SensorEvent;-import android.support.v7.preference.PreferenceFragmentCompat;+import android.os.Bundle;import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;@@ -24,6 +22,8 @@ import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;import org.havenapp.main.sensors.motion.CameraViewHolder;+import androidx.fragment.app.Fragment;+public final class CameraFragment extends Fragment {private CameraViewHolder cameraViewHolder;diff --git a/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.javaindex 9915ef8..49161cf 100644--- a/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java@@ -6,8 +6,6 @@ package org.havenapp.main.ui;import android.os.Bundle;-import android.support.annotation.Nullable;-import android.support.v4.app.Fragment;import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;@@ -16,6 +14,9 @@ import android.widget.TextView;import org.havenapp.main.R;+import androidx.annotation.Nullable;+import androidx.fragment.app.Fragment;+public class CustomSlideBigText extends Fragment {diff --git a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.javaindex 574d693..1611997 100644--- a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java@@ -8,10 +8,6 @@ package org.havenapp.main.ui;import android.Manifest;import android.content.pm.PackageManager;import android.os.Bundle;-import android.support.annotation.Nullable;-import android.support.v4.app.ActivityCompat;-import android.support.v4.app.Fragment;-import android.support.v4.content.ContextCompat;import android.text.TextUtils;import android.view.LayoutInflater;import android.view.View;@@ -22,6 +18,11 @@ import android.widget.EditText;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;+import androidx.annotation.Nullable;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import androidx.fragment.app.Fragment;+public class CustomSlideNotify extends Fragment {private static final String ARG_LAYOUT_RES_ID = "layoutResId";diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 6ddb799..724da3b 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -5,16 +5,12 @@ import android.net.Uri;import android.os.Bundle;import android.os.Handler;import android.os.StrictMode;-import android.support.design.widget.FloatingActionButton;-import android.support.design.widget.Snackbar;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.LinearLayoutManager;-import android.support.v7.widget.RecyclerView;-import android.support.v7.widget.Toolbar;-import android.support.v7.widget.helper.ItemTouchHelper;import android.view.MenuItem;import android.view.View;+import com.google.android.material.floatingactionbutton.FloatingActionButton;+import com.google.android.material.snackbar.Snackbar;+import org.havenapp.main.R;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;@@ -22,6 +18,12 @@ import org.havenapp.main.model.EventTrigger;import java.io.File;import java.util.ArrayList;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;+import androidx.recyclerview.widget.ItemTouchHelper;+import androidx.recyclerview.widget.LinearLayoutManager;+import androidx.recyclerview.widget.RecyclerView;+public class EventActivity extends AppCompatActivity {diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javaindex 7d1d73f..df5c986 100644--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -1,7 +1,7 @@package org.havenapp.main.ui;import android.content.Context;-import android.support.v7.widget.RecyclerView;+import androidx.recyclerview.widget.RecyclerView;import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex ab8aef8..3ab3b38 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable;import android.media.ThumbnailUtils;import android.net.Uri;import android.provider.MediaStore;-import android.support.v4.content.FileProvider;-import android.support.v7.widget.RecyclerView;import android.text.TextUtils;import android.view.LayoutInflater;import android.view.View;@@ -27,6 +25,9 @@ import java.io.File;import java.util.ArrayList;import java.util.List;+import androidx.annotation.NonNull;+import androidx.core.content.FileProvider;+import androidx.recyclerview.widget.RecyclerView;import nl.changer.audiowife.AudioWife;/**@@ -63,7 +64,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte}}-+ @NonNull@Overridepublic EventTriggerVH onCreateViewHolder(ViewGroup parent, int viewType) {View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_event, parent, false);@@ -72,7 +73,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte}@Override- public void onBindViewHolder(EventTriggerVH holder, int position) {+ public void onBindViewHolder(@NonNull EventTriggerVH holder, int position) {final EventTrigger eventTrigger = eventTriggers.get(position);@@ -122,14 +123,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteint startPosition = 0;- /**- for (int i = 0; i < eventTriggerImagePaths.size(); i++) {- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {- startPosition = i;- break;- }- }**/-ShareOverlayView overlayView = new ShareOverlayView(context);ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths).setStartPosition(startPosition)@@ -204,7 +197,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte}@Override- public void onDetachedFromRecyclerView(RecyclerView recyclerView) {+ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {super.onDetachedFromRecyclerView(recyclerView);AudioWife.getInstance().release();diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.javaindex 7000d3e..0ac4d23 100644--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java@@ -7,10 +7,6 @@ import android.graphics.Color;import android.graphics.Paint;import android.graphics.PorterDuff;import android.os.Bundle;-import android.support.v4.app.ActivityCompat;-import android.support.v4.content.ContextCompat;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.Toolbar;import android.view.MenuItem;import android.widget.TextView;@@ -23,7 +19,10 @@ import org.havenapp.main.sensors.media.MicrophoneTaskFactory;import java.util.LinkedList;-import me.angrybyte.numberpicker.listener.OnValueChangeListener;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;import me.angrybyte.numberpicker.view.ActualNumberPicker;public class MicrophoneConfigureActivity extends AppCompatActivity implements MicSamplerTask.MicListener {diff --git a/src/main/java/org/havenapp/main/ui/PPAppIntro.java b/src/main/java/org/havenapp/main/ui/PPAppIntro.javaindex 8869d19..33a6f8a 100644--- a/src/main/java/org/havenapp/main/ui/PPAppIntro.java+++ b/src/main/java/org/havenapp/main/ui/PPAppIntro.java@@ -1,19 +1,19 @@package org.havenapp.main.ui;-import com.github.paolorotolo.appintro.AppIntro;-import com.github.paolorotolo.appintro.AppIntroFragment;-import android.content.Intent;import android.os.Bundle;-import android.support.annotation.Nullable;-import android.support.v4.app.Fragment;import android.view.View;import android.widget.Toast;+import com.github.paolorotolo.appintro.AppIntro;+import com.github.paolorotolo.appintro.AppIntroFragment;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;+import androidx.annotation.Nullable;+import androidx.fragment.app.Fragment;+/*** Created by n8fr8 on 5/8/17.*/diff --git a/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java b/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.javaindex 0ff972d..7c51f48 100644--- a/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java+++ b/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java@@ -1,18 +1,15 @@package org.havenapp.main.ui;-import android.net.Uri;import android.os.Bundle;-import android.support.design.widget.FloatingActionButton;-import android.support.design.widget.Snackbar;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.Toolbar;-import android.view.View;import com.halilibo.bettervideoplayer.BetterVideoCallback;import com.halilibo.bettervideoplayer.BetterVideoPlayer;import org.havenapp.main.R;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;+public class VideoPlayerActivity extends AppCompatActivity implements BetterVideoCallback {private BetterVideoPlayer player;diff --git a/src/main/res/layout/activity_accel_configure.xml b/src/main/res/layout/activity_accel_configure.xmlindex eaf1ce7..72b13d9 100644--- a/src/main/res/layout/activity_accel_configure.xml+++ b/src/main/res/layout/activity_accel_configure.xml@@ -6,7 +6,7 @@android:background="@color/colorPrimaryDark"android:orientation="vertical">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"diff --git a/src/main/res/layout/activity_camera_configure.xml b/src/main/res/layout/activity_camera_configure.xmlindex b8fe32f..e9b83e2 100644--- a/src/main/res/layout/activity_camera_configure.xml+++ b/src/main/res/layout/activity_camera_configure.xml@@ -1,12 +1,12 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"android:id="@+id/main_content"android:layout_width="match_parent"android:layout_height="match_parent"android:background="@color/colorPrimaryDark">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"@@ -92,4 +92,4 @@</LinearLayout></LinearLayout></FrameLayout>-</android.support.design.widget.CoordinatorLayout>\ No newline at end of file+</androidx.coordinatorlayout.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xmlindex 8fe71c1..e0481ad 100644--- a/src/main/res/layout/activity_event.xml+++ b/src/main/res/layout/activity_event.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"android:layout_width="match_parent"@@ -7,14 +7,14 @@android:fitsSystemWindows="true"tools:context="org.havenapp.main.ui.EventActivity">- <android.support.design.widget.AppBarLayout+ <com.google.android.material.appbar.AppBarLayoutandroid:id="@+id/app_bar"android:layout_width="match_parent"android:layout_height="@dimen/app_bar_height"android:fitsSystemWindows="true"android:theme="@style/AppTheme.AppBarOverlay">- <android.support.design.widget.CollapsingToolbarLayout+ <com.google.android.material.appbar.CollapsingToolbarLayoutandroid:id="@+id/toolbar_layout"android:layout_width="match_parent"android:layout_height="match_parent"@@ -24,24 +24,24 @@android:background="@drawable/header">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"app:layout_collapseMode="pin"app:popupTheme="@style/AppTheme.PopupOverlay" />- </android.support.design.widget.CollapsingToolbarLayout>- </android.support.design.widget.AppBarLayout>+ </com.google.android.material.appbar.CollapsingToolbarLayout>+ </com.google.android.material.appbar.AppBarLayout>- <android.support.v7.widget.RecyclerView+ <androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/event_trigger_list"android:layout_width="match_parent"android:layout_height="match_parent"tools:listitem="@layout/item_event"app:layout_behavior="@string/appbar_scrolling_view_behavior" />- <android.support.design.widget.FloatingActionButton+ <com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/fab"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -51,4 +51,4 @@app:fabSize="normal"app:srcCompat="@drawable/ic_share" />-</android.support.design.widget.CoordinatorLayout>+</androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xmlindex 687ad8b..3beef4f 100644--- a/src/main/res/layout/activity_list.xml+++ b/src/main/res/layout/activity_list.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"android:layout_width="match_parent"@@ -7,12 +7,12 @@android:fitsSystemWindows="true"tools:context="org.havenapp.main.ListActivity">- <android.support.design.widget.AppBarLayout+ <com.google.android.material.appbar.AppBarLayoutandroid:layout_width="match_parent"android:layout_height="@dimen/appbar_height"android:theme="@style/AppTheme.AppBarOverlay">- <android.support.design.widget.CollapsingToolbarLayout+ <com.google.android.material.appbar.CollapsingToolbarLayoutandroid:id="@+id/collapsing_toolbar"android:layout_width="match_parent"android:layout_height="match_parent"@@ -25,16 +25,16 @@app:layout_scrollFlags="scroll|exitUntilCollapsed"app:title="@string/main_screen_title">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"app:popupTheme="@style/AppTheme.PopupOverlay" />- </android.support.design.widget.CollapsingToolbarLayout>- </android.support.design.widget.AppBarLayout>+ </com.google.android.material.appbar.CollapsingToolbarLayout>+ </com.google.android.material.appbar.AppBarLayout>- <android.support.v7.widget.RecyclerView+ <androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/main_list"android:layout_width="match_parent"android:layout_height="match_parent"@@ -46,10 +46,10 @@android:id="@+id/empty_view"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:src="@drawable/empty_prompt"+ app:srcCompat="@drawable/empty_prompt"app:layout_behavior="@string/appbar_scrolling_view_behavior" />- <android.support.design.widget.FloatingActionButton+ <com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/fab"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -59,4 +59,4 @@app:fabSize="normal"app:srcCompat="@drawable/ic_play_arrow" />-</android.support.design.widget.CoordinatorLayout>\ No newline at end of file+</androidx.coordinatorlayout.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_microphone_configure.xml b/src/main/res/layout/activity_microphone_configure.xmlindex e3648a9..cd79dc5 100644--- a/src/main/res/layout/activity_microphone_configure.xml+++ b/src/main/res/layout/activity_microphone_configure.xml@@ -1,11 +1,11 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"android:layout_width="match_parent"android:layout_height="match_parent"android:background="@color/colorPrimaryDark">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="0dp"android:layout_height="?attr/actionBarSize"@@ -116,4 +116,4 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/number_trigger_level"app:layout_constraintVertical_weight="1" />-</android.support.constraint.ConstraintLayout>+</androidx.constraintlayout.widget.ConstraintLayout>diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex e82f4bf..ea916a7 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"android:id="@+id/main_content"android:layout_width="match_parent"@@ -45,11 +45,11 @@android:textSize="78sp"android:textStyle="bold" />- <Button+ <androidx.appcompat.widget.AppCompatButtonandroid:id="@+id/btnStartNow"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_margin="10dp"+ android:layout_margin="16dp"android:background="@drawable/fill_drawable_accent"android:padding="6dp"android:text="@string/start_now"@@ -57,7 +57,7 @@android:textSize="25sp"android:textStyle="bold" />- <Button+ <androidx.appcompat.widget.AppCompatButtonandroid:id="@+id/btnStartLater"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -108,4 +108,4 @@app:srcCompat="@drawable/ic_settings" /></LinearLayout></FrameLayout>-</android.support.design.widget.CoordinatorLayout>\ No newline at end of file+</androidx.coordinatorlayout.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_video_player.xml b/src/main/res/layout/activity_video_player.xmlindex ac1ea8d..f4d0232 100644--- a/src/main/res/layout/activity_video_player.xml+++ b/src/main/res/layout/activity_video_player.xml@@ -1,25 +1,25 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.constraintlayout.widget.ConstraintLayoutwidget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"android:layout_width="match_parent"android:layout_height="match_parent"tools:context=".ui.VideoPlayerActivity">- <android.support.design.widget.AppBarLayout+ <com.google.android.material.appbar.AppBarLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"android:theme="@style/AppTheme.AppBarOverlay">- <android.support.v7.widget.Toolbar+ <androidx.appcompat.widget.Toolbarandroid:id="@+id/toolbar"android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"android:background="?attr/colorPrimary"app:popupTheme="@style/AppTheme.PopupOverlay" />- </android.support.design.widget.AppBarLayout>+ </com.google.android.material.appbar.AppBarLayout><include layout="@layout/content_video_player" />-</android.support.design.widget.CoordinatorLayout>\ No newline at end of file+</androidx.constraintlayout.widget.ConstraintLayoutwidget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/content_video_player.xml b/src/main/res/layout/content_video_player.xmlindex a2e4243..8c7fdcb 100644--- a/src/main/res/layout/content_video_player.xml+++ b/src/main/res/layout/content_video_player.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"android:layout_width="match_parent"@@ -8,12 +8,14 @@tools:context=".ui.VideoPlayerActivity"tools:showIn="@layout/activity_video_player">- <com.halilibo.bettervideoplayer.BetterVideoPlayer- xmlns:android="http://schemas.android.com/apk/res/android"+ <com.halilibo.bettervideoplayer.BetterVideoPlayer xmlns:android="http://schemas.android.com/apk/res/android"android:id="@+id/player"android:layout_width="match_parent"- android:layout_height="match_parent" />+ android:layout_height="match_parent"+ app:layout_constraintBottom_toTopOf="parent"+ app:layout_constraintEnd_toStartOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />--</android.support.constraint.ConstraintLayout>\ No newline at end of file+</androidx.constraintlayout.ConstraintLayout>\ No newline at end of filediff --git a/src/main/res/layout/custom_slide_big_text.xml b/src/main/res/layout/custom_slide_big_text.xmlindex fe7e406..312e34c 100644--- a/src/main/res/layout/custom_slide_big_text.xml+++ b/src/main/res/layout/custom_slide_big_text.xml@@ -18,11 +18,11 @@android:textStyle="bold"android:textSize="28sp"/>- <Button+ <androidx.appcompat.widget.AppCompatButtonandroid:id="@+id/custom_slide_button"- android:layout_width="120dp"- android:layout_height="40dp"- android:layout_margin="10dp"+ android:layout_width="140dp"+ android:layout_height="50dp"+ android:layout_margin="16dp"android:background="@drawable/round_drawable"android:textColor="@color/White"android:visibility="gone"diff --git a/src/main/res/layout/custom_slide_notify.xml b/src/main/res/layout/custom_slide_notify.xmlindex 087afd0..3d85655 100644--- a/src/main/res/layout/custom_slide_notify.xml+++ b/src/main/res/layout/custom_slide_notify.xml@@ -18,7 +18,7 @@android:textStyle="bold"android:textSize="28sp"/>- <android.support.v7.widget.AppCompatEditText+ <androidx.appcompat.widget.AppCompatEditTextandroid:layout_width="200dp"android:layout_height="wrap_content"android:textColor="@color/White"@@ -43,11 +43,11 @@android:textStyle="bold"android:textSize="16sp"/>- <Button- android:layout_width="120dp"- android:layout_height="40dp"+ <androidx.appcompat.widget.AppCompatButton+ android:layout_width="140dp"+ android:layout_height="60dp"+ android:layout_margin="16dp"android:text="@string/save_number"- android:layout_margin="10dp"android:id="@+id/btnSaveNumber"android:background="@drawable/round_drawable"android:textColor="@color/White"diff --git a/src/main/res/layout/item_event.xml b/src/main/res/layout/item_event.xmlindex 86b467f..a80574f 100644--- a/src/main/res/layout/item_event.xml+++ b/src/main/res/layout/item_event.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"android:id="@+id/note_item"@@ -89,4 +89,4 @@</LinearLayout>-</android.support.v7.widget.CardView>\ No newline at end of file+</androidx.cardview.widget.CardView>\ No newline at end of filediff --git a/src/main/res/layout/mdtp_done_button.xml b/src/main/res/layout/mdtp_done_button.xmlnew file mode 100644index 0000000..a829f94--- /dev/null+++ b/src/main/res/layout/mdtp_done_button.xml@@ -0,0 +1,40 @@+<?xml version="1.0" encoding="utf-8"?>+<!-- Copyright (C) 2013 The Android Open Source Project+ Licensed under the Apache License, Version 2.0 (the "License");+ you may not use this file except in compliance with the License.+ You may obtain a copy of the License at+ http://www.apache.org/licenses/LICENSE-2.0+ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"+ android:id="@+id/mdtp_done_background"+ android:layout_width="match_parent"+ android:layout_height="56dp"+ android:orientation="horizontal"+ android:background="@android:color/transparent"+ android:gravity="end|right"+ android:layout_gravity="center_vertical"+ android:paddingBottom="8dp">++ <androidx.appcompat.widget.AppCompatButton+ android:id="@+id/mdtp_cancel"+ android:layout_height="wrap_content"+ android:layout_width="wrap_content"+ android:layout_marginRight="16dp"+ android:layout_marginEnd="16dp"+ style="@style/mdtp_ActionButton.Text"+ android:text="@string/mdtp_cancel" />++ <androidx.appcompat.widget.AppCompatButton+ android:id="@+id/mdtp_ok"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginRight="16dp"+ android:layout_marginEnd="16dp"+ style="@style/mdtp_ActionButton.Text"+ android:text="@string/mdtp_ok" />+</LinearLayout>\ No newline at end of filediff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xmlindex 23a73cd..cd062f8 100644--- a/src/main/res/values/styles.xml+++ b/src/main/res/values/styles.xml@@ -1,8 +1,8 @@-<resources>--+<?xml version="1.0" encoding="utf-8"?>+<resources xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto"><!-- Base application theme. -->- <style name="AppTheme" parent="Theme.AppCompat.Light">+ <style name="AppTheme" parent="Theme.MaterialComponents.Light"><!-- Customize your theme here. --><item name="colorPrimary">@color/colorPrimary</item><item name="colorPrimaryDark">@color/colorPrimaryDark</item>@@ -13,7 +13,7 @@<item name="windowNoTitle">true</item></style>- <style name="SettingsTheme" parent="Theme.AppCompat.Light.DarkActionBar">+ <style name="SettingsTheme" parent="Theme.MaterialComponents.Light.DarkActionBar"><!-- Customize your theme here. --><item name="colorPrimary">@color/colorPrimary</item><item name="colorPrimaryDark">@color/colorPrimaryDark</item>@@ -25,7 +25,7 @@<!-- Style for an Preference Entry --><style name="AppPreference">- <item name="android:layout">@layout/preference_material</item>+ <!--item name="layout">@android:layout/preference_category</item --></style><!-- Style for a DialogPreference Entry -->@@ -49,8 +49,8 @@<item name="negativeButtonText">@android:string/cancel</item></style>- <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />+ <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />- <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />+ <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" /></resources>\ No newline at end of file