From 9ce0975d41fb676d0be50393f92a11422ba0b63b Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sat, 9 Feb 2019 11:59:55 +0100 Subject: [PATCH] migrate to androidx --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 2 +- .../java/android/support/iosched/tabs/SlidingTabLayout.java | 5 +++-- .../ch/blinkenlights/android/vanilla/LibraryActivity.java | 3 ++- .../blinkenlights/android/vanilla/LibraryPagerAdapter.java | 6 ++++-- .../java/ch/blinkenlights/android/vanilla/MediaUtils.java | 3 ++- .../java/ch/blinkenlights/android/vanilla/Playlist.java | 3 ++- .../blinkenlights/android/vanilla/VanillaImageButton.java | 2 +- .../java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java | 3 ++- app/src/main/res/layout-w600dp/library_content.xml | 2 +- app/src/main/res/layout/library_content.xml | 2 +- gradle.properties | 2 ++ 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 gradle.properties diff --git a/app/build.gradle b/app/build.gradle index c7670ef6..aade9be0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { } dependencies { - implementation 'com.android.support:support-core-ui:28.0.0' - implementation 'com.android.support:design:28.0.0' - compileOnly 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + compileOnly 'androidx.annotation:annotation:1.0.0' compileOnly 'junit:junit:4.12' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d11eedbe..cfd7606f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ THE SOFTWARE. android:value="true" /> diff --git a/app/src/main/java/android/support/iosched/tabs/SlidingTabLayout.java b/app/src/main/java/android/support/iosched/tabs/SlidingTabLayout.java index 86b0997e..e85a7df0 100644 --- a/app/src/main/java/android/support/iosched/tabs/SlidingTabLayout.java +++ b/app/src/main/java/android/support/iosched/tabs/SlidingTabLayout.java @@ -19,8 +19,6 @@ package android.support.iosched.tabs; import android.content.Context; import android.graphics.Typeface; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; @@ -32,6 +30,9 @@ import android.widget.HorizontalScrollView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + /** * To be used with ViewPager to provide a tab indicator component which give constant feedback as to * the user's scroll progress. diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java index 26214d28..b4ed286d 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java @@ -40,7 +40,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.iosched.tabs.VanillaTabLayout; -import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.KeyEvent; import android.view.Menu; @@ -55,6 +54,8 @@ import android.widget.TextView; import android.widget.SearchView; import android.widget.Toast; +import androidx.viewpager.widget.ViewPager; + import java.io.File; import junit.framework.Assert; diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java index 10bb371b..0a250f17 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java @@ -32,8 +32,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -43,6 +41,10 @@ import android.widget.ListView; import java.util.Arrays; import java.util.ArrayList; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + + /** * PagerAdapter that manages the library media ListViews. */ diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java b/app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java index 72de7ec8..0de56bdd 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java @@ -43,10 +43,11 @@ import android.database.Cursor; import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; -import android.support.v4.content.FileProvider; import android.database.MatrixCursor; import android.widget.Toast; +import androidx.core.content.FileProvider; + /** * Provides some static Song/MediaStore-related utility functions. diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/Playlist.java b/app/src/main/java/ch/blinkenlights/android/vanilla/Playlist.java index ae44c1ef..ade3bae7 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/Playlist.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/Playlist.java @@ -28,10 +28,11 @@ import ch.blinkenlights.android.medialibrary.MediaLibrary; import android.content.Context; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.Nullable; import android.text.TextUtils; import java.util.ArrayList; +import androidx.annotation.Nullable; + /** * Provides various playlist-related utility functions. */ diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/VanillaImageButton.java b/app/src/main/java/ch/blinkenlights/android/vanilla/VanillaImageButton.java index ae3ece37..10574269 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/VanillaImageButton.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/VanillaImageButton.java @@ -28,7 +28,7 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Paint; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class VanillaImageButton extends ImageButton { diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java b/app/src/main/java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java index 4811cfcc..ea513abc 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java @@ -26,7 +26,6 @@ import ch.blinkenlights.android.vanilla.R; import ch.blinkenlights.android.vanilla.ThemeHelper; import android.content.Context; -import android.support.design.widget.BottomSheetDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -36,6 +35,8 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.ImageView; +import com.google.android.material.bottomsheet.BottomSheetDialog; + import java.util.ArrayList; diff --git a/app/src/main/res/layout-w600dp/library_content.xml b/app/src/main/res/layout-w600dp/library_content.xml index 3a4b766d..6be1c0b1 100644 --- a/app/src/main/res/layout-w600dp/library_content.xml +++ b/app/src/main/res/layout-w600dp/library_content.xml @@ -39,7 +39,7 @@ THE SOFTWARE. android:layout_height="@dimen/row_normal_height" android:elevation="4dp" android:background="?tabs_background" /> - -