fossasia · CloudyPadmal · Oct 4, 2021 · Oct 4, 2021 · Oct 4, 2021 · Oct 4, 2021
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         versionCode 21
         versionName "2.0.20"
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     signingConfigs {
@@ -77,15 +77,15 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // Android stock libraries
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:preference-v14:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Custom tools libraries
     implementation "com.github.PhilJay:MPAndroidChart:$rootProject.mpAndroidChartVersion"
@@ -120,23 +120,23 @@ dependencies {
     fdroidImplementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
     playstoreImplementation "com.google.android.gms:play-services-maps:$rootProject.googleMapsVersion"
 
-    implementation "com.android.support:multidex:$rootProject.multiDexVersion"
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation "io.realm:android-adapters:$rootProject.realmAdapter"
 
     testImplementation "junit:junit:$rootProject.junitVersion"
-    androidTestImplementation("com.android.support.test:runner:$rootProject.testRunnerRulesVersion") {
+    androidTestImplementation('androidx.test.ext:junit:1.1.3') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation("com.android.support.test:rules:$rootProject.testRunnerRulesVersion") {
+    androidTestImplementation('androidx.test:rules:1.4.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion") {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation("com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion") {
+    androidTestImplementation('androidx.test.espresso:espresso-intents:3.4.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.4.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'recyclerview-v7'

diff --git a/app/src/fdroid/java/io/pslab/activity/MapsActivity.java b/app/src/fdroid/java/io/pslab/activity/MapsActivity.java
@@ -1,7 +1,7 @@
 package io.pslab.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/app/src/main/java/io/pslab/activity/AccelerometerActivity.java b/app/src/main/java/io/pslab/activity/AccelerometerActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.fragment.app.Fragment;
+
+import androidx.preference.PreferenceManager;
 import io.pslab.R;
 import io.pslab.fragment.AccelerometerDataFragment;
 import io.pslab.fragment.AccelerometerSettingsFragment;

diff --git a/app/src/main/java/io/pslab/activity/BarometerActivity.java b/app/src/main/java/io/pslab/activity/BarometerActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.fragment.app.Fragment;
+
+import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
 import io.pslab.fragment.BaroMeterDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/CompassActivity.java b/app/src/main/java/io/pslab/activity/CompassActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.fragment.app.Fragment;
+
+import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
 import io.pslab.fragment.CompassDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/ControlActivity.java b/app/src/main/java/io/pslab/activity/ControlActivity.java
@@ -1,14 +1,16 @@
 package io.pslab.activity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
 import io.pslab.fragment.ControlFragmentAdvanced;
 import io.pslab.fragment.ControlFragmentMain;
 import io.pslab.fragment.ControlFragmentRead;
@@ -19,10 +21,6 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-/**
- * Created by viveksb007 on 10/5/17.
- */
-
 public class ControlActivity extends AppCompatActivity {
     ControlActivityCommon common = new ControlActivityCommon();
     @BindView(R.id.navigation)

diff --git a/app/src/main/java/io/pslab/activity/CreateConfigActivity.java b/app/src/main/java/io/pslab/activity/CreateConfigActivity.java
@@ -2,11 +2,11 @@
 
 import android.os.Bundle;
 import android.os.Environment;
-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 com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;

diff --git a/app/src/main/java/io/pslab/activity/DataLoggerActivity.java b/app/src/main/java/io/pslab/activity/DataLoggerActivity.java
@@ -7,20 +7,22 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.snackbar.Snackbar;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,10 +55,6 @@
 import io.realm.RealmObject;
 import io.realm.RealmResults;
 
-/**
- * Created by Avjeet on 05/08/18.
- */
-
 public class DataLoggerActivity extends AppCompatActivity {
 
     public static final String CALLER_ACTIVITY = "Caller";
@@ -220,6 +218,7 @@ private void selectFile() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 100) {
             if (resultCode == RESULT_OK) {
                 Uri uri = data.getData();

diff --git a/app/src/main/java/io/pslab/activity/DustSensorActivity.java b/app/src/main/java/io/pslab/activity/DustSensorActivity.java
@@ -2,7 +2,8 @@
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
 
 import io.pslab.R;
 import io.pslab.fragment.DustSensorDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/GasSensorActivity.java b/app/src/main/java/io/pslab/activity/GasSensorActivity.java
@@ -1,7 +1,8 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
 
 import io.pslab.R;
 import io.pslab.fragment.GasSensorDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/GyroscopeActivity.java b/app/src/main/java/io/pslab/activity/GyroscopeActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.fragment.app.Fragment;
+
+import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
 import io.pslab.fragment.GyroscopeDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java b/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java
@@ -5,11 +5,12 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/io/pslab/activity/LuxMeterActivity.java b/app/src/main/java/io/pslab/activity/LuxMeterActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.fragment.app.Fragment;
+
+import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
 import io.pslab.fragment.LuxMeterDataFragment;

diff --git a/app/src/main/java/io/pslab/activity/MainActivity.java b/app/src/main/java/io/pslab/activity/MainActivity.java
@@ -10,18 +10,17 @@
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.customtabs.CustomTabsServiceConnection;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,8 +29,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+
 import java.io.IOException;
 
+import javax.annotation.Nullable;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.pslab.BuildConfig;

diff --git a/app/src/main/java/io/pslab/activity/MultimeterActivity.java b/app/src/main/java/io/pslab/activity/MultimeterActivity.java
@@ -11,17 +11,16 @@
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.widget.SwitchCompat;
-import android.support.v7.widget.Toolbar;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -33,6 +32,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.snackbar.Snackbar;
+
 import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -110,7 +112,7 @@ public class MultimeterActivity extends AppCompatActivity {
     ImageView bottomSheetSchematic;
     @BindView(R.id.custom_dialog_desc)
     TextView bottomSheetDesc;
-    BottomSheetBehavior bottomSheetBehavior;
+    BottomSheetBehavior<View> bottomSheetBehavior;
     GestureDetector gestureDetector;
     SharedPreferences multimeter_data;
     private ScienceLab scienceLab;
@@ -418,7 +420,7 @@ public void onStateChanged(@NonNull final View bottomSheet, int newState) {
 
             @Override
             public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-                Float value = (float) MathUtils.map((double) slideOffset, 0.0, 1.0, 0.0, 0.8);
+                float value = (float) MathUtils.map((double) slideOffset, 0.0, 1.0, 0.0, 0.8);
                 tvShadow.setVisibility(View.VISIBLE);
                 tvShadow.setAlpha(value);
                 arrowUpDown.setRotation(slideOffset * 180);