Modernize2

app/build.gradle

@@ -1,21 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.pindroid"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 34
         versionCode 69
         versionName "3.3.2"
         vectorDrawables.useSupportLibrary = true
         testApplicationId "com.pindroid.test"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        jackOptions {
-            enabled true
-        }
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -30,31 +26,32 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    useLibrary 'org.apache.http.legacy' //workaround for legacy http client
-
-    lintOptions {
+    useLibrary 'org.apache.http.legacy'
+    namespace 'com.pindroid'
+    lint {
         abortOnError false
-    }
+    }//workaround for legacy http client
+
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:25.0.0'
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.android.support:support-v13:25.0.0'
-    compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
-    compile 'com.iangclifton.android:floatlabel:1.0.4'
-
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
-
-    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.5.2'
-    testCompile 'org.robolectric:robolectric:3.1.2'
-    testCompile 'org.robolectric:shadows-support-v4:3.1.2'
-    testCompile 'org.robolectric:shadows-httpclient:3.1.2'
-    testCompile 'com.artemzin.assert-parcelable:assert-parcelable:1.0.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
+    implementation 'com.melnykov:floatingactionbutton:1.3.0'
+    implementation 'com.iangclifton.android:floatlabel:1.0.4'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+
+    testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.5.2'
+    testImplementation 'org.robolectric:robolectric:3.1.2'
+    testImplementation 'org.robolectric:shadows-support-v4:3.1.2'
+    testImplementation 'org.robolectric:shadows-httpclient:3.1.2'
+    testImplementation 'com.artemzin.assert-parcelable:assert-parcelable:1.0.1'
 }
 
 

app/src/main/AndroidManifest.xml

@@ -23,15 +23,13 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.pindroid"
     android:installLocation="auto" >
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
@@ -57,11 +55,13 @@
         android:requiredAccountType="com.pindroid"
         android:theme="@style/PinDroid"
         tools:replace="android:theme, android:label, android:icon">
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
         <activity
             android:name=".activity.Main"
             android:label="@string/titleMain"
             android:theme="@style/PinDroidNoActionBar"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -84,7 +84,8 @@
         </activity>
         <activity
             android:name=".activity.GlobalSearchRecieverActivity"
-            android:theme="@android:style/Theme.NoDisplay" >
+            android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -97,7 +98,8 @@
             android:name=".activity.SaveReadLaterBookmark"
             android:label="@string/share_menu_read_later"
             android:icon="@drawable/ic_main_read_later"
-            android:theme="@android:style/Theme.NoDisplay" >
+            android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -109,7 +111,8 @@
         <activity
             android:name=".activity.StandaloneSaveReadLaterBookmark"
             android:label="@string/share_menu_read_later"
-            android:theme="@android:style/Theme.NoDisplay" >
+            android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.pindroid.action.ReadLater" />
 
@@ -121,7 +124,8 @@
         <activity
             android:name=".activity.Settings"
             android:label="@string/preferences_title"
-            android:parentActivityName=".activity.Main" >
+            android:parentActivityName=".activity.Main"
+            android:exported="true">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activity.Main" />
@@ -135,15 +139,17 @@
         <activity
             android:name=".activity.LargeWidgetConfigure"
             android:excludeFromRecents="true"
-            android:theme="@android:style/Theme.Dialog" >
+            android:theme="@android:style/Theme.Dialog"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
         <activity
             android:name=".activity.ChooseTagShortcut"
             android:icon="@drawable/ic_shortcut"
-            android:label="@string/tag_shortcut_activity_label" >
+            android:label="@string/tag_shortcut_activity_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -152,7 +158,8 @@
         <activity
             android:name=".activity.ScreenShortcut"
             android:icon="@drawable/ic_main"
-            android:label="@string/shortcut_activity_label" >
+            android:label="@string/shortcut_activity_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -237,7 +244,8 @@
             android:name=".dashclock.PinDroidExtension"
             android:icon="@drawable/ic_pindroid_dashclock"
             android:label="@string/dashclock_extension_title"
-            android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA" >
+            android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.google.android.apps.dashclock.Extension" />
             </intent-filter>

app/src/main/java/com/pindroid/activity/AddBookmark.java

@@ -1,9 +1,8 @@
 package com.pindroid.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.pindroid.R;
 import com.pindroid.fragment.AddBookmarkFragment;
 import com.pindroid.providers.BookmarkContent;

app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java

@@ -26,16 +26,12 @@
 import com.pindroid.action.IntentHelper;
 import com.pindroid.fragment.BrowseTagsFragment;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 
 public class ChooseTagShortcut extends AppCompatActivity implements BrowseTagsFragment.OnTagSelectedListener {

app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java

@@ -28,10 +28,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/pindroid/activity/Main.java

@@ -22,7 +22,6 @@
 package com.pindroid.activity;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -33,22 +32,21 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.ShareCompat;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.app.ShareCompat;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java

@@ -37,7 +37,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ShareCompat;
+import androidx.core.app.ShareCompat;
 import android.widget.Toast;
 
 public class SaveReadLaterBookmark extends Activity {

app/src/main/java/com/pindroid/activity/ScreenShortcut.java

@@ -26,8 +26,7 @@
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.View;
 import android.widget.AdapterView;

app/src/main/java/com/pindroid/activity/SelectTags.java

@@ -21,24 +21,16 @@
 
 package com.pindroid.activity;
 
-import android.accounts.AccountManager;
-import android.content.Intent;
-import android.content.Intent.ShortcutIconResource;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 
-import com.pindroid.Constants;
 import com.pindroid.R;
-import com.pindroid.action.IntentHelper;
 import com.pindroid.application.PindroidApplication;
-import com.pindroid.fragment.BrowseTagsFragment;
 import com.pindroid.fragment.SelectTagsFragment;
 
-import java.util.List;
 import java.util.Set;
 
 public class SelectTags extends AppCompatActivity implements SelectTagsFragment.OnTagsSelectedListener {

app/src/main/java/com/pindroid/activity/Settings.java

@@ -22,8 +22,7 @@
 package com.pindroid.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.pindroid.R;
 

app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java

@@ -33,15 +33,12 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.Window;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 import android.widget.TextView;

app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java

@@ -44,13 +44,12 @@
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.CursorAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.cursoradapter.widget.CursorAdapter;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java

@@ -43,10 +43,10 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.AsyncTaskLoader;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.AsyncTaskLoader;
+import androidx.loader.content.Loader;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuInflater;
@@ -57,7 +57,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.support.v4.widget.SimpleCursorAdapter;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
 
 public class BrowseBookmarkFeedFragment extends ListFragment 
 	implements LoaderManager.LoaderCallbacks<Cursor>, BookmarkBrowser, PindroidFragment  {