From 9ab8b4e0181e65f09788d33d073fc1b21a350b9a Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Thu, 14 Jan 2021 19:26:19 -0700 Subject: [PATCH] Added elevation to detail covers Added some elevation to the images on the detail fragments. --- app/src/main/java/org/oxycblt/auxio/AuxioApp.kt | 5 ++++- app/src/main/java/org/oxycblt/auxio/MainActivity.kt | 1 - app/src/main/java/org/oxycblt/auxio/MainFragment.kt | 1 - app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt | 5 +---- .../main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt | 1 + app/src/main/res/layout-land/item_album_header.xml | 2 ++ app/src/main/res/layout-land/item_artist_header.xml | 2 ++ app/src/main/res/layout-land/item_genre_header.xml | 2 ++ app/src/main/res/layout/item_album_header.xml | 2 ++ app/src/main/res/layout/item_artist_header.xml | 2 ++ app/src/main/res/layout/item_genre_header.xml | 2 ++ 11 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt index 1940999ec..de374d160 100644 --- a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt +++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt @@ -13,13 +13,16 @@ class AuxioApp : Application(), ImageLoaderFactory { super.onCreate() // Init SettingsManager here so that there aren't any race conditions - // [e,g Service starts/gets SettingsManager before activity can init SettingsManager] + // [e.g Service gets SettingsManager before activity can init SettingsManager] val settingsManager = SettingsManager.init(applicationContext) AppCompatDelegate.setDefaultNightMode(settingsManager.theme) } override fun newImageLoader(): ImageLoader { + // Don't cache images on-disk [The covers are already on-disk] + // Crossfade by default + // Use a transparent placeholder return ImageLoader.Builder(applicationContext) .diskCachePolicy(CachePolicy.DISABLED) .crossfade(true) diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index a28c3ee79..ec6145bcd 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -7,7 +7,6 @@ import android.view.View import android.view.WindowInsets import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import coil.Coil import org.oxycblt.auxio.databinding.ActivityMainBinding import org.oxycblt.auxio.playback.PlaybackService import org.oxycblt.auxio.settings.SettingsManager diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index 2c1e6024f..5ad725b40 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -24,7 +24,6 @@ import org.oxycblt.auxio.ui.toColor /** * The primary "Home" [Fragment] for Auxio. - * TODO: Make navigation stack instead of artificially rerouting to LibraryFragment */ class MainFragment : Fragment() { private val playbackModel: PlaybackViewModel by activityViewModels() diff --git a/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt b/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt index 1cf256963..2550f49a3 100644 --- a/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt +++ b/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt @@ -198,8 +198,5 @@ fun ImageRequest.Builder.doCoverSetup(context: Context, data: BaseModel): ImageR * @return The base request */ private fun ImageView.getDefaultRequest(): ImageRequest.Builder { - return ImageRequest.Builder(context) - .crossfade(true) - .placeholder(android.R.color.transparent) - .target(this) + return ImageRequest.Builder(context).target(this) } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index bf7f6dbeb..1a16a3f83 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -111,6 +111,7 @@ class PlaybackFragment : Fragment(), SeekBar.OnSeekBarChangeListener { } } + // TODO: Add binding adapters for these playbackModel.isShuffling.observe(viewLifecycleOwner) { // Highlight the shuffle button if Playback is shuffled, and revert it if not. if (it) { diff --git a/app/src/main/res/layout-land/item_album_header.xml b/app/src/main/res/layout-land/item_album_header.xml index f0e59a7dc..75683f3c5 100644 --- a/app/src/main/res/layout-land/item_album_header.xml +++ b/app/src/main/res/layout-land/item_album_header.xml @@ -29,6 +29,8 @@ android:layout_height="@dimen/size_cover_mid_huge" android:layout_marginStart="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" android:contentDescription="@{@string/description_album_cover(album.name)}" app:coverArt="@{album}" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/item_artist_header.xml b/app/src/main/res/layout-land/item_artist_header.xml index 5117c884a..ab010efdd 100644 --- a/app/src/main/res/layout-land/item_artist_header.xml +++ b/app/src/main/res/layout-land/item_artist_header.xml @@ -29,6 +29,8 @@ android:layout_height="@dimen/size_cover_mid_huge" android:layout_margin="@dimen/margin_medium" android:contentDescription="@{@string/description_artist_image(artist.name)}" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" app:artistImage="@{artist}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout-land/item_genre_header.xml b/app/src/main/res/layout-land/item_genre_header.xml index 336ee00db..239dd60e3 100644 --- a/app/src/main/res/layout-land/item_genre_header.xml +++ b/app/src/main/res/layout-land/item_genre_header.xml @@ -29,6 +29,8 @@ android:layout_height="@dimen/size_cover_mid_huge" android:layout_margin="@dimen/margin_medium" android:contentDescription="@{@string/description_genre_image(genre.name)}" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" app:genreImage="@{genre}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml index 890dfe02b..60d2b124c 100644 --- a/app/src/main/res/layout/item_album_header.xml +++ b/app/src/main/res/layout/item_album_header.xml @@ -29,6 +29,8 @@ android:layout_height="@dimen/size_cover_huge" android:layout_marginTop="@dimen/margin_medium" android:contentDescription="@{@string/description_album_cover(album.name)}" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" app:coverArt="@{album}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml index 7a04aa6b2..bef922dce 100644 --- a/app/src/main/res/layout/item_artist_header.xml +++ b/app/src/main/res/layout/item_artist_header.xml @@ -29,6 +29,8 @@ android:layout_height="@dimen/size_cover_huge" android:layout_marginTop="@dimen/margin_medium" android:contentDescription="@{@string/description_artist_image(artist.name)}" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" app:artistImage="@{artist}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_genre_header.xml b/app/src/main/res/layout/item_genre_header.xml index 7fb9ea002..233c7a649 100644 --- a/app/src/main/res/layout/item_genre_header.xml +++ b/app/src/main/res/layout/item_genre_header.xml @@ -30,6 +30,8 @@ android:layout_height="@dimen/size_cover_huge" android:layout_marginTop="@dimen/margin_medium" android:contentDescription="@{@string/description_genre_image(genre.name)}" + android:outlineProvider="bounds" + android:elevation="@dimen/elevation_normal" app:genreImage="@{genre}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"