Skip to content

Commit a2e3c6b

Browse files
iscleiscle
committed
Update to SDK 28 and migrate to AndroidX
1 parent a621bcd commit a2e3c6b

14 files changed

+46
-44
lines changed

‎app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55
buildToolsVersion '28.0.3'
66

77
defaultConfig {
88
applicationId 'ru.meefik.linuxdeploy'
99
minSdkVersion 15
10-
targetSdkVersion 27
10+
targetSdkVersion 28
1111
versionCode 244
1212
versionName "2.2.2"
1313
}
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
implementation 'com.android.support:appcompat-v7:27.1.1'
28-
implementation 'com.android.support:design:27.1.1'
29-
implementation 'com.android.support:customtabs:27.1.1'
27+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
28+
implementation 'com.google.android.material:material:1.1.0-alpha03'
29+
implementation 'androidx.browser:browser:1.0.0'
3030
}

‎app/src/main/java/ru/meefik/linuxdeploy/AboutActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ru.meefik.linuxdeploy;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.text.method.LinkMovementMethod;
66
import android.widget.TextView;
77

‎app/src/main/java/ru/meefik/linuxdeploy/ActionReceiver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.BroadcastReceiver;
55
import android.content.Context;
66
import android.content.Intent;
7-
import android.support.v4.app.NotificationCompat;
7+
import androidx.core.app.NotificationCompat;
88

99
public class ActionReceiver extends BroadcastReceiver {
1010

‎app/src/main/java/ru/meefik/linuxdeploy/AppCompatPreferenceActivity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import android.content.res.Configuration;
1919
import android.os.Bundle;
2020
import android.preference.PreferenceActivity;
21-
import android.support.annotation.LayoutRes;
22-
import android.support.annotation.Nullable;
23-
import android.support.v4.app.NavUtils;
24-
import android.support.v7.app.ActionBar;
25-
import android.support.v7.app.AppCompatDelegate;
26-
import android.support.v7.widget.Toolbar;
21+
import androidx.annotation.LayoutRes;
22+
import androidx.annotation.Nullable;
23+
import androidx.core.app.NavUtils;
24+
import androidx.appcompat.app.ActionBar;
25+
import androidx.appcompat.app.AppCompatDelegate;
26+
import androidx.appcompat.widget.Toolbar;
2727
import android.view.MenuInflater;
2828
import android.view.MenuItem;
2929
import android.view.View;

‎app/src/main/java/ru/meefik/linuxdeploy/ExecService.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package ru.meefik.linuxdeploy;
22

3-
import android.app.Service;
43
import android.content.Context;
54
import android.content.Intent;
6-
import android.os.IBinder;
7-
import android.support.annotation.NonNull;
8-
import android.support.v4.app.JobIntentService;
5+
6+
import androidx.annotation.NonNull;
7+
import androidx.core.app.JobIntentService;
98

109
public class ExecService extends JobIntentService {
1110

‎app/src/main/java/ru/meefik/linuxdeploy/FullscreenActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.pm.ActivityInfo;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.Surface;
77
import android.view.Window;
88
import android.view.WindowManager;

‎app/src/main/java/ru/meefik/linuxdeploy/MainActivity.java

+13-12
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
import android.os.Bundle;
1414
import android.os.Handler;
1515
import android.os.PowerManager;
16-
import android.support.annotation.NonNull;
17-
import android.support.customtabs.CustomTabsIntent;
18-
import android.support.design.widget.NavigationView;
19-
import android.support.v4.app.ActivityCompat;
20-
import android.support.v4.content.ContextCompat;
21-
import android.support.v4.view.GravityCompat;
22-
import android.support.v4.widget.DrawerLayout;
23-
import android.support.v7.app.ActionBar;
24-
import android.support.v7.app.ActionBarDrawerToggle;
25-
import android.support.v7.app.AlertDialog;
26-
import android.support.v7.app.AppCompatActivity;
16+
import androidx.annotation.NonNull;
17+
import androidx.browser.customtabs.CustomTabsIntent;
18+
import androidx.core.app.ActivityCompat;
19+
import androidx.core.content.ContextCompat;
20+
import androidx.core.view.GravityCompat;
21+
import androidx.drawerlayout.widget.DrawerLayout;
22+
import androidx.appcompat.app.ActionBar;
23+
import androidx.appcompat.app.ActionBarDrawerToggle;
24+
import androidx.appcompat.app.AlertDialog;
25+
import androidx.appcompat.app.AppCompatActivity;
2726
import android.text.method.LinkMovementMethod;
2827
import android.util.TypedValue;
2928
import android.view.Menu;
@@ -35,6 +34,8 @@
3534
import android.widget.TextView;
3635
import android.widget.Toast;
3736

37+
import com.google.android.material.navigation.NavigationView;
38+
3839
public class MainActivity extends AppCompatActivity implements
3940
NavigationView.OnNavigationItemSelectedListener {
4041

@@ -412,7 +413,7 @@ private void containerExport() {
412413
new AlertDialog.Builder(this)
413414
.setTitle(R.string.title_export_dialog)
414415
.setCancelable(false)
415-
.setView(input, 16, 32, 16, 0)
416+
.setView(input)
416417
.setPositiveButton(android.R.string.yes,
417418
new DialogInterface.OnClickListener() {
418419
@Override

‎app/src/main/java/ru/meefik/linuxdeploy/MountsActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.content.DialogInterface;
44
import android.os.Bundle;
5-
import android.support.v7.app.AlertDialog;
6-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AlertDialog;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.view.LayoutInflater;
88
import android.view.Menu;
99
import android.view.MenuItem;

‎app/src/main/java/ru/meefik/linuxdeploy/PrefStore.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.content.res.Configuration;
1111
import android.graphics.Point;
1212
import android.os.Build;
13-
import android.support.v4.app.NotificationCompat;
14-
import android.support.v4.app.TaskStackBuilder;
13+
import androidx.core.app.NotificationCompat;
14+
import androidx.core.app.TaskStackBuilder;
1515
import android.text.TextUtils;
1616
import android.view.Display;
1717
import android.view.WindowManager;

‎app/src/main/java/ru/meefik/linuxdeploy/ProfilesActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.content.Context;
55
import android.content.DialogInterface;
66
import android.os.Bundle;
7-
import android.support.v7.app.AlertDialog;
8-
import android.support.v7.app.AppCompatActivity;
7+
import androidx.appcompat.app.AlertDialog;
8+
import androidx.appcompat.app.AppCompatActivity;
99
import android.view.GestureDetector;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

‎app/src/main/java/ru/meefik/linuxdeploy/RepositoryActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import android.net.Uri;
1212
import android.os.AsyncTask;
1313
import android.os.Bundle;
14-
import android.support.v7.app.AlertDialog;
15-
import android.support.v7.app.AppCompatActivity;
14+
import androidx.appcompat.app.AlertDialog;
15+
import androidx.appcompat.app.AppCompatActivity;
1616
import android.view.Menu;
1717
import android.view.MenuItem;
1818
import android.view.View;

‎app/src/main/java/ru/meefik/linuxdeploy/SettingsActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import android.preference.PreferenceGroup;
1616
import android.preference.PreferenceManager;
1717
import android.preference.PreferenceScreen;
18-
import android.support.v4.app.ActivityCompat;
19-
import android.support.v4.content.ContextCompat;
20-
import android.support.v7.app.AlertDialog;
18+
import androidx.core.app.ActivityCompat;
19+
import androidx.core.content.ContextCompat;
20+
import androidx.appcompat.app.AlertDialog;
2121

2222
public class SettingsActivity extends AppCompatPreferenceActivity implements
2323
OnSharedPreferenceChangeListener, Preference.OnPreferenceClickListener {

‎app/src/main/res/layout/activity_main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
1+
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:id="@+id/drawer_layout"
@@ -18,4 +18,4 @@
1818
app:menu="@menu/activity_main_drawer"
1919
android:theme="@style/NavigationViewTheme" />
2020

21-
</android.support.v4.widget.DrawerLayout>
21+
</androidx.drawerlayout.widget.DrawerLayout>

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.enableJetifier=true
20+
android.useAndroidX=true

0 commit comments

Comments
 (0)