From ebae33755c0ae01f89bf38ef0550b7e37eaba7a8 Mon Sep 17 00:00:00 2001 From: DoomMortal Date: Wed, 15 Apr 2020 22:46:06 +0200 Subject: [PATCH] AndroidX migration Migration to AndroidX - Update to API level 29 - Update Java sourcecode and xml import statements - Upgrade Butterknife Version 10 AndroidX support - Set Java 8 compile options due Butterknife needs it --- app/build.gradle | 50 +++++++++++-------- .../testhelpers/LoaderIdlingResource.java | 2 +- .../java/org/xbmc/kore/testhelpers/Utils.java | 2 +- .../testhelpers/action/NestedScrollTo.java | 2 +- .../kore/testhelpers/action/ViewActions.java | 4 +- .../java/org/xbmc/kore/jsonrpc/ApiFuture.java | 2 +- .../ConnectionObserversManagerService.java | 2 +- .../kore/service/NotificationObserver.java | 6 +-- .../kore/ui/AbstractCursorListFragment.java | 16 +++--- .../org/xbmc/kore/ui/AbstractFragment.java | 5 +- .../xbmc/kore/ui/AbstractInfoFragment.java | 16 +++--- .../xbmc/kore/ui/AbstractListFragment.java | 9 ++-- .../kore/ui/AbstractSearchableFragment.java | 12 +++-- .../xbmc/kore/ui/AbstractTabsFragment.java | 5 +- .../java/org/xbmc/kore/ui/BaseActivity.java | 3 +- .../org/xbmc/kore/ui/BaseMediaActivity.java | 11 ++-- .../kore/ui/RecyclerViewCursorAdapter.java | 3 +- .../animators/ChangeImageFadeAnimation.java | 7 ++- .../ui/behaviors/FABSpeedDialBehavior.java | 7 +-- .../FadeOutOnVerticalScrollBehavior.java | 7 +-- .../xbmc/kore/ui/generic/CastFragment.java | 9 ++-- .../kore/ui/generic/GenericSelectDialog.java | 7 +-- .../ui/generic/NavigationDrawerFragment.java | 10 ++-- .../org/xbmc/kore/ui/generic/RefreshItem.java | 3 +- .../ui/generic/SendTextDialogFragment.java | 7 +-- ...olumeControllerDialogFragmentListener.java | 10 ++-- .../ui/sections/addon/AddonListFragment.java | 3 +- .../ui/sections/addon/AddonsActivity.java | 5 +- .../sections/addon/SharedElementFragment.java | 2 +- .../ui/sections/audio/AlbumInfoFragment.java | 7 +-- .../ui/sections/audio/AlbumListFragment.java | 6 +-- .../audio/AlbumSongsListFragment.java | 9 ++-- .../ui/sections/audio/ArtistInfoFragment.java | 9 ++-- .../ui/sections/audio/ArtistListFragment.java | 6 +-- .../audio/AudioGenresListFragment.java | 4 +- .../kore/ui/sections/audio/MusicActivity.java | 3 +- .../ui/sections/audio/MusicListFragment.java | 3 +- .../audio/MusicVideoInfoFragment.java | 11 ++-- .../audio/MusicVideoListFragment.java | 4 +- .../ui/sections/audio/SongsListFragment.java | 11 ++-- .../favourites/FavouritesActivity.java | 2 +- .../favourites/FavouritesListFragment.java | 11 ++-- .../kore/ui/sections/file/FileActivity.java | 2 +- .../sections/file/MediaFileListFragment.java | 3 +- .../ui/sections/hosts/AddHostActivity.java | 5 +- .../sections/hosts/AddHostFragmentFinish.java | 3 +- .../hosts/AddHostFragmentWelcome.java | 3 +- .../hosts/AddHostFragmentZeroconf.java | 3 +- .../ui/sections/hosts/EditHostActivity.java | 3 +- .../HostFragmentManualConfiguration.java | 3 +- .../ui/sections/hosts/HostListFragment.java | 9 ++-- .../sections/hosts/HostManagerActivity.java | 7 +-- .../sections/localfile/LocalFileActivity.java | 6 +-- .../localfile/LocalFileListFragment.java | 2 +- .../localfile/LocalMediaFileListFragment.java | 9 ++-- .../sections/remote/NowPlayingFragment.java | 3 +- .../ui/sections/remote/PlaylistFragment.java | 5 +- .../ui/sections/remote/RemoteActivity.java | 15 +++--- .../ui/sections/remote/RemoteFragment.java | 5 +- .../settings/AboutDialogFragment.java | 8 +-- .../sections/settings/SettingsActivity.java | 9 ++-- .../sections/settings/SettingsFragment.java | 16 +++--- .../ui/sections/video/AllCastActivity.java | 7 +-- .../ui/sections/video/MovieInfoFragment.java | 11 ++-- .../ui/sections/video/MovieListFragment.java | 3 +- .../ui/sections/video/MoviesActivity.java | 3 +- .../kore/ui/sections/video/PVRActivity.java | 5 +- .../video/PVRChannelEPGListFragment.java | 4 +- .../video/PVRChannelsListFragment.java | 3 +- .../ui/sections/video/PVRListFragment.java | 3 +- .../video/PVRRecordingsListFragment.java | 3 +- .../video/TVShowEpisodeInfoFragment.java | 11 ++-- .../video/TVShowEpisodeListFragment.java | 9 ++-- .../ui/sections/video/TVShowInfoFragment.java | 7 +-- .../ui/sections/video/TVShowListFragment.java | 3 +- .../video/TVShowProgressFragment.java | 11 ++-- .../ui/sections/video/TVShowsActivity.java | 5 +- .../RecyclerViewEmptyViewSupport.java | 8 ++- .../kore/ui/views/CirclePageIndicator.java | 7 +-- .../org/xbmc/kore/ui/views/PageIndicator.java | 2 +- .../org/xbmc/kore/ui/views/RatingBar.java | 11 ++-- .../org/xbmc/kore/ui/widgets/ControlPad.java | 3 +- .../xbmc/kore/ui/widgets/HighlightButton.java | 3 +- .../xbmc/kore/ui/widgets/PlaylistsBar.java | 3 +- .../kore/ui/widgets/RepeatModeButton.java | 1 - .../fabspeeddial/DialActionButton.java | 10 ++-- .../ui/widgets/fabspeeddial/FABSpeedDial.java | 8 +-- .../org/xbmc/kore/utils/MediaPlayerUtils.java | 3 +- .../kore/utils/SharedElementTransition.java | 9 ++-- .../java/org/xbmc/kore/utils/TabsAdapter.java | 7 +-- .../java/org/xbmc/kore/utils/UIUtils.java | 10 ++-- .../main/java/org/xbmc/kore/utils/Utils.java | 3 +- app/src/main/res/layout/activity_all_cast.xml | 4 +- .../res/layout/activity_generic_media.xml | 5 +- .../main/res/layout/activity_host_manager.xml | 4 +- app/src/main/res/layout/activity_remote.xml | 6 +-- app/src/main/res/layout/activity_settings.xml | 1 - .../main/res/layout/dial_action_button.xml | 4 +- app/src/main/res/layout/fab_speed_dial.xml | 2 +- app/src/main/res/layout/fragment_about.xml | 2 - .../layout/fragment_default_view_pager.xml | 6 +-- .../main/res/layout/fragment_generic_list.xml | 5 +- .../layout/fragment_generic_media_list.xml | 4 +- app/src/main/res/layout/fragment_info.xml | 12 ++--- app/src/main/res/layout/fragment_pvr_list.xml | 5 +- app/src/main/res/layout/grid_item_addon.xml | 5 +- app/src/main/res/layout/grid_item_album.xml | 4 +- app/src/main/res/layout/grid_item_artist.xml | 4 +- .../main/res/layout/grid_item_audio_genre.xml | 4 +- app/src/main/res/layout/grid_item_channel.xml | 4 +- .../res/layout/grid_item_channel_group.xml | 4 +- app/src/main/res/layout/grid_item_file.xml | 4 +- app/src/main/res/layout/grid_item_host.xml | 4 +- app/src/main/res/layout/grid_item_movie.xml | 9 ++-- .../main/res/layout/grid_item_music_video.xml | 4 +- app/src/main/res/layout/grid_item_picture.xml | 4 +- .../main/res/layout/grid_item_playlist.xml | 4 +- .../main/res/layout/grid_item_recording.xml | 5 +- app/src/main/res/layout/grid_item_season.xml | 6 +-- app/src/main/res/layout/grid_item_song.xml | 4 +- app/src/main/res/layout/grid_item_tvshow.xml | 4 +- app/src/main/res/layout/list_item_episode.xml | 6 +-- .../res/layout/list_item_next_episode.xml | 5 +- app/src/main/res/layout/playlist_bar.xml | 6 +-- .../main/res/layout/remote_control_pad.xml | 20 ++++---- app/src/main/res/layout/toolbar_default.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 128 files changed, 426 insertions(+), 360 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ba199dc..9448a3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,16 +11,16 @@ def getVersionName = { -> android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { applicationId "org.xbmc.kore" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 26 versionName = getVersionName() - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' def supportedLocales = ["en", "ast", "ru", "it", "ca", "cs", "zh-CN", "ja", "pt", "pt-BR", "pl", "sl", "sk", "lt", "eu", "iw", "fr", "es", "hr", "hu", "nl", @@ -46,12 +46,20 @@ android { } testOptions { - execution 'ANDROID_TEST_ORCHESTRATOR' + execution 'ANDROIDX_TEST_ORCHESTRATOR' unitTests { includeAndroidResources = true } } + /* + * This is just to enable Java 8 in the app + */ + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { if (keystoreFile.exists()) { @@ -99,18 +107,18 @@ ext { } dependencies { - implementation "com.android.support:support-v4:${supportLibVersion}" - implementation "com.android.support:appcompat-v7:${supportLibVersion}" - implementation "com.android.support:cardview-v7:${supportLibVersion}" - implementation "com.android.support:preference-v14:${supportLibVersion}" - implementation "com.android.support:support-v13:${supportLibVersion}" - implementation "com.android.support:design:${supportLibVersion}" - implementation "com.android.support:recyclerview-v7:${supportLibVersion}" - implementation "com.android.support.constraint:constraint-layout:1.1.3" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.legacy:legacy-preference-v14:1.0.0' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.fasterxml.jackson.core:jackson-databind:2.5.2' - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' implementation 'com.squareup.okhttp:okhttp:2.3.0' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'de.greenrobot:eventbus:2.4.0' @@ -120,13 +128,13 @@ dependencies { implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.20' implementation 'org.nanohttpd:nanohttpd:2.3.1' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' - androidTestUtil 'com.android.support.test:orchestrator:1.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test:rules:1.1.1' + androidTestUtil 'androidx.test:orchestrator:1.1.1' androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' - androidTestImplementation "com.android.support:support-v13:${supportLibVersion}" + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0' + androidTestImplementation 'androidx.legacy:legacy-support-v13:1.0.0' androidTestImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:4.3' diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java index b979981..dcb6a67 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java @@ -17,7 +17,7 @@ package org.xbmc.kore.testhelpers; import android.support.test.espresso.IdlingResource; -import android.support.v4.app.LoaderManager; +import androidx.core.app.LoaderManager; public class LoaderIdlingResource implements IdlingResource { diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java index 42f18e3..33f3431 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java @@ -22,7 +22,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.IBinder; import android.support.test.rule.ActivityTestRule; -import android.support.v4.widget.DrawerLayout; +import androidx.core.widget.DrawerLayout; import android.support.v7.preference.PreferenceManager; import android.util.Log; import android.view.Gravity; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java index 53747ab..ae2d8c3 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java @@ -22,7 +22,7 @@ import android.support.test.espresso.UiController; import android.support.test.espresso.ViewAction; import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.espresso.util.HumanReadables; -import android.support.v4.widget.NestedScrollView; +import androidx.core.widget.NestedScrollView; import android.view.View; import org.hamcrest.Matcher; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java index 3192375..ecb6829 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java @@ -24,8 +24,8 @@ import android.support.test.espresso.action.MotionEvents; import android.support.test.espresso.action.Press; import android.support.test.espresso.util.HumanReadables; import android.support.test.espresso.util.TreeIterables; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.core.view.PagerAdapter; +import androidx.core.view.ViewPager; import android.view.View; import android.widget.SeekBar; diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java index 3909df5..da3fccb 100644 --- a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java +++ b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java @@ -1,6 +1,6 @@ package org.xbmc.kore.jsonrpc; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java index 28a3ec3..fa7bf8c 100644 --- a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java +++ b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.os.Handler; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostConnectionObserver; diff --git a/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java b/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java index d4d771f..a8bdf7f 100644 --- a/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java +++ b/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java @@ -28,8 +28,8 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.Build; import android.preference.PreferenceManager; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; @@ -263,7 +263,7 @@ public class NotificationObserver .addAction(rewindIcon, service.getString(R.string.rewind), rewindPendingIntent) // #0 .addAction(playPauseIcon, service.getString(R.string.play), playPausePendingIntent) // #1 .addAction(ffIcon, service.getString(R.string.fast_forward), ffPendingIntent) // #2 - .setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle() + .setStyle(new androidx.media.app.NotificationCompat.MediaStyle() .setShowActionsInCompactView(0, 1, 2)) .setContentIntent(remoteStartPendingIntent) .setContentTitle(title) diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java index 4a5a470..9af8ccb 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java @@ -22,13 +22,15 @@ import android.content.Intent; import android.content.ServiceConnection; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.core.view.MenuItemCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.RecyclerView; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java index d3b8fa7..5304803 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java @@ -17,8 +17,9 @@ package org.xbmc.kore.ui; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; + +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; public class AbstractFragment extends Fragment { diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java index 369d4b7..e5bac9e 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java @@ -28,13 +28,15 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.NestedScrollView; -import android.support.v4.widget.SwipeRefreshLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.widget.NestedScrollView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java index ff2c4e9..53ec767 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java @@ -20,10 +20,6 @@ import android.annotation.TargetApi; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -32,6 +28,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.ui.viewgroups.RecyclerViewEmptyViewSupport; diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java index 730eb11..e478935 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java @@ -2,11 +2,13 @@ package org.xbmc.kore.ui; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.SearchView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.core.view.MenuItemCompat; +import androidx.fragment.app.Fragment; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java index b4a5057..91b5fc8 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java @@ -19,12 +19,13 @@ package org.xbmc.kore.ui; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; + import org.xbmc.kore.R; import org.xbmc.kore.utils.LogUtils; import org.xbmc.kore.utils.SharedElementTransition; diff --git a/app/src/main/java/org/xbmc/kore/ui/BaseActivity.java b/app/src/main/java/org/xbmc/kore/ui/BaseActivity.java index 557a9f7..46af646 100644 --- a/app/src/main/java/org/xbmc/kore/ui/BaseActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/BaseActivity.java @@ -18,7 +18,8 @@ package org.xbmc.kore.ui; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import org.xbmc.kore.Settings; import org.xbmc.kore.utils.UIUtils; diff --git a/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java b/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java index 4d8adc9..61cca9b 100644 --- a/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java @@ -21,11 +21,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.transition.TransitionInflater; import android.view.KeyEvent; @@ -35,6 +30,12 @@ import android.view.View; import android.view.Window; import android.widget.ImageView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + import com.sothree.slidinguppanel.SlidingUpPanelLayout; import org.xbmc.kore.R; diff --git a/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java b/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java index 0e73041..d2a13c3 100644 --- a/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java +++ b/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java @@ -17,9 +17,10 @@ package org.xbmc.kore.ui; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; abstract public class RecyclerViewCursorAdapter diff --git a/app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java b/app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java index ea98c54..b2e9bb3 100644 --- a/app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java +++ b/app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java @@ -17,12 +17,11 @@ package org.xbmc.kore.ui.animators; import android.animation.Animator; import android.animation.ValueAnimator; -import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import org.xbmc.kore.utils.LogUtils; +import androidx.annotation.NonNull; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; public class ChangeImageFadeAnimation { diff --git a/app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java b/app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java index 7fbd6b6..c898dc1 100644 --- a/app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java +++ b/app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java @@ -17,9 +17,10 @@ package org.xbmc.kore.ui.behaviors; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.ViewCompat; + +import androidx.annotation.NonNull; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java b/app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java index 194a872..35babfb 100644 --- a/app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java +++ b/app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java @@ -17,9 +17,10 @@ package org.xbmc.kore.ui.behaviors; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.ViewCompat; + +import androidx.annotation.NonNull; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java index 38ee6a5..8006c0d 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java @@ -20,15 +20,16 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.GridLayout; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.type.VideoType; diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java b/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java index 1043d6b..bc70ecc 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java @@ -19,9 +19,10 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; /** * Dialog fragment that presents a list options to the user. diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java index 66b56b7..501d949 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java @@ -25,10 +25,12 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; + +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; + import android.util.SparseArray; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java b/app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java index 1cfd643..f58810b 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java @@ -19,9 +19,10 @@ package org.xbmc.kore.ui.generic; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; import android.widget.Toast; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java index c3d40e6..ed35bf1 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java @@ -19,9 +19,6 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; @@ -30,6 +27,10 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + import org.xbmc.kore.R; /** diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java b/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java index 546596d..d2137b5 100644 --- a/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java +++ b/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java @@ -5,14 +5,16 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AppCompatDialogFragment; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.preference.PreferenceManager; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostConnectionObserver; @@ -190,7 +192,7 @@ public class VolumeControllerDialogFragmentListener extends AppCompatDialogFragm public static boolean handleVolumeKeyEvent(Context context, KeyEvent event) { boolean shouldInterceptKey = - android.support.v7.preference.PreferenceManager.getDefaultSharedPreferences(context) + PreferenceManager.getDefaultSharedPreferences(context) .getBoolean(Settings.KEY_PREF_USE_HARDWARE_VOLUME_KEYS, Settings.DEFAULT_PREF_USE_HARDWARE_VOLUME_KEYS); diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java index 5903bd9..37ad0ac 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -33,6 +32,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.recyclerview.widget.RecyclerView; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java index 0a4311b..698183f 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java @@ -18,8 +18,9 @@ package org.xbmc.kore.ui.sections.addon; import android.annotation.TargetApi; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.fragment.app.Fragment; + import android.text.TextUtils; import android.view.MenuItem; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java index a786042..dd9ce93 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java @@ -1,7 +1,7 @@ package org.xbmc.kore.ui.sections.addon; -import android.support.v4.app.Fragment; import android.view.View; +import androidx.fragment.app.Fragment; public abstract class SharedElementFragment extends Fragment { public abstract View getSharedElement(); diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java index a44f588..0016846 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java @@ -21,13 +21,14 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; import android.text.TextUtils; import android.view.View; import android.widget.Toast; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java index 592b627..f8d1c19 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java @@ -15,7 +15,6 @@ */ package org.xbmc.kore.ui.sections.audio; -import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; @@ -24,8 +23,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -37,6 +34,9 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.fragment.app.Fragment; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostInfo; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java index 56e6daa..29a00de 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java @@ -21,10 +21,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; @@ -37,6 +33,11 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java index cecdded..2fe0180 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java @@ -21,12 +21,13 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; import android.view.View; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.jsonrpc.event.MediaSyncEvent; import org.xbmc.kore.jsonrpc.type.PlaylistType; import org.xbmc.kore.provider.MediaContract; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java index beefc3c..bb47d1b 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java @@ -15,14 +15,11 @@ */ package org.xbmc.kore.ui.sections.audio; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; @@ -32,6 +29,9 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.fragment.app.Fragment; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java index aae39ca..e1ad309 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java @@ -15,13 +15,11 @@ */ package org.xbmc.kore.ui.sections.audio; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; @@ -31,6 +29,8 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java index 2dae1f8..5225869 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java @@ -17,9 +17,10 @@ package org.xbmc.kore.ui.sections.audio; import android.annotation.TargetApi; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.MenuItem; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.ui.AbstractInfoFragment; import org.xbmc.kore.ui.BaseMediaActivity; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java index 0266c5f..104a7cb 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java @@ -16,11 +16,12 @@ package org.xbmc.kore.ui.sections.audio; import android.os.Bundle; -import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.viewpager.widget.ViewPager; + import org.xbmc.kore.R; import org.xbmc.kore.ui.AbstractCursorListFragment; import org.xbmc.kore.ui.AbstractTabsFragment; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java index c27bbf5..4fd1c3b 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java @@ -21,14 +21,15 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; import android.view.View; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.jsonrpc.ApiCallback; import org.xbmc.kore.jsonrpc.event.MediaSyncEvent; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java index 53e520e..bb5fd3c 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java @@ -15,13 +15,11 @@ */ package org.xbmc.kore.ui.sections.audio; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -29,6 +27,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java index c960e48..0da94a1 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java @@ -15,7 +15,6 @@ */ package org.xbmc.kore.ui.sections.audio; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; @@ -23,10 +22,12 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.content.CursorLoader; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.SearchView; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.core.view.MenuItemCompat; +import androidx.loader.content.CursorLoader; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java index 717f728..90bc07c 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java @@ -15,7 +15,7 @@ */ package org.xbmc.kore.ui.sections.favourites; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseMediaActivity; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java index 397c66e..faf7ef1 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java @@ -19,11 +19,6 @@ import android.content.Context; import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -32,6 +27,12 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java index 10308a6..84cc001 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java @@ -15,7 +15,7 @@ */ package org.xbmc.kore.ui.sections.file; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseMediaActivity; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java index 875cc28..3b75e6b 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java @@ -23,7 +23,6 @@ import android.os.Handler; import android.os.Parcel; import android.os.Parcelable; import android.net.Uri; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -33,6 +32,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import androidx.recyclerview.widget.RecyclerView; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java index cc1f8c9..d6e1e48 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java @@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.hosts; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java index 97f81d3..0604259 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java @@ -22,7 +22,6 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; @@ -31,6 +30,8 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.fasterxml.jackson.databind.JsonNode; import org.xbmc.kore.R; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java index 0b13404..7ea3ef0 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java @@ -17,7 +17,6 @@ package org.xbmc.kore.ui.sections.hosts; import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; @@ -26,6 +25,8 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; /** diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java index 2de07cc..13976dc 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java @@ -22,7 +22,6 @@ import android.net.NetworkInfo; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; @@ -37,6 +36,8 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.jsonrpc.HostConnection; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java index ea0c126..02b4699 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java @@ -18,10 +18,11 @@ package org.xbmc.kore.ui.sections.hosts; import android.content.Intent; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.v7.app.ActionBar; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java index c06814b..9e7337f 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java @@ -20,7 +20,6 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +30,8 @@ import android.widget.CompoundButton; import android.widget.EditText; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.eventclient.EventServerConnection; import org.xbmc.kore.host.HostInfo; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java index 95dc675..b7d52a6 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java @@ -21,10 +21,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -39,6 +35,11 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java index 73595c7..dc655f9 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java @@ -17,12 +17,13 @@ package org.xbmc.kore.ui.sections.hosts; import android.os.Bundle; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; + import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseActivity; import org.xbmc.kore.ui.generic.NavigationDrawerFragment; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java index 0bd7a60..5c41034 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java @@ -16,15 +16,11 @@ */ package org.xbmc.kore.ui.sections.localfile; -import android.Manifest; -import android.content.pm.PackageManager; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.fragment.app.Fragment; import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseMediaActivity; import org.xbmc.kore.ui.OnBackPressedListener; -import org.xbmc.kore.ui.sections.file.FileListFragment; /** * Handles listing of files fragments diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java index 5be7a33..191a670 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java @@ -18,7 +18,7 @@ package org.xbmc.kore.ui.sections.localfile; import android.app.Activity; import android.os.Bundle; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import org.xbmc.kore.R; import org.xbmc.kore.jsonrpc.type.ListType; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java index 6fc1404..f842c42 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java @@ -22,9 +22,11 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; -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.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -62,7 +64,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; - /** * Presents a list of files of different types (Video/Music) */ diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java index 92cd94a..dec47a7 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java @@ -19,7 +19,6 @@ import android.app.Activity; import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.LayoutInflater; @@ -36,6 +35,8 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostConnectionObserver; import org.xbmc.kore.host.HostInfo; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java index b931c1e..813833a 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java @@ -19,8 +19,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v7.widget.CardView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -36,6 +34,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostConnectionObserver; import org.xbmc.kore.host.HostConnectionObserver.PlayerEventsObserver; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java index f641389..dfe4333 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java @@ -21,12 +21,14 @@ import android.graphics.Point; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.v4.text.TextDirectionHeuristicsCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.widget.Toolbar; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.preference.PreferenceManager; +import androidx.viewpager.widget.ViewPager; + import android.text.TextUtils; import android.view.KeyEvent; import android.view.Menu; @@ -78,7 +80,6 @@ import java.util.regex.Pattern; import butterknife.BindView; import butterknife.ButterKnife; - public class RemoteActivity extends BaseActivity implements HostConnectionObserver.PlayerEventsObserver, NowPlayingFragment.NowPlayingListener, diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java index cff5453..1c0de34 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java @@ -19,8 +19,6 @@ import android.content.res.TypedArray; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,6 +28,9 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.eventclient.ButtonCodes; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java index d06e137..d4ed0d0 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java @@ -8,16 +8,16 @@ import android.app.Activity; import android.app.Dialog; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.TextView; -import org.xbmc.kore.R; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import org.xbmc.kore.R; /** * Dialog fragment that presents about diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java index 80703e5..59dfab3 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java @@ -18,12 +18,13 @@ package org.xbmc.kore.ui.sections.settings; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.FragmentManager; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.utils.LogUtils; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java index 5759b04..efe3fd8 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java @@ -24,13 +24,15 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.TwoStatePreference; + +import androidx.annotation.NonNull; +import androidx.core.app.TaskStackBuilder; +import androidx.core.content.ContextCompat; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.TwoStatePreference; + import android.widget.Toast; import org.xbmc.kore.BuildConfig; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java index 7976958..759fbcd 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java @@ -19,9 +19,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.MenuItem; @@ -34,6 +31,10 @@ import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.type.VideoType; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieInfoFragment.java index 103fef9..a7c8a6e 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieInfoFragment.java @@ -21,15 +21,16 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.View; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java index f1b5a7e..9720b5e 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java @@ -24,7 +24,6 @@ import android.graphics.PorterDuff; import android.net.Uri; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -35,6 +34,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostInfo; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java index 1fe5291..13c17d3 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java @@ -17,9 +17,10 @@ package org.xbmc.kore.ui.sections.video; import android.annotation.TargetApi; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.MenuItem; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseMediaActivity; import org.xbmc.kore.utils.LogUtils; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java index 9daea6e..f54c9de 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java @@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.video; import android.annotation.TargetApi; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; import android.transition.TransitionInflater; import android.view.MenuItem; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + import org.xbmc.kore.R; import org.xbmc.kore.ui.BaseMediaActivity; import org.xbmc.kore.utils.LogUtils; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java index 2f807c0..91d3983 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java @@ -18,8 +18,6 @@ package org.xbmc.kore.ui.sections.video; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.text.format.DateUtils; import android.view.LayoutInflater; @@ -30,6 +28,8 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java index e2cf71e..c5a62c2 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; -import android.support.v4.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; @@ -34,6 +33,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.ApiCallback; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java index 9c14616..dd371de 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java @@ -16,7 +16,8 @@ package org.xbmc.kore.ui.sections.video; import android.os.Bundle; -import android.support.v4.app.Fragment; + +import androidx.fragment.app.Fragment; import org.xbmc.kore.R; import org.xbmc.kore.ui.AbstractTabsFragment; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java index 35b5a2b..0fd8b79 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java @@ -21,7 +21,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -36,6 +35,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeInfoFragment.java index 1294467..3d6079f 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeInfoFragment.java @@ -21,14 +21,15 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.View; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.jsonrpc.ApiCallback; import org.xbmc.kore.jsonrpc.event.MediaSyncEvent; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java index fcdf0bf..26164d0 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java @@ -25,8 +25,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.content.CursorLoader; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -37,6 +35,9 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostInfo; @@ -94,7 +95,9 @@ public class TVShowEpisodeListFragment extends AbstractCursorListFragment { @Override protected int getSyncItemID() { return tvshowId; }; - @TargetApi(16) @Nullable @Override + @TargetApi(16) + @Nullable + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View root = super.onCreateView(inflater, container, savedInstanceState); tvshowId = getArguments().getInt(TVSHOWID, -1); diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowInfoFragment.java index 2228499..cecec17 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowInfoFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowInfoFragment.java @@ -19,9 +19,10 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.BaseColumns; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; + +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; import org.xbmc.kore.R; import org.xbmc.kore.Settings; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java index a148bcd..10fe567 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java @@ -24,7 +24,6 @@ import android.database.Cursor; import android.net.Uri; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -36,6 +35,8 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.loader.content.CursorLoader; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostInfo; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java index fda077c..c01eff5 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java @@ -25,11 +25,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.BaseColumns; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.widget.PopupMenu; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -39,6 +34,12 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.PopupMenu; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostManager; import org.xbmc.kore.jsonrpc.type.PlaylistType; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java index c50843f..fd56d69 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java @@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.video; import android.annotation.TargetApi; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; import android.transition.TransitionInflater; import android.view.MenuItem; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + import org.xbmc.kore.R; import org.xbmc.kore.ui.AbstractFragment; import org.xbmc.kore.ui.AbstractInfoFragment; diff --git a/app/src/main/java/org/xbmc/kore/ui/viewgroups/RecyclerViewEmptyViewSupport.java b/app/src/main/java/org/xbmc/kore/ui/viewgroups/RecyclerViewEmptyViewSupport.java index 746c2f5..e0974ea 100644 --- a/app/src/main/java/org/xbmc/kore/ui/viewgroups/RecyclerViewEmptyViewSupport.java +++ b/app/src/main/java/org/xbmc/kore/ui/viewgroups/RecyclerViewEmptyViewSupport.java @@ -18,14 +18,12 @@ package org.xbmc.kore.ui.viewgroups; import android.content.Context; import android.content.res.TypedArray; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; + import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; /** diff --git a/app/src/main/java/org/xbmc/kore/ui/views/CirclePageIndicator.java b/app/src/main/java/org/xbmc/kore/ui/views/CirclePageIndicator.java index 92dfaed..fb59a87 100644 --- a/app/src/main/java/org/xbmc/kore/ui/views/CirclePageIndicator.java +++ b/app/src/main/java/org/xbmc/kore/ui/views/CirclePageIndicator.java @@ -25,9 +25,10 @@ import android.graphics.Paint.Style; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewConfigurationCompat; -import android.support.v4.view.ViewPager; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewConfigurationCompat; +import androidx.viewpager.widget.ViewPager; + import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/org/xbmc/kore/ui/views/PageIndicator.java b/app/src/main/java/org/xbmc/kore/ui/views/PageIndicator.java index cbd58ed..66d7b16 100644 --- a/app/src/main/java/org/xbmc/kore/ui/views/PageIndicator.java +++ b/app/src/main/java/org/xbmc/kore/ui/views/PageIndicator.java @@ -16,7 +16,7 @@ */ package org.xbmc.kore.ui.views; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; /** * A PageIndicator is responsible to show an visual indicator on the total views diff --git a/app/src/main/java/org/xbmc/kore/ui/views/RatingBar.java b/app/src/main/java/org/xbmc/kore/ui/views/RatingBar.java index 4494e74..ae10206 100644 --- a/app/src/main/java/org/xbmc/kore/ui/views/RatingBar.java +++ b/app/src/main/java/org/xbmc/kore/ui/views/RatingBar.java @@ -19,11 +19,12 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.drawable.ClipDrawable; -import android.support.annotation.DrawableRes; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.ImageViewCompat; -import android.support.v7.widget.AppCompatImageView; -import android.support.v7.widget.LinearLayoutCompat; + +import androidx.annotation.DrawableRes; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.appcompat.widget.LinearLayoutCompat; +import androidx.core.content.ContextCompat; +import androidx.core.widget.ImageViewCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java b/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java index 82b9d42..b0aaa0a 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java @@ -24,7 +24,6 @@ import android.graphics.BitmapFactory; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.BitmapDrawable; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -33,6 +32,8 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; +import androidx.annotation.Nullable; + import org.xbmc.kore.R; import org.xbmc.kore.ui.viewgroups.SquareGridLayout; import org.xbmc.kore.utils.LogUtils; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java index a7568f4..ad77311 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java @@ -17,10 +17,11 @@ package org.xbmc.kore.ui.widgets; import android.content.Context; import android.content.res.TypedArray; -import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.ViewTreeObserver; +import androidx.appcompat.widget.AppCompatImageButton; + import org.xbmc.kore.R; import org.xbmc.kore.utils.Utils; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java b/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java index f19bf5d..b251bef 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java @@ -21,10 +21,11 @@ import android.content.res.TypedArray; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Handler; -import android.support.design.widget.TabLayout; import android.util.AttributeSet; import android.view.LayoutInflater; +import com.google.android.material.tabs.TabLayout; + import org.xbmc.kore.R; import org.xbmc.kore.jsonrpc.type.PlaylistType; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java index 24f7815..23868f2 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java @@ -18,7 +18,6 @@ package org.xbmc.kore.ui.widgets; import android.content.Context; import android.content.res.TypedArray; -import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; import org.xbmc.kore.R; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/DialActionButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/DialActionButton.java index 5af03d2..73c7eea 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/DialActionButton.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/DialActionButton.java @@ -21,20 +21,20 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.TypedArray; -import android.graphics.Interpolator; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.content.res.AppCompatResources; -import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.appcompat.widget.AppCompatTextView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.xbmc.kore.R; -import org.xbmc.kore.utils.Utils; import butterknife.ButterKnife; import butterknife.BindView; diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/FABSpeedDial.java b/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/FABSpeedDial.java index e6d92ac..121657f 100644 --- a/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/FABSpeedDial.java +++ b/app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/FABSpeedDial.java @@ -22,9 +22,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.content.res.AppCompatResources; import android.util.AttributeSet; import android.util.TypedValue; import android.view.LayoutInflater; @@ -33,6 +30,11 @@ import android.view.animation.AccelerateInterpolator; import android.view.animation.OvershootInterpolator; import android.widget.LinearLayout; +import androidx.annotation.Nullable; +import androidx.appcompat.content.res.AppCompatResources; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.ui.animators.ChangeImageFadeAnimation; diff --git a/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java b/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java index 29ad3b4..cba99fa 100644 --- a/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java +++ b/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java @@ -20,9 +20,10 @@ import android.content.Context; import android.content.Intent; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/java/org/xbmc/kore/utils/SharedElementTransition.java b/app/src/main/java/org/xbmc/kore/utils/SharedElementTransition.java index 3d84ae2..7e2af33 100644 --- a/app/src/main/java/org/xbmc/kore/utils/SharedElementTransition.java +++ b/app/src/main/java/org/xbmc/kore/utils/SharedElementTransition.java @@ -18,9 +18,10 @@ package org.xbmc.kore.utils; import android.annotation.TargetApi; import android.content.Context; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.app.SharedElementCallback; +import androidx.core.app.SharedElementCallback; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + import android.transition.Transition; import android.transition.TransitionInflater; import android.view.View; @@ -87,7 +88,7 @@ public class SharedElementTransition { return; } - android.support.v4.app.SharedElementCallback seCallback = new android.support.v4.app.SharedElementCallback() { + androidx.core.app.SharedElementCallback seCallback = new androidx.core.app.SharedElementCallback() { @Override public void onMapSharedElements(List names, Map sharedElements) { // On returning, onMapSharedElements for the exiting fragment is called before the onMapSharedElements diff --git a/app/src/main/java/org/xbmc/kore/utils/TabsAdapter.java b/app/src/main/java/org/xbmc/kore/utils/TabsAdapter.java index 7741376..450a9d8 100644 --- a/app/src/main/java/org/xbmc/kore/utils/TabsAdapter.java +++ b/app/src/main/java/org/xbmc/kore/utils/TabsAdapter.java @@ -17,11 +17,12 @@ package org.xbmc.kore.utils; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; + import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java index cfb7f87..bf8f68e 100644 --- a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java +++ b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java @@ -28,10 +28,12 @@ import android.graphics.Rect; import android.os.Handler; import android.os.Vibrator; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v4.widget.TextViewCompat; -import android.support.v7.app.AlertDialog; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.widget.TextViewCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.TextUtils; diff --git a/app/src/main/java/org/xbmc/kore/utils/Utils.java b/app/src/main/java/org/xbmc/kore/utils/Utils.java index cb357ce..9c1714f 100644 --- a/app/src/main/java/org/xbmc/kore/utils/Utils.java +++ b/app/src/main/java/org/xbmc/kore/utils/Utils.java @@ -26,10 +26,11 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import org.xbmc.kore.R; import org.xbmc.kore.Settings; import org.xbmc.kore.host.HostManager; diff --git a/app/src/main/res/layout/activity_all_cast.xml b/app/src/main/res/layout/activity_all_cast.xml index c92ef18..22a7151 100644 --- a/app/src/main/res/layout/activity_all_cast.xml +++ b/app/src/main/res/layout/activity_all_cast.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/app/src/main/res/layout/activity_generic_media.xml b/app/src/main/res/layout/activity_generic_media.xml index d7cb849..6006595 100644 --- a/app/src/main/res/layout/activity_generic_media.xml +++ b/app/src/main/res/layout/activity_generic_media.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - + diff --git a/app/src/main/res/layout/activity_host_manager.xml b/app/src/main/res/layout/activity_host_manager.xml index a3366ad..f985280 100644 --- a/app/src/main/res/layout/activity_host_manager.xml +++ b/app/src/main/res/layout/activity_host_manager.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/app/src/main/res/layout/activity_remote.xml b/app/src/main/res/layout/activity_remote.xml index 12fcd9f..02ef7d8 100644 --- a/app/src/main/res/layout/activity_remote.xml +++ b/app/src/main/res/layout/activity_remote.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - @@ -61,4 +61,4 @@ android:layout_gravity="start" android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/> - + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b4941b7..c9d9a4f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -27,5 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - \ No newline at end of file diff --git a/app/src/main/res/layout/dial_action_button.xml b/app/src/main/res/layout/dial_action_button.xml index a3abcf6..14a2a20 100644 --- a/app/src/main/res/layout/dial_action_button.xml +++ b/app/src/main/res/layout/dial_action_button.xml @@ -4,7 +4,7 @@ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content"> - - - @@ -40,7 +39,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_vertical" - android:fontFamily="sans-serif-light" android:textSize="18sp"/> diff --git a/app/src/main/res/layout/fragment_default_view_pager.xml b/app/src/main/res/layout/fragment_default_view_pager.xml index 0525a93..b10d521 100644 --- a/app/src/main/res/layout/fragment_default_view_pager.xml +++ b/app/src/main/res/layout/fragment_default_view_pager.xml @@ -21,12 +21,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_generic_list.xml b/app/src/main/res/layout/fragment_generic_list.xml index 54eaf8d..7c1cbdd 100644 --- a/app/src/main/res/layout/fragment_generic_list.xml +++ b/app/src/main/res/layout/fragment_generic_list.xml @@ -22,8 +22,7 @@ - @@ -40,6 +39,6 @@ android:listSelector="?attr/selectableItemBackground" android:drawSelectorOnTop="true" style="@style/Widget.ListView"/> - + diff --git a/app/src/main/res/layout/fragment_generic_media_list.xml b/app/src/main/res/layout/fragment_generic_media_list.xml index f6f354a..2d47340 100644 --- a/app/src/main/res/layout/fragment_generic_media_list.xml +++ b/app/src/main/res/layout/fragment_generic_media_list.xml @@ -21,7 +21,7 @@ - - + diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml index 5428578..c1dfbc9 100644 --- a/app/src/main/res/layout/fragment_info.xml +++ b/app/src/main/res/layout/fragment_info.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - - - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pvr_list.xml b/app/src/main/res/layout/fragment_pvr_list.xml index 5f2d869..a176b2f 100644 --- a/app/src/main/res/layout/fragment_pvr_list.xml +++ b/app/src/main/res/layout/fragment_pvr_list.xml @@ -24,8 +24,7 @@ - @@ -42,6 +41,6 @@ android:listSelector="?attr/selectableItemBackground" android:drawSelectorOnTop="true" style="@style/Widget.GridView"/> - + diff --git a/app/src/main/res/layout/grid_item_addon.xml b/app/src/main/res/layout/grid_item_addon.xml index 985c6ae..fc46443 100644 --- a/app/src/main/res/layout/grid_item_addon.xml +++ b/app/src/main/res/layout/grid_item_addon.xml @@ -15,14 +15,13 @@ limitations under the License. --> - @@ -66,4 +65,4 @@ android:src="?attr/iconDisabled" android:contentDescription="@string/addon_disabled"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_album.xml b/app/src/main/res/layout/grid_item_album.xml index 28165c4..a255291 100644 --- a/app/src/main/res/layout/grid_item_album.xml +++ b/app/src/main/res/layout/grid_item_album.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_artist.xml b/app/src/main/res/layout/grid_item_artist.xml index 53291dc..7a37fc1 100644 --- a/app/src/main/res/layout/grid_item_artist.xml +++ b/app/src/main/res/layout/grid_item_artist.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_audio_genre.xml b/app/src/main/res/layout/grid_item_audio_genre.xml index a46bdfd..659b2f5 100644 --- a/app/src/main/res/layout/grid_item_audio_genre.xml +++ b/app/src/main/res/layout/grid_item_audio_genre.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_channel.xml b/app/src/main/res/layout/grid_item_channel.xml index ff8eb7b..2798f40 100644 --- a/app/src/main/res/layout/grid_item_channel.xml +++ b/app/src/main/res/layout/grid_item_channel.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_channel_group.xml b/app/src/main/res/layout/grid_item_channel_group.xml index 072cdea..1b0790a 100644 --- a/app/src/main/res/layout/grid_item_channel_group.xml +++ b/app/src/main/res/layout/grid_item_channel_group.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_file.xml b/app/src/main/res/layout/grid_item_file.xml index ae7054d..c56463a 100644 --- a/app/src/main/res/layout/grid_item_file.xml +++ b/app/src/main/res/layout/grid_item_file.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_host.xml b/app/src/main/res/layout/grid_item_host.xml index 70ad6bd..619722e 100644 --- a/app/src/main/res/layout/grid_item_host.xml +++ b/app/src/main/res/layout/grid_item_host.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - + diff --git a/app/src/main/res/layout/grid_item_movie.xml b/app/src/main/res/layout/grid_item_movie.xml index 208a9c1..6aa13ea 100644 --- a/app/src/main/res/layout/grid_item_movie.xml +++ b/app/src/main/res/layout/grid_item_movie.xml @@ -15,7 +15,8 @@ limitations under the License. --> - - @@ -96,5 +97,5 @@ app:layout_constraintBottom_toBottomOf="@id/meta_info" app:layout_constraintRight_toRightOf="parent" app:layout_constraintEnd_toEndOf="parent"/> - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_music_video.xml b/app/src/main/res/layout/grid_item_music_video.xml index d4dc552..9d3982f 100644 --- a/app/src/main/res/layout/grid_item_music_video.xml +++ b/app/src/main/res/layout/grid_item_music_video.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_picture.xml b/app/src/main/res/layout/grid_item_picture.xml index 60bbeb8..493303d 100644 --- a/app/src/main/res/layout/grid_item_picture.xml +++ b/app/src/main/res/layout/grid_item_picture.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_playlist.xml b/app/src/main/res/layout/grid_item_playlist.xml index a1b6b8d..e977b58 100644 --- a/app/src/main/res/layout/grid_item_playlist.xml +++ b/app/src/main/res/layout/grid_item_playlist.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_recording.xml b/app/src/main/res/layout/grid_item_recording.xml index 4298e56..2240131 100644 --- a/app/src/main/res/layout/grid_item_recording.xml +++ b/app/src/main/res/layout/grid_item_recording.xml @@ -15,14 +15,13 @@ limitations under the License. --> - @@ -61,4 +60,4 @@ android:layout_alignParentBottom="true" style="@style/TextAppearance.Medialist.OtherInfo"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_season.xml b/app/src/main/res/layout/grid_item_season.xml index b1c841b..ae6c023 100644 --- a/app/src/main/res/layout/grid_item_season.xml +++ b/app/src/main/res/layout/grid_item_season.xml @@ -15,11 +15,11 @@ limitations under the License. --> - + style="@style/Widget.CardView" android:focusable="true" android:clickable="true" android:foreground="?android:attr/selectableItemBackground"> @@ -68,4 +68,4 @@ android:layout_below="@id/season_progress_bar" style="@style/TextAppearance.Medialist.Details"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_song.xml b/app/src/main/res/layout/grid_item_song.xml index 0f03870..c7eaa75 100644 --- a/app/src/main/res/layout/grid_item_song.xml +++ b/app/src/main/res/layout/grid_item_song.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_tvshow.xml b/app/src/main/res/layout/grid_item_tvshow.xml index 3ad64fc..a341f4e 100644 --- a/app/src/main/res/layout/grid_item_tvshow.xml +++ b/app/src/main/res/layout/grid_item_tvshow.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_episode.xml b/app/src/main/res/layout/list_item_episode.xml index b89e37f..5c73834 100644 --- a/app/src/main/res/layout/list_item_episode.xml +++ b/app/src/main/res/layout/list_item_episode.xml @@ -15,14 +15,13 @@ limitations under the License. --> - @@ -99,6 +98,5 @@ android:paddingBottom="0dp" android:gravity="center_vertical"/> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_next_episode.xml b/app/src/main/res/layout/list_item_next_episode.xml index a582238..03502e3 100644 --- a/app/src/main/res/layout/list_item_next_episode.xml +++ b/app/src/main/res/layout/list_item_next_episode.xml @@ -15,14 +15,13 @@ limitations under the License. --> - @@ -76,4 +75,4 @@ android:layout_alignParentBottom="true" style="@style/TextAppearance.Medialist.OtherInfo"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/playlist_bar.xml b/app/src/main/res/layout/playlist_bar.xml index a0e975c..d4b388e 100644 --- a/app/src/main/res/layout/playlist_bar.xml +++ b/app/src/main/res/layout/playlist_bar.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - -