Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update tablet detail layouts

Browse source 
Update the tablet detail layouts to look better.
This commit is contained in:
OxygenCobalt 2021-01-30 13:26:49 -07:00
parent 67c177ccf3
commit 7fc0bcc56d
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
16 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
View file

@ -63,7 +63,7 @@ class LibraryFragment : Fragment() {
binding.libraryRecycler.apply { binding.libraryRecycler.apply {
adapter = libraryAdapter adapter = libraryAdapter
setHasFixedSize(true) setHasFixedSize(true)
val spans = context.getSpans() val spans = getSpans()
if (spans != 1) { if (spans != 1) {
layoutManager = GridLayoutManager(requireContext(), spans) layoutManager = GridLayoutManager(requireContext(), spans)

1
app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
View file

@ -5,7 +5,6 @@ import androidx.annotation.IdRes
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.Album import org.oxycblt.auxio.music.Album
import org.oxycblt.auxio.music.Artist import org.oxycblt.auxio.music.Artist
import org.oxycblt.auxio.music.BaseModel
import org.oxycblt.auxio.music.Genre import org.oxycblt.auxio.music.Genre
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song

2
app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
View file

@ -83,7 +83,7 @@ class SearchFragment : Fragment() {
binding.searchRecycler.apply { binding.searchRecycler.apply {
adapter = searchAdapter adapter = searchAdapter
val spans = context.getSpans() val spans = getSpans()
if (spans != -1) { if (spans != -1) {
layoutManager = GridLayoutManager(requireContext(), spans).apply { layoutManager = GridLayoutManager(requireContext(), spans).apply {

2
app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
View file

@ -69,7 +69,7 @@ class SongsFragment : Fragment() {
adapter = songAdapter adapter = songAdapter
setHasFixedSize(true) setHasFixedSize(true)
val spans = context.getSpans() val spans = getSpans()
if (spans != 1) { if (spans != 1) {
layoutManager = GridLayoutManager(requireContext(), spans) layoutManager = GridLayoutManager(requireContext(), spans)

3
app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
View file

@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.button.MaterialButton import com.google.android.material.button.MaterialButton
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.logE import org.oxycblt.auxio.logE
@ -162,7 +163,7 @@ fun isTablet(resources: Resources): Boolean {
/** /**
* Get the span count for most RecyclerViews * Get the span count for most RecyclerViews
*/ */
fun Context.getSpans(): Int { fun RecyclerView.getSpans(): Int {
return if (isLandscape(resources)) { return if (isLandscape(resources)) {
if (isTablet(resources)) 3 else 2 if (isTablet(resources)) 3 else 2
} else { } else {

4
app/src/main/res/layout-land/item_album_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/album_cover" android:id="@+id/album_cover"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail_land"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail_land"
android:layout_marginStart="@dimen/margin_medium" android:layout_marginStart="@dimen/margin_medium"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:contentDescription="@{@string/description_album_cover(album.name)}" android:contentDescription="@{@string/description_album_cover(album.name)}"

4
app/src/main/res/layout-land/item_artist_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/artist_image" android:id="@+id/artist_image"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail_land"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail_land"
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
android:contentDescription="@{@string/description_artist_image(artist.name)}" android:contentDescription="@{@string/description_artist_image(artist.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout-land/item_genre_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/genre_image" android:id="@+id/genre_image"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail_land"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail_land"
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
android:contentDescription="@{@string/description_genre_image(genre.name)}" android:contentDescription="@{@string/description_genre_image(genre.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout-large-port/item_album_header.xml → app/src/main/res/layout-large/item_album_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/album_cover" android:id="@+id/album_cover"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_marginStart="@dimen/margin_medium" android:layout_marginStart="@dimen/margin_medium"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:contentDescription="@{@string/description_album_cover(album.name)}" android:contentDescription="@{@string/description_album_cover(album.name)}"

4
app/src/main/res/layout-large-port/item_artist_header.xml → app/src/main/res/layout-large/item_artist_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/artist_image" android:id="@+id/artist_image"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
android:contentDescription="@{@string/description_artist_image(artist.name)}" android:contentDescription="@{@string/description_artist_image(artist.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout-large-port/item_genre_header.xml → app/src/main/res/layout-large/item_genre_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/genre_image" android:id="@+id/genre_image"
android:layout_width="@dimen/size_cover_mid_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_mid_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
android:contentDescription="@{@string/description_genre_image(genre.name)}" android:contentDescription="@{@string/description_genre_image(genre.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout/item_album_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/album_cover" android:id="@+id/album_cover"
android:layout_width="@dimen/size_cover_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:contentDescription="@{@string/description_album_cover(album.name)}" android:contentDescription="@{@string/description_album_cover(album.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout/item_artist_header.xml
View file

@ -25,8 +25,8 @@
<ImageView <ImageView
android:id="@+id/artist_image" android:id="@+id/artist_image"
android:layout_width="@dimen/size_cover_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:contentDescription="@{@string/description_artist_image(artist.name)}" android:contentDescription="@{@string/description_artist_image(artist.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/layout/item_genre_header.xml
View file

@ -26,8 +26,8 @@
<ImageView <ImageView
android:id="@+id/genre_image" android:id="@+id/genre_image"
android:layout_width="@dimen/size_cover_huge" android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_huge" android:layout_height="@dimen/size_cover_detail"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:contentDescription="@{@string/description_genre_image(genre.name)}" android:contentDescription="@{@string/description_genre_image(genre.name)}"
android:elevation="@dimen/elevation_normal" android:elevation="@dimen/elevation_normal"

4
app/src/main/res/values-large/dimens.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="size_cover_mid_huge">200dp</dimen>
</resources>

6
app/src/main/res/values/dimens.xml
View file

@ -31,8 +31,8 @@
<dimen name="size_cover_compact">44dp</dimen> <dimen name="size_cover_compact">44dp</dimen>
<dimen name="size_cover_normal">56dp</dimen> <dimen name="size_cover_normal">56dp</dimen>
<dimen name="size_cover_large">68dp</dimen> <dimen name="size_cover_large">68dp</dimen>
<dimen name="size_cover_mid_huge">130dp</dimen> <dimen name="size_cover_detail">260dp</dimen>
<dimen name="size_cover_huge">260dp</dimen> <dimen name="size_cover_detail_land">130dp</dimen>
<dimen name="size_play_pause">70dp</dimen> <dimen name="size_play_pause">70dp</dimen>
<dimen name="size_play_pause_compact">36dp</dimen> <dimen name="size_play_pause_compact">36dp</dimen>
@ -46,7 +46,7 @@
<dimen name="text_size_detail_header_max">26sp</dimen> <dimen name="text_size_detail_header_max">26sp</dimen>
<dimen name="text_size_thumb">18sp</dimen> <dimen name="text_size_thumb">18sp</dimen>
<dimen name="text_size_header">19sp</dimen> <dimen name="text_size_header">19sp</dimen>
<dimen name="text_size_material_button">15sp</dimen> <dimen name="text_size_material_button">16sp</dimen>
<dimen name="text_size_toolbar_header">20sp</dimen> <dimen name="text_size_toolbar_header">20sp</dimen>
<!-- Misc --> <!-- Misc -->