ui: update list spacing further
Update other uses of list spacing in-app to be more consistent with the new, slightly more compact style
This commit is contained in:
parent
78523021fd
commit
f1ae870eea
14 changed files with 33 additions and 24 deletions
|
|
@ -26,6 +26,7 @@ import org.oxycblt.auxio.playback.state.PlaybackStateManager
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class enabling more advanced queue list functionality and queue editing.
|
* Class enabling more advanced queue list functionality and queue editing.
|
||||||
|
* TODO: Allow editing previous parts of the queue
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
*/
|
*/
|
||||||
class QueueViewModel : ViewModel(), PlaybackStateManager.Callback {
|
class QueueViewModel : ViewModel(), PlaybackStateManager.Callback {
|
||||||
|
|
|
||||||
|
|
@ -526,7 +526,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val ANIM_MILLIS = 150L
|
|
||||||
private const val AUTO_HIDE_SCROLLBAR_DELAY_MILLIS = 1500
|
private const val AUTO_HIDE_SCROLLBAR_DELAY_MILLIS = 1500
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,10 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/spacing_medium">
|
android:paddingTop="@dimen/spacing_medium"
|
||||||
|
android:paddingStart="@dimen/spacing_medium"
|
||||||
|
android:paddingEnd="@dimen/spacing_medium"
|
||||||
|
android:paddingBottom="@dimen/spacing_mid_medium">
|
||||||
<org.oxycblt.auxio.image.StyledImageView
|
<org.oxycblt.auxio.image.StyledImageView
|
||||||
android:id="@+id/detail_cover"
|
android:id="@+id/detail_cover"
|
||||||
style="@style/Widget.Auxio.Image.Huge"
|
style="@style/Widget.Auxio.Image.Huge"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,10 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/spacing_medium">
|
android:paddingTop="@dimen/spacing_medium"
|
||||||
|
android:paddingStart="@dimen/spacing_medium"
|
||||||
|
android:paddingEnd="@dimen/spacing_medium"
|
||||||
|
android:paddingBottom="@dimen/spacing_mid_medium">
|
||||||
|
|
||||||
<org.oxycblt.auxio.image.StyledImageView
|
<org.oxycblt.auxio.image.StyledImageView
|
||||||
android:id="@+id/detail_cover"
|
android:id="@+id/detail_cover"
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
android:paddingBottom="@dimen/spacing_tiny"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
@ -98,7 +99,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:layout_marginTop="@dimen/spacing_medium"
|
android:layout_marginTop="@dimen/spacing_mid_medium"
|
||||||
android:text="@string/lbl_version"
|
android:text="@string/lbl_version"
|
||||||
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
|
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/about_version"
|
app:layout_constraintBottom_toTopOf="@+id/about_version"
|
||||||
|
|
@ -115,13 +116,12 @@
|
||||||
app:layout_constraintTop_toBottomOf="@+id/about_version_title"
|
app:layout_constraintTop_toBottomOf="@+id/about_version_title"
|
||||||
tools:text="16.16.16" />
|
tools:text="16.16.16" />
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/about_code"
|
android:id="@+id/about_code"
|
||||||
style="@style/Widget.Auxio.TextView.Icon.Clickable"
|
style="@style/Widget.Auxio.TextView.Icon.Clickable"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/spacing_medium"
|
android:layout_marginTop="@dimen/spacing_mid_medium"
|
||||||
android:text="@string/lbl_code"
|
android:text="@string/lbl_code"
|
||||||
app:drawableStartCompat="@drawable/ic_code_24"
|
app:drawableStartCompat="@drawable/ic_code_24"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/about_faq"
|
app:layout_constraintBottom_toTopOf="@+id/about_faq"
|
||||||
|
|
@ -174,6 +174,7 @@
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:paddingBottom="@dimen/spacing_tiny"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
style="@style/Widget.Auxio.TextView.Item.Primary"
|
style="@style/Widget.Auxio.TextView.Item.Primary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/spacing_small"
|
android:layout_marginEnd="@dimen/spacing_mid_medium"
|
||||||
android:textColor="@color/sel_selectable_text_primary"
|
android:textColor="@color/sel_selectable_text_primary"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/song_duration"
|
app:layout_constraintBottom_toTopOf="@+id/song_duration"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/song_menu"
|
app:layout_constraintEnd_toStartOf="@+id/song_menu"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,10 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/spacing_medium">
|
android:paddingTop="@dimen/spacing_medium"
|
||||||
|
android:paddingStart="@dimen/spacing_medium"
|
||||||
|
android:paddingEnd="@dimen/spacing_medium"
|
||||||
|
android:paddingBottom="@dimen/spacing_mid_medium">
|
||||||
|
|
||||||
<org.oxycblt.auxio.image.StyledImageView
|
<org.oxycblt.auxio.image.StyledImageView
|
||||||
android:id="@+id/detail_cover"
|
android:id="@+id/detail_cover"
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,10 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_large"
|
android:layout_marginStart="@dimen/spacing_large"
|
||||||
android:layout_marginEnd="@dimen/spacing_medium"
|
android:layout_marginEnd="@dimen/spacing_mid_medium"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:maxLines="@null"
|
android:maxLines="@null"
|
||||||
android:paddingTop="@dimen/spacing_small"
|
|
||||||
android:paddingBottom="@dimen/spacing_small"
|
|
||||||
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
|
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
|
||||||
tools:text="primary:path/to/music" />
|
tools:text="primary:path/to/music" />
|
||||||
|
|
||||||
|
|
@ -27,7 +25,7 @@
|
||||||
style="@style/Widget.Auxio.Button.Icon.Small"
|
style="@style/Widget.Auxio.Button.Icon.Small"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/spacing_mid_medium"
|
android:layout_marginEnd="@dimen/spacing_mid_large"
|
||||||
android:contentDescription="@string/desc_music_dir_delete"
|
android:contentDescription="@string/desc_music_dir_delete"
|
||||||
app:icon="@drawable/ic_delete_24"
|
app:icon="@drawable/ic_delete_24"
|
||||||
app:tint="?attr/colorControlNormal" />
|
app:tint="?attr/colorControlNormal" />
|
||||||
|
|
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:paddingTop="@dimen/spacing_small"
|
android:paddingTop="@dimen/spacing_tiny"
|
||||||
android:paddingBottom="@dimen/spacing_small">
|
android:paddingBottom="@dimen/spacing_tiny">
|
||||||
|
|
||||||
<com.google.android.material.checkbox.MaterialCheckBox
|
<com.google.android.material.checkbox.MaterialCheckBox
|
||||||
android:id="@+id/tab_icon"
|
android:id="@+id/tab_icon"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:layout_marginEnd="@dimen/spacing_tiny"
|
android:layout_marginEnd="@dimen/spacing_mid_medium"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
style="@style/Widget.Auxio.Button.Icon.Small"
|
style="@style/Widget.Auxio.Button.Icon.Small"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/spacing_mid_medium"
|
android:layout_marginEnd="@dimen/spacing_mid_large"
|
||||||
android:contentDescription="@string/desc_tab_handle"
|
android:contentDescription="@string/desc_tab_handle"
|
||||||
app:icon="@drawable/ic_handle_24" />
|
app:icon="@drawable/ic_handle_24" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -258,6 +258,7 @@
|
||||||
<plurals name="fmt_artist_count">
|
<plurals name="fmt_artist_count">
|
||||||
<item quantity="one">%d umělec</item>
|
<item quantity="one">%d umělec</item>
|
||||||
<item quantity="few">%d umělci</item>
|
<item quantity="few">%d umělci</item>
|
||||||
|
<item quantity="many">%d umělců</item>
|
||||||
<item quantity="other">%d umělců</item>
|
<item quantity="other">%d umělců</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="err_did_not_wipe">Nepodařilo se vymazat stav</string>
|
<string name="err_did_not_wipe">Nepodařilo se vymazat stav</string>
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<string name="set_content">Contenido</string>
|
<string name="set_content">Contenido</string>
|
||||||
<string name="set_save_state">Guardar estado de reproducción</string>
|
<string name="set_save_state">Guardar estado de reproducción</string>
|
||||||
<string name="set_save_desc">Guardar el estado de reproduccion ahora</string>
|
<string name="set_save_desc">Guardar el estado de reproduccion ahora</string>
|
||||||
<string name="set_reindex">Actualizar musica</string>
|
<string name="set_reindex">Actualizar música</string>
|
||||||
<string name="set_reindex_desc">Recargar la biblioteca musical, utilizando las etiquetas en caché cuando sea posible</string>
|
<string name="set_reindex_desc">Recargar la biblioteca musical, utilizando las etiquetas en caché cuando sea posible</string>
|
||||||
<!-- Error Namespace | Error Labels -->
|
<!-- Error Namespace | Error Labels -->
|
||||||
<string name="err_no_music">Sin música</string>
|
<string name="err_no_music">Sin música</string>
|
||||||
|
|
@ -129,12 +129,10 @@
|
||||||
<string name="fmt_lib_song_count">Canciones cargadas: %d</string>
|
<string name="fmt_lib_song_count">Canciones cargadas: %d</string>
|
||||||
<plurals name="fmt_song_count">
|
<plurals name="fmt_song_count">
|
||||||
<item quantity="one">%d canción</item>
|
<item quantity="one">%d canción</item>
|
||||||
<item quantity="many">%d canciones</item>
|
|
||||||
<item quantity="other">%d canciones</item>
|
<item quantity="other">%d canciones</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<plurals name="fmt_album_count">
|
<plurals name="fmt_album_count">
|
||||||
<item quantity="one">%d álbum</item>
|
<item quantity="one">%d álbum</item>
|
||||||
<item quantity="many">%d álbumes</item>
|
|
||||||
<item quantity="other">%d álbumes</item>
|
<item quantity="other">%d álbumes</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="lbl_size">Tamaño</string>
|
<string name="lbl_size">Tamaño</string>
|
||||||
|
|
@ -252,7 +250,6 @@
|
||||||
<string name="set_hide_collaborators">Ocultar colaboradores</string>
|
<string name="set_hide_collaborators">Ocultar colaboradores</string>
|
||||||
<plurals name="fmt_artist_count">
|
<plurals name="fmt_artist_count">
|
||||||
<item quantity="one">%d artista</item>
|
<item quantity="one">%d artista</item>
|
||||||
<item quantity="many">%d artistas</item>
|
|
||||||
<item quantity="other">%d artistas</item>
|
<item quantity="other">%d artistas</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="err_did_not_save">Imposible guardar el estado</string>
|
<string name="err_did_not_save">Imposible guardar el estado</string>
|
||||||
|
|
|
||||||
|
|
@ -136,12 +136,10 @@
|
||||||
<string name="fmt_lib_total_duration">Durata totale: %s</string>
|
<string name="fmt_lib_total_duration">Durata totale: %s</string>
|
||||||
<plurals name="fmt_song_count">
|
<plurals name="fmt_song_count">
|
||||||
<item quantity="one">%d canzone</item>
|
<item quantity="one">%d canzone</item>
|
||||||
<item quantity="many">%d canzoni</item>
|
|
||||||
<item quantity="other">%d canzoni</item>
|
<item quantity="other">%d canzoni</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<plurals name="fmt_album_count">
|
<plurals name="fmt_album_count">
|
||||||
<item quantity="one">%d disco</item>
|
<item quantity="one">%d disco</item>
|
||||||
<item quantity="many">%d dischi</item>
|
|
||||||
<item quantity="other">%d dischi</item>
|
<item quantity="other">%d dischi</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="set_dirs_mode">Modo</string>
|
<string name="set_dirs_mode">Modo</string>
|
||||||
|
|
|
||||||
|
|
@ -97,6 +97,7 @@
|
||||||
<plurals name="fmt_album_count">
|
<plurals name="fmt_album_count">
|
||||||
<item quantity="one">%d albumas</item>
|
<item quantity="one">%d albumas</item>
|
||||||
<item quantity="few">%d albumai</item>
|
<item quantity="few">%d albumai</item>
|
||||||
|
<item quantity="many">%d albumų</item>
|
||||||
<item quantity="other">%d albumų</item>
|
<item quantity="other">%d albumų</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="lbl_remix_group">Remiksai</string>
|
<string name="lbl_remix_group">Remiksai</string>
|
||||||
|
|
@ -107,6 +108,7 @@
|
||||||
<plurals name="fmt_song_count">
|
<plurals name="fmt_song_count">
|
||||||
<item quantity="one">%d daina</item>
|
<item quantity="one">%d daina</item>
|
||||||
<item quantity="few">%d dainos</item>
|
<item quantity="few">%d dainos</item>
|
||||||
|
<item quantity="many">%d albumų</item>
|
||||||
<item quantity="other">%d dainų</item>
|
<item quantity="other">%d dainų</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="clr_dynamic">Dinaminis</string>
|
<string name="clr_dynamic">Dinaminis</string>
|
||||||
|
|
@ -246,6 +248,7 @@
|
||||||
<plurals name="fmt_artist_count">
|
<plurals name="fmt_artist_count">
|
||||||
<item quantity="one">%d atlikėjas</item>
|
<item quantity="one">%d atlikėjas</item>
|
||||||
<item quantity="few">%d atlikėjai</item>
|
<item quantity="few">%d atlikėjai</item>
|
||||||
|
<item quantity="many">%d albumų</item>
|
||||||
<item quantity="other">%d atlikėjų</item>
|
<item quantity="other">%d atlikėjų</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="set_rescan">Perskenuoti muziką</string>
|
<string name="set_rescan">Perskenuoti muziką</string>
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,10 @@
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Icon" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Icon" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:drawablePadding">@dimen/spacing_medium</item>
|
<item name="android:drawablePadding">@dimen/spacing_medium</item>
|
||||||
<item name="android:padding">@dimen/spacing_medium</item>
|
<item name="android:paddingTop">@dimen/spacing_mid_medium</item>
|
||||||
|
<item name="android:paddingStart">@dimen/spacing_medium</item>
|
||||||
|
<item name="android:paddingBottom">@dimen/spacing_mid_medium</item>
|
||||||
|
<item name="android:paddingEnd">@dimen/spacing_medium</item>
|
||||||
<item name="android:textAppearance">@style/TextAppearance.Auxio.BodyLarge</item>
|
<item name="android:textAppearance">@style/TextAppearance.Auxio.BodyLarge</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue