Browse Source

Move to AndroidX

tags/2.6.0
tom79 1 year ago
parent
commit
c4b360ea83
100 changed files with 385 additions and 398 deletions
  1. +9
    -8
      app/build.gradle
  2. +1
    -1
      app/src/main/AndroidManifest.xml
  3. +2
    -2
      app/src/main/java/app/fedilab/android/activities/AboutActivity.java
  4. +5
    -7
      app/src/main/java/app/fedilab/android/activities/BaseActivity.java
  5. +24
    -27
      app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
  6. +2
    -2
      app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
  7. +6
    -6
      app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
  8. +5
    -6
      app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
  9. +3
    -3
      app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
  10. +1
    -1
      app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
  11. +2
    -2
      app/src/main/java/app/fedilab/android/activities/LanguageActivity.java
  12. +7
    -7
      app/src/main/java/app/fedilab/android/activities/ListActivity.java
  13. +6
    -6
      app/src/main/java/app/fedilab/android/activities/LoginActivity.java
  14. +3
    -3
      app/src/main/java/app/fedilab/android/activities/MainApplication.java
  15. +3
    -3
      app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java
  16. +3
    -3
      app/src/main/java/app/fedilab/android/activities/MediaActivity.java
  17. +2
    -2
      app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java
  18. +9
    -9
      app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java
  19. +2
    -2
      app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
  20. +8
    -13
      app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
  21. +3
    -3
      app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
  22. +4
    -4
      app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
  23. +9
    -9
      app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
  24. +7
    -7
      app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
  25. +2
    -2
      app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java
  26. +1
    -1
      app/src/main/java/app/fedilab/android/activities/ProxyActivity.java
  27. +6
    -6
      app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
  28. +2
    -2
      app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
  29. +8
    -8
      app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
  30. +14
    -14
      app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
  31. +7
    -7
      app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
  32. +3
    -3
      app/src/main/java/app/fedilab/android/activities/TagCacheActivity.java
  33. +9
    -9
      app/src/main/java/app/fedilab/android/activities/TootActivity.java
  34. +6
    -6
      app/src/main/java/app/fedilab/android/activities/TootInfoActivity.java
  35. +3
    -3
      app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
  36. +3
    -5
      app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
  37. +2
    -2
      app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
  38. +1
    -1
      app/src/main/java/app/fedilab/android/client/API.java
  39. +3
    -3
      app/src/main/java/app/fedilab/android/client/Entities/Account.java
  40. +5
    -5
      app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
  41. +2
    -2
      app/src/main/java/app/fedilab/android/client/Entities/Notification.java
  42. +3
    -3
      app/src/main/java/app/fedilab/android/client/Entities/Status.java
  43. +1
    -1
      app/src/main/java/app/fedilab/android/client/Entities/Version.java
  44. +1
    -1
      app/src/main/java/app/fedilab/android/client/GNUAPI.java
  45. +1
    -1
      app/src/main/java/app/fedilab/android/client/Glide/CustomStreamFetcher.java
  46. +2
    -2
      app/src/main/java/app/fedilab/android/client/Glide/HttpsUrlLoader.java
  47. +1
    -1
      app/src/main/java/app/fedilab/android/client/Glide/TLSLibraryGlideModule.java
  48. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java
  49. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java
  50. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java
  51. +4
    -4
      app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java
  52. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/AccountsReplyAdapter.java
  53. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java
  54. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java
  55. +3
    -3
      app/src/main/java/app/fedilab/android/drawers/ConversationDecoration.java
  56. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
  57. +3
    -3
      app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java
  58. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java
  59. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/EmojisSearchAdapter.java
  60. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java
  61. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/HowToVideosAdapter.java
  62. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java
  63. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/ListAdapter.java
  64. +6
    -6
      app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
  65. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java
  66. +3
    -3
      app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java
  67. +5
    -5
      app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
  68. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java
  69. +3
    -3
      app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java
  70. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java
  71. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java
  72. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/SearchTagsAdapter.java
  73. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java
  74. +6
    -6
      app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
  75. +2
    -2
      app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java
  76. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/TagsSearchAdapter.java
  77. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/WhoToFollowAccountsAdapter.java
  78. +1
    -1
      app/src/main/java/app/fedilab/android/drawers/WhoToFollowAdapter.java
  79. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java
  80. +6
    -6
      app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java
  81. +4
    -4
      app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java
  82. +6
    -6
      app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java
  83. +4
    -4
      app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java
  84. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java
  85. +2
    -2
      app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java
  86. +4
    -4
      app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java
  87. +4
    -4
      app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java
  88. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java
  89. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
  90. +6
    -6
      app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java
  91. +5
    -6
      app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
  92. +2
    -2
      app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java
  93. +4
    -4
      app/src/main/java/app/fedilab/android/fragments/DisplaySearchFragment.java
  94. +6
    -6
      app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
  95. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
  96. +5
    -5
      app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java
  97. +3
    -3
      app/src/main/java/app/fedilab/android/fragments/SettingsNotificationsFragment.java
  98. +2
    -2
      app/src/main/java/app/fedilab/android/fragments/SettingsOptimizationFragment.java
  99. +2
    -2
      app/src/main/java/app/fedilab/android/fragments/SettingsPeertubeFragment.java
  100. +7
    -7
      app/src/main/java/app/fedilab/android/fragments/TabLayoutNotificationsFragment.java

+ 9
- 8
app/build.gradle View File

@@ -68,15 +68,16 @@ ext.torrentstreamVersion = "2.5.0"


dependencies {
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion"
implementation "com.android.support:support-v4:$supportLibraryVersion"
implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
implementation "com.android.support:customtabs:$supportLibraryVersion"
implementation "com.android.support:exifinterface:$supportLibraryVersion"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "com.github.bumptech.glide:glide:$glideLibraryVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideLibraryVersion"
annotationProcessor 'com.android.support:support-annotations:28.0.0'
implementation "org.conscrypt:conscrypt-android:$conscryptLibraryVersion"
implementation "com.evernote:android-job:$evernoteLibraryVersion"
implementation "com.google.code.gson:gson:$gsonLibraryVersion"
@@ -92,7 +93,7 @@ dependencies {
implementation 'com.github.franmontiel:LocaleChanger:0.9.2'
implementation 'com.github.GrenderG:Toasty:1.3.1'
implementation 'com.elconfidencial.bubbleshowcase:bubbleshowcase:1.3.1'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'com.google.android.exoplayer:exoplayer:2.9.3'
implementation 'com.github.stom79:android-upload-service:3.4.2-Mastalab'
implementation 'org.apache.poi:poi:3.16'


+ 1
- 1
app/src/main/AndroidManifest.xml View File

@@ -295,7 +295,7 @@
android:label="@string/app_name"
/>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="app.fedilab.android.fileProvider"
android:exported="false"
android:grantUriPermissions="true">


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/AboutActivity.java View File

@@ -22,8 +22,8 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.view.LayoutInflater;


+ 5
- 7
app/src/main/java/app/fedilab/android/activities/BaseActivity.java View File

@@ -5,14 +5,12 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.NonNull;
import com.google.android.material.snackbar.Snackbar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Toast;

import com.franmontiel.localechanger.LocaleChanger;


+ 24
- 27
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java View File

@@ -18,7 +18,6 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ActivityManager;
import android.content.ActivityNotFoundException;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -30,26 +29,26 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.NavigationView;
import android.support.design.widget.TabLayout;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.navigation.NavigationView;
import com.google.android.material.tabs.TabLayout;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.core.content.ContextCompat;
import androidx.core.view.GravityCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import android.util.Patterns;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -67,7 +66,6 @@ import android.widget.TextView;
import android.widget.Toast;

import java.lang.reflect.Method;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -108,7 +106,6 @@ import app.fedilab.android.helper.MenuFloating;
import app.fedilab.android.services.BackupStatusService;
import app.fedilab.android.services.LiveNotificationService;
import app.fedilab.android.sqlite.AccountDAO;
import app.fedilab.android.sqlite.InstancesDAO;
import app.fedilab.android.sqlite.Sqlite;
import app.fedilab.android.sqlite.TimelineCacheDAO;
import app.fedilab.android.sqlite.TimelinesDAO;
@@ -265,13 +262,13 @@ public abstract class BaseMainActivity extends BaseActivity
delete_instance = findViewById(R.id.delete_instance);
display_timeline = findViewById(R.id.display_timeline);
if( theme == Helper.THEME_LIGHT) {
ImageView icon = toolbar_search.findViewById(android.support.v7.appcompat.R.id.search_button);
ImageView close = toolbar_search.findViewById(android.support.v7.appcompat.R.id.search_close_btn);
ImageView icon = toolbar_search.findViewById(R.id.search_button);
ImageView close = toolbar_search.findViewById(R.id.search_close_btn);
if( icon != null)
icon.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon));
if( close != null)
close.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon));
EditText editText = toolbar_search.findViewById(android.support.v7.appcompat.R.id.search_src_text);
EditText editText = toolbar_search.findViewById(R.id.search_src_text);
editText.setHintTextColor(getResources().getColor(R.color.dark_icon));
editText.setTextColor(getResources().getColor(R.color.dark_icon));
changeDrawableColor(BaseMainActivity.this,delete_instance, R.color.dark_icon);
@@ -857,7 +854,7 @@ public abstract class BaseMainActivity extends BaseActivity
iconbar.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
drawer.openDrawer(Gravity.START);
drawer.openDrawer(GravityCompat.START);
}
});
Helper.loadPictureIcon(BaseMainActivity.this, account.getAvatar(),iconbar);


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java View File

@@ -22,8 +22,8 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.text.TextUtils;
import android.view.LayoutInflater;


+ 6
- 6
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java View File

@@ -30,12 +30,12 @@ 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.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.Html;
import android.text.TextWatcher;


+ 5
- 6
app/src/main/java/app/fedilab/android/activities/HashTagActivity.java View File

@@ -20,12 +20,11 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/InstanceActivity.java View File

@@ -23,9 +23,9 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.MenuItem;


+ 1
- 1
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java View File

@@ -30,7 +30,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.view.MenuItem;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/LanguageActivity.java View File

@@ -22,8 +22,8 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 7
- 7
app/src/main/java/app/fedilab/android/activities/ListActivity.java View File

@@ -20,13 +20,13 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.Menu;


+ 6
- 6
app/src/main/java/app/fedilab/android/activities/LoginActivity.java View File

@@ -27,12 +27,12 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import com.google.android.material.textfield.TextInputLayout;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.SpannableString;
import android.text.TextWatcher;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/MainApplication.java View File

@@ -17,9 +17,9 @@ package app.fedilab.android.activities;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.StrictMode;
import android.support.multidex.MultiDex;
import android.support.multidex.MultiDexApplication;
import android.support.v4.content.ContextCompat;
import androidx.multidex.MultiDex;
import androidx.multidex.MultiDexApplication;
import androidx.core.content.ContextCompat;

import com.evernote.android.job.JobManager;
import com.franmontiel.localechanger.LocaleChanger;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java View File

@@ -17,9 +17,9 @@ package app.fedilab.android.activities;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.MenuItem;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/MediaActivity.java View File

@@ -23,9 +23,9 @@ import android.graphics.RectF;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
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.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java View File

@@ -20,8 +20,8 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 9
- 9
app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java View File

@@ -26,15 +26,15 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java View File

@@ -20,8 +20,8 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.MenuItem;


+ 8
- 13
app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java View File

@@ -32,14 +32,14 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.AppCompatImageView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.appcompat.widget.PopupMenu;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -90,16 +90,13 @@ import app.fedilab.android.client.Entities.Playlist;
import app.fedilab.android.client.Entities.Status;
import app.fedilab.android.client.TLSSocketFactory;
import app.fedilab.android.drawers.StatusListAdapter;
import app.fedilab.android.fragments.DisplayStatusFragment;
import app.fedilab.android.helper.CrossActions;
import app.fedilab.android.helper.FullScreenMediaController;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.interfaces.OnPlaylistActionInterface;
import app.fedilab.android.sqlite.AccountDAO;
import app.fedilab.android.sqlite.InstancesDAO;
import app.fedilab.android.sqlite.PeertubeFavoritesDAO;
import app.fedilab.android.sqlite.Sqlite;
import app.fedilab.android.sqlite.TimelinesDAO;
import app.fedilab.android.webview.MastalabWebChromeClient;
import app.fedilab.android.webview.MastalabWebViewClient;
import es.dmoral.toasty.Toasty;
@@ -112,8 +109,6 @@ import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.interfaces.OnPostActionInterface;
import app.fedilab.android.interfaces.OnRetrievePeertubeInterface;

import static app.fedilab.android.activities.BaseMainActivity.mPageReferenceMap;
import static app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask.action.GET_LIST_VIDEOS;
import static app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask.action.GET_PLAYLIST;
import static app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask.action.GET_PLAYLIST_FOR_VIDEO;
import static app.fedilab.android.helper.Helper.changeDrawableColor;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java View File

@@ -21,9 +21,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 4
- 4
app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java View File

@@ -29,10 +29,10 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.provider.OpenableColumns;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 9
- 9
app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java View File

@@ -19,8 +19,8 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.v4.content.LocalBroadcastManager;
import androidx.annotation.NonNull;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.view.Window;


@@ -45,13 +45,13 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.provider.MediaStore;
import android.support.constraint.ConstraintLayout;
import android.support.constraint.ConstraintSet;
import android.support.transition.ChangeBounds;
import android.support.transition.TransitionManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.transition.ChangeBounds;
import androidx.transition.TransitionManager;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.animation.AnticipateOvershootInterpolator;
import android.widget.Button;


+ 7
- 7
app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java View File

@@ -19,13 +19,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.appcompat.app.ActionBar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java View File

@@ -18,8 +18,8 @@ package app.fedilab.android.activities;
import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 1
- 1
app/src/main/java/app/fedilab/android/activities/ProxyActivity.java View File

@@ -19,7 +19,7 @@ package app.fedilab.android.activities;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java View File

@@ -23,12 +23,12 @@ import android.graphics.Paint;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.support.v7.widget.helper.ItemTouchHelper;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.ItemTouchHelper;
import android.text.Editable;
import android.text.InputFilter;
import android.text.TextWatcher;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java View File

@@ -18,8 +18,8 @@ import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 8
- 8
app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java View File

@@ -17,14 +17,14 @@ package app.fedilab.android.activities;
import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 14
- 14
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java View File

@@ -26,20 +26,20 @@ import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.PopupMenu;
import androidx.annotation.NonNull;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;


+ 7
- 7
app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java View File

@@ -23,13 +23,13 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.appcompat.app.ActionBar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/TagCacheActivity.java View File

@@ -19,9 +19,9 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;


+ 9
- 9
app/src/main/java/app/fedilab/android/activities/TootActivity.java View File

@@ -37,15 +37,15 @@ import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.speech.RecognizerIntent;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.FileProvider;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.Html;
import android.text.InputFilter;


+ 6
- 6
app/src/main/java/app/fedilab/android/activities/TootInfoActivity.java View File

@@ -17,12 +17,12 @@ package app.fedilab.android.activities;

import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.Toast;


+ 3
- 3
app/src/main/java/app/fedilab/android/activities/WebviewActivity.java View File

@@ -29,9 +29,9 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
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 android.view.Menu;
import android.view.MenuItem;
import android.view.View;


+ 3
- 5
app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java View File

@@ -23,9 +23,9 @@ import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -42,8 +42,6 @@ import android.widget.Toast;
import org.json.JSONException;
import org.json.JSONObject;

import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.HashMap;

import app.fedilab.android.client.HttpsConnection;


+ 2
- 2
app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java View File

@@ -19,8 +19,8 @@ import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;


+ 1
- 1
app/src/main/java/app/fedilab/android/client/API.java View File

@@ -19,7 +19,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;


+ 3
- 3
app/src/main/java/app/fedilab/android/client/Entities/Account.java View File

@@ -24,8 +24,8 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import android.text.Html;
import android.text.Spannable;
import android.text.SpannableString;
@@ -60,7 +60,7 @@ import app.fedilab.android.helper.CrossActions;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.interfaces.OnRetrieveEmojiAccountInterface;

import static android.support.v4.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
import static app.fedilab.android.helper.Helper.THEME_BLACK;
import static app.fedilab.android.helper.Helper.THEME_DARK;
import static app.fedilab.android.helper.Helper.THEME_LIGHT;


+ 5
- 5
app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java View File

@@ -23,11 +23,11 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.PorterDuff;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.PopupMenu;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.FragmentTransaction;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;


+ 2
- 2
app/src/main/java/app/fedilab/android/client/Entities/Notification.java View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ImageSpan;


+ 3
- 3
app/src/main/java/app/fedilab/android/client/Entities/Status.java View File

@@ -25,9 +25,9 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import android.text.Html;
import android.text.Spannable;
import android.text.SpannableString;


+ 1
- 1
app/src/main/java/app/fedilab/android/client/Entities/Version.java View File

@@ -1,6 +1,6 @@
package app.fedilab.android.client.Entities;

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





+ 1
- 1
app/src/main/java/app/fedilab/android/client/GNUAPI.java View File

@@ -19,7 +19,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import org.json.JSONArray;
import org.json.JSONException;


+ 1
- 1
app/src/main/java/app/fedilab/android/client/Glide/CustomStreamFetcher.java View File

@@ -1,7 +1,7 @@
package app.fedilab.android.client.Glide;

import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.bumptech.glide.Priority;
import com.bumptech.glide.load.DataSource;


+ 2
- 2
app/src/main/java/app/fedilab/android/client/Glide/HttpsUrlLoader.java View File

@@ -1,8 +1,8 @@
package app.fedilab.android.client.Glide;

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

import com.bumptech.glide.load.Options;
import com.bumptech.glide.load.model.GlideUrl;


+ 1
- 1
app/src/main/java/app/fedilab/android/client/Glide/TLSLibraryGlideModule.java View File

@@ -1,7 +1,7 @@
package app.fedilab.android.client.Glide;

import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.bumptech.glide.Glide;
import com.bumptech.glide.GlideBuilder;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java View File

@@ -20,8 +20,8 @@ import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.content.ContextCompat;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java View File

@@ -21,8 +21,8 @@ import android.content.SharedPreferences;
import android.graphics.PorterDuff;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java View File

@@ -18,8 +18,8 @@ import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.widget.RecyclerView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 4
- 4
app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java View File

@@ -21,10 +21,10 @@ import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.text.util.Linkify;
import android.view.LayoutInflater;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/AccountsReplyAdapter.java View File

@@ -16,7 +16,7 @@ package app.fedilab.android.drawers;


import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java View File

@@ -18,7 +18,7 @@ package app.fedilab.android.drawers;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java View File

@@ -20,8 +20,8 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 3
- 3
app/src/main/java/app/fedilab/android/drawers/ConversationDecoration.java View File

@@ -19,9 +19,9 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;

import app.fedilab.android.client.Entities.Status;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java View File

@@ -18,7 +18,7 @@ package app.fedilab.android.drawers;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;


+ 3
- 3
app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java View File

@@ -18,9 +18,9 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java View File

@@ -22,7 +22,7 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/EmojisSearchAdapter.java View File

@@ -16,7 +16,7 @@ package app.fedilab.android.drawers;


import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/HowToVideosAdapter.java View File

@@ -20,7 +20,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java View File

@@ -17,8 +17,8 @@ package app.fedilab.android.drawers;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/ListAdapter.java View File

@@ -20,7 +20,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java View File

@@ -28,12 +28,12 @@ import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.constraint.ConstraintLayout;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.util.TypedValue;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java View File

@@ -19,8 +19,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 3
- 3
app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java View File

@@ -19,9 +19,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;


+ 5
- 5
app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java View File

@@ -21,11 +21,11 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java View File

@@ -23,7 +23,7 @@ import android.content.SharedPreferences;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 3
- 3
app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java View File

@@ -19,8 +19,8 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.PorterDuff;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -48,7 +48,7 @@ import app.fedilab.android.activities.ReorderTimelinesActivity;

/**
* Simple RecyclerView.Adapter that implements {@link ItemTouchHelperAdapter} to respond to move and
* dismiss events from a {@link android.support.v7.widget.helper.ItemTouchHelper}.
* dismiss events from a {@link androidx.recyclerview.widget.ItemTouchHelper}.
*
* @author Paul Burke (ipaulpro)
*/


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java View File

@@ -23,7 +23,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.text.Html;
import android.text.Spanned;
import android.view.LayoutInflater;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java View File

@@ -20,7 +20,7 @@ import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.text.Html;
import android.text.util.Linkify;
import android.view.LayoutInflater;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/SearchTagsAdapter.java View File

@@ -17,8 +17,8 @@ package app.fedilab.android.drawers;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java View File

@@ -22,8 +22,8 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java View File

@@ -33,12 +33,12 @@ import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Environment;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.constraint.ConstraintLayout;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.text.Spannable;
import android.text.SpannableString;


+ 2
- 2
app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java View File

@@ -17,8 +17,8 @@ package app.fedilab.android.drawers;

import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/TagsSearchAdapter.java View File

@@ -16,7 +16,7 @@ package app.fedilab.android.drawers;


import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/WhoToFollowAccountsAdapter.java View File

@@ -16,7 +16,7 @@ package app.fedilab.android.drawers;


import android.content.Context;
import android.support.design.widget.FloatingActionButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 1
- 1
app/src/main/java/app/fedilab/android/drawers/WhoToFollowAdapter.java View File

@@ -20,7 +20,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 7
- 7
app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java View File

@@ -18,13 +18,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java View File

@@ -20,12 +20,12 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 4
- 4
app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java View File

@@ -19,10 +19,10 @@ import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java View File

@@ -20,12 +20,12 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 4
- 4
app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java View File

@@ -21,10 +21,10 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 7
- 7
app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java View File

@@ -18,13 +18,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 2
- 2
app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java View File

@@ -17,8 +17,8 @@ package app.fedilab.android.fragments;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 4
- 4
app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java View File

@@ -22,10 +22,10 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.View;


+ 4
- 4
app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java View File

@@ -20,10 +20,10 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 7
- 7
app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java View File

@@ -18,13 +18,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 7
- 7
app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java View File

@@ -23,13 +23,13 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 6
- 6
app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java View File

@@ -20,12 +20,12 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;


+ 5
- 6
app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java View File

@@ -22,11 +22,11 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.appcompat.app.AlertDialog;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.View;
@@ -56,7 +56,6 @@ import java.util.Map;

import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.PeertubeUploadActivity;
import app.fedilab.android.activities.PlaylistsActivity;
import app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask;
import app.fedilab.android.asynctasks.RetrievePeertubeChannelsAsyncTask;


+ 2
- 2
app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java View File

@@ -26,8 +26,8 @@ import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.text.Html;
import android.text.Spanned;
import android.view.LayoutInflater;


+ 4
- 4
app/src/main/java/app/fedilab/android/fragments/DisplaySearchFragment.java View File