From 09e9603133b98b8f832b1a2ebeef92b23b84666c Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 20 Jun 2020 00:00:15 -0400 Subject: [PATCH] Migrate to AndroidX --- app/build.gradle | 8 +++----- .../core/app/settings/SettingsUtils.java | 4 ++-- .../org/transdroid/core/gui/DetailsActivity.java | 4 ++-- .../org/transdroid/core/gui/DetailsFragment.java | 6 +++--- .../core/gui/TorrentTasksExecutor.java | 4 ++-- .../transdroid/core/gui/TorrentsActivity.java | 16 ++++++++-------- .../transdroid/core/gui/TorrentsFragment.java | 8 ++++---- .../org/transdroid/core/gui/TransdroidApp.java | 4 ++-- .../transdroid/core/gui/log/DatabaseHelper.java | 2 +- .../core/gui/navigation/NavigationHelper.java | 6 +++--- .../core/gui/remoterss/RemoteRssFragment.java | 2 +- .../core/gui/rss/RssFeedsActivity.java | 14 +++++++------- .../core/gui/rss/RssFeedsFragment.java | 2 +- .../core/gui/rss/RssItemsActivity.java | 4 ++-- .../core/gui/rss/RssItemsFragment.java | 4 ++-- .../core/gui/search/SearchActivity.java | 6 +++--- .../core/gui/search/SearchResultsFragment.java | 2 +- .../InterceptableEditTextPreference.java | 2 +- .../gui/settings/PreferenceCompatActivity.java | 10 +++++----- .../gui/settings/ServerSettingsActivity.java | 2 +- .../gui/settings/SystemSettingsActivity.java | 2 +- .../transdroid/core/service/AppUpdateJob.java | 2 +- .../core/service/AppUpdateJobRunner.java | 2 +- .../core/service/ConnectivityHelper.java | 6 +++--- .../transdroid/core/service/RssCheckerJob.java | 2 +- .../core/service/RssCheckerJobRunner.java | 2 +- .../core/service/ScheduledJobCreator.java | 4 ++-- .../core/service/ServerCheckerJob.java | 2 +- .../core/service/ServerCheckerJobRunner.java | 2 +- .../core/widget/ListWidgetConfigActivity.java | 4 ++-- .../core/widget/ListWidgetProvider.java | 2 +- .../org/transdroid/daemon/DaemonException.java | 2 +- .../transdroid/daemon/Deluge/DelugeCommon.java | 2 +- .../daemon/Deluge/DelugeRpcAdapter.java | 2 +- .../daemon/Deluge/DelugeRpcClient.java | 2 +- .../main/res/layout-w600dp/activity_search.xml | 2 +- .../main/res/layout-w600dp/activity_torrents.xml | 8 ++++---- .../main/res/layout-w900dp/activity_rssfeeds.xml | 8 ++++---- .../main/res/layout-w900dp/activity_torrents.xml | 10 +++++----- app/src/main/res/layout/activity_details.xml | 2 +- app/src/main/res/layout/activity_rssfeeds.xml | 8 ++++---- app/src/main/res/layout/activity_rssitems.xml | 2 +- app/src/main/res/layout/activity_search.xml | 4 ++-- app/src/main/res/layout/activity_torrents.xml | 12 ++++++------ app/src/main/res/layout/fragment_details.xml | 8 ++++---- app/src/main/res/layout/fragment_torrents.xml | 4 ++-- app/src/main/res/menu/activity_search.xml | 2 +- app/src/main/res/menu/activity_torrents_main.xml | 2 +- gradle.properties | 2 ++ 49 files changed, 111 insertions(+), 111 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8ae7b809..dffc9a97 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,11 +77,9 @@ android { dependencies { // Android support - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' + implementation 'com.google.android.material:material:1.1.0' // Other implementation 'org.androidannotations:androidannotations-api:4.7.0' diff --git a/app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java b/app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java index 79989549..1c5a2834 100644 --- a/app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java +++ b/app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java @@ -2,8 +2,8 @@ package org.transdroid.core.app.settings; import android.content.Context; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.Theme; diff --git a/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java index 2ec7ee0e..2dc28601 100644 --- a/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java @@ -20,8 +20,8 @@ import android.annotation.TargetApi; import android.content.Intent; import android.os.Build; 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 com.nispok.snackbar.Snackbar; import com.nispok.snackbar.SnackbarManager; diff --git a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java index d701d54e..c4b8baf2 100644 --- a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java @@ -23,9 +23,9 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.ActionMenuView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.ActionMenuView; import android.view.ActionMode; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java b/app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java index dd7c5036..297dec6c 100644 --- a/app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java @@ -16,8 +16,8 @@ */ package org.transdroid.core.gui; -import android.support.v7.widget.ActionMenuView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.Toolbar; import org.transdroid.daemon.Priority; import org.transdroid.daemon.Torrent; diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java index 054f140a..0d67a33f 100644 --- a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java @@ -24,14 +24,14 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.view.MenuItemCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.ActionMenuView; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.core.view.MenuItemCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java index 9553e107..9e2dccd0 100644 --- a/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java @@ -18,10 +18,10 @@ package org.transdroid.core.gui; import android.app.Fragment; import android.content.Context; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.ActionMenuView; -import android.support.v7.widget.Toolbar; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.Toolbar; import android.view.ActionMode; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/org/transdroid/core/gui/TransdroidApp.java b/app/src/main/java/org/transdroid/core/gui/TransdroidApp.java index 54c5088e..0f8299b0 100644 --- a/app/src/main/java/org/transdroid/core/gui/TransdroidApp.java +++ b/app/src/main/java/org/transdroid/core/gui/TransdroidApp.java @@ -17,8 +17,8 @@ package org.transdroid.core.gui; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.evernote.android.job.JobConfig; import com.evernote.android.job.JobManager; import com.evernote.android.job.util.JobLogger; diff --git a/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java b/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java index 448a3df9..dda98570 100644 --- a/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java @@ -20,7 +20,7 @@ import java.sql.SQLException; import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import android.util.Log; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; diff --git a/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java index 2051c814..c7018530 100644 --- a/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java @@ -26,9 +26,9 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.style.TypefaceSpan; diff --git a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java index 43cb2e87..088292c8 100644 --- a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java @@ -17,7 +17,7 @@ package org.transdroid.core.gui.remoterss; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.View; import android.widget.ArrayAdapter; import android.widget.ListView; diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java index 06035b47..c5eba827 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java @@ -22,13 +22,13 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Parcel; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java b/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java index 894bf4f0..f60acf9f 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.rss; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java index 46e9a7aa..7f9794da 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java @@ -20,8 +20,8 @@ import android.annotation.TargetApi; import android.content.Intent; import android.os.Build; 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 org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssItemsFragment.java b/app/src/main/java/org/transdroid/core/gui/rss/RssItemsFragment.java index e14c42cf..48133995 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssItemsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssItemsFragment.java @@ -23,8 +23,8 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.ActionMode; import android.view.Menu; diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java index d7f85bf4..254840fe 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java @@ -23,9 +23,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.SearchRecentSuggestions; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +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; diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java index 696d43b0..59d19702 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java @@ -20,7 +20,7 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.ActionMode; import android.view.Menu; diff --git a/app/src/main/java/org/transdroid/core/gui/settings/InterceptableEditTextPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/InterceptableEditTextPreference.java index 71e48b96..c0b49954 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/InterceptableEditTextPreference.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/InterceptableEditTextPreference.java @@ -3,7 +3,7 @@ package org.transdroid.core.gui.settings; import android.content.Context; import android.os.Build; import android.preference.EditTextPreference; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; public class InterceptableEditTextPreference extends EditTextPreference { diff --git a/app/src/main/java/org/transdroid/core/gui/settings/PreferenceCompatActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/PreferenceCompatActivity.java index 6553f068..8cd67c2d 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/PreferenceCompatActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/PreferenceCompatActivity.java @@ -3,11 +3,11 @@ package org.transdroid.core.gui.settings; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatCallback; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.view.ActionMode; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatCallback; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.view.ActionMode; public class PreferenceCompatActivity extends PreferenceActivity implements AppCompatCallback { diff --git a/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java index 8d3c4727..e8b85992 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; diff --git a/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java index ebc1e066..2995086d 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.nispok.snackbar.Snackbar; diff --git a/app/src/main/java/org/transdroid/core/service/AppUpdateJob.java b/app/src/main/java/org/transdroid/core/service/AppUpdateJob.java index 62197eec..cf50c4c7 100644 --- a/app/src/main/java/org/transdroid/core/service/AppUpdateJob.java +++ b/app/src/main/java/org/transdroid/core/service/AppUpdateJob.java @@ -17,7 +17,7 @@ package org.transdroid.core.service; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; import com.evernote.android.job.JobRequest; diff --git a/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java b/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java index ce41ddb9..23afcd45 100644 --- a/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java +++ b/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java @@ -23,7 +23,7 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.evernote.android.job.Job; diff --git a/app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java b/app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java index 4e532d36..ad0497c4 100644 --- a/app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java +++ b/app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java @@ -23,9 +23,9 @@ import android.content.DialogInterface; import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.EBean.Scope; import org.androidannotations.annotations.SystemService; diff --git a/app/src/main/java/org/transdroid/core/service/RssCheckerJob.java b/app/src/main/java/org/transdroid/core/service/RssCheckerJob.java index 85bf6479..066ce99a 100644 --- a/app/src/main/java/org/transdroid/core/service/RssCheckerJob.java +++ b/app/src/main/java/org/transdroid/core/service/RssCheckerJob.java @@ -17,7 +17,7 @@ package org.transdroid.core.service; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; import com.evernote.android.job.JobRequest; diff --git a/app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java b/app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java index 910c90da..f1343a96 100644 --- a/app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java +++ b/app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java @@ -20,7 +20,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.evernote.android.job.Job; diff --git a/app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java b/app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java index 450aeacf..01f8c0f4 100644 --- a/app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java +++ b/app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java @@ -16,8 +16,8 @@ */ package org.transdroid.core.service; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.evernote.android.job.Job; import com.evernote.android.job.JobCreator; diff --git a/app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java b/app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java index a0f05bba..218bc129 100644 --- a/app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java +++ b/app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java @@ -17,7 +17,7 @@ package org.transdroid.core.service; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; import com.evernote.android.job.JobRequest; diff --git a/app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java b/app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java index 8573dfae..094ef47f 100644 --- a/app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java +++ b/app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java @@ -20,7 +20,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.text.TextUtils; import com.evernote.android.job.Job; import org.androidannotations.annotations.Bean; diff --git a/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java index 73f806bb..e4d7d68d 100644 --- a/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java @@ -22,8 +22,8 @@ import android.appwidget.AppWidgetManager; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; diff --git a/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java index 2ef2b471..efc38d58 100644 --- a/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java @@ -24,7 +24,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.RemoteViews; import org.androidannotations.annotations.Bean; diff --git a/app/src/main/java/org/transdroid/daemon/DaemonException.java b/app/src/main/java/org/transdroid/daemon/DaemonException.java index ca367540..29040814 100644 --- a/app/src/main/java/org/transdroid/daemon/DaemonException.java +++ b/app/src/main/java/org/transdroid/daemon/DaemonException.java @@ -18,7 +18,7 @@ package org.transdroid.daemon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * An exception thrown when an error occurs inside a server daemon adapter. diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java index 73622761..fdb76964 100644 --- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java +++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java @@ -17,7 +17,7 @@ */ package org.transdroid.daemon.Deluge; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.transdroid.daemon.Priority; import org.transdroid.daemon.TorrentStatus; diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java index 252cab19..8c9e9011 100644 --- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java @@ -17,7 +17,7 @@ */ package org.transdroid.daemon.Deluge; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.base64.android.Base64; import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.remoterss.data.RemoteRssChannel; diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java index 9906d560..47069f04 100644 --- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java +++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java @@ -17,7 +17,7 @@ */ package org.transdroid.daemon.Deluge; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.DaemonException.ExceptionType; import org.transdroid.daemon.DaemonSettings; diff --git a/app/src/main/res/layout-w600dp/activity_search.xml b/app/src/main/res/layout-w600dp/activity_search.xml index cf882efe..149c511f 100644 --- a/app/src/main/res/layout-w600dp/activity_search.xml +++ b/app/src/main/res/layout-w600dp/activity_search.xml @@ -23,7 +23,7 @@ android:orientation="horizontal" tools:context=".core.gui.search.SearchActivity_"> - - - - - - - - @@ -79,6 +79,6 @@ android:layout_height="match_parent" tools:layout="@layout/fragment_torrents" /> - + diff --git a/app/src/main/res/layout-w900dp/activity_torrents.xml b/app/src/main/res/layout-w900dp/activity_torrents.xml index daadda61..04d54f77 100644 --- a/app/src/main/res/layout-w900dp/activity_torrents.xml +++ b/app/src/main/res/layout-w900dp/activity_torrents.xml @@ -30,7 +30,7 @@ android:focusable="true" android:focusableInTouchMode="true"/> - - - - - - - - - @@ -73,6 +73,6 @@ tools:layout="@layout/fragment_torrents" /> - + diff --git a/app/src/main/res/layout/activity_rssitems.xml b/app/src/main/res/layout/activity_rssitems.xml index 1350234e..1b7df4a9 100644 --- a/app/src/main/res/layout/activity_rssitems.xml +++ b/app/src/main/res/layout/activity_rssitems.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" tools:context=".core.gui.rss.RssItemsActivity_"> - - - + . --> - - - - - - + diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml index f6f5af5c..3470e821 100644 --- a/app/src/main/res/layout/fragment_details.xml +++ b/app/src/main/res/layout/fragment_details.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" tools:context=".core.gui.DetailsActivity_"> - - - - + - @@ -36,7 +36,7 @@ tools:listitem="@layout/list_item_torrent" tools:visibility="visible" /> - +