SecT0uch
/
Kore
forked from Mirroring/Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AndroidX migration

Browse Source 
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
master
DoomMortal 3 years ago committed by Martijn Brekhof
parent a8389b9215
commit ebae33755c
128 changed files with 426 additions and 360 deletions
Show Stats Download Patch File Download Diff File

50
app/build.gradle
Unescape Escape View File

@ -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'

2
app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java
Unescape Escape View File

@ -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 {

2
app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java
Unescape Escape View File

@ -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;

2
app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java
Unescape Escape View File

@ -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;

4
app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java
Unescape Escape View File

@ -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;

2
app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java
Unescape Escape View File

@ -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;

2
app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java
Unescape Escape View File

@ -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;

6
app/src/main/java/org/xbmc/kore/service/NotificationObserver.java
Unescape Escape View File

@ -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)

16
app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java
Unescape Escape View File

@ -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;

5
app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java
Unescape Escape View File

@ -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 {

16
app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java
Unescape Escape View File

@ -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;

12
app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java
Unescape Escape View File

@ -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;

5
app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/BaseActivity.java
Unescape Escape View File

@ -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;

11
app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java
Unescape Escape View File

@ -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

7
app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java
Unescape Escape View File

@ -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 {

7
app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java
Unescape Escape View File

@ -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;

7
app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java
Unescape Escape View File

@ -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;

7
app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java
Unescape Escape View File

@ -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.

10
app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java
Unescape Escape View File

@ -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;

7
app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java
Unescape Escape View File

@ -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;
/**

10
app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java
Unescape Escape View File

@ -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);

3
app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
Unescape Escape View File

@ -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;

5
app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java
Unescape Escape View File

@ -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;

2
app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java
Unescape Escape View File

@ -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();

7
app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java
Unescape Escape View File

@ -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;

6
app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java
Unescape Escape View File

@ -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;

6
app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java
Unescape Escape View File

@ -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;

4
app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java
Unescape Escape View File

@ -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;

11
app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java
Unescape Escape View File

@ -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;

4
app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java
Unescape Escape View File

@ -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;

11
app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java
Unescape Escape View File

@ -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;

2
app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java
Unescape Escape View File

@ -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;

11
app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java
Unescape Escape View File

@ -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;

2
app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java
Unescape Escape View File

@ -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;

5
app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java
Unescape Escape View File

@ -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;
/**

3
app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java
Unescape Escape View File

@ -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;

3
app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java
Unescape Escape View File

@ -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;

7
app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java
Unescape Escape View File

@ -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;

6
app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java
Unescape Escape View File

@ -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

2
app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java
Unescape Escape View File

@ -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;

9
app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java
Unescape Escape View File

@ -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)
*/

3
app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
Unescape Escape View File

@ -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;

5
app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java
Unescape Escape View File

@ -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;

15
app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java
Unescape Escape View File

@ -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,

5
app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java
Unescape Escape View File

@ -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;

8
app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java
Unescape Escape View File

@ -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 o