diff --git a/app/build.gradle b/app/build.gradle index 4324ce4..37edb3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,9 +45,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:2.0.4' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.2' testImplementation 'junit:junit:4.13.2' - 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.0.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.0.2' + implementation 'androidx.annotation:annotation:1.2.0' + implementation 'androidx.drawerlayout:drawerlayout:1.1.1' } diff --git a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java index 834d2fb..90049fa 100644 --- a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java +++ b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java @@ -1,11 +1,11 @@ package com.termux.x11; -import android.annotation.SuppressLint; +import androidx.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Rect; import android.preference.PreferenceManager; -import android.support.v7.widget.AppCompatTextView; +import androidx.widget.AppCompatTextView; import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 26f6b04..3108960 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -7,9 +7,9 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.provider.Settings; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.app.ActionBar; +import androidx.app.AlertDialog; +import androidx.app.AppCompatActivity; import android.util.Log; import android.view.MenuItem; diff --git a/app/src/main/java/com/termux/x11/LorieService.java b/app/src/main/java/com/termux/x11/LorieService.java index 3158f80..c9f12ca 100644 --- a/app/src/main/java/com/termux/x11/LorieService.java +++ b/app/src/main/java/com/termux/x11/LorieService.java @@ -1,6 +1,6 @@ package com.termux.x11; -import android.annotation.SuppressLint; +import androidx.annotation.SuppressLint; import android.app.ActivityManager; import android.app.Notification; import android.app.NotificationChannel; @@ -17,9 +17,9 @@ import android.os.IBinder; import android.os.PowerManager; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.app.NotificationCompat; import android.util.DisplayMetrics; import android.util.Log; import android.view.InputDevice; diff --git a/app/src/main/java/com/termux/x11/LorieTestService.java b/app/src/main/java/com/termux/x11/LorieTestService.java index 77cfd86..e00b517 100644 --- a/app/src/main/java/com/termux/x11/LorieTestService.java +++ b/app/src/main/java/com/termux/x11/LorieTestService.java @@ -9,8 +9,8 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.IBinder; -import android.support.annotation.RequiresApi; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.RequiresApi; +import androidx.app.NotificationCompat; public class LorieTestService extends Service { @Override diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 573ff2e..2cbff74 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Build; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.app.AppCompatActivity; import android.os.Bundle; import android.view.KeyEvent; import android.view.PointerIcon; diff --git a/app/src/main/res/layout/preferences_toolbar.xml b/app/src/main/res/layout/preferences_toolbar.xml index 499232d..151d34e 100644 --- a/app/src/main/res/layout/preferences_toolbar.xml +++ b/app/src/main/res/layout/preferences_toolbar.xml @@ -1,7 +1,7 @@ - \ No newline at end of file + android:background="?attr/colorPrimary"/>