Migrate to AndroidX

mad-lab-fau · Apr 25, 2019 · a6e8e5b · a6e8e5b
1 parent 76ea605
commit a6e8e5b
Show file tree

Hide file tree

Showing 33 changed files with 92 additions and 92 deletions.
diff --git a/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java b/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java
@@ -11,7 +11,7 @@
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.androidplot.xy.LineAndPointFormatter;

diff --git a/SensorLib/rxsensorlib/build.gradle b/SensorLib/rxsensorlib/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -33,9 +33,9 @@ dependencies {
 
     api 'io.reactivex.rxjava2:rxandroid:2.1.0'
     api 'io.reactivex.rxjava2:rxjava:2.2.6'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     api project(path: ':sensorlib')
 }
diff --git a/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java b/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package de.fau.sensorlib.rx;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/SensorLib/sensorlib/build.gradle b/SensorLib/sensorlib/build.gradle
@@ -82,10 +82,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'org.apache.commons:commons-lang3:3.0'
-    api 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    api 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.github.hannesa2:MPAndroidChart:3.0.6'
 }
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java
@@ -9,7 +9,7 @@
 
 import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanResult;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import android.util.Log;
 import android.util.SparseArray;
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java
@@ -20,8 +20,8 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.ParcelUuid;
-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 java.util.ArrayList;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java
@@ -10,7 +10,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import android.util.Log;
 
 import java.util.ArrayList;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java
@@ -8,7 +8,7 @@
 
 package de.fau.sensorlib.widgets;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class GenericFileProvider extends FileProvider {
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java
@@ -12,8 +12,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 
 import java.io.File;
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java
@@ -9,11 +9,11 @@
 package de.fau.sensorlib.widgets;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java
@@ -11,12 +11,12 @@
 import android.content.ContextWrapper;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.widget.TextViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -250,4 +250,4 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
             outRect.set(spacing, spacing, spacing, spacing);
         }
     }
-}
+}
diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java
@@ -1,8 +1,8 @@
 package de.fau.sensorlib.widgets;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java
@@ -14,16 +14,16 @@
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.ArraySet;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.content.ContextCompat;
+import androidx.collection.ArraySet;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java
@@ -11,14 +11,14 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java
@@ -5,10 +5,10 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,7 +31,7 @@
 import de.fau.sensorlib.enums.KnownSensor;
 
 /**
- * {@link android.support.v4.app.DialogFragment} that lists files for simulation.
+ * {@link DialogFragment} that lists files for simulation.
  */
 public class SimulationPickerFragment extends DialogFragment implements View.OnClickListener {
 

diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java
@@ -9,7 +9,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

diff --git a/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml b/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v7.widget.CardView 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="70dp"
-    app:cardCornerRadius="@dimen/cardview_default_radius"
-    app:cardElevation="@dimen/cardview_default_elevation">
+<androidx.cardview.widget.CardView 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="70dp"
+                                   app:cardCornerRadius="@dimen/cardview_default_radius"
+                                   app:cardElevation="@dimen/cardview_default_elevation">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -59,4 +59,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml b/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="112dp"
-    android:layout_margin="10dp"
-    card_view:cardCornerRadius="@dimen/cardview_default_radius"
-    card_view:cardElevation="@dimen/cardview_default_elevation">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                   xmlns:card_view="http://schemas.android.com/apk/res-auto"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="112dp"
+                                   android:layout_margin="10dp"
+                                   card_view:cardCornerRadius="@dimen/cardview_default_radius"
+                                   card_view:cardElevation="@dimen/cardview_default_elevation">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -83,4 +83,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml
@@ -30,7 +30,7 @@
     </LinearLayout>
 
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,4 +62,4 @@
             android:text="@string/ok" />
     </RelativeLayout>
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml b/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml
@@ -38,7 +38,7 @@
             tools:ignore="ButtonStyle" />
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,4 +53,4 @@
         app:fabSize="normal"
         app:pressedTranslationZ="@dimen/elevation_fab_pressed" />
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/SensorLib/sensorlibutils/build.gradle b/SensorLib/sensorlibutils/build.gradle
@@ -23,7 +23,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }
 
 tasks.create(name: 'copyApk', type: Copy) {

diff --git a/SensorLib/sls-fitnessshirt/build.gradle b/SensorLib/sls-fitnessshirt/build.gradle
@@ -23,7 +23,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':sensorlib')
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }
 
 tasks.create(name: 'copyApk', type: Copy) {

diff --git a/SensorLib/sls-portabiles/build.gradle b/SensorLib/sls-portabiles/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(path: ':sensorlib')
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
 }
 

diff --git a/...rLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java b/...rLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java
@@ -12,7 +12,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;
 

diff --git a/...sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java b/...sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java
@@ -12,7 +12,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;