From e796c704aac2f3db5370cc7d572bb2b13fb5aaba Mon Sep 17 00:00:00 2001 From: Matthew Schmidt Date: Fri, 27 Oct 2023 15:21:00 -0400 Subject: [PATCH 1/4] Modernize build --- app/build.gradle | 53 +++++++++---------- app/src/main/AndroidManifest.xml | 30 +++++++---- .../com/pindroid/activity/AddBookmark.java | 5 +- .../pindroid/activity/ChooseTagShortcut.java | 8 +-- .../activity/FragmentBaseActivity.java | 7 ++- .../main/java/com/pindroid/activity/Main.java | 24 ++++----- .../activity/SaveReadLaterBookmark.java | 2 +- .../com/pindroid/activity/ScreenShortcut.java | 3 +- .../com/pindroid/activity/SelectTags.java | 10 +--- .../java/com/pindroid/activity/Settings.java | 3 +- .../authenticator/AuthenticatorActivity.java | 7 +-- .../fragment/AddBookmarkFragment.java | 5 +- .../fragment/BrowseBookmarkFeedFragment.java | 10 ++-- .../fragment/BrowseBookmarksFragment.java | 17 +++--- .../fragment/BrowseNotesFragment.java | 8 +-- .../pindroid/fragment/BrowseTagsFragment.java | 12 ++--- .../fragment/MainSearchResultsFragment.java | 5 +- .../pindroid/fragment/SelectTagsFragment.java | 16 ++---- .../fragment/ViewBookmarkFragment.java | 6 +-- .../pindroid/fragment/ViewNoteFragment.java | 2 +- .../listadapter/BookmarkViewBinder.java | 2 +- .../TagAutoCompleteCursorAdapter.java | 2 +- .../pindroid/platform/BookmarkManager.java | 2 +- .../com/pindroid/platform/NoteManager.java | 2 +- .../com/pindroid/platform/TagManager.java | 2 +- .../syncadapter/BookmarkSyncAdapter.java | 2 +- .../java/com/pindroid/util/SyncUtils.java | 2 +- .../main/res/layout/add_bookmark_fragment.xml | 4 +- .../res/layout/browse_bookmark_fragment.xml | 4 +- app/src/main/res/layout/main.xml | 6 +-- app/src/main/res/menu/base_menu.xml | 2 +- app/src/main/res/menu/view_menu.xml | 2 +- app/src/main/res/values-v21/dimens.xml | 2 +- app/src/main/res/values-v21/styles.xml | 2 +- .../activity/FragmentBaseActivityTest.java | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 11 ++-- 37 files changed, 130 insertions(+), 156 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4433a532..aaf361bc 100644 --- a/app/build.gradle +++ b/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' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bf7c2c15..a0bc4d15 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,6 @@ --> @@ -31,7 +30,6 @@ - @@ -56,11 +54,13 @@ android:requiredAccountType="com.pindroid" android:theme="@style/PinDroid" tools:replace="android:theme, android:label, android:icon"> + + android:launchMode="singleTop" + android:exported="true"> @@ -83,7 +83,8 @@ + android:theme="@android:style/Theme.NoDisplay" + android:exported="true"> @@ -96,7 +97,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"> @@ -108,7 +110,8 @@ + android:theme="@android:style/Theme.NoDisplay" + android:exported="true"> @@ -120,7 +123,8 @@ + android:parentActivityName=".activity.Main" + android:exported="true"> @@ -134,7 +138,8 @@ + android:theme="@android:style/Theme.Dialog" + android:exported="true"> @@ -142,7 +147,8 @@ + android:label="@string/tag_shortcut_activity_label" + android:exported="true"> @@ -151,7 +157,8 @@ + android:label="@string/shortcut_activity_label" + android:exported="true"> @@ -236,7 +243,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"> diff --git a/app/src/main/java/com/pindroid/activity/AddBookmark.java b/app/src/main/java/com/pindroid/activity/AddBookmark.java index 37b00aba..c0641f79 100644 --- a/app/src/main/java/com/pindroid/activity/AddBookmark.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java b/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java index 2f7eab44..1eca9a3a 100644 --- a/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java b/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java index 8935e7f9..ec6de060 100644 --- a/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/Main.java b/app/src/main/java/com/pindroid/activity/Main.java index 17dd44de..2dbf730a 100644 --- a/app/src/main/java/com/pindroid/activity/Main.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java b/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java index e425dd24..e9a90759 100644 --- a/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/ScreenShortcut.java b/app/src/main/java/com/pindroid/activity/ScreenShortcut.java index 21619586..8d202702 100644 --- a/app/src/main/java/com/pindroid/activity/ScreenShortcut.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/SelectTags.java b/app/src/main/java/com/pindroid/activity/SelectTags.java index 857ca423..5c3750a6 100644 --- a/app/src/main/java/com/pindroid/activity/SelectTags.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/Settings.java b/app/src/main/java/com/pindroid/activity/Settings.java index 308fec07..e3737476 100644 --- a/app/src/main/java/com/pindroid/activity/Settings.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java b/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java index a95474bf..f3291e41 100644 --- a/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java b/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java index ef5fc42a..032ba94d 100644 --- a/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java index c39602cd..01ebe505 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java +++ b/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, BookmarkBrowser, PindroidFragment { diff --git a/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java index 7a65a57d..eaea9e17 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java @@ -28,14 +28,14 @@ import android.content.IntentFilter; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.cursoradapter.widget.SimpleCursorAdapter; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; @@ -50,7 +50,6 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; -import android.widget.Button; import android.widget.ListView; import com.melnykov.fab.FloatingActionButton; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java index 212caf84..4eb738cc 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java @@ -23,10 +23,10 @@ import android.app.Activity; 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.Loader; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java index 323f7281..6eb09ff0 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java @@ -23,13 +23,11 @@ import android.app.Activity; 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.Loader; -import android.support.v4.widget.SimpleCursorAdapter; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; + import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; diff --git a/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java b/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java index 5026f952..57c57170 100644 --- a/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java @@ -28,10 +28,9 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; -import android.support.v4.app.ListFragment; -import android.view.LayoutInflater; +import androidx.fragment.app.ListFragment; + import android.view.View; -import android.view.ViewGroup; public class MainSearchResultsFragment extends ListFragment { diff --git a/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java b/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java index 18498e02..0d8d76af 100644 --- a/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java @@ -23,30 +23,24 @@ import android.app.Activity; import android.database.Cursor; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.widget.SimpleCursorAdapter; + +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.util.SparseBooleanArray; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; -import android.widget.CheckBox; import android.widget.ListView; -import android.widget.TextView; import com.pindroid.R; import com.pindroid.platform.TagManager; import com.pindroid.providers.TagContent.Tag; import com.pindroid.util.SettingsHelper; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; public class SelectTagsFragment extends ListFragment diff --git a/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java b/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java index 41a9b76d..6a984db8 100644 --- a/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java +++ b/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java @@ -29,9 +29,9 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.ShareActionProvider; +import androidx.fragment.app.Fragment; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.widget.ShareActionProvider; import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java b/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java index 0e83b281..1c750375 100644 --- a/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java +++ b/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java @@ -22,7 +22,7 @@ package com.pindroid.fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java b/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java index f081839a..31e4e0c0 100644 --- a/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java +++ b/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java @@ -26,7 +26,7 @@ import android.database.Cursor; import android.view.View; import android.widget.ImageView; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.widget.TextView; public class BookmarkViewBinder implements SimpleCursorAdapter.ViewBinder { diff --git a/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java b/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java index da8c902a..b6f18813 100644 --- a/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java +++ b/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java @@ -25,7 +25,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.cursoradapter.widget.SimpleCursorAdapter; public class TagAutoCompleteCursorAdapter extends SimpleCursorAdapter { diff --git a/app/src/main/java/com/pindroid/platform/BookmarkManager.java b/app/src/main/java/com/pindroid/platform/BookmarkManager.java index bec1ccae..2a7f7c58 100644 --- a/app/src/main/java/com/pindroid/platform/BookmarkManager.java +++ b/app/src/main/java/com/pindroid/platform/BookmarkManager.java @@ -33,7 +33,7 @@ import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.text.TextUtils; public class BookmarkManager { diff --git a/app/src/main/java/com/pindroid/platform/NoteManager.java b/app/src/main/java/com/pindroid/platform/NoteManager.java index 6de70231..7adae246 100644 --- a/app/src/main/java/com/pindroid/platform/NoteManager.java +++ b/app/src/main/java/com/pindroid/platform/NoteManager.java @@ -32,7 +32,7 @@ import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.text.TextUtils; public class NoteManager { diff --git a/app/src/main/java/com/pindroid/platform/TagManager.java b/app/src/main/java/com/pindroid/platform/TagManager.java index e7fef0e8..9c09aecf 100644 --- a/app/src/main/java/com/pindroid/platform/TagManager.java +++ b/app/src/main/java/com/pindroid/platform/TagManager.java @@ -27,7 +27,7 @@ import android.content.ContentValues; import android.content.Context; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.database.Cursor; import android.text.TextUtils; diff --git a/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java b/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java index 7126114a..8042a180 100644 --- a/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java +++ b/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java @@ -37,7 +37,7 @@ import android.content.Intent; import android.content.SyncResult; import android.os.Bundle; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/pindroid/util/SyncUtils.java b/app/src/main/java/com/pindroid/util/SyncUtils.java index 2d4c434f..561dad60 100644 --- a/app/src/main/java/com/pindroid/util/SyncUtils.java +++ b/app/src/main/java/com/pindroid/util/SyncUtils.java @@ -26,7 +26,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.Toast; import com.pindroid.Constants; diff --git a/app/src/main/res/layout/add_bookmark_fragment.xml b/app/src/main/res/layout/add_bookmark_fragment.xml index df38dacb..51107932 100644 --- a/app/src/main/res/layout/add_bookmark_fragment.xml +++ b/app/src/main/res/layout/add_bookmark_fragment.xml @@ -198,7 +198,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center_horizontal"> - - - @@ -35,7 +35,7 @@ android:id="@id/android:list" android:layout_width="match_parent" android:layout_height="match_parent" /> - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/base_menu.xml b/app/src/main/res/menu/base_menu.xml index ca60c45c..166125fa 100644 --- a/app/src/main/res/menu/base_menu.xml +++ b/app/src/main/res/menu/base_menu.xml @@ -28,6 +28,6 @@ android:title="@string/menu_search_title" android:icon="@drawable/ic_search_white_24dp" pindroid:showAsAction="ifRoom" - pindroid:actionViewClass="android.support.v7.widget.SearchView" + pindroid:actionViewClass="androidx.appcompat.widget.SearchView" android:orderInCategory="2" /> diff --git a/app/src/main/res/menu/view_menu.xml b/app/src/main/res/menu/view_menu.xml index d93dd616..e34d6c9f 100644 --- a/app/src/main/res/menu/view_menu.xml +++ b/app/src/main/res/menu/view_menu.xml @@ -67,6 +67,6 @@ android:title="@string/menu_view_sendbookmark_title" pindroid:showAsAction="never" android:icon="@drawable/ic_share_white_24dp" - pindroid:actionProviderClass="android.support.v7.widget.ShareActionProvider" + pindroid:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" android:orderInCategory="15" /> diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml index 6a6be1b3..daf1b060 100644 --- a/app/src/main/res/values-v21/dimens.xml +++ b/app/src/main/res/values-v21/dimens.xml @@ -22,6 +22,6 @@ */ --> - 24dp + 0dp 16dp \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 746038b0..38d87f75 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -30,6 +30,6 @@ @color/text_body @style/AccountSpinner @style/MySearchViewStyle - true + @color/pindroid_blue_dark \ No newline at end of file diff --git a/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java b/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java index 99743374..1a238ab3 100644 --- a/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java +++ b/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java @@ -3,7 +3,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.pindroid.BuildConfig; import com.pindroid.Constants; diff --git a/build.gradle b/build.gradle index b3e1f021..d44dc70e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7d0bdb37..da1db5f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Apr 29 08:24:07 EDT 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From 8d8384932983dc4457d0849bf2c18ef718931676 Mon Sep 17 00:00:00 2001 From: Matthew Schmidt Date: Fri, 27 Oct 2023 15:21:32 -0400 Subject: [PATCH 2/4] Modernize build --- gradle.properties | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..e3dfef4e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true +android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false +android.useAndroidX=true \ No newline at end of file From 6a1189df97d257cc7b674d6877363f075b0efcfb Mon Sep 17 00:00:00 2001 From: Matthew Schmidt Date: Fri, 27 Oct 2023 15:21:00 -0400 Subject: [PATCH 3/4] Modernize build --- app/build.gradle | 53 +++++++++---------- app/src/main/AndroidManifest.xml | 30 +++++++---- .../com/pindroid/activity/AddBookmark.java | 5 +- .../pindroid/activity/ChooseTagShortcut.java | 8 +-- .../activity/FragmentBaseActivity.java | 7 ++- .../main/java/com/pindroid/activity/Main.java | 24 ++++----- .../activity/SaveReadLaterBookmark.java | 2 +- .../com/pindroid/activity/ScreenShortcut.java | 3 +- .../com/pindroid/activity/SelectTags.java | 10 +--- .../java/com/pindroid/activity/Settings.java | 3 +- .../authenticator/AuthenticatorActivity.java | 7 +-- .../fragment/AddBookmarkFragment.java | 5 +- .../fragment/BrowseBookmarkFeedFragment.java | 10 ++-- .../fragment/BrowseBookmarksFragment.java | 17 +++--- .../fragment/BrowseNotesFragment.java | 8 +-- .../pindroid/fragment/BrowseTagsFragment.java | 12 ++--- .../fragment/MainSearchResultsFragment.java | 5 +- .../pindroid/fragment/SelectTagsFragment.java | 16 ++---- .../fragment/ViewBookmarkFragment.java | 6 +-- .../pindroid/fragment/ViewNoteFragment.java | 2 +- .../listadapter/BookmarkViewBinder.java | 2 +- .../TagAutoCompleteCursorAdapter.java | 2 +- .../pindroid/platform/BookmarkManager.java | 2 +- .../com/pindroid/platform/NoteManager.java | 2 +- .../com/pindroid/platform/TagManager.java | 2 +- .../syncadapter/BookmarkSyncAdapter.java | 2 +- .../java/com/pindroid/util/SyncUtils.java | 2 +- .../main/res/layout/add_bookmark_fragment.xml | 4 +- .../res/layout/browse_bookmark_fragment.xml | 4 +- app/src/main/res/layout/main.xml | 6 +-- app/src/main/res/menu/base_menu.xml | 2 +- app/src/main/res/menu/view_menu.xml | 2 +- app/src/main/res/values-v21/dimens.xml | 2 +- app/src/main/res/values-v21/styles.xml | 2 +- .../activity/FragmentBaseActivityTest.java | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 11 ++-- 37 files changed, 130 insertions(+), 156 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4433a532..aaf361bc 100644 --- a/app/build.gradle +++ b/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' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14897348..4bf83bc6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,6 @@ --> @@ -31,7 +30,6 @@ - @@ -57,11 +55,13 @@ android:requiredAccountType="com.pindroid" android:theme="@style/PinDroid" tools:replace="android:theme, android:label, android:icon"> + + android:launchMode="singleTop" + android:exported="true"> @@ -84,7 +84,8 @@ + android:theme="@android:style/Theme.NoDisplay" + android:exported="true"> @@ -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"> @@ -109,7 +111,8 @@ + android:theme="@android:style/Theme.NoDisplay" + android:exported="true"> @@ -121,7 +124,8 @@ + android:parentActivityName=".activity.Main" + android:exported="true"> @@ -135,7 +139,8 @@ + android:theme="@android:style/Theme.Dialog" + android:exported="true"> @@ -143,7 +148,8 @@ + android:label="@string/tag_shortcut_activity_label" + android:exported="true"> @@ -152,7 +158,8 @@ + android:label="@string/shortcut_activity_label" + android:exported="true"> @@ -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"> diff --git a/app/src/main/java/com/pindroid/activity/AddBookmark.java b/app/src/main/java/com/pindroid/activity/AddBookmark.java index 37b00aba..c0641f79 100644 --- a/app/src/main/java/com/pindroid/activity/AddBookmark.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java b/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java index 2f7eab44..1eca9a3a 100644 --- a/app/src/main/java/com/pindroid/activity/ChooseTagShortcut.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java b/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java index 8935e7f9..ec6de060 100644 --- a/app/src/main/java/com/pindroid/activity/FragmentBaseActivity.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/Main.java b/app/src/main/java/com/pindroid/activity/Main.java index 17dd44de..2dbf730a 100644 --- a/app/src/main/java/com/pindroid/activity/Main.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java b/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java index e425dd24..e9a90759 100644 --- a/app/src/main/java/com/pindroid/activity/SaveReadLaterBookmark.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/ScreenShortcut.java b/app/src/main/java/com/pindroid/activity/ScreenShortcut.java index 21619586..8d202702 100644 --- a/app/src/main/java/com/pindroid/activity/ScreenShortcut.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/activity/SelectTags.java b/app/src/main/java/com/pindroid/activity/SelectTags.java index 857ca423..5c3750a6 100644 --- a/app/src/main/java/com/pindroid/activity/SelectTags.java +++ b/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 { diff --git a/app/src/main/java/com/pindroid/activity/Settings.java b/app/src/main/java/com/pindroid/activity/Settings.java index 308fec07..e3737476 100644 --- a/app/src/main/java/com/pindroid/activity/Settings.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java b/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java index a95474bf..f3291e41 100644 --- a/app/src/main/java/com/pindroid/authenticator/AuthenticatorActivity.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java b/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java index ef5fc42a..032ba94d 100644 --- a/app/src/main/java/com/pindroid/fragment/AddBookmarkFragment.java +++ b/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; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java index c39602cd..01ebe505 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseBookmarkFeedFragment.java +++ b/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, BookmarkBrowser, PindroidFragment { diff --git a/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java index 7a65a57d..eaea9e17 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseBookmarksFragment.java @@ -28,14 +28,14 @@ import android.content.IntentFilter; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.cursoradapter.widget.SimpleCursorAdapter; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; @@ -50,7 +50,6 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; -import android.widget.Button; import android.widget.ListView; import com.melnykov.fab.FloatingActionButton; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java index 212caf84..4eb738cc 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseNotesFragment.java @@ -23,10 +23,10 @@ import android.app.Activity; 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.Loader; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; diff --git a/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java b/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java index 323f7281..6eb09ff0 100644 --- a/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/BrowseTagsFragment.java @@ -23,13 +23,11 @@ import android.app.Activity; 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.Loader; -import android.support.v4.widget.SimpleCursorAdapter; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; + import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; diff --git a/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java b/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java index 5026f952..57c57170 100644 --- a/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/MainSearchResultsFragment.java @@ -28,10 +28,9 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; -import android.support.v4.app.ListFragment; -import android.view.LayoutInflater; +import androidx.fragment.app.ListFragment; + import android.view.View; -import android.view.ViewGroup; public class MainSearchResultsFragment extends ListFragment { diff --git a/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java b/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java index 18498e02..0d8d76af 100644 --- a/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java +++ b/app/src/main/java/com/pindroid/fragment/SelectTagsFragment.java @@ -23,30 +23,24 @@ import android.app.Activity; import android.database.Cursor; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.widget.SimpleCursorAdapter; + +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.util.SparseBooleanArray; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; -import android.widget.CheckBox; import android.widget.ListView; -import android.widget.TextView; import com.pindroid.R; import com.pindroid.platform.TagManager; import com.pindroid.providers.TagContent.Tag; import com.pindroid.util.SettingsHelper; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; public class SelectTagsFragment extends ListFragment diff --git a/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java b/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java index 41a9b76d..6a984db8 100644 --- a/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java +++ b/app/src/main/java/com/pindroid/fragment/ViewBookmarkFragment.java @@ -29,9 +29,9 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.ShareActionProvider; +import androidx.fragment.app.Fragment; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.widget.ShareActionProvider; import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java b/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java index 0e83b281..1c750375 100644 --- a/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java +++ b/app/src/main/java/com/pindroid/fragment/ViewNoteFragment.java @@ -22,7 +22,7 @@ package com.pindroid.fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java b/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java index f081839a..31e4e0c0 100644 --- a/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java +++ b/app/src/main/java/com/pindroid/listadapter/BookmarkViewBinder.java @@ -26,7 +26,7 @@ import android.database.Cursor; import android.view.View; import android.widget.ImageView; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.widget.TextView; public class BookmarkViewBinder implements SimpleCursorAdapter.ViewBinder { diff --git a/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java b/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java index da8c902a..b6f18813 100644 --- a/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java +++ b/app/src/main/java/com/pindroid/listadapter/TagAutoCompleteCursorAdapter.java @@ -25,7 +25,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.cursoradapter.widget.SimpleCursorAdapter; public class TagAutoCompleteCursorAdapter extends SimpleCursorAdapter { diff --git a/app/src/main/java/com/pindroid/platform/BookmarkManager.java b/app/src/main/java/com/pindroid/platform/BookmarkManager.java index bec1ccae..2a7f7c58 100644 --- a/app/src/main/java/com/pindroid/platform/BookmarkManager.java +++ b/app/src/main/java/com/pindroid/platform/BookmarkManager.java @@ -33,7 +33,7 @@ import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.text.TextUtils; public class BookmarkManager { diff --git a/app/src/main/java/com/pindroid/platform/NoteManager.java b/app/src/main/java/com/pindroid/platform/NoteManager.java index 6de70231..7adae246 100644 --- a/app/src/main/java/com/pindroid/platform/NoteManager.java +++ b/app/src/main/java/com/pindroid/platform/NoteManager.java @@ -32,7 +32,7 @@ import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.text.TextUtils; public class NoteManager { diff --git a/app/src/main/java/com/pindroid/platform/TagManager.java b/app/src/main/java/com/pindroid/platform/TagManager.java index e7fef0e8..9c09aecf 100644 --- a/app/src/main/java/com/pindroid/platform/TagManager.java +++ b/app/src/main/java/com/pindroid/platform/TagManager.java @@ -27,7 +27,7 @@ import android.content.ContentValues; import android.content.Context; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import android.database.Cursor; import android.text.TextUtils; diff --git a/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java b/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java index 7126114a..8042a180 100644 --- a/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java +++ b/app/src/main/java/com/pindroid/syncadapter/BookmarkSyncAdapter.java @@ -37,7 +37,7 @@ import android.content.Intent; import android.content.SyncResult; import android.os.Bundle; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/pindroid/util/SyncUtils.java b/app/src/main/java/com/pindroid/util/SyncUtils.java index 2d4c434f..561dad60 100644 --- a/app/src/main/java/com/pindroid/util/SyncUtils.java +++ b/app/src/main/java/com/pindroid/util/SyncUtils.java @@ -26,7 +26,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.Toast; import com.pindroid.Constants; diff --git a/app/src/main/res/layout/add_bookmark_fragment.xml b/app/src/main/res/layout/add_bookmark_fragment.xml index df38dacb..51107932 100644 --- a/app/src/main/res/layout/add_bookmark_fragment.xml +++ b/app/src/main/res/layout/add_bookmark_fragment.xml @@ -198,7 +198,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center_horizontal"> - - - @@ -35,7 +35,7 @@ android:id="@id/android:list" android:layout_width="match_parent" android:layout_height="match_parent" /> - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/base_menu.xml b/app/src/main/res/menu/base_menu.xml index ca60c45c..166125fa 100644 --- a/app/src/main/res/menu/base_menu.xml +++ b/app/src/main/res/menu/base_menu.xml @@ -28,6 +28,6 @@ android:title="@string/menu_search_title" android:icon="@drawable/ic_search_white_24dp" pindroid:showAsAction="ifRoom" - pindroid:actionViewClass="android.support.v7.widget.SearchView" + pindroid:actionViewClass="androidx.appcompat.widget.SearchView" android:orderInCategory="2" /> diff --git a/app/src/main/res/menu/view_menu.xml b/app/src/main/res/menu/view_menu.xml index d93dd616..e34d6c9f 100644 --- a/app/src/main/res/menu/view_menu.xml +++ b/app/src/main/res/menu/view_menu.xml @@ -67,6 +67,6 @@ android:title="@string/menu_view_sendbookmark_title" pindroid:showAsAction="never" android:icon="@drawable/ic_share_white_24dp" - pindroid:actionProviderClass="android.support.v7.widget.ShareActionProvider" + pindroid:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" android:orderInCategory="15" /> diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml index 6a6be1b3..daf1b060 100644 --- a/app/src/main/res/values-v21/dimens.xml +++ b/app/src/main/res/values-v21/dimens.xml @@ -22,6 +22,6 @@ */ --> - 24dp + 0dp 16dp \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 746038b0..38d87f75 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -30,6 +30,6 @@ @color/text_body @style/AccountSpinner @style/MySearchViewStyle - true + @color/pindroid_blue_dark \ No newline at end of file diff --git a/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java b/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java index 99743374..1a238ab3 100644 --- a/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java +++ b/app/src/test/java/com/pindroid/activity/FragmentBaseActivityTest.java @@ -3,7 +3,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.pindroid.BuildConfig; import com.pindroid.Constants; diff --git a/build.gradle b/build.gradle index b3e1f021..d44dc70e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7d0bdb37..da1db5f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Apr 29 08:24:07 EDT 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From 106693c4bcf91223d5ed266a02d3ac7db4dad457 Mon Sep 17 00:00:00 2001 From: Matthew Schmidt Date: Fri, 27 Oct 2023 15:21:32 -0400 Subject: [PATCH 4/4] Modernize build --- gradle.properties | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..e3dfef4e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true +android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false +android.useAndroidX=true \ No newline at end of file