Browse Source

Migrate to AndroidX

pull/554/head
TacoTheDank 4 years ago
parent
commit
09e9603133
  1. 8
      app/build.gradle
  2. 4
      app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java
  3. 4
      app/src/main/java/org/transdroid/core/gui/DetailsActivity.java
  4. 6
      app/src/main/java/org/transdroid/core/gui/DetailsFragment.java
  5. 4
      app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java
  6. 16
      app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java
  7. 8
      app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java
  8. 4
      app/src/main/java/org/transdroid/core/gui/TransdroidApp.java
  9. 2
      app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java
  10. 6
      app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java
  11. 2
      app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java
  12. 14
      app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java
  13. 2
      app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java
  14. 4
      app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java
  15. 4
      app/src/main/java/org/transdroid/core/gui/rss/RssItemsFragment.java
  16. 6
      app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java
  17. 2
      app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java
  18. 2
      app/src/main/java/org/transdroid/core/gui/settings/InterceptableEditTextPreference.java
  19. 10
      app/src/main/java/org/transdroid/core/gui/settings/PreferenceCompatActivity.java
  20. 2
      app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java
  21. 2
      app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java
  22. 2
      app/src/main/java/org/transdroid/core/service/AppUpdateJob.java
  23. 2
      app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java
  24. 6
      app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java
  25. 2
      app/src/main/java/org/transdroid/core/service/RssCheckerJob.java
  26. 2
      app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java
  27. 4
      app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java
  28. 2
      app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java
  29. 2
      app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java
  30. 4
      app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java
  31. 2
      app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java
  32. 2
      app/src/main/java/org/transdroid/daemon/DaemonException.java
  33. 2
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java
  34. 2
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java
  35. 2
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java
  36. 2
      app/src/main/res/layout-w600dp/activity_search.xml
  37. 8
      app/src/main/res/layout-w600dp/activity_torrents.xml
  38. 8
      app/src/main/res/layout-w900dp/activity_rssfeeds.xml
  39. 10
      app/src/main/res/layout-w900dp/activity_torrents.xml
  40. 2
      app/src/main/res/layout/activity_details.xml
  41. 8
      app/src/main/res/layout/activity_rssfeeds.xml
  42. 2
      app/src/main/res/layout/activity_rssitems.xml
  43. 4
      app/src/main/res/layout/activity_search.xml
  44. 12
      app/src/main/res/layout/activity_torrents.xml
  45. 8
      app/src/main/res/layout/fragment_details.xml
  46. 4
      app/src/main/res/layout/fragment_torrents.xml
  47. 2
      app/src/main/res/menu/activity_search.xml
  48. 2
      app/src/main/res/menu/activity_torrents_main.xml
  49. 2
      gradle.properties

8
app/build.gradle

@ -77,11 +77,9 @@ android {
dependencies { dependencies {
// Android support // Android support
implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
implementation 'com.android.support:support-annotations:28.0.0' implementation 'com.google.android.material:material:1.1.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
// Other // Other
implementation 'org.androidannotations:androidannotations-api:4.7.0' implementation 'org.androidannotations:androidannotations-api:4.7.0'

4
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.content.Context;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme; import com.afollestad.materialdialogs.Theme;

4
app/src/main/java/org/transdroid/core/gui/DetailsActivity.java

@ -20,8 +20,8 @@ import android.annotation.TargetApi;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import com.nispok.snackbar.Snackbar; import com.nispok.snackbar.Snackbar;
import com.nispok.snackbar.SnackbarManager; import com.nispok.snackbar.SnackbarManager;

6
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.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.v4.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.ActionMenuView; import androidx.appcompat.widget.ActionMenuView;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;

4
app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java

@ -16,8 +16,8 @@
*/ */
package org.transdroid.core.gui; package org.transdroid.core.gui;
import android.support.v7.widget.ActionMenuView; import androidx.appcompat.widget.ActionMenuView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import org.transdroid.daemon.Priority; import org.transdroid.daemon.Priority;
import org.transdroid.daemon.Torrent; import org.transdroid.daemon.Torrent;

16
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.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.view.MenuItemCompat; import androidx.core.view.MenuItemCompat;
import android.support.v4.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.ActionMenuView; import androidx.appcompat.widget.ActionMenuView;
import android.support.v7.widget.SearchView; import androidx.appcompat.widget.SearchView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

8
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.app.Fragment;
import android.content.Context; import android.content.Context;
import android.support.v4.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.ActionMenuView; import androidx.appcompat.widget.ActionMenuView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;

4
app/src/main/java/org/transdroid/core/gui/TransdroidApp.java

@ -17,8 +17,8 @@
package org.transdroid.core.gui; package org.transdroid.core.gui;
import android.app.Application; import android.app.Application;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import com.evernote.android.job.JobConfig; import com.evernote.android.job.JobConfig;
import com.evernote.android.job.JobManager; import com.evernote.android.job.JobManager;
import com.evernote.android.job.util.JobLogger; import com.evernote.android.job.util.JobLogger;

2
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.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.Keep; import androidx.annotation.Keep;
import android.util.Log; import android.util.Log;
import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;

6
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.content.pm.ResolveInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.TypefaceSpan; import android.text.style.TypefaceSpan;

2
app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java

@ -17,7 +17,7 @@
package org.transdroid.core.gui.remoterss; package org.transdroid.core.gui.remoterss;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;

14
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.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.view.PagerAdapter; import androidx.viewpager.widget.PagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

2
app/src/main/java/org/transdroid/core/gui/rss/RssFeedsFragment.java

@ -16,7 +16,7 @@
*/ */
package org.transdroid.core.gui.rss; package org.transdroid.core.gui.rss;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

4
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.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.EActivity;

4
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.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;

6
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.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.SearchRecentSuggestions; import android.provider.SearchRecentSuggestions;
import android.support.v4.view.MenuItemCompat; import androidx.core.view.MenuItemCompat;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

2
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.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;

2
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.content.Context;
import android.os.Build; import android.os.Build;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.support.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import android.util.AttributeSet; import android.util.AttributeSet;
public class InterceptableEditTextPreference extends EditTextPreference { public class InterceptableEditTextPreference extends EditTextPreference {

10
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.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.ActionBar; import androidx.appcompat.app.ActionBar;
import android.support.v7.app.AppCompatCallback; import androidx.appcompat.app.AppCompatCallback;
import android.support.v7.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import android.support.v7.view.ActionMode; import androidx.appcompat.view.ActionMode;
public class PreferenceCompatActivity extends PreferenceActivity implements AppCompatCallback { public class PreferenceCompatActivity extends PreferenceActivity implements AppCompatCallback {

2
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.EditTextPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.Bean;
import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsItem;

2
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;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import com.nispok.snackbar.Snackbar; import com.nispok.snackbar.Snackbar;

2
app/src/main/java/org/transdroid/core/service/AppUpdateJob.java

@ -17,7 +17,7 @@
package org.transdroid.core.service; package org.transdroid.core.service;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import com.evernote.android.job.JobManager; import com.evernote.android.job.JobManager;
import com.evernote.android.job.JobRequest; import com.evernote.android.job.JobRequest;

2
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.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;

6
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.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.EBean;
import org.androidannotations.annotations.EBean.Scope; import org.androidannotations.annotations.EBean.Scope;
import org.androidannotations.annotations.SystemService; import org.androidannotations.annotations.SystemService;

2
app/src/main/java/org/transdroid/core/service/RssCheckerJob.java

@ -17,7 +17,7 @@
package org.transdroid.core.service; package org.transdroid.core.service;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import com.evernote.android.job.JobManager; import com.evernote.android.job.JobManager;
import com.evernote.android.job.JobRequest; import com.evernote.android.job.JobRequest;

2
app/src/main/java/org/transdroid/core/service/RssCheckerJobRunner.java

@ -20,7 +20,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;

4
app/src/main/java/org/transdroid/core/service/ScheduledJobCreator.java

@ -16,8 +16,8 @@
*/ */
package org.transdroid.core.service; package org.transdroid.core.service;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import com.evernote.android.job.JobCreator; import com.evernote.android.job.JobCreator;

2
app/src/main/java/org/transdroid/core/service/ServerCheckerJob.java

@ -17,7 +17,7 @@
package org.transdroid.core.service; package org.transdroid.core.service;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import com.evernote.android.job.JobManager; import com.evernote.android.job.JobManager;
import com.evernote.android.job.JobRequest; import com.evernote.android.job.JobRequest;

2
app/src/main/java/org/transdroid/core/service/ServerCheckerJobRunner.java

@ -20,7 +20,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import android.text.TextUtils; import android.text.TextUtils;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.Bean;

4
app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java

@ -22,8 +22,8 @@ import android.appwidget.AppWidgetManager;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import androidx.appcompat.app.ActionBar;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.CheckBox; import android.widget.CheckBox;

2
app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java

@ -24,7 +24,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.Bean;

2
app/src/main/java/org/transdroid/daemon/DaemonException.java

@ -18,7 +18,7 @@
package org.transdroid.daemon; 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. * An exception thrown when an error occurs inside a server daemon adapter.

2
app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java

@ -17,7 +17,7 @@
*/ */
package org.transdroid.daemon.Deluge; package org.transdroid.daemon.Deluge;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import org.transdroid.daemon.Priority; import org.transdroid.daemon.Priority;
import org.transdroid.daemon.TorrentStatus; import org.transdroid.daemon.TorrentStatus;

2
app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java

@ -17,7 +17,7 @@
*/ */
package org.transdroid.daemon.Deluge; package org.transdroid.daemon.Deluge;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import org.base64.android.Base64; import org.base64.android.Base64;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
import org.transdroid.core.gui.remoterss.data.RemoteRssChannel; import org.transdroid.core.gui.remoterss.data.RemoteRssChannel;

2
app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java

@ -17,7 +17,7 @@
*/ */
package org.transdroid.daemon.Deluge; package org.transdroid.daemon.Deluge;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.DaemonException;
import org.transdroid.daemon.DaemonException.ExceptionType; import org.transdroid.daemon.DaemonException.ExceptionType;
import org.transdroid.daemon.DaemonSettings; import org.transdroid.daemon.DaemonSettings;

2
app/src/main/res/layout-w600dp/activity_search.xml

@ -23,7 +23,7 @@
android:orientation="horizontal" android:orientation="horizontal"
tools:context=".core.gui.search.SearchActivity_"> tools:context=".core.gui.search.SearchActivity_">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/search_toolbar" android:id="@+id/search_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

8
app/src/main/res/layout-w600dp/activity_torrents.xml

@ -31,14 +31,14 @@
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true"/> android:focusableInTouchMode="true"/>
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/torrents_toolbar" android:id="@+id/torrents_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/actions_toolbar" android:id="@+id/actions_toolbar"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -48,7 +48,7 @@
android:paddingEnd="@dimen/ui_actions_padding" android:paddingEnd="@dimen/ui_actions_padding"
android:paddingRight="@dimen/ui_actions_padding" /> android:paddingRight="@dimen/ui_actions_padding" />
<android.support.v7.widget.ActionMenuView <androidx.appcompat.widget.ActionMenuView
android:id="@+id/contextual_menu" android:id="@+id/contextual_menu"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -58,7 +58,7 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
<android.support.v7.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/filter_search" android:id="@+id/filter_search"
android:layout_width="@dimen/ui_filters_list" android:layout_width="@dimen/ui_filters_list"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
app/src/main/res/layout-w900dp/activity_rssfeeds.xml

@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.rss.RssFeedsActivity_"> tools:context=".core.gui.rss.RssFeedsActivity_">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/rssfeeds_toolbar" android:id="@+id/rssfeeds_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -32,13 +32,13 @@
style="@style/DefaultToolbarShadow" style="@style/DefaultToolbarShadow"
android:layout_below="@id/rssfeeds_toolbar" /> android:layout_below="@id/rssfeeds_toolbar" />
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/rssfeeds_pager" android:id="@+id/rssfeeds_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/rssfeeds_toolbar"> android:layout_below="@+id/rssfeeds_toolbar">
<android.support.design.widget.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/rssfeeds_tabs" android:id="@+id/rssfeeds_tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
@ -79,6 +79,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:layout="@layout/fragment_torrents" /> tools:layout="@layout/fragment_torrents" />
</LinearLayout> </LinearLayout>
</android.support.v4.view.ViewPager> </androidx.viewpager.widget.ViewPager>
</RelativeLayout> </RelativeLayout>

10
app/src/main/res/layout-w900dp/activity_torrents.xml

@ -30,7 +30,7 @@
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true"/> android:focusableInTouchMode="true"/>
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/selection_toolbar" android:id="@+id/selection_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -41,7 +41,7 @@
android:layout_alignRight="@id/filters_list" android:layout_alignRight="@id/filters_list"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v7.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/filter_search" android:id="@+id/filter_search"
android:layout_width="@dimen/ui_filters_list" android:layout_width="@dimen/ui_filters_list"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -80,7 +80,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/actions_toolbar" android:id="@+id/actions_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -89,7 +89,7 @@
android:layout_toStartOf="@id/fragments_divider" android:layout_toStartOf="@id/fragments_divider"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v7.widget.ActionMenuView <androidx.appcompat.widget.ActionMenuView
android:id="@+id/contextual_toolbar" android:id="@+id/contextual_toolbar"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -101,7 +101,7 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/torrents_toolbar" android:id="@+id/torrents_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/activity_details.xml

@ -6,7 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".DetailsActivity"> tools:context=".DetailsActivity">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/selection_toolbar" android:id="@+id/selection_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

8
app/src/main/res/layout/activity_rssfeeds.xml

@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.rss.RssFeedsActivity_"> tools:context=".core.gui.rss.RssFeedsActivity_">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/rssfeeds_toolbar" android:id="@+id/rssfeeds_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -32,14 +32,14 @@
style="@style/DefaultToolbarShadow" style="@style/DefaultToolbarShadow"
android:layout_below="@id/rssfeeds_toolbar" /> android:layout_below="@id/rssfeeds_toolbar" />
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/rssfeeds_pager" android:id="@+id/rssfeeds_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/rssfeeds_toolbar" android:layout_below="@id/rssfeeds_toolbar"
android:layout_marginTop="-2dp"> android:layout_marginTop="-2dp">
<android.support.design.widget.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/rssfeeds_tabs" android:id="@+id/rssfeeds_tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -73,6 +73,6 @@
tools:layout="@layout/fragment_torrents" /> tools:layout="@layout/fragment_torrents" />
</LinearLayout> </LinearLayout>
</android.support.v4.view.ViewPager> </androidx.viewpager.widget.ViewPager>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout/activity_rssitems.xml

@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.rss.RssItemsActivity_"> tools:context=".core.gui.rss.RssItemsActivity_">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/rssfeeds_toolbar" android:id="@+id/rssfeeds_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

4
app/src/main/res/layout/activity_search.xml

@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.search.SearchActivity_"> tools:context=".core.gui.search.SearchActivity_">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/search_toolbar" android:id="@+id/search_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -33,7 +33,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</android.support.v7.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"

12
app/src/main/res/layout/activity_torrents.xml

@ -16,7 +16,7 @@
along with Transdroid. If not, see <http://www.gnu.org/licenses/>. along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
--> -->
<!-- This layout is for phones in portrait and shows the torrents list with the filters as navigation drawer. --> <!-- This layout is for phones in portrait and shows the torrents list with the filters as navigation drawer. -->
<android.support.v4.widget.DrawerLayout <androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
@ -31,14 +31,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/torrents_toolbar" android:id="@+id/torrents_toolbar"
style="@style/DefaultToolbar" style="@style/DefaultToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/actions_toolbar" android:id="@+id/actions_toolbar"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -48,7 +48,7 @@
android:paddingEnd="@dimen/ui_actions_padding" android:paddingEnd="@dimen/ui_actions_padding"
android:paddingRight="@dimen/ui_actions_padding" /> android:paddingRight="@dimen/ui_actions_padding" />
<android.support.v7.widget.ActionMenuView <androidx.appcompat.widget.ActionMenuView
android:id="@+id/contextual_menu" android:id="@+id/contextual_menu"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -107,7 +107,7 @@
android:divider="@null" android:divider="@null"
tools:listitem="@layout/list_item_filter" /> tools:listitem="@layout/list_item_filter" />
<android.support.v7.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/filter_search" android:id="@+id/filter_search"
android:layout_width="@dimen/ui_filters_list" android:layout_width="@dimen/ui_filters_list"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -121,4 +121,4 @@
</LinearLayout> </LinearLayout>
</android.support.v4.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

8
app/src/main/res/layout/fragment_details.xml

@ -23,7 +23,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.DetailsActivity_"> tools:context=".core.gui.DetailsActivity_">
<android.support.v7.widget.ActionMenuView <androidx.appcompat.widget.ActionMenuView
android:id="@+id/details_menu" android:id="@+id/details_menu"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -31,7 +31,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v7.widget.ActionMenuView <androidx.appcompat.widget.ActionMenuView
android:id="@+id/contextual_menu" android:id="@+id/contextual_menu"
style="@style/SplitToolbar" style="@style/SplitToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -41,7 +41,7 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_layout" android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -56,7 +56,7 @@
android:dividerHeight="0dip" android:dividerHeight="0dip"
android:visibility="gone" /> android:visibility="gone" />
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<ProgressBar <ProgressBar
android:id="@+id/loading_progress" android:id="@+id/loading_progress"

4
app/src/main/res/layout/fragment_torrents.xml

@ -20,7 +20,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_layout" android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -36,7 +36,7 @@
tools:listitem="@layout/list_item_torrent" tools:listitem="@layout/list_item_torrent"
tools:visibility="visible" /> tools:visibility="visible" />
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<ProgressBar <ProgressBar
android:id="@+id/loading_progress" android:id="@+id/loading_progress"

2
app/src/main/res/menu/activity_search.xml

@ -21,7 +21,7 @@
android:id="@+id/action_search" android:id="@+id/action_search"
android:icon="@drawable/ic_action_search" android:icon="@drawable/ic_action_search"
android:title="@string/action_search" android:title="@string/action_search"
app:actionViewClass="android.support.v7.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="collapseActionView|ifRoom" /> app:showAsAction="collapseActionView|ifRoom" />
<item <item
android:id="@+id/action_refresh" android:id="@+id/action_refresh"

2
app/src/main/res/menu/activity_torrents_main.xml

@ -21,7 +21,7 @@
android:id="@+id/action_search" android:id="@+id/action_search"
android:icon="@drawable/ic_action_search" android:icon="@drawable/ic_action_search"
android:title="@string/action_search" android:title="@string/action_search"
app:actionViewClass="android.support.v7.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="collapseActionView|ifRoom" /> app:showAsAction="collapseActionView|ifRoom" />
<item <item
android:id="@+id/action_rss" android:id="@+id/action_rss"

2
gradle.properties

@ -11,3 +11,5 @@
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
android.enableJetifier=true
android.useAndroidX=true

Loading…
Cancel
Save