Migrate to AndroidX

app/build.gradle

@@ -4,8 +4,9 @@ android {
     compileSdkVersion 28
 
     dependencies {
-        implementation "com.android.support:support-annotations:28.0.0"
+        implementation "androidx.annotation:annotation:1.0.1"
-        implementation "com.android.support:support-core-ui:28.0.0"
+        implementation "androidx.viewpager:viewpager:1.0.0"
+        implementation "androidx.drawerlayout:drawerlayout:1.0.0"
         implementation project(":terminal-view")
     }
 

app/src/main/java/com/termux/app/ExtraKeysView.java

@@ -108,16 +108,6 @@ public final class ExtraKeysView extends GridLayout {
     private PopupWindow popupWindow;
     private int longPressCount;
     
-    /** @deprecated call readSpecialButton(SpecialButton.CTRL); */
-    public boolean readControlButton() {
-        return readSpecialButton(SpecialButton.CTRL);
-    }
-    
-    /** @deprecated call readSpecialButton(SpecialButton.ALT); */
-    public boolean readAltButton() {
-        return readSpecialButton(SpecialButton.ALT);
-    }
-    
     public boolean readSpecialButton(SpecialButton name) {
         SpecialButtonState state = specialButtons.get(name);
         if (state == null)

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -25,11 +25,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -70,6 +65,12 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * A terminal emulator activity.
  * <p/>
@@ -645,7 +646,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         // Pattern for recognizing a URL, based off RFC 3986
         // http://stackoverflow.com/questions/5713558/detect-and-extract-url-from-a-string
         final Pattern urlPattern = Pattern.compile(
-            "(?:^|[\\W])((ht|f)tp(s?)://|www\\.)" + "(([\\w\\-]+\\.)+?([\\w\\-.~]+/?)*" + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
+            "(?:^|[\\W])((ht|f)tp(s?)://|www\\.)" + "(([\\w\\-]+\\.)+?([\\w\\-.~]+/?)*" + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]*$~@!:/{};']*)",
             Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
         LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
         Matcher matcher = urlPattern.matcher(text);

app/src/main/java/com/termux/app/TermuxOpenReceiver.java

@@ -11,7 +11,6 @@ import android.net.Uri;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
@@ -21,6 +20,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import androidx.annotation.NonNull;
+
 public class TermuxOpenReceiver extends BroadcastReceiver {
 
     @Override

app/src/main/java/com/termux/app/TermuxPreferences.java

@@ -3,7 +3,6 @@ package com.termux.app;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.IntDef;
 import android.util.Log;
 import android.util.TypedValue;
 import android.widget.Toast;
@@ -21,6 +20,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import androidx.annotation.IntDef;
+
 final class TermuxPreferences {
 
     @IntDef({BELL_VIBRATE, BELL_BEEP, BELL_IGNORE})

app/src/main/java/com/termux/app/TermuxViewClient.java

@@ -2,7 +2,6 @@ package com.termux.app;
 
 import android.content.Context;
 import android.media.AudioManager;
-import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -16,6 +15,8 @@ import com.termux.view.TerminalViewClient;
 
 import java.util.List;
 
+import androidx.drawerlayout.widget.DrawerLayout;
+
 public final class TermuxViewClient implements TerminalViewClient {
 
     final TermuxActivity mActivity;
@@ -112,12 +113,12 @@ public final class TermuxViewClient implements TerminalViewClient {
 
     @Override
     public boolean readControlKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readControlButton()) || mVirtualControlKeyDown;
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
     }
 
     @Override
     public boolean readAltKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readAltButton());
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.ALT));
     }
 
     @Override

app/src/main/res/layout/drawer_layout.xml

@@ -4,7 +4,7 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_alignParentTop="true"
@@ -66,9 +66,9 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:visibility="gone"
         android:layout_width="match_parent"

terminal-view/build.gradle

@@ -20,7 +20,7 @@ android {
     compileSdkVersion 28
 
     dependencies {
-        implementation "com.android.support:support-annotations:28.0.0"
+        implementation "androidx.annotation:annotation:1.0.1"
         api project(":terminal-emulator")
     }
 

terminal-view/src/main/java/com/termux/view/TerminalView.java

@@ -200,7 +200,7 @@ public final class TerminalView extends View {
             }
         });
         mScroller = new Scroller(context);
-        AccessibilityManager am = (AccessibilityManager) context.getSystemService(context.ACCESSIBILITY_SERVICE);
+        AccessibilityManager am = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
         mAccessibilityEnabled = am.isEnabled();
     }