Skip to content

Commit 74c7120

Browse files
CloudyPadmalCloudyPadmal
authored
fix: added android-x compatibility (#2239)
* fix: added android-x compatibility * chore: upgraded dependencies * fix: android-x compatibility * fix: import error * fix: codacy issues
1 parent 20a31aa commit 74c7120

File tree

123 files changed

+556
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+556
-536
lines changed

‎app/build.gradle‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
versionCode 21
1717
versionName "2.0.20"
1818
multiDexEnabled true
19-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
19+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2020
}
2121

2222
signingConfigs {
@@ -77,15 +77,15 @@ dependencies {
7777
implementation fileTree(include: ['*.jar'], dir: 'libs')
7878

7979
// Android stock libraries
80-
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
81-
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
82-
implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
83-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
84-
implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
85-
implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
86-
implementation "com.android.support:preference-v14:$rootProject.supportLibraryVersion"
87-
implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
88-
implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
80+
implementation 'androidx.appcompat:appcompat:1.3.1'
81+
implementation 'androidx.cardview:cardview:1.0.0'
82+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
83+
implementation 'com.google.android.material:material:1.4.0'
84+
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
85+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
86+
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
87+
implementation 'androidx.browser:browser:1.3.0'
88+
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
8989

9090
// Custom tools libraries
9191
implementation "com.github.PhilJay:MPAndroidChart:$rootProject.mpAndroidChartVersion"
@@ -120,23 +120,23 @@ dependencies {
120120
fdroidImplementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
121121
playstoreImplementation "com.google.android.gms:play-services-maps:$rootProject.googleMapsVersion"
122122

123-
implementation "com.android.support:multidex:$rootProject.multiDexVersion"
123+
implementation 'androidx.multidex:multidex:2.0.1'
124124
implementation "io.realm:android-adapters:$rootProject.realmAdapter"
125125

126126
testImplementation "junit:junit:$rootProject.junitVersion"
127-
androidTestImplementation("com.android.support.test:runner:$rootProject.testRunnerRulesVersion") {
127+
androidTestImplementation('androidx.test.ext:junit:1.1.3') {
128128
exclude group: 'com.android.support', module: 'support-annotations'
129129
}
130-
androidTestImplementation("com.android.support.test:rules:$rootProject.testRunnerRulesVersion") {
130+
androidTestImplementation('androidx.test:rules:1.4.0') {
131131
exclude group: 'com.android.support', module: 'support-annotations'
132132
}
133-
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion") {
133+
androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0') {
134134
exclude group: 'com.android.support', module: 'support-annotations'
135135
}
136-
androidTestImplementation("com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion") {
136+
androidTestImplementation('androidx.test.espresso:espresso-intents:3.4.0') {
137137
exclude group: 'com.android.support', module: 'support-annotations'
138138
}
139-
androidTestImplementation("com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
139+
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.4.0') {
140140
exclude group: 'com.android.support', module: 'support-annotations'
141141
exclude group: 'com.android.support', module: 'support-v4'
142142
exclude group: 'com.android.support', module: 'recyclerview-v7'

‎app/src/fdroid/java/io/pslab/activity/MapsActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.pslab.activity;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import org.json.JSONArray;
77
import org.json.JSONException;

‎app/src/main/java/io/pslab/activity/AccelerometerActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
4-
import android.support.v4.app.Fragment;
5-
import android.support.v7.preference.PreferenceManager;
4+
import androidx.fragment.app.Fragment;
5+
6+
import androidx.preference.PreferenceManager;
67
import io.pslab.R;
78
import io.pslab.fragment.AccelerometerDataFragment;
89
import io.pslab.fragment.AccelerometerSettingsFragment;

‎app/src/main/java/io/pslab/activity/BarometerActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
4-
import android.support.v4.app.Fragment;
5-
import android.support.v7.preference.PreferenceManager;
4+
import androidx.fragment.app.Fragment;
5+
6+
import androidx.preference.PreferenceManager;
67

78
import io.pslab.R;
89
import io.pslab.fragment.BaroMeterDataFragment;

‎app/src/main/java/io/pslab/activity/CompassActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
4-
import android.support.v4.app.Fragment;
5-
import android.support.v7.preference.PreferenceManager;
4+
import androidx.fragment.app.Fragment;
5+
6+
import androidx.preference.PreferenceManager;
67

78
import io.pslab.R;
89
import io.pslab.fragment.CompassDataFragment;

‎app/src/main/java/io/pslab/activity/ControlActivity.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package io.pslab.activity;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
6-
import android.support.design.widget.BottomNavigationView;
7-
import android.support.v4.app.Fragment;
8-
import android.support.v4.app.FragmentTransaction;
9-
import android.support.v7.app.AppCompatActivity;
104
import android.view.MenuItem;
115

6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.AppCompatActivity;
9+
import androidx.fragment.app.Fragment;
10+
import androidx.fragment.app.FragmentTransaction;
11+
12+
import com.google.android.material.bottomnavigation.BottomNavigationView;
13+
1214
import io.pslab.fragment.ControlFragmentAdvanced;
1315
import io.pslab.fragment.ControlFragmentMain;
1416
import io.pslab.fragment.ControlFragmentRead;
@@ -19,10 +21,6 @@
1921
import butterknife.BindView;
2022
import butterknife.ButterKnife;
2123

22-
/**
23-
* Created by viveksb007 on 10/5/17.
24-
*/
25-
2624
public class ControlActivity extends AppCompatActivity {
2725
ControlActivityCommon common = new ControlActivityCommon();
2826
@BindView(R.id.navigation)

‎app/src/main/java/io/pslab/activity/CreateConfigActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import android.os.Bundle;
44
import android.os.Environment;
5-
import android.support.design.widget.Snackbar;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.LinearLayoutManager;
8-
import android.support.v7.widget.RecyclerView;
9-
import android.support.v7.widget.Toolbar;
5+
import com.google.android.material.snackbar.Snackbar;
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.recyclerview.widget.LinearLayoutManager;
8+
import androidx.recyclerview.widget.RecyclerView;
9+
import androidx.appcompat.widget.Toolbar;
1010
import android.view.MenuItem;
1111
import android.view.View;
1212
import android.widget.AdapterView;

‎app/src/main/java/io/pslab/activity/DataLoggerActivity.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@
77
import android.os.AsyncTask;
88
import android.os.Bundle;
99
import android.os.Environment;
10-
import android.support.annotation.Nullable;
11-
import android.support.design.widget.Snackbar;
12-
import android.support.v7.app.AlertDialog;
13-
import android.support.v7.app.AppCompatActivity;
14-
import android.support.v7.widget.DividerItemDecoration;
15-
import android.support.v7.widget.LinearLayoutManager;
16-
import android.support.v7.widget.RecyclerView;
17-
import android.support.v7.widget.Toolbar;
1810
import android.view.Menu;
1911
import android.view.MenuItem;
2012
import android.view.View;
2113
import android.widget.ProgressBar;
2214
import android.widget.TextView;
2315

16+
import androidx.annotation.Nullable;
17+
import androidx.appcompat.app.AlertDialog;
18+
import androidx.appcompat.app.AppCompatActivity;
19+
import androidx.appcompat.widget.Toolbar;
20+
import androidx.recyclerview.widget.DividerItemDecoration;
21+
import androidx.recyclerview.widget.LinearLayoutManager;
22+
import androidx.recyclerview.widget.RecyclerView;
23+
24+
import com.google.android.material.snackbar.Snackbar;
25+
2426
import java.io.BufferedReader;
2527
import java.io.File;
2628
import java.io.FileInputStream;
@@ -53,10 +55,6 @@
5355
import io.realm.RealmObject;
5456
import io.realm.RealmResults;
5557

56-
/**
57-
* Created by Avjeet on 05/08/18.
58-
*/
59-
6058
public class DataLoggerActivity extends AppCompatActivity {
6159

6260
public static final String CALLER_ACTIVITY = "Caller";
@@ -220,6 +218,7 @@ private void selectFile() {
220218

221219
@Override
222220
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
221+
super.onActivityResult(requestCode, resultCode, data);
223222
if (requestCode == 100) {
224223
if (resultCode == RESULT_OK) {
225224
Uri uri = data.getData();

‎app/src/main/java/io/pslab/activity/DustSensorActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import android.content.SharedPreferences;
44
import android.preference.PreferenceManager;
5-
import android.support.v4.app.Fragment;
5+
import androidx.fragment.app.Fragment;
6+
67

78
import io.pslab.R;
89
import io.pslab.fragment.DustSensorDataFragment;

‎app/src/main/java/io/pslab/activity/GasSensorActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
5+
56

67
import io.pslab.R;
78
import io.pslab.fragment.GasSensorDataFragment;

0 commit comments

Comments
 (0)