From d7718c0969ed0e7e7f6256773ca7a58c54609e2a Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Wed, 16 Oct 2019 11:29:54 +0530 Subject: [PATCH 1/6] Refactor to AndroidX All thanks to https://gist.github.com/alexjlockwood/c59e74e95037f6c230dde8a39c328970 --- app/src/main/AndroidManifest.xml | 2 +- .../widget/CustomCollapsingTextHelper.java | 58 +++++++-------- .../widget/CustomCollapsingToolbarLayout.java | 40 ++++++----- .../amp_library/ShuttleApplication.java | 6 +- .../amp_library/billing/BillingManager.java | 2 +- .../di/app/activity/ActivityModule.kt | 4 +- .../fragment/DialogFragmentModule.java | 2 +- .../app/activity/fragment/FragmentModule.kt | 2 +- .../glide/fetcher/BaseFetcher.java | 2 +- .../amp_library/glide/palette/ColorSet.kt | 2 +- .../glide/palette/ColorSetResource.java | 2 +- .../RecyclerToListViewScrollListener.java | 6 +- .../preloader/RecyclerViewPreloader.java | 8 +-- .../amp_library/glide/utils/GlideUtils.java | 2 +- .../glide/utils/WrappingViewAdapter.java | 2 +- .../amp_library/interfaces/FileType.java | 2 +- .../simplecity/amp_library/model/Album.java | 6 +- .../amp_library/model/AlbumArtist.java | 4 +- .../amp_library/model/ArtworkProvider.java | 4 +- .../amp_library/model/CategoryItem.java | 4 +- .../simplecity/amp_library/model/Song.java | 4 +- .../MusicNotificationHelper.java | 10 +-- .../playback/DummyNotificationHelper.java | 2 +- .../amp_library/playback/LocalPlayback.kt | 2 +- .../amp_library/playback/MediaManager.java | 4 +- .../amp_library/playback/MusicService.java | 6 +- .../amp_library/playback/PlaybackManager.java | 6 +- .../amp_library/playback/QueueManager.java | 4 +- .../amp_library/saf/SafManager.java | 14 ++-- .../services/ArtworkDownloadService.java | 4 +- .../simplecity/amp_library/sql/SqlUtils.java | 2 +- .../providers/PlayCountContentProvider.java | 2 +- .../sql/sqlbrite/QueryToOneOperator.java | 2 +- .../ui/adapters/LoggingViewModelAdapter.java | 2 +- .../amp_library/ui/adapters/PagerAdapter.java | 10 +-- .../ui/adapters/SectionedAdapter.java | 2 +- .../amp_library/ui/common/BaseActivity.java | 8 +-- .../amp_library/ui/common/BaseFragment.java | 6 +- .../ui/common/BaseFragmentModule.java | 2 +- .../ui/common/EqualizerModule.java | 2 +- .../amp_library/ui/common/Presenter.java | 6 +- .../ui/common/ToolbarListener.java | 2 +- .../ui/dialog/AlbumBiographyDialog.kt | 4 +- .../ui/dialog/ArtistBiographyDialog.kt | 4 +- .../amp_library/ui/dialog/ChangelogDialog.kt | 6 +- .../amp_library/ui/dialog/DeleteDialog.java | 12 ++-- .../amp_library/ui/dialog/FileInfoDialog.kt | 4 +- .../amp_library/ui/dialog/InclExclDialog.kt | 8 +-- .../amp_library/ui/dialog/ShareDialog.kt | 6 +- .../amp_library/ui/dialog/SongInfoDialog.kt | 4 +- .../amp_library/ui/dialog/UpgradeDialog.kt | 4 +- .../amp_library/ui/dialog/UpgradeNagDialog.kt | 2 +- .../ui/dialog/UpgradeSuccessDialog.kt | 2 +- .../ui/dialog/WeekSelectorDialog.kt | 4 +- .../ui/modelviews/AlbumArtistView.java | 4 +- .../amp_library/ui/modelviews/AlbumView.java | 4 +- .../ui/modelviews/ArtworkView.java | 2 +- .../modelviews/BaseSelectableViewModel.java | 2 +- .../ui/modelviews/BreadcrumbsView.java | 2 +- .../amp_library/ui/modelviews/EmptyView.java | 2 +- .../amp_library/ui/modelviews/FolderView.java | 6 +- .../amp_library/ui/modelviews/GenreView.java | 2 +- .../ui/modelviews/HorizontalRecyclerView.java | 6 +- .../ui/modelviews/InclExclView.java | 6 +- .../ui/modelviews/MultiItemView.java | 2 +- .../ui/modelviews/PlaylistView.java | 2 +- .../ui/modelviews/ShuffleView.java | 4 +- .../amp_library/ui/modelviews/SongView.java | 2 +- .../ui/modelviews/SuggestedHeaderView.java | 2 +- .../ui/modelviews/SuggestedSongView.java | 2 +- .../ui/modelviews/TabViewModel.java | 2 +- .../album/detail/AlbumDetailFragment.kt | 10 +-- .../detail/AlbumsDetailFragmentModule.java | 2 +- .../screens/album/list/AlbumListFragment.kt | 4 +- .../album/list/AlbumListFragmentModule.java | 2 +- .../artist/detail/ArtistDetailFragment.kt | 14 ++-- .../artist/detail/ArtistDetailPresenter.kt | 2 +- .../detail/ArtistsDetailFragmentModule.java | 2 +- .../artist/list/AlbumArtistListFragment.kt | 4 +- .../list/AlbumArtistListFragmentModule.java | 2 +- .../ui/screens/drawer/DrawerAdapter.java | 2 +- .../ui/screens/drawer/DrawerChild.java | 4 +- .../ui/screens/drawer/DrawerDivider.java | 2 +- .../ui/screens/drawer/DrawerFragment.kt | 8 +-- .../screens/drawer/DrawerFragmentModule.java | 2 +- .../ui/screens/drawer/DrawerLockManager.java | 2 +- .../ui/screens/drawer/DrawerParent.java | 12 ++-- .../ui/screens/drawer/DrawerProvider.java | 2 +- .../screens/drawer/NavigationEventRelay.java | 4 +- .../screens/equalizer/EqualizerFragment.java | 6 +- .../ui/screens/equalizer/EqualizerModule.java | 2 +- .../ui/screens/folders/FolderFragment.java | 10 +-- .../screens/folders/FolderFragmentModule.java | 2 +- .../genre/detail/GenreDetailFragment.kt | 14 ++-- .../detail/GenreDetailFragmentModule.java | 2 +- .../genre/detail/GenreDetailPresenter.kt | 2 +- .../screens/genre/list/GenreListFragment.kt | 4 +- .../genre/list/GenreListFragmentModule.java | 2 +- .../ui/screens/lyrics/LyricsDialog.kt | 4 +- .../ui/screens/main/LibraryController.java | 20 +++--- .../screens/main/LibraryFragmentModule.java | 2 +- .../ui/screens/main/MainActivity.java | 10 +-- .../ui/screens/main/MainActivityModule.java | 2 +- .../ui/screens/main/MainController.java | 12 ++-- .../ui/screens/main/MainControllerModule.java | 2 +- .../miniplayer/MiniPlayerFragment.java | 4 +- .../miniplayer/MiniPlayerFragmentModule.java | 2 +- .../ui/screens/nowplaying/PlayerFragment.java | 8 +-- .../nowplaying/PlayerFragmentModule.java | 2 +- .../playlist/detail/PlaylistDetailFragment.kt | 14 ++-- .../detail/PlaylistDetailFragmentModule.java | 2 +- .../playlist/dialog/CreatePlaylistDialog.kt | 6 +- .../DeletePlaylistConfirmationDialog.kt | 6 +- .../playlist/dialog/M3uPlaylistDialog.kt | 6 +- .../playlist/dialog/RenamePlaylistDialog.kt | 4 +- .../playlist/list/PlaylistListFragment.kt | 6 +- .../list/PlaylistListFragmentModule.java | 2 +- .../ui/screens/queue/QueueFragment.kt | 10 +-- .../ui/screens/queue/QueueFragmentModule.java | 2 +- .../queue/pager/QueuePagerFragment.java | 10 +-- .../queue/pager/QueuePagerFragmentModule.java | 2 +- .../queue/pager/QueuePagerPresenter.java | 2 +- .../ui/screens/search/SearchFragment.kt | 12 ++-- .../screens/search/SearchFragmentModule.java | 2 +- .../shortcut/ShortcutTrampolineActivity.kt | 2 +- .../ui/screens/songs/list/SongListFragment.kt | 4 +- .../songs/list/SongsListFragmentModule.java | 2 +- .../ui/screens/suggested/SuggestedFragment.kt | 6 +- .../suggested/SuggestedFragmentModule.java | 2 +- .../tagger/CheckDocumentPermissionsTask.java | 2 +- .../ui/screens/tagger/TaggerDialog.java | 10 +-- .../ui/screens/tagger/TaggerTask.java | 2 +- .../ui/screens/tagger/TaggerUtils.java | 2 +- .../ui/screens/upnext/UpNextView.kt | 4 +- .../ui/screens/widgets/WidgetFragment.java | 4 +- .../ui/settings/SettingsFragmentModule.java | 2 +- .../ui/settings/SettingsParentFragment.java | 20 +++--- .../SettingsParentFragmentModule.java | 2 +- .../ui/settings/SettingsPresenter.java | 2 +- .../amp_library/ui/settings/SettingsView.java | 2 +- .../ui/settings/SupportPresenter.java | 2 +- .../ui/settings/TabChooserDialog.kt | 12 ++-- .../ui/views/AestheticDrawableTextView.java | 4 +- .../ui/views/AestheticTintedImageView.java | 6 +- .../amp_library/ui/views/BreadcrumbItem.java | 2 +- .../amp_library/ui/views/CircleImageView.java | 4 +- .../amp_library/ui/views/CircleView.java | 2 +- .../ui/views/ContextualToolbar.java | 4 +- .../views/CustomMediaRouteActionProvider.java | 4 +- .../ui/views/DrawerIconImageView.java | 8 +-- .../ui/views/FavoriteActionBarView.java | 8 +-- .../ui/views/LockActionBarView.java | 10 +-- .../ui/views/NonClickableToolbar.java | 2 +- .../ui/views/NonScrollImageButton.java | 4 +- .../amp_library/ui/views/OverflowButton.java | 4 +- .../ui/views/PagerListenerAdapter.java | 2 +- .../amp_library/ui/views/PlayCountView.java | 6 +- .../ui/views/PlayPauseDrawable.java | 2 +- .../amp_library/ui/views/PlayPauseView.java | 4 +- .../amp_library/ui/views/RatingSnackbar.kt | 6 +- .../amp_library/ui/views/RepeatButton.java | 10 +-- .../ui/views/RepeatingImageButton.java | 6 +- .../amp_library/ui/views/ShuffleButton.java | 10 +-- .../amp_library/ui/views/SnowfallView.java | 2 +- .../ui/views/SquareHeightImageView.java | 2 +- .../amp_library/ui/views/SquareImageView.java | 2 +- .../ui/views/SuggestedDividerDecoration.java | 4 +- .../ui/views/SuggestedHeaderButton.java | 4 +- .../ui/views/ThemedStatusBarView.java | 2 +- .../multisheet/CustomMultiSheetView.java | 6 +- .../multisheet/MultiSheetSlideEventRelay.java | 2 +- .../recyclerview/AdaptableSpanSizeLookup.java | 2 +- .../recyclerview/GridDividerDecoration.java | 4 +- .../recyclerview/ItemTouchHelperCallback.java | 6 +- .../recyclerview/SpacesItemDecoration.java | 2 +- .../widgets/BaseWidgetConfigureActivity.java | 22 +++--- .../ui/widgets/BaseWidgetProvider.java | 2 +- ...dgetConfigureActivityExtraLargeModule.java | 2 +- .../WidgetConfigureActivityLargeModule.java | 2 +- .../WidgetConfigureActivityMediumModule.java | 2 +- .../WidgetConfigureActivitySmallModule.java | 2 +- .../ui/widgets/WidgetFragmentModule.java | 2 +- .../ui/widgets/WidgetProviderExtraLarge.java | 2 +- .../ui/widgets/WidgetProviderLarge.java | 2 +- .../ui/widgets/WidgetProviderMedium.java | 2 +- .../ui/widgets/WidgetProviderSmall.java | 2 +- .../amp_library/utils/ArtworkDialog.java | 6 +- .../amp_library/utils/ArtworkUtils.java | 6 +- .../amp_library/utils/ComparisonUtils.java | 2 +- .../utils/ContextualToolbarHelper.java | 2 +- .../amp_library/utils/CustomMediaScanner.java | 2 +- .../amp_library/utils/DrawableUtils.java | 2 +- .../amp_library/utils/FileBrowser.java | 4 +- .../amp_library/utils/FileHelper.java | 2 +- .../amp_library/utils/FragmentExt.kt | 2 +- .../amp_library/utils/LegacyUtils.java | 2 +- .../amp_library/utils/LogUtils.java | 2 +- .../utils/MusicServiceConnectionUtils.java | 2 +- .../utils/PlaceholderProvider.java | 6 +- .../utils/ResumingServiceManager.kt | 6 +- .../amp_library/utils/SettingsManager.java | 2 +- .../amp_library/utils/ShuttleUtils.java | 2 +- .../amp_library/utils/StringUtils.java | 4 +- .../amp_library/utils/ThemeUtils.java | 2 +- .../amp_library/utils/TypefaceManager.java | 2 +- .../amp_library/utils/ViewUtils.java | 2 +- .../utils/color/BitmapPaletteProcessor.java | 4 +- .../amp_library/utils/color/ColorHelper.java | 12 ++-- .../amp_library/utils/extensions/SongExt.kt | 2 +- .../amp_library/utils/menu/MenuUtils.java | 4 +- .../utils/menu/album/AlbumMenuUtils.kt | 4 +- .../menu/albumartist/AlbumArtistMenuUtils.kt | 4 +- .../utils/menu/folder/FolderMenuUtils.kt | 6 +- .../utils/menu/genre/GenreMenuUtils.kt | 2 +- .../utils/menu/playlist/PlaylistMenuUtils.kt | 4 +- .../utils/menu/queue/QueueMenuUtils.kt | 4 +- .../utils/menu/song/SongMenuUtils.kt | 4 +- .../playlists/FavoritesPlaylistManager.kt | 2 +- .../main/res/layout-land/fragment_player.xml | 6 +- app/src/main/res/layout-land/up_next_view.xml | 6 +- .../res/layout-sw600dp/list_item_edit.xml | 4 +- .../res/layout-sw600dp/list_item_one_line.xml | 4 +- .../layout-sw600dp/list_item_two_lines.xml | 4 +- app/src/main/res/layout/activity_main.xml | 10 +-- .../res/layout/activity_widget_config.xml | 10 +-- app/src/main/res/layout/dialog_artwork.xml | 2 +- app/src/main/res/layout/dialog_incl_excl.xml | 2 +- app/src/main/res/layout/dialog_lyrics.xml | 6 +- app/src/main/res/layout/dialog_tagger.xml | 72 +++++++++---------- app/src/main/res/layout/fragment_detail.xml | 14 ++-- app/src/main/res/layout/fragment_drawer.xml | 2 +- .../main/res/layout/fragment_equalizer.xml | 2 +- .../res/layout/fragment_folder_browser.xml | 16 ++--- app/src/main/res/layout/fragment_library.xml | 18 ++--- .../main/res/layout/fragment_mini_player.xml | 4 +- app/src/main/res/layout/fragment_player.xml | 6 +- .../main/res/layout/fragment_queue_pager.xml | 6 +- app/src/main/res/layout/fragment_search.xml | 2 +- app/src/main/res/layout/fragment_settings.xml | 2 +- .../main/res/layout/fragment_suggested.xml | 2 +- app/src/main/res/layout/grid_item.xml | 4 +- app/src/main/res/layout/grid_item_card.xml | 8 +-- .../main/res/layout/grid_item_horizontal.xml | 4 +- app/src/main/res/layout/list_item_drawer.xml | 4 +- app/src/main/res/layout/list_item_edit.xml | 4 +- app/src/main/res/layout/list_item_folder.xml | 4 +- app/src/main/res/layout/list_item_image.xml | 4 +- .../main/res/layout/list_item_one_line.xml | 4 +- .../res/layout/list_item_reorder_tabs.xml | 4 +- app/src/main/res/layout/list_item_small.xml | 4 +- .../main/res/layout/list_item_two_lines.xml | 4 +- app/src/main/res/layout/recycler_header.xml | 2 +- app/src/main/res/layout/up_next_view.xml | 2 +- app/src/main/res/menu/menu_search.xml | 2 +- app/src/main/res/xml/settings_artwork.xml | 30 ++++---- app/src/main/res/xml/settings_blacklist.xml | 16 ++--- app/src/main/res/xml/settings_display.xml | 24 +++---- app/src/main/res/xml/settings_headers.xml | 20 +++--- app/src/main/res/xml/settings_headset.xml | 22 +++--- app/src/main/res/xml/settings_playback.xml | 10 +-- app/src/main/res/xml/settings_scrobbling.xml | 12 ++-- app/src/main/res/xml/settings_support.xml | 20 +++--- app/src/main/res/xml/settings_themes.xml | 22 +++--- .../aesthetic/ActiveInactiveColors.java | 2 +- .../com/afollestad/aesthetic/Aesthetic.java | 22 +++--- .../AestheticActionMenuItemView.java | 2 +- .../aesthetic/AestheticActivity.java | 4 +- .../AestheticBottomNavigationView.java | 8 +-- .../afollestad/aesthetic/AestheticButton.java | 2 +- .../aesthetic/AestheticCardView.java | 4 +- .../aesthetic/AestheticCheckBox.java | 2 +- .../aesthetic/AestheticCoordinatorLayout.java | 18 ++--- .../aesthetic/AestheticDialogButton.java | 2 +- .../aesthetic/AestheticDrawerLayout.java | 8 +-- .../aesthetic/AestheticEditText.java | 2 +- .../afollestad/aesthetic/AestheticFab.java | 4 +- .../aesthetic/AestheticImageButton.java | 4 +- .../aesthetic/AestheticImageView.java | 4 +- .../aesthetic/AestheticKeyProvider.java | 2 +- .../aesthetic/AestheticNavigationView.java | 4 +- .../aesthetic/AestheticNestedScrollView.java | 2 +- .../aesthetic/AestheticRadioButton.java | 2 +- .../aesthetic/AestheticRecyclerView.java | 2 +- .../aesthetic/AestheticSeekBar.java | 2 +- .../aesthetic/AestheticSnackBarButton.java | 2 +- .../aesthetic/AestheticSnackBarTextView.java | 2 +- .../aesthetic/AestheticSpinner.java | 2 +- .../aesthetic/AestheticSwitchCompat.java | 2 +- .../aesthetic/AestheticTabLayout.java | 4 +- .../aesthetic/AestheticTextInputEditText.java | 2 +- .../aesthetic/AestheticTextInputLayout.java | 2 +- .../aesthetic/AestheticTextView.java | 2 +- .../aesthetic/AestheticToolbar.java | 6 +- .../aesthetic/AestheticViewPager.java | 2 +- .../afollestad/aesthetic/AutoSwitchMode.java | 2 +- .../aesthetic/BgIconColorState.java | 8 +-- .../afollestad/aesthetic/BottomNavBgMode.java | 2 +- .../aesthetic/BottomNavIconTextMode.java | 2 +- .../aesthetic/ColorIsDarkState.java | 6 +- .../afollestad/aesthetic/EdgeGlowUtil.java | 18 ++--- .../aesthetic/InflationInterceptor.java | 54 +++++++------- .../aesthetic/LightDarkColorState.java | 6 +- .../aesthetic/MaterialDialogsUtil.java | 4 +- .../aesthetic/NavigationViewMode.java | 2 +- .../afollestad/aesthetic/TabLayoutBgMode.java | 2 +- .../aesthetic/TabLayoutIndicatorMode.java | 2 +- .../aesthetic/TextInputLayoutUtil.java | 10 +-- .../com/afollestad/aesthetic/TintHelper.java | 26 +++---- .../java/com/afollestad/aesthetic/Util.java | 20 +++--- .../aesthetic/ViewBackgroundAction.java | 2 +- .../aesthetic/ViewBackgroundSubscriber.java | 8 +-- .../aesthetic/ViewHintTextColorAction.java | 6 +- .../aesthetic/ViewObservablePair.java | 4 +- .../aesthetic/ViewTextColorAction.java | 6 +- .../com/afollestad/aesthetic/ViewUtil.java | 10 +-- .../florent37/glidepalette/BitmapPalette.java | 12 ++-- .../florent37/glidepalette/GlidePalette.java | 2 +- .../florent37/glidepalette/PaletteTarget.java | 2 +- .../behavior/CustomBottomSheetBehavior.java | 4 +- .../ui/view/MultiSheetView.java | 10 +-- .../src/main/res/layout/multi_sheet.xml | 6 +- .../androidnavigation/base/Controller.java | 2 +- .../base/NavigationController.java | 6 +- .../fragment/BackPressHandler.java | 2 +- .../fragment/BaseController.java | 4 +- .../fragment/BaseNavigationController.java | 12 ++-- .../fragment/FragmentInfo.java | 4 +- .../adapter/CompletionListUpdateCallback.java | 2 +- .../adapter/ViewModelAdapter.java | 10 +-- .../recycler_adapter/model/BaseViewModel.java | 4 +- .../recycler_adapter/model/ViewModel.java | 2 +- .../recyclerview/BaseViewHolder.java | 2 +- .../ChildAttachStateChangeListener.java | 2 +- .../recyclerview/RecyclerListener.java | 2 +- .../recyclerview/RecyclingViewHolder.java | 2 +- .../recyclerview/SpanSizeLookup.java | 2 +- 336 files changed, 944 insertions(+), 942 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6df396b6b..4f807170a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -307,7 +307,7 @@ android:exported="false"/> diff --git a/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java b/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java index 6d8d02a8c..4f384c2c0 100644 --- a/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java +++ b/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java @@ -27,12 +27,12 @@ import android.graphics.RectF; import android.graphics.Typeface; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.design.animation.AnimationUtils; -import android.support.v4.math.MathUtils; -import android.support.v4.text.TextDirectionHeuristicsCompat; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.TintTypedArray; +import androidx.annotation.ColorInt; +import com.google.android.material.animation.AnimationUtils; +import androidx.core.math.MathUtils; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.core.view.ViewCompat; +import androidx.appcompat.widget.TintTypedArray; import android.text.TextPaint; import android.text.TextUtils; import android.view.Gravity; @@ -213,24 +213,24 @@ public void setCollapsedTextGravity(int gravity) { public void setCollapsedTextAppearance(int resId) { TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId, - android.support.v7.appcompat.R.styleable.TextAppearance); - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) { + androidx.appcompat.R.styleable.TextAppearance); + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) { mCollapsedTitleColor = a.getColorStateList( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); + androidx.appcompat.R.styleable.TextAppearance_android_textColor); } - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) { + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) { mCollapsedTextSize = a.getDimensionPixelSize( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, + androidx.appcompat.R.styleable.TextAppearance_android_textSize, (int) mCollapsedTextSize); } mCollapsedShadowColor = a.getInt( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); mCollapsedShadowDx = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); mCollapsedShadowDy = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); mCollapsedShadowRadius = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); a.recycle(); if (Build.VERSION.SDK_INT >= 16) { @@ -242,24 +242,24 @@ public void setCollapsedTextAppearance(int resId) { public void setExpandedTextAppearance(int resId) { TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId, - android.support.v7.appcompat.R.styleable.TextAppearance); - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) { + androidx.appcompat.R.styleable.TextAppearance); + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) { mExpandedTitleColor = a.getColorStateList( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); + androidx.appcompat.R.styleable.TextAppearance_android_textColor); } - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) { + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) { mExpandedTextSize = a.getDimensionPixelSize( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, + androidx.appcompat.R.styleable.TextAppearance_android_textSize, (int) mExpandedTextSize); } mExpandedShadowColor = a.getInt( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); mExpandedShadowDx = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); mExpandedShadowDy = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); mExpandedShadowRadius = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); a.recycle(); if (Build.VERSION.SDK_INT >= 16) { @@ -283,14 +283,14 @@ public void setCollapsedSubAppearance(int resId) { public void setExpandedSubAppearance(int resId) { TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId, - android.support.v7.appcompat.R.styleable.TextAppearance); - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) { + androidx.appcompat.R.styleable.TextAppearance); + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) { mExpandedSubColor = a.getColorStateList( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); + androidx.appcompat.R.styleable.TextAppearance_android_textColor); } - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) { + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) { mExpandedSubSize = a.getDimensionPixelSize( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, + androidx.appcompat.R.styleable.TextAppearance_android_textSize, (int) mExpandedSubSize); } } diff --git a/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java b/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java index 205fa96e4..f731b67d1 100644 --- a/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java +++ b/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java @@ -9,23 +9,23 @@ import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RestrictTo; -import android.support.annotation.StyleRes; -import android.support.design.animation.AnimationUtils; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.math.MathUtils; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.WindowInsetsCompat; -import android.support.v4.widget.ViewGroupUtils; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import androidx.annotation.StyleRes; +import com.google.android.material.animation.AnimationUtils; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.math.MathUtils; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.coordinatorlayout.widget.ViewGroupUtils; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; @@ -35,12 +35,14 @@ import android.view.animation.Interpolator; import android.widget.FrameLayout; +import com.google.android.material.appbar.AppBarLayout; + import com.simplecity.amp_library.R; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** * @author Hendra Anggrian (hendraanggrian@gmail.com) @@ -158,7 +160,7 @@ public CustomCollapsingToolbarLayout(Context context, AttributeSet attrs, int de mCollapsingTextHelper.setExpandedTextAppearance( R.style.TextAppearance_Design_CollapsingToolbar_Expanded); mCollapsingTextHelper.setCollapsedTextAppearance( - android.support.v7.appcompat.R.style.TextAppearance_AppCompat_Widget_ActionBar_Title); + androidx.appcompat.R.style.TextAppearance_AppCompat_Widget_ActionBar_Title); // Now overlay any custom text appearances if (a1.hasValue(R.styleable.CollapsingToolbarLayout_expandedTitleTextAppearance)) { diff --git a/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java b/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java index 741e1483f..d1182cff7 100644 --- a/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java +++ b/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java @@ -9,9 +9,9 @@ import android.os.Environment; import android.os.StrictMode; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.PreferenceManager; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.util.Log; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java b/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java index 38b6e3082..d8f0eee8a 100644 --- a/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java +++ b/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java @@ -2,7 +2,7 @@ import android.annotation.SuppressLint; import android.app.Activity; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingClientStateListener; diff --git a/app/src/main/java/com/simplecity/amp_library/di/app/activity/ActivityModule.kt b/app/src/main/java/com/simplecity/amp_library/di/app/activity/ActivityModule.kt index 330c9a581..fa1a01c5b 100644 --- a/app/src/main/java/com/simplecity/amp_library/di/app/activity/ActivityModule.kt +++ b/app/src/main/java/com/simplecity/amp_library/di/app/activity/ActivityModule.kt @@ -1,8 +1,8 @@ package com.simplecity.amp_library.di.app.activity import android.app.Activity -import android.support.v4.app.FragmentManager -import android.support.v7.app.AppCompatActivity +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AppCompatActivity import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/DialogFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/DialogFragmentModule.java index 7af1a7f7a..d906084dd 100644 --- a/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/DialogFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/DialogFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.di.app.activity.fragment; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import dagger.Binds; import dagger.Module; import javax.inject.Named; diff --git a/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/FragmentModule.kt b/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/FragmentModule.kt index 6d64d60bb..9f3f1cb4a 100644 --- a/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/FragmentModule.kt +++ b/app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/FragmentModule.kt @@ -1,6 +1,6 @@ package com.simplecity.amp_library.di.app.activity.fragment -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import com.bumptech.glide.Glide import com.bumptech.glide.RequestManager import dagger.Module diff --git a/app/src/main/java/com/simplecity/amp_library/glide/fetcher/BaseFetcher.java b/app/src/main/java/com/simplecity/amp_library/glide/fetcher/BaseFetcher.java index b47ab06d5..e82b826eb 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/fetcher/BaseFetcher.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/fetcher/BaseFetcher.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.glide.fetcher; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import com.bumptech.glide.Priority; import com.bumptech.glide.load.data.DataFetcher; import com.simplecity.amp_library.model.ArtworkProvider; diff --git a/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSet.kt b/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSet.kt index ee869bc1c..3a586ab4e 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSet.kt +++ b/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSet.kt @@ -3,7 +3,7 @@ package com.simplecity.amp_library.glide.palette import android.content.Context import android.graphics.Bitmap import android.graphics.Color -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import com.simplecity.amp_library.utils.color.BitmapPaletteProcessor import com.simplecity.amp_library.utils.color.ColorHelper diff --git a/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSetResource.java b/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSetResource.java index 8eaf10e26..de3f44503 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSetResource.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSetResource.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.glide.palette; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.engine.Resource; public class ColorSetResource implements Resource { diff --git a/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerToListViewScrollListener.java b/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerToListViewScrollListener.java index b0e8f80c0..340897cfb 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerToListViewScrollListener.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerToListViewScrollListener.java @@ -1,12 +1,12 @@ package com.simplecity.amp_library.glide.preloader; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.widget.AbsListView; import android.widget.ListView; /** - * Converts {@link android.support.v7.widget.RecyclerView.OnScrollListener} events to + * Converts {@link androidx.recyclerview.widget.RecyclerView.OnScrollListener} events to * {@link AbsListView} scroll events. *

*

Requires that the the recycler view be using a {@link LinearLayoutManager} subclass. diff --git a/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerViewPreloader.java b/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerViewPreloader.java index 016b61146..b8b0edcce 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerViewPreloader.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerViewPreloader.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.glide.preloader; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.ListPreloader; import com.bumptech.glide.ListPreloader.PreloadModelProvider; import com.bumptech.glide.ListPreloader.PreloadSizeProvider; @@ -14,10 +14,10 @@ *

Must be added as a listener to the {@link RecyclerView} using * {@link RecyclerView#addOnScrollListener(RecyclerView.OnScrollListener)}, or have its * corresponding methods called from another - * {@link android.support.v7.widget.RecyclerView.OnScrollListener} to function.

+ * {@link androidx.recyclerview.widget.RecyclerView.OnScrollListener} to function.

* - *

This class only works with {@link android.support.v7.widget.LinearLayoutManager} and - * subclasses of {@link android.support.v7.widget.LinearLayoutManager}.

+ *

This class only works with {@link androidx.recyclerview.widget.LinearLayoutManager} and + * subclasses of {@link androidx.recyclerview.widget.LinearLayoutManager}.

* * @param The type of the model being displayed in the {@link RecyclerView}. */ diff --git a/app/src/main/java/com/simplecity/amp_library/glide/utils/GlideUtils.java b/app/src/main/java/com/simplecity/amp_library/glide/utils/GlideUtils.java index 7ff841ec9..3162a8cb5 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/utils/GlideUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/utils/GlideUtils.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class GlideUtils { diff --git a/app/src/main/java/com/simplecity/amp_library/glide/utils/WrappingViewAdapter.java b/app/src/main/java/com/simplecity/amp_library/glide/utils/WrappingViewAdapter.java index f5ae50c57..ed534bfd2 100644 --- a/app/src/main/java/com/simplecity/amp_library/glide/utils/WrappingViewAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/glide/utils/WrappingViewAdapter.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.glide.utils; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.bumptech.glide.request.animation.GlideAnimation.ViewAdapter; diff --git a/app/src/main/java/com/simplecity/amp_library/interfaces/FileType.java b/app/src/main/java/com/simplecity/amp_library/interfaces/FileType.java index c3bf6e282..1912e82d8 100644 --- a/app/src/main/java/com/simplecity/amp_library/interfaces/FileType.java +++ b/app/src/main/java/com/simplecity/amp_library/interfaces/FileType.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.interfaces; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; @IntDef({ FileType.PARENT, FileType.FOLDER, FileType.FILE }) public @interface FileType { diff --git a/app/src/main/java/com/simplecity/amp_library/model/Album.java b/app/src/main/java/com/simplecity/amp_library/model/Album.java index 9e3105681..bdf832406 100644 --- a/app/src/main/java/com/simplecity/amp_library/model/Album.java +++ b/app/src/main/java/com/simplecity/amp_library/model/Album.java @@ -1,9 +1,9 @@ package com.simplecity.amp_library.model; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import com.simplecity.amp_library.utils.ArtworkUtils; import com.simplecity.amp_library.utils.ComparisonUtils; import com.simplecity.amp_library.utils.StringUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java b/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java index a14aa78bd..1bff95ecf 100644 --- a/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java +++ b/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.model; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.simplecity.amp_library.data.Repository; import com.simplecity.amp_library.utils.ComparisonUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/model/ArtworkProvider.java b/app/src/main/java/com/simplecity/amp_library/model/ArtworkProvider.java index aa76561c1..d0546cd39 100644 --- a/app/src/main/java/com/simplecity/amp_library/model/ArtworkProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/model/ArtworkProvider.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.model; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.File; import java.io.InputStream; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/model/CategoryItem.java b/app/src/main/java/com/simplecity/amp_library/model/CategoryItem.java index e7a9433a1..ae7b63cc9 100644 --- a/app/src/main/java/com/simplecity/amp_library/model/CategoryItem.java +++ b/app/src/main/java/com/simplecity/amp_library/model/CategoryItem.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.R; import com.simplecity.amp_library.ui.screens.album.list.AlbumListFragment; import com.simplecity.amp_library.ui.screens.artist.list.AlbumArtistListFragment; diff --git a/app/src/main/java/com/simplecity/amp_library/model/Song.java b/app/src/main/java/com/simplecity/amp_library/model/Song.java index 3799bb865..138cf71d5 100644 --- a/app/src/main/java/com/simplecity/amp_library/model/Song.java +++ b/app/src/main/java/com/simplecity/amp_library/model/Song.java @@ -5,8 +5,8 @@ import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.simplecity.amp_library.R; import com.simplecity.amp_library.sql.SqlUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java index 15308b915..22249662b 100644 --- a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java +++ b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java @@ -10,9 +10,9 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.support.v4.media.session.MediaSessionCompat; import android.util.Log; import com.bumptech.glide.Glide; @@ -73,7 +73,7 @@ public NotificationCompat.Builder getBuilder(Context context, @NonNull Song song .setPriority(NotificationCompat.PRIORITY_MAX) .setContentTitle(song.name) .setContentText(song.artistName + " - " + song.albumName) - .setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle() + .setStyle(new androidx.media.app.NotificationCompat.MediaStyle() .setShowActionsInCompactView(0, 1, 2) .setMediaSession(mediaSessionToken)) .addAction( @@ -97,7 +97,7 @@ public NotificationCompat.Builder getBuilder(Context context, @NonNull Song song MusicService.retrievePlaybackAction(context, ServiceCommand.TOGGLE_FAVORITE) ) .setShowWhen(false) - .setVisibility(android.support.v4.app.NotificationCompat.VISIBILITY_PUBLIC); + .setVisibility(androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC); if (bitmap != null) { builder.setLargeIcon(bitmap); diff --git a/app/src/main/java/com/simplecity/amp_library/playback/DummyNotificationHelper.java b/app/src/main/java/com/simplecity/amp_library/playback/DummyNotificationHelper.java index 079959403..5d3cae6a9 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/DummyNotificationHelper.java +++ b/app/src/main/java/com/simplecity/amp_library/playback/DummyNotificationHelper.java @@ -5,7 +5,7 @@ import android.app.NotificationManager; import android.app.Service; import android.os.Build; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.simplecity.amp_library.R; import io.reactivex.Completable; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/simplecity/amp_library/playback/LocalPlayback.kt b/app/src/main/java/com/simplecity/amp_library/playback/LocalPlayback.kt index b4a377f50..fb0ecc3a7 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/LocalPlayback.kt +++ b/app/src/main/java/com/simplecity/amp_library/playback/LocalPlayback.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.media.AudioManager -import android.support.annotation.CallSuper +import androidx.annotation.CallSuper import android.util.Log import com.simplecity.amp_library.playback.Playback.Callbacks import com.simplecity.amp_library.playback.constants.MediaButtonCommand diff --git a/app/src/main/java/com/simplecity/amp_library/playback/MediaManager.java b/app/src/main/java/com/simplecity/amp_library/playback/MediaManager.java index 1ae056609..b1efea467 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/MediaManager.java +++ b/app/src/main/java/com/simplecity/amp_library/playback/MediaManager.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.playback; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import com.simplecity.amp_library.ShuttleApplication; import com.simplecity.amp_library.model.Album; diff --git a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java index ac2f4e161..ebbd946cd 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java +++ b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java @@ -12,10 +12,10 @@ import android.os.Handler; import android.os.IBinder; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.support.v4.media.MediaBrowserCompat; -import android.support.v4.media.MediaBrowserServiceCompat; +import androidx.media.MediaBrowserServiceCompat; import android.util.Log; import android.widget.Toast; import com.crashlytics.android.Crashlytics; diff --git a/app/src/main/java/com/simplecity/amp_library/playback/PlaybackManager.java b/app/src/main/java/com/simplecity/amp_library/playback/PlaybackManager.java index 55612ac20..660b8a1f9 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/PlaybackManager.java +++ b/app/src/main/java/com/simplecity/amp_library/playback/PlaybackManager.java @@ -8,9 +8,9 @@ import android.database.sqlite.SQLiteException; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.support.v4.media.session.MediaSessionCompat; import android.util.Log; import com.simplecity.amp_library.data.Repository; diff --git a/app/src/main/java/com/simplecity/amp_library/playback/QueueManager.java b/app/src/main/java/com/simplecity/amp_library/playback/QueueManager.java index ee47860a6..6db491a4b 100644 --- a/app/src/main/java/com/simplecity/amp_library/playback/QueueManager.java +++ b/app/src/main/java/com/simplecity/amp_library/playback/QueueManager.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.playback; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.simplecity.amp_library.data.Repository; import com.simplecity.amp_library.model.Song; diff --git a/app/src/main/java/com/simplecity/amp_library/saf/SafManager.java b/app/src/main/java/com/simplecity/amp_library/saf/SafManager.java index 17e6eb25c..f3fc0c0b0 100644 --- a/app/src/main/java/com/simplecity/amp_library/saf/SafManager.java +++ b/app/src/main/java/com/simplecity/amp_library/saf/SafManager.java @@ -9,13 +9,13 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.provider.DocumentFile; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.documentfile.provider.DocumentFile; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; diff --git a/app/src/main/java/com/simplecity/amp_library/services/ArtworkDownloadService.java b/app/src/main/java/com/simplecity/amp_library/services/ArtworkDownloadService.java index d852eb8f6..9f658d7ea 100644 --- a/app/src/main/java/com/simplecity/amp_library/services/ArtworkDownloadService.java +++ b/app/src/main/java/com/simplecity/amp_library/services/ArtworkDownloadService.java @@ -5,8 +5,8 @@ import android.content.ComponentName; import android.content.Intent; import android.os.IBinder; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.util.Log; import android.widget.Toast; import com.bumptech.glide.Glide; diff --git a/app/src/main/java/com/simplecity/amp_library/sql/SqlUtils.java b/app/src/main/java/com/simplecity/amp_library/sql/SqlUtils.java index daaf90954..9fd217f40 100644 --- a/app/src/main/java/com/simplecity/amp_library/sql/SqlUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/sql/SqlUtils.java @@ -2,7 +2,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.util.Log; import com.simplecity.amp_library.BuildConfig; import com.simplecity.amp_library.model.Query; diff --git a/app/src/main/java/com/simplecity/amp_library/sql/providers/PlayCountContentProvider.java b/app/src/main/java/com/simplecity/amp_library/sql/providers/PlayCountContentProvider.java index 8e0d1bf46..f4843fa45 100644 --- a/app/src/main/java/com/simplecity/amp_library/sql/providers/PlayCountContentProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/sql/providers/PlayCountContentProvider.java @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.simplecity.amp_library.BuildConfig; import java.util.Arrays; diff --git a/app/src/main/java/com/simplecity/amp_library/sql/sqlbrite/QueryToOneOperator.java b/app/src/main/java/com/simplecity/amp_library/sql/sqlbrite/QueryToOneOperator.java index cd9812588..e5b168663 100644 --- a/app/src/main/java/com/simplecity/amp_library/sql/sqlbrite/QueryToOneOperator.java +++ b/app/src/main/java/com/simplecity/amp_library/sql/sqlbrite/QueryToOneOperator.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.sql.sqlbrite; import android.database.Cursor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.squareup.sqlbrite2.SqlBrite; import io.reactivex.ObservableOperator; import io.reactivex.Observer; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/adapters/LoggingViewModelAdapter.java b/app/src/main/java/com/simplecity/amp_library/ui/adapters/LoggingViewModelAdapter.java index 8b9950ab2..b0d4e6c63 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/adapters/LoggingViewModelAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/adapters/LoggingViewModelAdapter.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.adapters; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.crashlytics.android.Crashlytics; import com.simplecityapps.recycler_adapter.adapter.CompletionListUpdateCallback; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/adapters/PagerAdapter.java b/app/src/main/java/com/simplecity/amp_library/ui/adapters/PagerAdapter.java index 2e9e64054..4c2ad25b2 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/adapters/PagerAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/adapters/PagerAdapter.java @@ -1,10 +1,10 @@ package com.simplecity.amp_library.ui.adapters; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentTransaction; import android.util.SparseArray; import android.view.ViewGroup; import com.annimon.stream.IntStream; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/adapters/SectionedAdapter.java b/app/src/main/java/com/simplecity/amp_library/ui/adapters/SectionedAdapter.java index 7d953c99a..9b755d02a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/adapters/SectionedAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/adapters/SectionedAdapter.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.adapters; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.simplecity.amp_library.ui.modelviews.SectionedView; import com.simplecityapps.recycler_adapter.adapter.ViewModelAdapter; import com.simplecityapps.recycler_adapter.model.ViewModel; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseActivity.java b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseActivity.java index 4a3f8a079..93d5a82b3 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseActivity.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseActivity.java @@ -8,10 +8,10 @@ import android.os.Build; import android.os.Bundle; import android.os.IBinder; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.KeyEvent; import android.view.Window; import android.widget.Toast; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragment.java index 7d8b2baf5..055dcfec3 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragment.java @@ -2,9 +2,9 @@ import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragmentModule.java index 3587e41ad..8e666a2cb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/BaseFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.common; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/EqualizerModule.java b/app/src/main/java/com/simplecity/amp_library/ui/common/EqualizerModule.java index 21d7108b7..97b427777 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/EqualizerModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/EqualizerModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.common; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import com.simplecity.amp_library.ui.screens.equalizer.EqualizerFragment; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/Presenter.java b/app/src/main/java/com/simplecity/amp_library/ui/common/Presenter.java index 540a3982b..671266f0f 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/Presenter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/Presenter.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.ui.common; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/common/ToolbarListener.java b/app/src/main/java/com/simplecity/amp_library/ui/common/ToolbarListener.java index 23b67a6d6..ec8f7bc20 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/common/ToolbarListener.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/common/ToolbarListener.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.common; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; //Todo: Better name public interface ToolbarListener { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/AlbumBiographyDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/AlbumBiographyDialog.kt index 010b973bf..ed7cef128 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/AlbumBiographyDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/AlbumBiographyDialog.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.text.Html import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ArtistBiographyDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ArtistBiographyDialog.kt index d2866adf5..339fc1ce5 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ArtistBiographyDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ArtistBiographyDialog.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.text.Html import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt index 50f3cabae..622d8ac42 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt @@ -4,9 +4,9 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager -import android.support.v4.content.ContextCompat +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager +import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.webkit.WebView import android.webkit.WebViewClient diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/DeleteDialog.java b/app/src/main/java/com/simplecity/amp_library/ui/dialog/DeleteDialog.java index c47cb080d..fa08c579a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/DeleteDialog.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/DeleteDialog.java @@ -7,12 +7,12 @@ import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.provider.DocumentFile; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.documentfile.provider.DocumentFile; import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; import com.annimon.stream.Collectors; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/FileInfoDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/FileInfoDialog.kt index 5a6eabdc5..5b3326455 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/FileInfoDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/FileInfoDialog.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.view.LayoutInflater import android.view.View import android.widget.TextView diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/InclExclDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/InclExclDialog.kt index e96f64b97..2ad3091e6 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/InclExclDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/InclExclDialog.kt @@ -4,10 +4,10 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.widget.Toast import com.afollestad.materialdialogs.MaterialDialog diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ShareDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ShareDialog.kt index 0c7b78cdb..545b483c4 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ShareDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ShareDialog.kt @@ -5,9 +5,9 @@ import android.content.Context import android.content.Intent import android.graphics.Bitmap import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager -import android.support.v4.content.FileProvider +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager +import androidx.core.content.FileProvider import com.afollestad.materialdialogs.MaterialDialog import com.bumptech.glide.Glide import com.bumptech.glide.Priority diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/SongInfoDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/SongInfoDialog.kt index 7b7f357a4..61b5fa76c 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/SongInfoDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/SongInfoDialog.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.view.LayoutInflater import android.view.View import android.widget.TextView diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeDialog.kt index 578e0be6b..5c787ce63 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeDialog.kt @@ -3,8 +3,8 @@ package com.simplecity.amp_library.ui.dialog import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import com.afollestad.materialdialogs.MaterialDialog import com.android.billingclient.api.BillingClient import com.simplecity.amp_library.R diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeNagDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeNagDialog.kt index 8b458185b..a4dd242e1 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeNagDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeNagDialog.kt @@ -3,7 +3,7 @@ package com.simplecity.amp_library.ui.dialog import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import android.view.View import com.afollestad.materialdialogs.MaterialDialog import com.simplecity.amp_library.R diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeSuccessDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeSuccessDialog.kt index 1a68b1bce..d53dc4ece 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeSuccessDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/UpgradeSuccessDialog.kt @@ -3,7 +3,7 @@ package com.simplecity.amp_library.ui.dialog import android.app.Dialog import android.content.Intent import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import com.afollestad.materialdialogs.MaterialDialog import com.simplecity.amp_library.R import com.simplecity.amp_library.ui.screens.main.MainActivity diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/WeekSelectorDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/WeekSelectorDialog.kt index 5a176f180..35de1e215 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/WeekSelectorDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/WeekSelectorDialog.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.view.LayoutInflater import android.widget.NumberPicker import com.afollestad.materialdialogs.MaterialDialog diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumArtistView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumArtistView.java index d00a29f7b..ac88fcf08 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumArtistView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumArtistView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumView.java index d4e4b5251..088d54d00 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/AlbumView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ArtworkView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ArtworkView.java index 4294e8db2..8d047d4bf 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ArtworkView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ArtworkView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BaseSelectableViewModel.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BaseSelectableViewModel.java index ffaa1cf9f..697fda183 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BaseSelectableViewModel.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BaseSelectableViewModel.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import com.simplecityapps.recycler_adapter.model.BaseViewModel; import com.simplecityapps.recycler_adapter.recyclerview.BaseViewHolder; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BreadcrumbsView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BreadcrumbsView.java index 7c06a0333..c9ec788c0 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BreadcrumbsView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/BreadcrumbsView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/EmptyView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/EmptyView.java index c259f31e9..e90e6ad46 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/EmptyView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/EmptyView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/FolderView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/FolderView.java index 1ded230fb..d69bddd41 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/FolderView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/FolderView.java @@ -3,9 +3,9 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/GenreView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/GenreView.java index c7c27f758..fd4f02dfa 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/GenreView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/GenreView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/HorizontalRecyclerView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/HorizontalRecyclerView.java index 086c98493..2c7a82ed6 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/HorizontalRecyclerView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/HorizontalRecyclerView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import com.simplecityapps.recycler_adapter.adapter.ViewModelAdapter; @@ -11,7 +11,7 @@ import io.reactivex.disposables.Disposable; import java.util.List; -import static android.support.v7.widget.LinearLayoutManager.HORIZONTAL; +import static androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL; import static com.simplecity.amp_library.R.layout.recycler_header; import static com.simplecity.amp_library.ui.adapters.ViewType.HORIZONTAL_RECYCLERVIEW; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/InclExclView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/InclExclView.java index 2041f0e4c..941c53eb8 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/InclExclView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/InclExclView.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/MultiItemView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/MultiItemView.java index 313b8048a..d19eb6018 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/MultiItemView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/MultiItemView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/PlaylistView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/PlaylistView.java index dd022c711..793373b29 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/PlaylistView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/PlaylistView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ShuffleView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ShuffleView.java index 2dd684e8a..a8455dd5b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ShuffleView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/ShuffleView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SongView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SongView.java index c7e1b54c1..764571684 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SongView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SongView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedHeaderView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedHeaderView.java index 60d7b4380..2310b28b7 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedHeaderView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedHeaderView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedSongView.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedSongView.java index 7aa4750d2..ab4b2b815 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedSongView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/SuggestedSongView.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.RequestManager; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/TabViewModel.java b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/TabViewModel.java index aef57fe59..76d269a75 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/modelviews/TabViewModel.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/modelviews/TabViewModel.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.modelviews; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumDetailFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumDetailFragment.kt index 4f92a0f3b..3fa131266 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumDetailFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumDetailFragment.kt @@ -6,11 +6,11 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.ColorStateList import android.os.Bundle -import android.support.v4.app.SharedElementCallback -import android.support.v4.view.ViewCompat -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.core.app.SharedElementCallback +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import android.transition.Transition import android.view.LayoutInflater import android.view.MenuItem diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumsDetailFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumsDetailFragmentModule.java index d3b5944a6..0a6b530c8 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumsDetailFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/detail/AlbumsDetailFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.album.detail; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragment.kt index 58228d8ca..8baf51c4b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragment.kt @@ -2,8 +2,8 @@ package com.simplecity.amp_library.ui.screens.album.list import android.content.Context import android.os.Bundle -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.PopupMenu +import androidx.recyclerview.widget.GridLayoutManager +import androidx.appcompat.widget.PopupMenu import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragmentModule.java index 6a624949d..b2938d422 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/album/list/AlbumListFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.album.list; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailFragment.kt index a9589a491..3d3c7b9b3 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailFragment.kt @@ -6,13 +6,13 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.ColorStateList import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.SharedElementCallback -import android.support.v4.util.Pair -import android.support.v4.view.ViewCompat -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.fragment.app.Fragment +import androidx.core.app.SharedElementCallback +import androidx.core.util.Pair +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import android.transition.Transition import android.transition.TransitionInflater import android.view.LayoutInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailPresenter.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailPresenter.kt index 9200e3b75..3f0d7d19d 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailPresenter.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistDetailPresenter.kt @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.artist.detail -import android.support.v4.util.Pair +import androidx.core.util.Pair import com.simplecity.amp_library.data.Repository.SongsRepository import com.simplecity.amp_library.model.Album import com.simplecity.amp_library.model.AlbumArtist diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistsDetailFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistsDetailFragmentModule.java index 016b61b23..4e4768a1b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistsDetailFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/detail/ArtistsDetailFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.artist.detail; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragment.kt index 8c49a2ceb..be344ce6d 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragment.kt @@ -2,8 +2,8 @@ package com.simplecity.amp_library.ui.screens.artist.list import android.content.Context import android.os.Bundle -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.PopupMenu +import androidx.recyclerview.widget.GridLayoutManager +import androidx.appcompat.widget.PopupMenu import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragmentModule.java index 3dbd52bed..c03822939 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/artist/list/AlbumArtistListFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.artist.list; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerAdapter.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerAdapter.java index ea117884e..55b70a4b1 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerAdapter.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.ViewGroup; import com.bignerdranch.expandablerecyclerview.ExpandableRecyclerAdapter; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerChild.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerChild.java index 687664775..463d5b38b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerChild.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerChild.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerDivider.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerDivider.java index 18255f604..69b864bf7 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerDivider.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerDivider.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.bignerdranch.expandablerecyclerview.ParentViewHolder; import com.bignerdranch.expandablerecyclerview.model.Parent; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragment.kt index 2c8ec1082..579b0275f 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragment.kt @@ -4,10 +4,10 @@ import android.content.Context import android.graphics.PorterDuff import android.graphics.drawable.Drawable import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v4.widget.DrawerLayout -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu +import androidx.core.content.ContextCompat +import androidx.drawerlayout.widget.DrawerLayout +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu import android.view.Gravity import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragmentModule.java index 74c72926a..acd9cbaca 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerLockManager.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerLockManager.java index 6057e24f0..ca213f8bf 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerLockManager.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerLockManager.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerParent.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerParent.java index 10cfa7a8f..50977b6f5 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerParent.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerParent.java @@ -3,12 +3,12 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.view.View; import android.view.animation.DecelerateInterpolator; import android.widget.ImageView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerProvider.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerProvider.java index 7ec30c74c..560b6b1bc 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/DrawerProvider.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.v4.widget.DrawerLayout; +import androidx.drawerlayout.widget.DrawerLayout; public interface DrawerProvider { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/NavigationEventRelay.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/NavigationEventRelay.java index ff231092b..f1d0b0214 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/NavigationEventRelay.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/drawer/NavigationEventRelay.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.screens.drawer; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.jakewharton.rxrelay2.PublishRelay; import com.simplecity.amp_library.ShuttleApplication; import com.simplecity.amp_library.utils.SettingsManager; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerFragment.java index 0fc1950c8..6b4f749da 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerFragment.java @@ -8,9 +8,9 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v7.widget.SwitchCompat; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SwitchCompat; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerModule.java index 37a7bbe69..aaf0b55cb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/equalizer/EqualizerModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.equalizer; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragment.java index 917d431f5..75a925dcb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragment.java @@ -2,11 +2,11 @@ import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.design.widget.AppBarLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import com.google.android.material.appbar.AppBarLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.PopupMenu; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragmentModule.java index 6a7a22a58..e6ae4f22c 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.folders; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragment.kt index 089ad45b9..0026c548b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragment.kt @@ -6,13 +6,13 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.ColorStateList import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.SharedElementCallback -import android.support.v4.util.Pair -import android.support.v4.view.ViewCompat -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.fragment.app.Fragment +import androidx.core.app.SharedElementCallback +import androidx.core.util.Pair +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import android.transition.Transition import android.transition.TransitionInflater import android.view.LayoutInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragmentModule.java index 22145143e..6989093bb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.genre.detail; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailPresenter.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailPresenter.kt index b7e6868b4..1126b3210 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailPresenter.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/detail/GenreDetailPresenter.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.screens.genre.detail import android.content.Context -import android.support.v4.util.Pair +import androidx.core.util.Pair import com.simplecity.amp_library.model.Album import com.simplecity.amp_library.model.Genre import com.simplecity.amp_library.model.Song diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragment.kt index efc357612..f3a79b1e0 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragment.kt @@ -2,8 +2,8 @@ package com.simplecity.amp_library.ui.screens.genre.list import android.content.Context import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragmentModule.java index 11b59e6f4..328d5aa92 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/genre/list/GenreListFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.genre.list; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/lyrics/LyricsDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/lyrics/LyricsDialog.kt index d5fb4230d..db1f335f0 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/lyrics/LyricsDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/lyrics/LyricsDialog.kt @@ -5,8 +5,8 @@ import android.app.Dialog import android.content.ActivityNotFoundException import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.view.LayoutInflater import android.view.View import android.widget.Button diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryController.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryController.java index f06b844ff..45ec5da42 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryController.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryController.java @@ -4,16 +4,16 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.util.Pair; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.core.util.Pair; +import androidx.core.view.ViewCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.transition.Transition; import android.transition.TransitionInflater; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryFragmentModule.java index 5f9aeef48..34805153a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/LibraryFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.main; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivity.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivity.java index ee6a91a53..bc0c98eda 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivity.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivity.java @@ -9,11 +9,11 @@ import android.os.Bundle; import android.os.IBinder; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; import com.afollestad.aesthetic.Aesthetic; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivityModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivityModule.java index e661948d0..10238a2de 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivityModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainActivityModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.main; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.simplecity.amp_library.billing.BillingManager; import com.simplecity.amp_library.di.app.activity.ActivityModule; import com.simplecity.amp_library.di.app.activity.ActivityScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainController.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainController.java index 70b9c1f0a..41b4bb53e 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainController.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainController.java @@ -4,12 +4,12 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.util.Pair; -import android.support.v4.widget.DrawerLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.util.Pair; +import androidx.drawerlayout.widget.DrawerLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainControllerModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainControllerModule.java index 2fb08543e..7c26b08d4 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainControllerModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/main/MainControllerModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.main; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragment.java index 421968744..a3aa8c972 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragment.java @@ -2,8 +2,8 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragmentModule.java index d3618cad7..c3d81d96e 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/miniplayer/MiniPlayerFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.miniplayer; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragment.java index 64398a7f6..cda4c8e87 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragment.java @@ -7,10 +7,10 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragmentModule.java index 0a0a7733a..eafddc9ac 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/nowplaying/PlayerFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.nowplaying; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragment.kt index c187111a6..6a7b604ea 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragment.kt @@ -6,13 +6,13 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.ColorStateList import android.os.Bundle -import android.support.v4.app.SharedElementCallback -import android.support.v4.view.ViewCompat -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.Toolbar -import android.support.v7.widget.helper.ItemTouchHelper +import androidx.core.app.SharedElementCallback +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.recyclerview.widget.RecyclerView +import androidx.appcompat.widget.Toolbar +import androidx.recyclerview.widget.ItemTouchHelper import android.transition.Transition import android.view.LayoutInflater import android.view.MenuItem diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragmentModule.java index 49559d901..b6db60506 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/detail/PlaylistDetailFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.playlist.detail; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/CreatePlaylistDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/CreatePlaylistDialog.kt index b177fe88c..ed62e2d4f 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/CreatePlaylistDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/CreatePlaylistDialog.kt @@ -8,9 +8,9 @@ import android.content.Context import android.net.Uri import android.os.Bundle import android.provider.MediaStore -import android.support.annotation.WorkerThread -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.annotation.WorkerThread +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.text.Editable import android.text.TextUtils import android.text.TextWatcher diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/DeletePlaylistConfirmationDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/DeletePlaylistConfirmationDialog.kt index bd71a6fa9..285055428 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/DeletePlaylistConfirmationDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/DeletePlaylistConfirmationDialog.kt @@ -3,9 +3,9 @@ package com.simplecity.amp_library.ui.screens.playlist.dialog import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager import com.afollestad.materialdialogs.MaterialDialog import com.simplecity.amp_library.R import com.simplecity.amp_library.data.Repository.PlaylistsRepository diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/M3uPlaylistDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/M3uPlaylistDialog.kt index 0c7a665c6..beeaa1a53 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/M3uPlaylistDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/M3uPlaylistDialog.kt @@ -5,9 +5,9 @@ import android.app.ProgressDialog import android.content.Context import android.os.Bundle import android.os.Environment -import android.support.v4.app.DialogFragment -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager import android.util.Log import android.widget.Toast import com.simplecity.amp_library.R diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/RenamePlaylistDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/RenamePlaylistDialog.kt index 916002d21..b98a2eac1 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/RenamePlaylistDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/dialog/RenamePlaylistDialog.kt @@ -5,8 +5,8 @@ import android.app.Dialog import android.content.ContentValues import android.os.Bundle import android.provider.MediaStore -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager import android.text.Editable import android.text.TextWatcher import android.view.LayoutInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragment.kt index 6cc8304c0..e89af93e4 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragment.kt @@ -2,9 +2,9 @@ package com.simplecity.amp_library.ui.screens.playlist.list import android.content.Context import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragmentModule.java index 786c3ec0f..33345ccac 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/playlist/list/PlaylistListFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.playlist.list; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragment.kt index 4a2c80816..b3ea346a8 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragment.kt @@ -3,11 +3,11 @@ package com.simplecity.amp_library.ui.screens.queue import android.content.Context import android.graphics.Color import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.Toolbar -import android.support.v7.widget.helper.ItemTouchHelper +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.recyclerview.widget.RecyclerView +import androidx.appcompat.widget.Toolbar +import androidx.recyclerview.widget.ItemTouchHelper import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragmentModule.java index b6dfdfdf7..f84fa5798 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/QueueFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.queue; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import com.simplecity.amp_library.ui.screens.nowplaying.PlayerFragment; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragment.java index de346668f..53d3142fe 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragment.java @@ -2,11 +2,11 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PagerSnapHelper; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SnapHelper; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.PagerSnapHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SnapHelper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragmentModule.java index a0fb806d5..b7c5649c0 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.queue.pager; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerPresenter.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerPresenter.java index 3d4dc12e1..fd05d7c4b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerPresenter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/queue/pager/QueuePagerPresenter.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.content.IntentFilter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import com.bumptech.glide.RequestManager; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragment.kt index 3d4264691..f54abbe52 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragment.kt @@ -3,12 +3,12 @@ package com.simplecity.amp_library.ui.screens.search import android.annotation.SuppressLint import android.content.Context import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.util.Pair -import android.support.v4.view.ViewCompat -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.SearchView +import androidx.fragment.app.Fragment +import androidx.core.util.Pair +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.SearchView import android.transition.TransitionInflater import android.view.LayoutInflater import android.view.MenuItem diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragmentModule.java index fbad8cd6c..1bcf11083 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/search/SearchFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.search; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/shortcut/ShortcutTrampolineActivity.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/shortcut/ShortcutTrampolineActivity.kt index 4cec6c33e..01147abe2 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/shortcut/ShortcutTrampolineActivity.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/shortcut/ShortcutTrampolineActivity.kt @@ -2,7 +2,7 @@ package com.simplecity.amp_library.ui.screens.shortcut import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.simplecity.amp_library.playback.MusicService import com.simplecity.amp_library.playback.constants.ShortcutCommands import com.simplecity.amp_library.ui.screens.main.MainActivity diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongListFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongListFragment.kt index 985b12544..9b5a46af3 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongListFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongListFragment.kt @@ -2,8 +2,8 @@ package com.simplecity.amp_library.ui.screens.songs.list import android.content.Context import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PopupMenu +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.appcompat.widget.PopupMenu import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongsListFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongsListFragmentModule.java index b5c0ebf35..8db042967 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongsListFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/songs/list/SongsListFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.songs.list; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragment.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragment.kt index a01727ba0..19e991dd7 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragment.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragment.kt @@ -2,9 +2,9 @@ package com.simplecity.amp_library.ui.screens.suggested import android.content.Context import android.os.Bundle -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.GridLayoutManager +import androidx.appcompat.widget.PopupMenu +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragmentModule.java index aef2ebf4b..fe657a6fe 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/suggested/SuggestedFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.screens.suggested; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/CheckDocumentPermissionsTask.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/CheckDocumentPermissionsTask.java index 50f72bd5b..2e42314ad 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/CheckDocumentPermissionsTask.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/CheckDocumentPermissionsTask.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.AsyncTask; -import android.support.v4.provider.DocumentFile; +import androidx.documentfile.provider.DocumentFile; import com.simplecity.amp_library.utils.SettingsManager; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerDialog.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerDialog.java index ae59a4dee..c66de7696 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerDialog.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerDialog.java @@ -8,11 +8,11 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.provider.DocumentFile; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.documentfile.provider.DocumentFile; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerTask.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerTask.java index 937964e80..76523038a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerTask.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerTask.java @@ -3,7 +3,7 @@ import android.content.Context; import android.os.AsyncTask; import android.os.ParcelFileDescriptor; -import android.support.v4.provider.DocumentFile; +import androidx.documentfile.provider.DocumentFile; import com.simplecity.amp_library.model.TagUpdate; import io.reactivex.annotations.NonNull; import java.io.File; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerUtils.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerUtils.java index 3fdca8736..13cab8334 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/tagger/TaggerUtils.java @@ -5,7 +5,7 @@ import android.content.UriPermission; import android.net.Uri; import android.os.Build; -import android.support.v4.provider.DocumentFile; +import androidx.documentfile.provider.DocumentFile; import android.util.Log; import com.afollestad.materialdialogs.MaterialDialog; import com.crashlytics.android.Crashlytics; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/upnext/UpNextView.kt b/app/src/main/java/com/simplecity/amp_library/ui/screens/upnext/UpNextView.kt index 617724a45..c311b3ee9 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/upnext/UpNextView.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/upnext/UpNextView.kt @@ -6,8 +6,8 @@ import android.animation.ValueAnimator import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.Drawable -import android.support.v4.graphics.drawable.DrawableCompat -import android.support.v4.util.Pair +import androidx.core.graphics.drawable.DrawableCompat +import androidx.core.util.Pair import android.util.AttributeSet import android.view.View import android.view.animation.AccelerateDecelerateInterpolator diff --git a/app/src/main/java/com/simplecity/amp_library/ui/screens/widgets/WidgetFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/screens/widgets/WidgetFragment.java index b591abd99..a15b9591c 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/screens/widgets/WidgetFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/screens/widgets/WidgetFragment.java @@ -2,8 +2,8 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsFragmentModule.java index 7ec135f75..b459872ba 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.settings; - import android.support.v4.app.Fragment; + import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragment.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragment.java index adf336eb5..56e1860a2 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragment.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragment.java @@ -4,16 +4,16 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.annotation.XmlRes; -import android.support.v4.app.Fragment; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.SwitchPreferenceCompat; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.XmlRes; +import androidx.fragment.app.Fragment; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.SwitchPreferenceCompat; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragmentModule.java index 00830e912..32100e70a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsParentFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.settings; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import dagger.Binds; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsPresenter.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsPresenter.java index 2f25d07c4..4862fa460 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsPresenter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsPresenter.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences; import android.net.Uri; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.color.ColorChooserDialog; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsView.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsView.java index 667ebca78..30acc2762 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SettingsView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.settings; import android.content.Intent; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.color.ColorChooserDialog; import com.simplecity.amp_library.ui.views.PurchaseView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java b/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java index 4d01f6878..dde6db86a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/SupportPresenter.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.simplecity.amp_library.BuildConfig; import com.simplecity.amp_library.ShuttleApplication; import com.simplecity.amp_library.ui.common.Presenter; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/settings/TabChooserDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/settings/TabChooserDialog.kt index e3fceea1d..e4303cebe 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/settings/TabChooserDialog.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/settings/TabChooserDialog.kt @@ -5,12 +5,12 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.preference.PreferenceManager -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager -import android.support.v4.content.LocalBroadcastManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.helper.ItemTouchHelper +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.ItemTouchHelper import com.afollestad.materialdialogs.MaterialDialog import com.annimon.stream.Stream import com.simplecity.amp_library.R diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticDrawableTextView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticDrawableTextView.java index ee2bb4246..b32766baf 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticDrawableTextView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticDrawableTextView.java @@ -2,8 +2,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.AppCompatTextView; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.aesthetic.Rx; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticTintedImageView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticTintedImageView.java index 6976c8559..75982d9b5 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticTintedImageView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/AestheticTintedImageView.java @@ -2,9 +2,9 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import io.reactivex.Observable; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/BreadcrumbItem.java b/app/src/main/java/com/simplecity/amp_library/ui/views/BreadcrumbItem.java index 15ec53793..1414ad8ba 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/BreadcrumbItem.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/BreadcrumbItem.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.v7.widget.AppCompatTextView; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/CircleImageView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/CircleImageView.java index f926a8a3b..99c5212ab 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/CircleImageView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/CircleImageView.java @@ -15,8 +15,8 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/CircleView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/CircleView.java index 8ae31bd2f..b5d6322ef 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/CircleView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/CircleView.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.View; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/ContextualToolbar.java b/app/src/main/java/com/simplecity/amp_library/ui/views/ContextualToolbar.java index 0e3d31db0..f792a292e 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/ContextualToolbar.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/ContextualToolbar.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.util.AttributeSet; import android.view.View; import com.afollestad.aesthetic.AestheticToolbar; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/CustomMediaRouteActionProvider.java b/app/src/main/java/com/simplecity/amp_library/ui/views/CustomMediaRouteActionProvider.java index 7aabd9fc9..4dfa732fb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/CustomMediaRouteActionProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/CustomMediaRouteActionProvider.java @@ -2,8 +2,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v7.app.MediaRouteActionProvider; -import android.support.v7.app.MediaRouteButton; +import androidx.mediarouter.app.MediaRouteActionProvider; +import androidx.mediarouter.app.MediaRouteButton; import android.util.AttributeSet; import com.afollestad.aesthetic.ActiveInactiveColors; import com.afollestad.aesthetic.Aesthetic; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/DrawerIconImageView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/DrawerIconImageView.java index 2869bd67e..ef3fe314a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/DrawerIconImageView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/DrawerIconImageView.java @@ -2,10 +2,10 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.util.Pair; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.util.Pair; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import io.reactivex.Observable; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/FavoriteActionBarView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/FavoriteActionBarView.java index 3f4137184..177aa5fe8 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/FavoriteActionBarView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/FavoriteActionBarView.java @@ -3,10 +3,10 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/LockActionBarView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/LockActionBarView.java index 4c46f1ef8..60c817129 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/LockActionBarView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/LockActionBarView.java @@ -1,11 +1,11 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.graphics.drawable.AnimatedVectorDrawableCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.TooltipCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.TooltipCompat; import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/NonClickableToolbar.java b/app/src/main/java/com/simplecity/amp_library/ui/views/NonClickableToolbar.java index 935b2dab3..06d225bfd 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/NonClickableToolbar.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/NonClickableToolbar.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import com.afollestad.aesthetic.AestheticToolbar; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/NonScrollImageButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/NonScrollImageButton.java index e9ea2886e..bf80d6eff 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/NonScrollImageButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/NonScrollImageButton.java @@ -7,9 +7,9 @@ /** * A custom {@link ImageButton} which prevents parent ScrollView scrolling when used as the - * anchor for a {@link android.support.v7.widget.PopupMenu} + * anchor for a {@link androidx.appcompat.widget.PopupMenu} */ -public class NonScrollImageButton extends android.support.v7.widget.AppCompatImageButton { +public class NonScrollImageButton extends androidx.appcompat.widget.AppCompatImageButton { public NonScrollImageButton(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/OverflowButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/OverflowButton.java index ff896cf9e..d1c683adb 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/OverflowButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/OverflowButton.java @@ -4,8 +4,8 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.aesthetic.LightDarkColorState; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/PagerListenerAdapter.java b/app/src/main/java/com/simplecity/amp_library/ui/views/PagerListenerAdapter.java index 8cc002848..5fccfaada 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/PagerListenerAdapter.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/PagerListenerAdapter.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.views; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; public abstract class PagerListenerAdapter implements ViewPager.OnPageChangeListener { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayCountView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayCountView.java index 74c4fbfff..ffe41cde9 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayCountView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayCountView.java @@ -3,9 +3,9 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.AppCompatTextView; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.aesthetic.Util; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseDrawable.java b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseDrawable.java index 0df13143e..547cc943a 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseDrawable.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseDrawable.java @@ -14,7 +14,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Property; import com.simplecity.amp_library.R; import com.simplecity.amp_library.utils.ResourceUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseView.java index 1260895c5..26db4d61f 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/PlayPauseView.java @@ -9,8 +9,8 @@ import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewOutlineProvider; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/RatingSnackbar.kt b/app/src/main/java/com/simplecity/amp_library/ui/views/RatingSnackbar.kt index 636932211..12c391029 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/RatingSnackbar.kt +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/RatingSnackbar.kt @@ -1,8 +1,8 @@ package com.simplecity.amp_library.ui.views import android.graphics.Color -import android.support.design.widget.BaseTransientBottomBar -import android.support.design.widget.Snackbar +import com.google.android.material.snackbar.BaseTransientBottomBar +import com.google.android.material.snackbar.Snackbar import android.view.View import android.widget.TextView import com.simplecity.amp_library.R @@ -38,7 +38,7 @@ class RatingSnackbar( }) snackbar.show() - val snackbarText = snackbar.view.findViewById(android.support.design.R.id.snackbar_text) + val snackbarText = snackbar.view.findViewById(com.google.android.material.R.id.snackbar_text) snackbarText?.setTextColor(Color.WHITE) analyticsManager.logRateShown() diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatButton.java index 37e9d9f7d..cc345edc1 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatButton.java @@ -3,17 +3,17 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.simplecity.amp_library.R; import com.simplecity.amp_library.playback.QueueManager; import io.reactivex.disposables.Disposable; -public class RepeatButton extends android.support.v7.widget.AppCompatImageButton { +public class RepeatButton extends androidx.appcompat.widget.AppCompatImageButton { @QueueManager.RepeatMode private int repeatMode; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatingImageButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatingImageButton.java index cc56fc208..4217ab4cc 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatingImageButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/RepeatingImageButton.java @@ -4,8 +4,8 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.NonNull; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.MotionEvent; @@ -15,7 +15,7 @@ * A button that will repeatedly call a 'listener' method * as long as the button is pressed. */ -public class RepeatingImageButton extends android.support.v7.widget.AppCompatImageButton { +public class RepeatingImageButton extends androidx.appcompat.widget.AppCompatImageButton { private long startTime; private int repeatCount; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/ShuffleButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/ShuffleButton.java index 782f286b4..e2a2663a0 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/ShuffleButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/ShuffleButton.java @@ -3,17 +3,17 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.simplecity.amp_library.R; import com.simplecity.amp_library.playback.QueueManager; import io.reactivex.disposables.Disposable; -public class ShuffleButton extends android.support.v7.widget.AppCompatImageButton { +public class ShuffleButton extends androidx.appcompat.widget.AppCompatImageButton { @QueueManager.ShuffleMode private int shuffleMode; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/SnowfallView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/SnowfallView.java index 15183c9e0..b699b8cf9 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/SnowfallView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/SnowfallView.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import com.google.firebase.remoteconfig.FirebaseRemoteConfig; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/SquareHeightImageView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/SquareHeightImageView.java index d5bcb4399..502844907 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/SquareHeightImageView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/SquareHeightImageView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; public class SquareHeightImageView extends AppCompatImageView { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/SquareImageView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/SquareImageView.java index 11b8d2c15..3739cf943 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/SquareImageView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/SquareImageView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; public class SquareImageView extends AppCompatImageView { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedDividerDecoration.java b/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedDividerDecoration.java index a22317f3a..40f4745b4 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedDividerDecoration.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedDividerDecoration.java @@ -2,8 +2,8 @@ import android.content.res.Resources; import android.graphics.Rect; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.simplecity.amp_library.ui.adapters.ViewType; import com.simplecity.amp_library.utils.ResourceUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedHeaderButton.java b/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedHeaderButton.java index c5355fd4c..ba5d9c951 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedHeaderButton.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/SuggestedHeaderButton.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.aesthetic.ColorIsDarkState; @@ -13,7 +13,7 @@ import com.simplecity.amp_library.utils.ResourceUtils; import io.reactivex.disposables.Disposable; -public class SuggestedHeaderButton extends android.support.v7.widget.AppCompatTextView { +public class SuggestedHeaderButton extends androidx.appcompat.widget.AppCompatTextView { private Disposable aestheticDisposable; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/ThemedStatusBarView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/ThemedStatusBarView.java index ba42c57bb..e7ce937a6 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/ThemedStatusBarView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/ThemedStatusBarView.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import com.afollestad.aesthetic.Aesthetic; import com.afollestad.aesthetic.Rx; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/CustomMultiSheetView.java b/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/CustomMultiSheetView.java index 7e2c25c80..e78a689ec 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/CustomMultiSheetView.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/CustomMultiSheetView.java @@ -1,9 +1,9 @@ package com.simplecity.amp_library.ui.views.multisheet; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetBehavior; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import android.util.AttributeSet; import com.simplecity.amp_library.ui.screens.drawer.DrawerLockManager; import com.simplecity.amp_library.ui.views.multisheet.MultiSheetSlideEventRelay.SlideEvent; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/MultiSheetSlideEventRelay.java b/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/MultiSheetSlideEventRelay.java index 46396428f..2b24ba71f 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/MultiSheetSlideEventRelay.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/multisheet/MultiSheetSlideEventRelay.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.views.multisheet; -import android.support.design.widget.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.jakewharton.rxrelay2.BehaviorRelay; import com.simplecity.multisheetview.ui.view.MultiSheetView.Sheet; import io.reactivex.Observable; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/AdaptableSpanSizeLookup.java b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/AdaptableSpanSizeLookup.java index c23ffc042..1ed9314b6 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/AdaptableSpanSizeLookup.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/AdaptableSpanSizeLookup.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.views.recyclerview; -import android.support.v7.widget.GridLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; import com.simplecityapps.recycler_adapter.adapter.ViewModelAdapter; import com.simplecityapps.recycler_adapter.model.ViewModel; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/GridDividerDecoration.java b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/GridDividerDecoration.java index e59270f61..63eec4428 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/GridDividerDecoration.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/GridDividerDecoration.java @@ -2,8 +2,8 @@ import android.content.res.Resources; import android.graphics.Rect; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.simplecity.amp_library.utils.ResourceUtils; import com.simplecityapps.recycler_adapter.adapter.ViewModelAdapter; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/ItemTouchHelperCallback.java b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/ItemTouchHelperCallback.java index f5cd81b83..baf22d05b 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/ItemTouchHelperCallback.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/ItemTouchHelperCallback.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.ui.views.recyclerview; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; public class ItemTouchHelperCallback extends ItemTouchHelper.Callback { diff --git a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/SpacesItemDecoration.java b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/SpacesItemDecoration.java index 419e98039..549298383 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/SpacesItemDecoration.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/views/recyclerview/SpacesItemDecoration.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.ui.views.recyclerview; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.simplecity.amp_library.utils.ResourceUtils; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetConfigureActivity.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetConfigureActivity.java index 957c2aa8d..3aeb4b308 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetConfigureActivity.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetConfigureActivity.java @@ -9,17 +9,17 @@ import android.os.Bundle; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.Toolbar; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetProvider.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetProvider.java index 128b8c503..73aea58f7 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/BaseWidgetProvider.java @@ -10,7 +10,7 @@ import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; -import android.support.annotation.LayoutRes; +import androidx.annotation.LayoutRes; import android.widget.RemoteViews; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityExtraLargeModule.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityExtraLargeModule.java index a9c367c09..8a6a59bfe 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityExtraLargeModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityExtraLargeModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.widgets; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.simplecity.amp_library.billing.BillingManager; import com.simplecity.amp_library.di.app.activity.ActivityModule; import com.simplecity.amp_library.di.app.activity.ActivityScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityLargeModule.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityLargeModule.java index f47287979..29a073ffc 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityLargeModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityLargeModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.widgets; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.simplecity.amp_library.billing.BillingManager; import com.simplecity.amp_library.di.app.activity.ActivityModule; import com.simplecity.amp_library.di.app.activity.ActivityScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityMediumModule.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityMediumModule.java index cfe2afd18..812dbf12d 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityMediumModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivityMediumModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.widgets; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.simplecity.amp_library.billing.BillingManager; import com.simplecity.amp_library.di.app.activity.ActivityModule; import com.simplecity.amp_library.di.app.activity.ActivityScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivitySmallModule.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivitySmallModule.java index 590a1b54d..22a237656 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivitySmallModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetConfigureActivitySmallModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.widgets; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.simplecity.amp_library.billing.BillingManager; import com.simplecity.amp_library.di.app.activity.ActivityModule; import com.simplecity.amp_library.di.app.activity.ActivityScope; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetFragmentModule.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetFragmentModule.java index add42530d..4175a0a24 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetFragmentModule.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetFragmentModule.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.ui.widgets; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.di.app.activity.fragment.FragmentModule; import com.simplecity.amp_library.di.app.activity.fragment.FragmentScope; import com.simplecity.amp_library.ui.screens.main.LibraryController; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderExtraLarge.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderExtraLarge.java index 6e267a5c8..beaea56ee 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderExtraLarge.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderExtraLarge.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.RemoteViews; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderLarge.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderLarge.java index 8e3e4abb2..d7244e5e2 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderLarge.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderLarge.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.RemoteViews; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderMedium.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderMedium.java index b1e5df0fa..e69a92e92 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderMedium.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderMedium.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.RemoteViews; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderSmall.java b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderSmall.java index 03cb90d4a..37c64068c 100644 --- a/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderSmall.java +++ b/app/src/main/java/com/simplecity/amp_library/ui/widgets/WidgetProviderSmall.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.RemoteViews; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ArtworkDialog.java b/app/src/main/java/com/simplecity/amp_library/utils/ArtworkDialog.java index 1e6740ccb..72a9c88c1 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ArtworkDialog.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ArtworkDialog.java @@ -3,9 +3,9 @@ import android.annotation.SuppressLint; import android.content.ContentValues; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import com.afollestad.materialdialogs.MaterialDialog; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ArtworkUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/ArtworkUtils.java index f107d0527..03a57dd95 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ArtworkUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ArtworkUtils.java @@ -5,9 +5,9 @@ import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.util.Log; import com.annimon.stream.Stream; import com.simplecity.amp_library.model.Album; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ComparisonUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/ComparisonUtils.java index 0298c154f..045c5f320 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ComparisonUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ComparisonUtils.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.text.Collator; import java.util.Locale; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ContextualToolbarHelper.java b/app/src/main/java/com/simplecity/amp_library/utils/ContextualToolbarHelper.java index 59cabf6f8..9dfe3bedc 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ContextualToolbarHelper.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ContextualToolbarHelper.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; import com.simplecity.amp_library.R; import com.simplecity.amp_library.ui.modelviews.SelectableViewModel; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/CustomMediaScanner.java b/app/src/main/java/com/simplecity/amp_library/utils/CustomMediaScanner.java index 7ad175d52..b05058826 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/CustomMediaScanner.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/CustomMediaScanner.java @@ -5,7 +5,7 @@ import android.media.MediaScannerConnection; import android.net.Uri; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/DrawableUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/DrawableUtils.java index 451b66a54..85e67612b 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/DrawableUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/DrawableUtils.java @@ -6,7 +6,7 @@ import android.graphics.ColorFilter; import android.graphics.LightingColorFilter; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.afollestad.aesthetic.Aesthetic; import com.simplecity.amp_library.R; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/FileBrowser.java b/app/src/main/java/com/simplecity/amp_library/utils/FileBrowser.java index 0883c91e5..b665ab4e7 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/FileBrowser.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/FileBrowser.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.utils; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import com.simplecity.amp_library.R; import com.simplecity.amp_library.interfaces.FileType; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/FileHelper.java b/app/src/main/java/com/simplecity/amp_library/utils/FileHelper.java index 023370c77..85ed6c37c 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/FileHelper.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/FileHelper.java @@ -5,7 +5,7 @@ import android.media.MediaPlayer; import android.net.Uri; import android.os.Environment; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import com.annimon.stream.Stream; import com.simplecity.amp_library.data.Repository; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/FragmentExt.kt b/app/src/main/java/com/simplecity/amp_library/utils/FragmentExt.kt index febff8720..10838c607 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/FragmentExt.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/FragmentExt.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment inline fun T.withArgs( argsBuilder: Bundle.() -> Unit diff --git a/app/src/main/java/com/simplecity/amp_library/utils/LegacyUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/LegacyUtils.java index 5281b1bde..90e4b5721 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/LegacyUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/LegacyUtils.java @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils; import android.os.Environment; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.simplecity.amp_library.ShuttleApplication; import io.reactivex.Completable; import java.io.File; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/LogUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/LogUtils.java index d804a5e94..9bf4f86a3 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/LogUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/LogUtils.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.crashlytics.android.Crashlytics; import com.simplecity.amp_library.BuildConfig; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/MusicServiceConnectionUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/MusicServiceConnectionUtils.java index dad804bf5..8dd2c1a60 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/MusicServiceConnectionUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/MusicServiceConnectionUtils.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.utils; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.content.ComponentName; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/PlaceholderProvider.java b/app/src/main/java/com/simplecity/amp_library/utils/PlaceholderProvider.java index b89624acc..b49d0348d 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/PlaceholderProvider.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/PlaceholderProvider.java @@ -5,9 +5,9 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.text.TextPaint; import android.text.TextUtils; import com.afollestad.aesthetic.Aesthetic; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ResumingServiceManager.kt b/app/src/main/java/com/simplecity/amp_library/utils/ResumingServiceManager.kt index 2e9337d8a..0fb345380 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ResumingServiceManager.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/ResumingServiceManager.kt @@ -1,8 +1,8 @@ package com.simplecity.amp_library.utils -import android.arch.lifecycle.Lifecycle -import android.arch.lifecycle.LifecycleObserver -import android.arch.lifecycle.OnLifecycleEvent +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleObserver +import androidx.lifecycle.OnLifecycleEvent import android.content.Context import android.content.Intent import android.os.Build diff --git a/app/src/main/java/com/simplecity/amp_library/utils/SettingsManager.java b/app/src/main/java/com/simplecity/amp_library/utils/SettingsManager.java index c0a486c8b..441182f5c 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/SettingsManager.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/SettingsManager.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.simplecity.amp_library.BuildConfig; import com.simplecity.amp_library.R; import com.simplecity.amp_library.model.CategoryItem; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ShuttleUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/ShuttleUtils.java index 4f62de90a..acc51b251 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ShuttleUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ShuttleUtils.java @@ -21,7 +21,7 @@ import android.provider.BaseColumns; import android.provider.MediaStore; import android.provider.Settings; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import android.widget.Toast; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/StringUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/StringUtils.java index 338f4ee63..d4afc0853 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/StringUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/StringUtils.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.simplecity.amp_library.R; import java.text.Normalizer; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ThemeUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/ThemeUtils.java index 8be59485f..5b2db8801 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ThemeUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ThemeUtils.java @@ -1,6 +1,6 @@ package com.simplecity.amp_library.utils; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorRes; import com.simplecity.amp_library.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/TypefaceManager.java b/app/src/main/java/com/simplecity/amp_library/utils/TypefaceManager.java index 9ecdbccd6..16a426a08 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/TypefaceManager.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/TypefaceManager.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Typeface; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import java.util.Map; public class TypefaceManager { diff --git a/app/src/main/java/com/simplecity/amp_library/utils/ViewUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/ViewUtils.java index 6d2d5e14a..3bc5842a6 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/ViewUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/ViewUtils.java @@ -3,7 +3,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.simplecity.amp_library.rx.UnsafeAction; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/color/BitmapPaletteProcessor.java b/app/src/main/java/com/simplecity/amp_library/utils/color/BitmapPaletteProcessor.java index 9efea2955..e3d8ca16e 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/color/BitmapPaletteProcessor.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/color/BitmapPaletteProcessor.java @@ -18,8 +18,8 @@ import android.graphics.Bitmap; import android.graphics.Color; -import android.support.v4.util.Pair; -import android.support.v7.graphics.Palette; +import androidx.core.util.Pair; +import androidx.palette.graphics.Palette; import java.util.List; /** diff --git a/app/src/main/java/com/simplecity/amp_library/utils/color/ColorHelper.java b/app/src/main/java/com/simplecity/amp_library/utils/color/ColorHelper.java index 7d727ec20..595b7bac4 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/color/ColorHelper.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/color/ColorHelper.java @@ -19,11 +19,11 @@ import android.app.Notification; import android.content.Context; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.v4.util.Pair; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.core.util.Pair; import android.util.Log; /** @@ -219,7 +219,7 @@ static boolean isColorLight(int backgroundColor) { } /** - * Framework copy of functions needed from android.support.v4.graphics.ColorUtils. + * Framework copy of functions needed from androidx.core.graphics.ColorUtils. */ private static class ColorUtilsFromCompat { private static final double XYZ_WHITE_REFERENCE_X = 95.047; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/extensions/SongExt.kt b/app/src/main/java/com/simplecity/amp_library/utils/extensions/SongExt.kt index cc9038a95..bdc9fce58 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/extensions/SongExt.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/extensions/SongExt.kt @@ -2,7 +2,7 @@ package com.simplecity.amp_library.utils.extensions import android.content.Context import android.content.Intent -import android.support.v4.content.FileProvider +import androidx.core.content.FileProvider import com.simplecity.amp_library.R import com.simplecity.amp_library.model.Song import com.simplecity.amp_library.utils.LogUtils diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/MenuUtils.java b/app/src/main/java/com/simplecity/amp_library/utils/menu/MenuUtils.java index 5677492fd..654de4f3e 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/MenuUtils.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/MenuUtils.java @@ -1,8 +1,8 @@ package com.simplecity.amp_library.utils.menu; import android.annotation.SuppressLint; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.simplecity.amp_library.data.Repository; import com.simplecity.amp_library.model.Album; import com.simplecity.amp_library.model.AlbumArtist; diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/album/AlbumMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/album/AlbumMenuUtils.kt index 993a9ba94..75c2a1d54 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/album/AlbumMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/album/AlbumMenuUtils.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils.menu.album -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import com.simplecity.amp_library.R import com.simplecity.amp_library.model.Album import com.simplecity.amp_library.model.Playlist diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/albumartist/AlbumArtistMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/albumartist/AlbumArtistMenuUtils.kt index 960105a4e..d72c90eaf 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/albumartist/AlbumArtistMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/albumartist/AlbumArtistMenuUtils.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils.menu.albumartist -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import com.simplecity.amp_library.R import com.simplecity.amp_library.model.AlbumArtist import com.simplecity.amp_library.model.Playlist diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/folder/FolderMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/folder/FolderMenuUtils.kt index 6bc1ef19f..a310d830c 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/folder/FolderMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/folder/FolderMenuUtils.kt @@ -2,9 +2,9 @@ package com.simplecity.amp_library.utils.menu.folder import android.annotation.SuppressLint import android.content.Context -import android.support.annotation.StringRes -import android.support.v4.app.Fragment -import android.support.v7.widget.PopupMenu +import androidx.annotation.StringRes +import androidx.fragment.app.Fragment +import androidx.appcompat.widget.PopupMenu import android.view.LayoutInflater import android.widget.EditText import android.widget.Toast diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/genre/GenreMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/genre/GenreMenuUtils.kt index 73c8847f6..f2dac9766 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/genre/GenreMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/genre/GenreMenuUtils.kt @@ -1,6 +1,6 @@ package com.simplecity.amp_library.utils.menu.genre -import android.support.v7.widget.PopupMenu +import androidx.appcompat.widget.PopupMenu import com.simplecity.amp_library.R import com.simplecity.amp_library.model.Genre import com.simplecity.amp_library.model.Playlist diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/playlist/PlaylistMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/playlist/PlaylistMenuUtils.kt index 8ff7a4e37..55eb9ab14 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/playlist/PlaylistMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/playlist/PlaylistMenuUtils.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils.menu.playlist -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import android.view.Menu import com.simplecity.amp_library.R import com.simplecity.amp_library.model.Playlist diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/queue/QueueMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/queue/QueueMenuUtils.kt index e5bbb4fce..361a1983f 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/queue/QueueMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/queue/QueueMenuUtils.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils.menu.queue -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import com.simplecity.amp_library.R import com.simplecity.amp_library.ui.screens.queue.QueueItem import com.simplecity.amp_library.ui.screens.queue.toSongs diff --git a/app/src/main/java/com/simplecity/amp_library/utils/menu/song/SongMenuUtils.kt b/app/src/main/java/com/simplecity/amp_library/utils/menu/song/SongMenuUtils.kt index 84e6afa6c..ab05bfea3 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/menu/song/SongMenuUtils.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/menu/song/SongMenuUtils.kt @@ -1,7 +1,7 @@ package com.simplecity.amp_library.utils.menu.song -import android.support.v7.widget.PopupMenu -import android.support.v7.widget.Toolbar +import androidx.appcompat.widget.PopupMenu +import androidx.appcompat.widget.Toolbar import com.simplecity.amp_library.R import com.simplecity.amp_library.model.Playlist import com.simplecity.amp_library.model.Song diff --git a/app/src/main/java/com/simplecity/amp_library/utils/playlists/FavoritesPlaylistManager.kt b/app/src/main/java/com/simplecity/amp_library/utils/playlists/FavoritesPlaylistManager.kt index 61e802d06..67d8e4b23 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/playlists/FavoritesPlaylistManager.kt +++ b/app/src/main/java/com/simplecity/amp_library/utils/playlists/FavoritesPlaylistManager.kt @@ -3,7 +3,7 @@ package com.simplecity.amp_library.utils.playlists import android.content.ContentValues import android.content.Context import android.provider.MediaStore -import android.support.v4.util.Pair +import androidx.core.util.Pair import com.simplecity.amp_library.R import com.simplecity.amp_library.data.PlaylistsRepository import com.simplecity.amp_library.data.SongsRepository diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index 1fdd7a7bd..4ca695612 100644 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout-land/up_next_view.xml b/app/src/main/res/layout-land/up_next_view.xml index b039d1ff6..a75bdb515 100644 --- a/app/src/main/res/layout-land/up_next_view.xml +++ b/app/src/main/res/layout-land/up_next_view.xml @@ -17,7 +17,7 @@ android:paddingRight="16dp" tools:parentTag="android.widget.LinearLayout"> - @@ -91,7 +91,7 @@ app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"/> - + - diff --git a/app/src/main/res/layout-sw600dp/list_item_edit.xml b/app/src/main/res/layout-sw600dp/list_item_edit.xml index 031c33e34..bdaa1f0e9 100644 --- a/app/src/main/res/layout-sw600dp/list_item_edit.xml +++ b/app/src/main/res/layout-sw600dp/list_item_edit.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/list_item_one_line.xml b/app/src/main/res/layout-sw600dp/list_item_one_line.xml index 28ee50ce5..d0e9f14db 100644 --- a/app/src/main/res/layout-sw600dp/list_item_one_line.xml +++ b/app/src/main/res/layout-sw600dp/list_item_one_line.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/list_item_two_lines.xml b/app/src/main/res/layout-sw600dp/list_item_two_lines.xml index 9be2ab3d8..5a498b468 100644 --- a/app/src/main/res/layout-sw600dp/list_item_two_lines.xml +++ b/app/src/main/res/layout-sw600dp/list_item_two_lines.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 12853143c..55df08a23 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml index aa2dd22f9..38f710ce8 100644 --- a/app/src/main/res/layout/activity_widget_config.xml +++ b/app/src/main/res/layout/activity_widget_config.xml @@ -7,7 +7,7 @@ android:fitsSystemWindows="true" android:orientation="vertical"> - - - - - - - - @@ -59,7 +59,7 @@ android:layout_gravity="center" android:gravity="center"> - - diff --git a/app/src/main/res/layout/dialog_tagger.xml b/app/src/main/res/layout/dialog_tagger.xml index 57bd4238c..ed07c2d01 100644 --- a/app/src/main/res/layout/dialog_tagger.xml +++ b/app/src/main/res/layout/dialog_tagger.xml @@ -16,11 +16,11 @@ android:layout_marginTop="@dimen/equalizer_activity_top_padding" android:orientation="vertical"> - - - + - - - + - - - + - - - + - - - + @@ -105,12 +105,12 @@ android:baselineAligned="false" android:orientation="horizontal"> - - - + - - - + - - - + - - - + - - - + - - - + - - - + diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml index 7324ec2c2..bf1f6b615 100644 --- a/app/src/main/res/layout/fragment_detail.xml +++ b/app/src/main/res/layout/fragment_detail.xml @@ -1,5 +1,5 @@ - - @@ -60,7 +60,7 @@ - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_drawer.xml b/app/src/main/res/layout/fragment_drawer.xml index 1a3201c44..75d60ff17 100644 --- a/app/src/main/res/layout/fragment_drawer.xml +++ b/app/src/main/res/layout/fragment_drawer.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/drawer_header_height"/> - - - - - - - - + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 68245fc32..5ea53de4a 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:background="@color/colorPrimaryDark"/> - - - - - - - + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index 448c75579..0da4c482a 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 3c766518e..6ba67358b 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/fragment_queue_pager.xml b/app/src/main/res/layout/fragment_queue_pager.xml index c6060037e..3e11abbd3 100644 --- a/app/src/main/res/layout/fragment_queue_pager.xml +++ b/app/src/main/res/layout/fragment_queue_pager.xml @@ -4,18 +4,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_card.xml b/app/src/main/res/layout/grid_item_card.xml index 1ab344edc..99c3e157d 100644 --- a/app/src/main/res/layout/grid_item_card.xml +++ b/app/src/main/res/layout/grid_item_card.xml @@ -1,5 +1,5 @@ - - @@ -37,6 +37,6 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/image"/> - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/grid_item_horizontal.xml b/app/src/main/res/layout/grid_item_horizontal.xml index 8a0735d7d..b42ceeaaa 100644 --- a/app/src/main/res/layout/grid_item_horizontal.xml +++ b/app/src/main/res/layout/grid_item_horizontal.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_drawer.xml b/app/src/main/res/layout/list_item_drawer.xml index c46c437fe..afaf51dc3 100644 --- a/app/src/main/res/layout/list_item_drawer.xml +++ b/app/src/main/res/layout/list_item_drawer.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_edit.xml b/app/src/main/res/layout/list_item_edit.xml index eef2b9832..3a775bc06 100644 --- a/app/src/main/res/layout/list_item_edit.xml +++ b/app/src/main/res/layout/list_item_edit.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_folder.xml b/app/src/main/res/layout/list_item_folder.xml index c68e72ab1..b4ceb9966 100644 --- a/app/src/main/res/layout/list_item_folder.xml +++ b/app/src/main/res/layout/list_item_folder.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_image.xml b/app/src/main/res/layout/list_item_image.xml index 960bd2814..c817cf67b 100644 --- a/app/src/main/res/layout/list_item_image.xml +++ b/app/src/main/res/layout/list_item_image.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/list_item_one_line.xml b/app/src/main/res/layout/list_item_one_line.xml index b981d3456..7208474bf 100644 --- a/app/src/main/res/layout/list_item_one_line.xml +++ b/app/src/main/res/layout/list_item_one_line.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_reorder_tabs.xml b/app/src/main/res/layout/list_item_reorder_tabs.xml index b8645921e..e835b73e7 100644 --- a/app/src/main/res/layout/list_item_reorder_tabs.xml +++ b/app/src/main/res/layout/list_item_reorder_tabs.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_small.xml b/app/src/main/res/layout/list_item_small.xml index 58a074576..8d1955248 100644 --- a/app/src/main/res/layout/list_item_small.xml +++ b/app/src/main/res/layout/list_item_small.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/list_item_two_lines.xml b/app/src/main/res/layout/list_item_two_lines.xml index 0243e5478..c04bc4ffb 100644 --- a/app/src/main/res/layout/list_item_two_lines.xml +++ b/app/src/main/res/layout/list_item_two_lines.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/recycler_header.xml b/app/src/main/res/layout/recycler_header.xml index f9dc805dc..8dc388749 100644 --- a/app/src/main/res/layout/recycler_header.xml +++ b/app/src/main/res/layout/recycler_header.xml @@ -1,5 +1,5 @@ - - diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml index b070db0e1..0e41c32bd 100644 --- a/app/src/main/res/menu/menu_search.xml +++ b/app/src/main/res/menu/menu_search.xml @@ -7,7 +7,7 @@ android:id="@+id/search" android:icon="@drawable/ic_search_24dp" android:title="@string/search_title" - app:actionViewClass="android.support.v7.widget.SearchView" + app:actionViewClass="androidx.appcompat.widget.SearchView" app:showAsAction="always|collapseActionView"/> - - - - - - - - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_blacklist.xml b/app/src/main/res/xml/settings_blacklist.xml index bb99a818a..7c7569881 100644 --- a/app/src/main/res/xml/settings_blacklist.xml +++ b/app/src/main/res/xml/settings_blacklist.xml @@ -1,25 +1,25 @@ - - - - + - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_display.xml b/app/src/main/res/xml/settings_display.xml index 92988459a..ae728fb7a 100644 --- a/app/src/main/res/xml/settings_display.xml +++ b/app/src/main/res/xml/settings_display.xml @@ -1,17 +1,17 @@ - - - - - + - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_headers.xml b/app/src/main/res/xml/settings_headers.xml index 1b97637e1..1cdbfe2ab 100644 --- a/app/src/main/res/xml/settings_headers.xml +++ b/app/src/main/res/xml/settings_headers.xml @@ -1,44 +1,44 @@ - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_headset.xml b/app/src/main/res/xml/settings_headset.xml index 52813f2d3..f83ab3634 100644 --- a/app/src/main/res/xml/settings_headset.xml +++ b/app/src/main/res/xml/settings_headset.xml @@ -1,45 +1,45 @@ - + - - - - - + - - - - + - + diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml index e1850b5ca..27ffa9149 100644 --- a/app/src/main/res/xml/settings_playback.xml +++ b/app/src/main/res/xml/settings_playback.xml @@ -1,17 +1,17 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_scrobbling.xml b/app/src/main/res/xml/settings_scrobbling.xml index bf2981be6..345f7a9ce 100644 --- a/app/src/main/res/xml/settings_scrobbling.xml +++ b/app/src/main/res/xml/settings_scrobbling.xml @@ -1,21 +1,21 @@ - + - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_support.xml b/app/src/main/res/xml/settings_support.xml index ec2a5a7b7..64d44808d 100644 --- a/app/src/main/res/xml/settings_support.xml +++ b/app/src/main/res/xml/settings_support.xml @@ -1,37 +1,37 @@ - - + - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_themes.xml b/app/src/main/res/xml/settings_themes.xml index bcde78923..3c5867aba 100644 --- a/app/src/main/res/xml/settings_themes.xml +++ b/app/src/main/res/xml/settings_themes.xml @@ -1,10 +1,10 @@ - - - - - - + - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ActiveInactiveColors.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ActiveInactiveColors.java index 406b94601..4a360a58a 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ActiveInactiveColors.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ActiveInactiveColors.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.res.ColorStateList; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; /** @author Aidan Follestad (afollestad) */ @SuppressWarnings("WeakerAccess") diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Aesthetic.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Aesthetic.java index 29476bc66..a34ce298b 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Aesthetic.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Aesthetic.java @@ -5,17 +5,17 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.CheckResult; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArrayMap; -import android.support.v4.util.Pair; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.CheckResult; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.core.content.ContextCompat; +import androidx.collection.ArrayMap; +import androidx.core.util.Pair; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActionMenuItemView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActionMenuItemView.java index 64325159d..b95b6bff7 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActionMenuItemView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActionMenuItemView.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import android.support.v7.view.menu.ActionMenuItemView; +import androidx.appcompat.view.menu.ActionMenuItemView; import android.util.AttributeSet; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActivity.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActivity.java index 1043f5b7f..0fb0b2a79 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActivity.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticActivity.java @@ -1,8 +1,8 @@ package com.afollestad.aesthetic; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; /** @author Aidan Follestad (afollestad) */ public class AestheticActivity extends AppCompatActivity implements AestheticKeyProvider { diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.java index 6ac1e14fa..f72392b87 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.java @@ -3,9 +3,9 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import io.reactivex.Observable; @@ -158,7 +158,7 @@ protected void onAttachedToWindow() { .subscribe( new Consumer() { @Override - public void accept(@android.support.annotation.NonNull State state) { + public void accept(@androidx.annotation.NonNull State state) { onState(state); } }, diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticButton.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticButton.java index 319cc0387..210bc534a 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticButton.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticButton.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; -import android.support.v7.widget.AppCompatButton; +import androidx.appcompat.widget.AppCompatButton; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCardView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCardView.java index 268e9e22c..79b2c5891 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCardView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCardView.java @@ -4,8 +4,8 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.CardView; +import androidx.annotation.Nullable; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.java index ea881909f..fad855f81 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.Context; -import android.support.v7.widget.AppCompatCheckBox; +import androidx.appcompat.widget.AppCompatCheckBox; import android.util.AttributeSet; import io.reactivex.Observable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCoordinatorLayout.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCoordinatorLayout.java index a9f1e8fb6..6c5f99aae 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCoordinatorLayout.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticCoordinatorLayout.java @@ -8,15 +8,15 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.util.Pair; -import android.support.v7.view.menu.ActionMenuItemView; -import android.support.v7.widget.ActionMenuView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.appbar.CollapsingToolbarLayout; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.util.Pair; +import androidx.appcompat.view.menu.ActionMenuItemView; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; import android.view.Menu; import android.view.View; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDialogButton.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDialogButton.java index 8f43b0cf7..86f66123f 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDialogButton.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDialogButton.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.Context; -import android.support.v7.widget.AppCompatButton; +import androidx.appcompat.widget.AppCompatButton; import android.util.AttributeSet; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDrawerLayout.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDrawerLayout.java index e70c83812..04964369c 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDrawerLayout.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticDrawerLayout.java @@ -3,10 +3,10 @@ import static com.afollestad.aesthetic.Rx.onErrorLogAndRethrow; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.graphics.drawable.DrawerArrowDrawable; +import androidx.annotation.NonNull; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.graphics.drawable.DrawerArrowDrawable; import android.util.AttributeSet; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticEditText.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticEditText.java index efe3ebe71..66a6f0d97 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticEditText.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticEditText.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.v7.widget.AppCompatEditText; +import androidx.appcompat.widget.AppCompatEditText; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticFab.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticFab.java index 7d46b4925..8084bf032 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticFab.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticFab.java @@ -6,8 +6,8 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageButton.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageButton.java index 224abda6f..42654c0ec 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageButton.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageButton.java @@ -4,8 +4,8 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageButton; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageView.java index 6380b6fa7..753fda1b7 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticImageView.java @@ -4,8 +4,8 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticKeyProvider.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticKeyProvider.java index 974690d44..cf74527f6 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticKeyProvider.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticKeyProvider.java @@ -1,6 +1,6 @@ package com.afollestad.aesthetic; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** @author Aidan Follestad (afollestad) */ @SuppressWarnings("WeakerAccess") diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNavigationView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNavigationView.java index 65e1a2653..78ad04ee2 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNavigationView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNavigationView.java @@ -7,8 +7,8 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.StateListDrawable; -import android.support.design.widget.NavigationView; -import android.support.v4.content.ContextCompat; +import com.google.android.material.navigation.NavigationView; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNestedScrollView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNestedScrollView.java index 40e61293f..8b2ada9e2 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNestedScrollView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticNestedScrollView.java @@ -3,7 +3,7 @@ import static com.afollestad.aesthetic.Rx.onErrorLogAndRethrow; import android.content.Context; -import android.support.v4.widget.NestedScrollView; +import androidx.core.widget.NestedScrollView; import android.util.AttributeSet; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.java index d3145e8d6..3ebd7dd4a 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.v7.widget.AppCompatRadioButton; +import androidx.appcompat.widget.AppCompatRadioButton; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.java index d76925092..d65604371 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.java @@ -3,7 +3,7 @@ import static com.afollestad.aesthetic.Rx.onErrorLogAndRethrow; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.java index 8648574c7..b283fd6f0 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.Context; -import android.support.v7.widget.AppCompatSeekBar; +import androidx.appcompat.widget.AppCompatSeekBar; import android.util.AttributeSet; import io.reactivex.Observable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarButton.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarButton.java index 5aaa97c75..ba5dd1567 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarButton.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarButton.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.Context; -import android.support.v7.widget.AppCompatButton; +import androidx.appcompat.widget.AppCompatButton; import android.util.AttributeSet; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarTextView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarTextView.java index 900fd7070..ad70a50d9 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarTextView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSnackBarTextView.java @@ -3,7 +3,7 @@ import static com.afollestad.aesthetic.Rx.onErrorLogAndRethrow; import android.content.Context; -import android.support.v7.widget.AppCompatTextView; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSpinner.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSpinner.java index e5a7f97b6..3fc864105 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSpinner.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSpinner.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.v7.widget.AppCompatSpinner; +import androidx.appcompat.widget.AppCompatSpinner; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSwitchCompat.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSwitchCompat.java index a86de45c1..10d16a25f 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSwitchCompat.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticSwitchCompat.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTabLayout.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTabLayout.java index 57da1a66c..85e6242d1 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTabLayout.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTabLayout.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.res.ColorStateList; -import android.support.annotation.ColorInt; -import android.support.design.widget.TabLayout; +import androidx.annotation.ColorInt; +import com.google.android.material.tabs.TabLayout; import android.util.AttributeSet; import io.reactivex.Observable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputEditText.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputEditText.java index 0d285507f..764e90e0a 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputEditText.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputEditText.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.design.widget.TextInputEditText; +import com.google.android.material.textfield.TextInputEditText; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.annotations.NonNull; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputLayout.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputLayout.java index ba630a1a4..226446002 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputLayout.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextInputLayout.java @@ -5,7 +5,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.util.AttributeSet; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.CompositeDisposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextView.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextView.java index c0af4d83a..88bc1d96a 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextView.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticTextView.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.Util.resolveResId; import android.content.Context; -import android.support.v7.widget.AppCompatTextView; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticToolbar.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticToolbar.java index 30769701f..5e272f300 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticToolbar.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticToolbar.java @@ -4,9 +4,9 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; import io.reactivex.Observable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticViewPager.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticViewPager.java index aa8ccbc7f..ab874d079 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticViewPager.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AestheticViewPager.java @@ -3,7 +3,7 @@ import static com.afollestad.aesthetic.Rx.onErrorLogAndRethrow; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AutoSwitchMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AutoSwitchMode.java index f381568f7..7719ed8a6 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AutoSwitchMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/AutoSwitchMode.java @@ -5,7 +5,7 @@ import static com.afollestad.aesthetic.AutoSwitchMode.ON; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BgIconColorState.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BgIconColorState.java index 9641ecbef..3c189decb 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BgIconColorState.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BgIconColorState.java @@ -1,12 +1,12 @@ package com.afollestad.aesthetic; -import android.support.annotation.ColorInt; -import android.support.annotation.Nullable; -import android.support.annotation.RestrictTo; +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; import io.reactivex.annotations.NonNull; import io.reactivex.functions.BiFunction; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** @author Aidan Follestad (afollestad) */ @RestrictTo(LIBRARY_GROUP) diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavBgMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavBgMode.java index dd3ae574c..29b2520ee 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavBgMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavBgMode.java @@ -6,7 +6,7 @@ import static com.afollestad.aesthetic.BottomNavBgMode.PRIMARY_DARK; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavIconTextMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavIconTextMode.java index 26d51016e..29dffbbdd 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavIconTextMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/BottomNavIconTextMode.java @@ -5,7 +5,7 @@ import static com.afollestad.aesthetic.BottomNavIconTextMode.SELECTED_PRIMARY; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ColorIsDarkState.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ColorIsDarkState.java index 68b5b2776..2094f22f6 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ColorIsDarkState.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ColorIsDarkState.java @@ -1,11 +1,11 @@ package com.afollestad.aesthetic; -import android.support.annotation.ColorInt; -import android.support.annotation.RestrictTo; +import androidx.annotation.ColorInt; +import androidx.annotation.RestrictTo; import io.reactivex.functions.BiFunction; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** @author Aidan Follestad (afollestad) */ @RestrictTo(LIBRARY_GROUP) diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/EdgeGlowUtil.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/EdgeGlowUtil.java index b18cf82d0..c0f5a718d 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/EdgeGlowUtil.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/EdgeGlowUtil.java @@ -1,19 +1,19 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import android.annotation.TargetApi; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RestrictTo; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.EdgeEffectCompat; -import android.support.v4.widget.NestedScrollView; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import androidx.viewpager.widget.ViewPager; +import androidx.core.widget.EdgeEffectCompat; +import androidx.core.widget.NestedScrollView; +import androidx.recyclerview.widget.RecyclerView; import android.widget.AbsListView; import android.widget.EdgeEffect; import android.widget.ScrollView; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/InflationInterceptor.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/InflationInterceptor.java index 885fb83aa..4cff2cb86 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/InflationInterceptor.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/InflationInterceptor.java @@ -1,13 +1,13 @@ package com.afollestad.aesthetic; import android.content.Context; -import android.support.annotation.RestrictTo; -import android.support.v4.view.LayoutInflaterFactory; +import androidx.annotation.RestrictTo; +import androidx.core.view.LayoutInflaterFactory; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import static com.afollestad.aesthetic.Util.resolveResId; /** @author Aidan Follestad (afollestad) */ @@ -21,21 +21,21 @@ public View onCreateView(View parent, final String name, Context context, Attrib switch (name) { case "ImageView": - case "android.support.v7.widget.AppCompatImageView": + case "androidx.appcompat.widget.AppCompatImageView": view = new AestheticImageView(context, attrs); break; case "ImageButton": - case "android.support.v7.widget.AppCompatImageButton": + case "androidx.appcompat.widget.AppCompatImageButton": view = new AestheticImageButton(context, attrs); break; - case "android.support.v4.widget.DrawerLayout": + case "androidx.drawerlayout.widget.DrawerLayout": view = new AestheticDrawerLayout(context, attrs); break; case "Toolbar": - case "android.support.v7.widget.Toolbar": + case "androidx.appcompat.widget.Toolbar": view = new AestheticToolbar(context, attrs); break; - case "android.support.v7.widget.AppCompatTextView": + case "androidx.appcompat.widget.AppCompatTextView": case "TextView": if (viewId == R.id.snackbar_text) { view = null; @@ -48,7 +48,7 @@ public View onCreateView(View parent, final String name, Context context, Attrib } break; case "Button": - case "android.support.v7.widget.AppCompatButton": + case "androidx.appcompat.widget.AppCompatButton": if (viewId == android.R.id.button1 || viewId == android.R.id.button2 || viewId == android.R.id.button3) { @@ -59,25 +59,25 @@ public View onCreateView(View parent, final String name, Context context, Attrib view = new AestheticButton(context, attrs); } break; - case "android.support.v7.widget.AppCompatCheckBox": + case "androidx.appcompat.widget.AppCompatCheckBox": case "CheckBox": view = new AestheticCheckBox(context, attrs); break; - case "android.support.v7.widget.AppCompatRadioButton": + case "androidx.appcompat.widget.AppCompatRadioButton": case "RadioButton": view = new AestheticRadioButton(context, attrs); break; - case "android.support.v7.widget.AppCompatEditText": + case "androidx.appcompat.widget.AppCompatEditText": case "EditText": view = new AestheticEditText(context, attrs); break; case "Switch": view = new AestheticSwitch(context, attrs); break; - case "android.support.v7.widget.SwitchCompat": + case "androidx.appcompat.widget.SwitchCompat": view = new AestheticSwitchCompat(context, attrs); break; - case "android.support.v7.widget.AppCompatSeekBar": + case "androidx.appcompat.widget.AppCompatSeekBar": case "SeekBar": view = new AestheticSeekBar(context, attrs); break; @@ -85,14 +85,14 @@ public View onCreateView(View parent, final String name, Context context, Attrib case "me.zhanghai.android.materialprogressbar.MaterialProgressBar": view = new AestheticProgressBar(context, attrs); break; - case "android.support.v7.view.menu.ActionMenuItemView": + case "androidx.appcompat.view.menu.ActionMenuItemView": view = new AestheticActionMenuItemView(context, attrs); break; - case "android.support.v7.widget.RecyclerView": + case "androidx.recyclerview.widget.RecyclerView": view = new AestheticRecyclerView(context, attrs); break; - case "android.support.v4.widget.NestedScrollView": + case "androidx.core.widget.NestedScrollView": view = new AestheticNestedScrollView(context, attrs); break; case "ListView": @@ -101,38 +101,38 @@ public View onCreateView(View parent, final String name, Context context, Attrib case "ScrollView": view = new AestheticScrollView(context, attrs); break; - case "android.support.v4.view.ViewPager": + case "androidx.viewpager.widget.ViewPager": view = new AestheticViewPager(context, attrs); break; case "Spinner": - case "android.support.v7.widget.AppCompatSpinner": + case "androidx.appcompat.widget.AppCompatSpinner": view = new AestheticSpinner(context, attrs); break; - case "android.support.design.widget.TextInputLayout": + case "com.google.android.material.textfield.TextInputLayout": view = new AestheticTextInputLayout(context, attrs); break; - case "android.support.design.widget.TextInputEditText": + case "com.google.android.material.textfield.TextInputEditText": view = new AestheticTextInputEditText(context, attrs); break; - case "android.support.v7.widget.CardView": + case "androidx.cardview.widget.CardView": view = new AestheticCardView(context, attrs); break; - case "android.support.design.widget.TabLayout": + case "com.google.android.material.tabs.TabLayout": view = new AestheticTabLayout(context, attrs); break; - case "android.support.design.widget.NavigationView": + case "com.google.android.material.navigation.NavigationView": view = new AestheticNavigationView(context, attrs); break; - case "android.support.design.widget.BottomNavigationView": + case "com.google.android.material.bottomnavigation.BottomNavigationView": view = new AestheticBottomNavigationView(context, attrs); break; - case "android.support.design.widget.FloatingActionButton": + case "com.google.android.material.floatingactionbutton.FloatingActionButton": view = new AestheticFab(context, attrs); break; - case "android.support.design.widget.CoordinatorLayout": + case "androidx.coordinatorlayout.widget.CoordinatorLayout": view = new AestheticCoordinatorLayout(context, attrs); break; } diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/LightDarkColorState.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/LightDarkColorState.java index c9dc88361..b39abcc7f 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/LightDarkColorState.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/LightDarkColorState.java @@ -1,11 +1,11 @@ package com.afollestad.aesthetic; -import android.support.annotation.ColorInt; -import android.support.annotation.RestrictTo; +import androidx.annotation.ColorInt; +import androidx.annotation.RestrictTo; import io.reactivex.functions.Function3; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** * @author Aidan Follestad (afollestad) diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/MaterialDialogsUtil.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/MaterialDialogsUtil.java index 11d1c4009..c01306fe9 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/MaterialDialogsUtil.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/MaterialDialogsUtil.java @@ -1,7 +1,7 @@ package com.afollestad.aesthetic; import android.content.res.ColorStateList; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -11,7 +11,7 @@ import io.reactivex.functions.Consumer; import io.reactivex.functions.Function4; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** * Handles auto theming of dialogs from my Material Dialogs library, using the ThemeSingleton class. diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/NavigationViewMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/NavigationViewMode.java index ea9ed067b..9a843c150 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/NavigationViewMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/NavigationViewMode.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.NavigationViewMode.SELECTED_PRIMARY; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutBgMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutBgMode.java index e53f91d9d..2f4593221 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutBgMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutBgMode.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.TabLayoutBgMode.PRIMARY; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutIndicatorMode.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutIndicatorMode.java index 7b18c7eb2..13b431a53 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutIndicatorMode.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TabLayoutIndicatorMode.java @@ -4,7 +4,7 @@ import static com.afollestad.aesthetic.TabLayoutIndicatorMode.PRIMARY; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; /** @author Aidan Follestad (afollestad) */ diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TextInputLayoutUtil.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TextInputLayoutUtil.java index ecbe2ae31..43497e642 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TextInputLayoutUtil.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TextInputLayoutUtil.java @@ -1,12 +1,12 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import android.content.res.ColorStateList; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.RestrictTo; -import android.support.design.widget.TextInputLayout; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; +import com.google.android.material.textfield.TextInputLayout; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TintHelper.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TintHelper.java index ec70d3bcf..d425ce099 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TintHelper.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/TintHelper.java @@ -1,6 +1,6 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import android.annotation.SuppressLint; import android.content.Context; @@ -9,18 +9,18 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.Build; -import android.support.annotation.CheckResult; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RestrictTo; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TextInputEditText; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.view.TintableBackgroundView; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.CheckResult; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.textfield.TextInputEditText; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.view.TintableBackgroundView; +import androidx.core.view.ViewCompat; +import androidx.appcompat.widget.SwitchCompat; import android.view.View; import android.widget.Button; import android.widget.CheckBox; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Util.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Util.java index 40633fc0f..92ce3e444 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Util.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/Util.java @@ -14,16 +14,16 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.os.Build; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.FloatRange; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.view.LayoutInflaterCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.view.LayoutInflaterCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundAction.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundAction.java index 10667c843..019b42012 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundAction.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundAction.java @@ -1,6 +1,6 @@ package com.afollestad.aesthetic; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import io.reactivex.functions.Consumer; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundSubscriber.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundSubscriber.java index 22c693c63..44f83d613 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundSubscriber.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewBackgroundSubscriber.java @@ -1,10 +1,10 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; -import android.support.annotation.NonNull; -import android.support.annotation.RestrictTo; -import android.support.v7.widget.CardView; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; +import androidx.cardview.widget.CardView; import android.view.View; import io.reactivex.exceptions.Exceptions; import io.reactivex.observers.DisposableObserver; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewHintTextColorAction.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewHintTextColorAction.java index 42ddaf925..b4d8de1e4 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewHintTextColorAction.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewHintTextColorAction.java @@ -1,9 +1,9 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; -import android.support.annotation.NonNull; -import android.support.annotation.RestrictTo; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; import android.widget.TextView; import io.reactivex.functions.Consumer; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewObservablePair.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewObservablePair.java index 0adcbf457..d140b2e24 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewObservablePair.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewObservablePair.java @@ -1,8 +1,8 @@ package com.afollestad.aesthetic; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import android.view.View; import io.reactivex.Observable; diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewTextColorAction.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewTextColorAction.java index da1563703..181b2c600 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewTextColorAction.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewTextColorAction.java @@ -1,12 +1,12 @@ package com.afollestad.aesthetic; -import android.support.annotation.NonNull; -import android.support.annotation.RestrictTo; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; import android.widget.TextView; import io.reactivex.functions.Consumer; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; /** @author Aidan Follestad (afollestad) */ @RestrictTo(LIBRARY_GROUP) diff --git a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewUtil.java b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewUtil.java index 81c8424fb..f1e4a9060 100644 --- a/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewUtil.java +++ b/libraries/aesthetic/src/main/java/com/afollestad/aesthetic/ViewUtil.java @@ -2,11 +2,11 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/BitmapPalette.java b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/BitmapPalette.java index 75c608d88..11abf4a51 100644 --- a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/BitmapPalette.java +++ b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/BitmapPalette.java @@ -6,12 +6,12 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; import android.os.Build; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.LruCache; -import android.support.v4.util.Pair; -import android.support.v7.graphics.Palette; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.LruCache; +import androidx.core.util.Pair; +import androidx.palette.graphics.Palette; import android.util.Log; import android.view.View; import android.widget.TextView; diff --git a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/GlidePalette.java b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/GlidePalette.java index ceee7cfa9..4a1759e49 100644 --- a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/GlidePalette.java +++ b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/GlidePalette.java @@ -1,7 +1,7 @@ package com.github.florent37.glidepalette; import android.graphics.Bitmap; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.widget.TextView; diff --git a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/PaletteTarget.java b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/PaletteTarget.java index 059059cac..74a0d07ed 100644 --- a/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/PaletteTarget.java +++ b/libraries/glidepalette/src/main/java/com/github/florent37/glidepalette/PaletteTarget.java @@ -1,6 +1,6 @@ package com.github.florent37.glidepalette; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.view.View; import android.widget.TextView; diff --git a/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/behavior/CustomBottomSheetBehavior.java b/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/behavior/CustomBottomSheetBehavior.java index 1792842f3..e8ea663a0 100644 --- a/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/behavior/CustomBottomSheetBehavior.java +++ b/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/behavior/CustomBottomSheetBehavior.java @@ -1,8 +1,8 @@ package com.simplecity.multisheetview.ui.behavior; import android.content.Context; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.CoordinatorLayout; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import androidx.coordinatorlayout.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/view/MultiSheetView.java b/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/view/MultiSheetView.java index 40a721e9e..2edffa3d9 100644 --- a/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/view/MultiSheetView.java +++ b/libraries/multisheetview/src/main/java/com/simplecity/multisheetview/ui/view/MultiSheetView.java @@ -3,11 +3,11 @@ import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.CoordinatorLayout; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import androidx.coordinatorlayout.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/libraries/multisheetview/src/main/res/layout/multi_sheet.xml b/libraries/multisheetview/src/main/res/layout/multi_sheet.xml index 9930b818a..a9d3a5c8b 100644 --- a/libraries/multisheetview/src/main/res/layout/multi_sheet.xml +++ b/libraries/multisheetview/src/main/res/layout/multi_sheet.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:parentTag="android.support.design.widget.CoordinatorLayout"> + tools:parentTag="androidx.coordinatorlayout.widget.CoordinatorLayout"> - @@ -56,6 +56,6 @@ android:layout_height="@dimen/bottom_sheet_peek_2_height"/> - + \ No newline at end of file diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/base/Controller.java b/libraries/navigation/src/main/java/test/com/androidnavigation/base/Controller.java index 1f6d8b986..c47d46b14 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/base/Controller.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/base/Controller.java @@ -1,6 +1,6 @@ package test.com.androidnavigation.base; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public interface Controller { diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/base/NavigationController.java b/libraries/navigation/src/main/java/test/com/androidnavigation/base/NavigationController.java index ee082824b..cb8e67645 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/base/NavigationController.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/base/NavigationController.java @@ -1,8 +1,8 @@ package test.com.androidnavigation.base; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import android.view.View; import java.util.List; diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BackPressHandler.java b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BackPressHandler.java index d5b918fdb..356a26021 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BackPressHandler.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BackPressHandler.java @@ -1,6 +1,6 @@ package test.com.androidnavigation.fragment; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import test.com.androidnavigation.base.NavigationController; diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseController.java b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseController.java index 7c285e7e2..5b6e8f96d 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseController.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseController.java @@ -1,7 +1,7 @@ package test.com.androidnavigation.fragment; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import test.com.androidnavigation.base.Controller; import test.com.androidnavigation.base.NavigationController; diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseNavigationController.java b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseNavigationController.java index fbef2c1b8..be5b8d457 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseNavigationController.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/BaseNavigationController.java @@ -1,12 +1,12 @@ package test.com.androidnavigation.fragment; import android.os.Bundle; -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.app.FragmentTransaction; -import android.support.v4.util.Pair; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/FragmentInfo.java b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/FragmentInfo.java index d919491b7..e8e1bac19 100644 --- a/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/FragmentInfo.java +++ b/libraries/navigation/src/main/java/test/com/androidnavigation/fragment/FragmentInfo.java @@ -4,8 +4,8 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; public class FragmentInfo implements Parcelable { diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/CompletionListUpdateCallback.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/CompletionListUpdateCallback.java index 7b969b20c..acf985981 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/CompletionListUpdateCallback.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/CompletionListUpdateCallback.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.adapter; -import android.support.v7.util.ListUpdateCallback; +import androidx.recyclerview.widget.ListUpdateCallback; /** * A custom {@link ListUpdateCallback} with an additional onComplete() methods, used for notifying when the diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/ViewModelAdapter.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/ViewModelAdapter.java index 49552d13a..88e15297d 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/ViewModelAdapter.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/adapter/ViewModelAdapter.java @@ -1,10 +1,10 @@ package com.simplecityapps.recycler_adapter.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.util.DiffUtil; -import android.support.v7.util.ListUpdateCallback; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.ListUpdateCallback; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.ViewGroup; import com.simplecityapps.recycler_adapter.BuildConfig; diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/BaseViewModel.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/BaseViewModel.java index fa1c81170..772b699ca 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/BaseViewModel.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/BaseViewModel.java @@ -1,7 +1,7 @@ package com.simplecityapps.recycler_adapter.model; -import android.support.annotation.CallSuper; -import android.support.annotation.LayoutRes; +import androidx.annotation.CallSuper; +import androidx.annotation.LayoutRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/ViewModel.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/ViewModel.java index 40ed17de4..d590bb827 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/ViewModel.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/model/ViewModel.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.model; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import java.util.List; diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/BaseViewHolder.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/BaseViewHolder.java index 453133fb9..de3b6263f 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/BaseViewHolder.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/BaseViewHolder.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.recyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.simplecityapps.recycler_adapter.model.ViewModel; diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/ChildAttachStateChangeListener.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/ChildAttachStateChangeListener.java index 9e3e77ef9..4cdd797e4 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/ChildAttachStateChangeListener.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/ChildAttachStateChangeListener.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.recyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class ChildAttachStateChangeListener implements RecyclerView.OnChildAttachStateChangeListener { diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclerListener.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclerListener.java index 0a22e0b5b..72cca7acd 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclerListener.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclerListener.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.recyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * A custom RecyclerListener that calls recycle() on the ViewHolder, if it implements {@link RecyclingViewHolder} diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclingViewHolder.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclingViewHolder.java index 6acae78c7..05e19eba3 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclingViewHolder.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/RecyclingViewHolder.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.recyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; public interface RecyclingViewHolder { diff --git a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/SpanSizeLookup.java b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/SpanSizeLookup.java index 3de5e4ed3..7ef5b1861 100644 --- a/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/SpanSizeLookup.java +++ b/libraries/recycler-adapter/src/main/java/com/simplecityapps/recycler_adapter/recyclerview/SpanSizeLookup.java @@ -1,6 +1,6 @@ package com.simplecityapps.recycler_adapter.recyclerview; -import android.support.v7.widget.GridLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; import com.simplecityapps.recycler_adapter.adapter.ViewModelAdapter; import com.simplecityapps.recycler_adapter.model.ViewModel; From d9e71df912b10da9c298b8246b560ede52b7ed9f Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Wed, 16 Oct 2019 11:36:08 +0530 Subject: [PATCH 2/6] Fix gradle dependencies Library version set to 1.0.0, will have to be set to latest stable version --- app/build.gradle | 1 + .../main/kotlin/dependencies/Dependencies.kt | 27 ++++++++++--------- gradle.properties | 6 ++++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d696d9efb..b671a6448 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -225,6 +225,7 @@ dependencies { implementation Dependencies.Google.prefCompatv14 implementation Dependencies.Google.recyclerView implementation Dependencies.Google.supportv4 + implementation Dependencies.Google.legacySupport implementation Dependencies.Google.firebaseCore implementation Dependencies.Google.firebaseRemoteConfig implementation Dependencies.Google.constraintLayout diff --git a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt index afb0539d7..d414b7115 100644 --- a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt @@ -104,22 +104,23 @@ object Dependencies { const val supportLib = "28.0.0" const val firebaseCore = "16.0.5" const val firebaseRemoteConfig = "16.1.0" - const val constraintLayout = "2.0.0-alpha3" + const val constraintLayout = "1.1.0" const val chromeCastFramework = "16.1.0" } - const val cardView = "com.android.support:cardview-v7:${Versions.supportLib}" - const val design = "com.android.support:design:${Versions.supportLib}" - const val palette = "com.android.support:palette-v7:${Versions.supportLib}" - const val recyclerView = "com.android.support:recyclerview-v7:${Versions.supportLib}" - const val supportv4 = "com.android.support:support-v4:${Versions.supportLib}" + const val cardView = "androidx.cardview:cardview:1.0.0" + const val design = "com.google.android.material:material:1.0.0" + const val palette = "androidx.palette:palette:1.0.0" + const val recyclerView = "androidx.recyclerview:recyclerview:1.0.0" + const val supportv4 = "androidx.legacy:legacy-support-v4:1.0.0" const val firebaseCore = "com.google.firebase:firebase-core:${Versions.firebaseCore}" const val firebaseRemoteConfig = "com.google.firebase:firebase-config:${Versions.firebaseRemoteConfig}" - const val appcompat = "com.android.support:appcompat-v7:${Versions.supportLib}" - const val mediarouter = "com.android.support:mediarouter-v7:${Versions.supportLib}" - const val constraintLayout = "com.android.support.constraint:constraint-layout:${Versions.constraintLayout}" - const val prefCompat = "com.android.support:preference-v7:${Versions.supportLib}" - const val prefCompatv14 = "com.android.support:preference-v14:${Versions.supportLib}" + const val appcompat = "androidx.appcompat:appcompat:1.0.0" + const val mediarouter = "androidx.mediarouter:mediarouter:1.0.0" + const val constraintLayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}" + const val prefCompat = "androidx.preference:preference:1.0.0" + const val prefCompatv14 = "androidx.legacy:legacy-preference-v14:1.0.0" + const val legacySupport = "androidx.legacy:legacy-support-v13:1.0.0" const val chromeCastFramework = "com.google.android.gms:play-services-cast-framework:${Versions.chromeCastFramework}" } @@ -192,7 +193,7 @@ object Dependencies { object Versions { const val junit = "4.12" - const val espressoCore = "3.0.0" + const val espressoCore = "3.1.0" const val assertj = "3.9.0" // Mockito version restriction -- PowerMock does not fully support Mockito2 yet. @@ -209,7 +210,7 @@ object Dependencies { const val junit = "junit:junit:${Versions.junit}" // Espresso - const val espresso = "com.android.support.test.espresso:espresso-core:${Versions.espressoCore}" + const val espresso = "androidx.test.espresso:espresso-core:${Versions.espressoCore}" // Mockito - https://github.com/mockito/mockito const val mockito = "org.mockito:mockito-core:${Versions.mockito}" diff --git a/gradle.properties b/gradle.properties index e203db9e9..bfdfe665f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,8 @@ org.gradle.jvmargs=-Xmx2048m org.gradle.parallel=true -org.gradle.daemon=true \ No newline at end of file +org.gradle.daemon=true + +# AndroidX +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file From c15b85617a1213e6996ac7b49d851993a19f5398 Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Wed, 16 Oct 2019 11:37:36 +0530 Subject: [PATCH 3/6] Update Butterknife libraries to support androidx --- buildSrc/src/main/kotlin/dependencies/Dependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt index d414b7115..a90d83326 100644 --- a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt @@ -16,8 +16,8 @@ object Dependencies { const val materialDialogs = "0.9.6.0" const val permiso = "0.3.0" const val streams = "1.2.1" - const val butterknife = "8.8.1" - const val butterknifeAnnotationProcessor = "8.8.1" + const val butterknife = "10.2.0" + const val butterknifeAnnotationProcessor = "10.2.0" const val dagger = "2.21" const val daggerAssistedInject = "0.3.2" const val expandableRecyclerView = "3.0.0-RC1" From 46dbd9594048901682c14aa2e0ec7a0344a3f427 Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Wed, 16 Oct 2019 11:53:30 +0530 Subject: [PATCH 4/6] Kang ViewOffsetHelper class from AOSP THis class is private within the support library now --- .../design/widget/ViewOffsetHelper.java | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 app/src/main/java/android/support/design/widget/ViewOffsetHelper.java diff --git a/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java b/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java new file mode 100644 index 000000000..8d4433c8e --- /dev/null +++ b/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.support.design.widget; +import android.os.Build; +import android.view.View; +import android.view.ViewParent; + +import androidx.legacy.view.ViewCompat; +/** + * Utility helper for moving a {@link android.view.View} around using + * {@link android.view.View#offsetLeftAndRight(int)} and + * {@link android.view.View#offsetTopAndBottom(int)}. + *

+ * Also the setting of absolute offsets (similar to translationX/Y), rather than additive + * offsets. + */ +class ViewOffsetHelper { + private final View mView; + private int mLayoutTop; + private int mLayoutLeft; + private int mOffsetTop; + private int mOffsetLeft; + public ViewOffsetHelper(View view) { + mView = view; + } + public void onViewLayout() { + // Now grab the intended top + mLayoutTop = mView.getTop(); + mLayoutLeft = mView.getLeft(); + // And offset it as needed + updateOffsets(); + } + private void updateOffsets() { + ViewCompat.offsetTopAndBottom(mView, mOffsetTop - (mView.getTop() - mLayoutTop)); + ViewCompat.offsetLeftAndRight(mView, mOffsetLeft - (mView.getLeft() - mLayoutLeft)); + // Manually invalidate the parent to make sure we get drawn pre-M + if (Build.VERSION.SDK_INT < 23) { + tickleParentInvalidationFlag(mView); + } + } + private static void tickleParentInvalidationFlag(View view) { + ViewParent vp = view.getParent(); + if (vp instanceof View) { + View parent = (View) vp; + final float x = ViewCompat.getTranslationX(parent); + ViewCompat.setTranslationX(parent, x + 1); + ViewCompat.setTranslationX(parent, x); + } + } + /** + * Set the top and bottom offset for this {@link ViewOffsetHelper}'s view. + * + * @param offset the offset in px. + * @return true if the offset has changed + */ + public boolean setTopAndBottomOffset(int offset) { + if (mOffsetTop != offset) { + mOffsetTop = offset; + updateOffsets(); + return true; + } + return false; + } + /** + * Set the left and right offset for this {@link ViewOffsetHelper}'s view. + * + * @param offset the offset in px. + * @return true if the offset has changed + */ + public boolean setLeftAndRightOffset(int offset) { + if (mOffsetLeft != offset) { + mOffsetLeft = offset; + updateOffsets(); + return true; + } + return false; + } + + public int getLayoutTop() { + return mOffsetTop; + } +} \ No newline at end of file From 5f237575bf4ccc9ff3ebedf5ea64ca84fa361642 Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Fri, 18 Oct 2019 19:14:37 +0530 Subject: [PATCH 5/6] Fix crash on Edit Tags dialog Observed on release variants with crash log java.lang.IllegalStateException: Failed to set TextInputLayout hint (collapsed) color: null at com.afollestad.aesthetic.cb.b(SourceFile:10) at com.afollestad.aesthetic.Aa.a(SourceFile:3) at com.afollestad.aesthetic.Aa.accept(SourceFile:1) at io.reactivex.internal.observers.LambdaObserver.a(SourceFile:7) at io.reactivex.internal.operators.observable.ObservableDistinctUntilChanged$DistinctUntilChangedObserver.a(SourceFile:10) at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.e(SourceFile:8) at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(SourceFile:3) at io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(SourceFile:1) at android.os.Handler.handleCallback(Handler.java:873) at android.os.Handler.dispatchMessage(Handler.java:99) at android.os.Looper.loop(Looper.java:193) at android.app.ActivityThread.main(ActivityThread.java:6672) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:495) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:860) --- app/proguard-rules.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index fdec8ca1e..b89880bf4 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -113,4 +113,7 @@ # Custom Cast Media Button, only referenced via menu -keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider.CustomMediaRouteButton { *; } --keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider { *; } \ No newline at end of file +-keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider { *; } + +# Adopted from https://github.com/afollestad/aesthetic/issues/41 +-keep class com.google.android.material.textfield.** { *; } \ No newline at end of file From 9f62e740e5b70bff46568af0a51237b7492591f9 Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Fri, 25 Oct 2019 09:28:29 +0530 Subject: [PATCH 6/6] Fix CustomCollapsingToolbarLayout Refactor directories to use the classes from androidx libraries Refactor some declarations to match up the above changes. This commit also reverts 46dbd9594048901682c14aa2e0ec7a0344a3f427. --- .../design/widget/ViewOffsetHelper.java | 95 ------------------- .../appbar}/CustomCollapsingTextHelper.java | 2 +- .../CustomCollapsingToolbarLayout.java | 2 +- app/src/main/res/layout/fragment_detail.xml | 4 +- 4 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 app/src/main/java/android/support/design/widget/ViewOffsetHelper.java rename app/src/main/java/{android/support/design/widget => com/google/android/material/appbar}/CustomCollapsingTextHelper.java (99%) rename app/src/main/java/{android/support/design/widget => com/google/android/material/appbar}/CustomCollapsingToolbarLayout.java (99%) diff --git a/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java b/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java deleted file mode 100644 index 8d4433c8e..000000000 --- a/app/src/main/java/android/support/design/widget/ViewOffsetHelper.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.support.design.widget; -import android.os.Build; -import android.view.View; -import android.view.ViewParent; - -import androidx.legacy.view.ViewCompat; -/** - * Utility helper for moving a {@link android.view.View} around using - * {@link android.view.View#offsetLeftAndRight(int)} and - * {@link android.view.View#offsetTopAndBottom(int)}. - *

- * Also the setting of absolute offsets (similar to translationX/Y), rather than additive - * offsets. - */ -class ViewOffsetHelper { - private final View mView; - private int mLayoutTop; - private int mLayoutLeft; - private int mOffsetTop; - private int mOffsetLeft; - public ViewOffsetHelper(View view) { - mView = view; - } - public void onViewLayout() { - // Now grab the intended top - mLayoutTop = mView.getTop(); - mLayoutLeft = mView.getLeft(); - // And offset it as needed - updateOffsets(); - } - private void updateOffsets() { - ViewCompat.offsetTopAndBottom(mView, mOffsetTop - (mView.getTop() - mLayoutTop)); - ViewCompat.offsetLeftAndRight(mView, mOffsetLeft - (mView.getLeft() - mLayoutLeft)); - // Manually invalidate the parent to make sure we get drawn pre-M - if (Build.VERSION.SDK_INT < 23) { - tickleParentInvalidationFlag(mView); - } - } - private static void tickleParentInvalidationFlag(View view) { - ViewParent vp = view.getParent(); - if (vp instanceof View) { - View parent = (View) vp; - final float x = ViewCompat.getTranslationX(parent); - ViewCompat.setTranslationX(parent, x + 1); - ViewCompat.setTranslationX(parent, x); - } - } - /** - * Set the top and bottom offset for this {@link ViewOffsetHelper}'s view. - * - * @param offset the offset in px. - * @return true if the offset has changed - */ - public boolean setTopAndBottomOffset(int offset) { - if (mOffsetTop != offset) { - mOffsetTop = offset; - updateOffsets(); - return true; - } - return false; - } - /** - * Set the left and right offset for this {@link ViewOffsetHelper}'s view. - * - * @param offset the offset in px. - * @return true if the offset has changed - */ - public boolean setLeftAndRightOffset(int offset) { - if (mOffsetLeft != offset) { - mOffsetLeft = offset; - updateOffsets(); - return true; - } - return false; - } - - public int getLayoutTop() { - return mOffsetTop; - } -} \ No newline at end of file diff --git a/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java b/app/src/main/java/com/google/android/material/appbar/CustomCollapsingTextHelper.java similarity index 99% rename from app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java rename to app/src/main/java/com/google/android/material/appbar/CustomCollapsingTextHelper.java index 4f384c2c0..0a79dd1f4 100644 --- a/app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java +++ b/app/src/main/java/com/google/android/material/appbar/CustomCollapsingTextHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.design.widget; +package com.google.android.material.appbar; import android.content.res.ColorStateList; import android.content.res.TypedArray; diff --git a/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java b/app/src/main/java/com/google/android/material/appbar/CustomCollapsingToolbarLayout.java similarity index 99% rename from app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java rename to app/src/main/java/com/google/android/material/appbar/CustomCollapsingToolbarLayout.java index f731b67d1..a015e383c 100644 --- a/app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java +++ b/app/src/main/java/com/google/android/material/appbar/CustomCollapsingToolbarLayout.java @@ -1,4 +1,4 @@ -package android.support.design.widget; +package com.google.android.material.appbar; import android.animation.ValueAnimator; import android.content.Context; diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml index bf1f6b615..19815ebc6 100644 --- a/app/src/main/res/layout/fragment_detail.xml +++ b/app/src/main/res/layout/fragment_detail.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/header_view_height"> - - +