Skip to content

Commit

Permalink
update to AndroidX
Browse files Browse the repository at this point in the history
  • Loading branch information
@n8fr8
n8fr8 committed Oct 29, 2019
1 parent 9f88106 commit 5f9788f
Show file tree
Hide file tree
Showing 48 changed files with 149 additions and 136 deletions.
4 changes: 2 additions & 2 deletions app-mini/build.gradle
View file
Expand Up @@ -102,9 +102,9 @@ android {
dependencies {
implementation project(':orbotservice')
implementation 'com.github.apl-devs:appintro:v4.2.2'
implementation 'com.android.support:palette-v7:28.0.0'
implementation 'androidx.palette:palette:1.0.0'
implementation 'com.github.javiersantos:AppUpdater:2.7'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
androidTestImplementation "tools.fastlane:screengrab:1.2.0"
}

Expand Down
16 changes: 8 additions & 8 deletions app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
View file
Expand Up @@ -23,14 +23,14 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.graphics.Palette;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.Toolbar;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.AppCompatActivity;
import androidx.palette.graphics.Palette;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
Expand Down
2 changes: 1 addition & 1 deletion app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
View file
Expand Up @@ -11,7 +11,7 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import com.github.javiersantos.appupdater.AppUpdater;
import com.github.javiersantos.appupdater.enums.Display;
import com.github.javiersantos.appupdater.enums.UpdateFrom;
Expand Down
4 changes: 2 additions & 2 deletions app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
View file
Expand Up @@ -4,8 +4,8 @@
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
Expand Down
2 changes: 1 addition & 1 deletion app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
View file
Expand Up @@ -12,7 +12,7 @@
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
Expand Down
2 changes: 1 addition & 1 deletion app-mini/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
View file
@@ -1,7 +1,7 @@
package org.torproject.android.mini.ui;

import android.content.Context;
import android.support.v7.widget.AppCompatEditText;
import androidx.appcompat.widget.AppCompatEditText;
import android.util.AttributeSet;
import android.view.inputmethod.EditorInfo;

Expand Down
4 changes: 2 additions & 2 deletions app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
View file
@@ -1,8 +1,8 @@
package org.torproject.android.mini.ui.onboarding;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
Expand Down
4 changes: 2 additions & 2 deletions app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
View file
Expand Up @@ -2,8 +2,8 @@

import android.content.Context;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.github.paolorotolo.appintro.AppIntro;
import org.torproject.android.mini.R;
import org.torproject.android.mini.settings.LocaleHelper;
Expand Down
2 changes: 1 addition & 1 deletion app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
View file
Expand Up @@ -5,7 +5,7 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Window;
import org.torproject.android.service.TorService;
Expand Down
10 changes: 5 additions & 5 deletions app-mini/src/main/res/layout/activity_app_config.xml
View file
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.AppConfigActivity">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/DefaultTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/dark_green"
app:popupTheme="@style/DefaultTheme.PopupOverlay" />

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>


<include layout="@layout/content_app_config" />

</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
10 changes: 5 additions & 5 deletions app-mini/src/main/res/layout/layout_main.xml
View file
Expand Up @@ -8,12 +8,12 @@
android:background="@color/light_gray"
xmlns:app="http://schemas.android.com/apk/res-auto">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" />
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -23,7 +23,7 @@
android:layout_height="match_parent">


<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/rv"
Expand Down Expand Up @@ -62,7 +62,7 @@
android:layout_margin="0dp"
android:src="@drawable/toroff" />

<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/btnVPN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -139,7 +139,7 @@
/>
</LinearLayout>

</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

</LinearLayout>

Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Expand Up @@ -83,7 +83,7 @@ android {
applicationId 'org.torproject.android.max'
targetSdkVersion 28
versionCode 16123000
versionName '16.1.2-RC-2-tor-0.4.1.5-rc'
versionName getVersionName()
archivesBaseName = "orbotMAX-$versionName"
}
}
Expand Down Expand Up @@ -117,10 +117,10 @@ android {

dependencies {
implementation project(':orbotservice')
implementation 'com.android.support:design:28.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'pl.bclogic:pulsator4droid:1.0.3'
implementation 'com.github.apl-devs:appintro:v4.2.2'
implementation 'com.github.javiersantos:AppUpdater:2.6.4'
implementation 'com.github.javiersantos:AppUpdater:2.7'
androidTestImplementation "tools.fastlane:screengrab:1.2.0"
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Expand Up @@ -137,7 +137,7 @@
android:authorities="org.torproject.android.ui.hiddenservices.providers"
android:exported="false" />
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="org.torproject.android.ui.hiddenservices.storage"
android:exported="false"
android:grantUriPermissions="true">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/torproject/android/OrbotApp.java
View file
Expand Up @@ -11,7 +11,7 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import com.github.javiersantos.appupdater.AppUpdater;
import com.github.javiersantos.appupdater.enums.Display;
import com.github.javiersantos.appupdater.enums.UpdateFrom;
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/org/torproject/android/OrbotMainActivity.java
View file
Expand Up @@ -24,11 +24,11 @@
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.Toolbar;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
Expand Down Expand Up @@ -87,7 +87,7 @@
import java.util.Locale;
import java.util.StringTokenizer;

import static android.support.v4.content.FileProvider.getUriForFile;
import static androidx.core.content.FileProvider.getUriForFile;
import static org.torproject.android.MainConstants.COUNTRY_CODES;
import static org.torproject.android.MainConstants.RESULT_CLOSE_ALL;
import static org.torproject.android.MainConstants.URL_TOR_CHECK;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
View file
Expand Up @@ -12,7 +12,7 @@
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
View file
@@ -1,7 +1,7 @@
package org.torproject.android.ui;

import android.content.Context;
import android.support.v7.widget.AppCompatEditText;
import androidx.appcompat.widget.AppCompatEditText;
import android.util.AttributeSet;
import android.view.inputmethod.EditorInfo;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
View file
Expand Up @@ -5,7 +5,7 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Window;
import org.torproject.android.service.TorService;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
View file
Expand Up @@ -9,9 +9,9 @@
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
View file
Expand Up @@ -8,10 +8,10 @@
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
View file
Expand Up @@ -4,7 +4,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import androidx.cursoradapter.widget.CursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
View file
Expand Up @@ -4,7 +4,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import androidx.cursoradapter.widget.CursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
View file
@@ -1,8 +1,8 @@
package org.torproject.android.ui.hiddenservices.backup;


import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
View file
Expand Up @@ -5,9 +5,9 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
View file
Expand Up @@ -6,9 +6,9 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
View file
Expand Up @@ -5,9 +5,9 @@
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
View file
Expand Up @@ -8,9 +8,9 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
View file
Expand Up @@ -5,9 +5,9 @@
import android.content.ClipboardManager;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
Expand Down

0 comments on commit 5f9788f

Please sign in to comment.