videolan
/
vlc-android
mirror of https://gitea.goldendeliverer.com/videolan/vlc-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

New audio cards design

merge-requests/1287/head
Nicolas Pomepuy 5 years ago
parent
e0139361b7
commit
d1aa388d2e
6 changed files with 88 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      application/resources/src/main/res/drawable/ic_play_circle_card.xml
  2. 2
      application/resources/src/main/res/drawable/video_list_background_selected.xml
  3. 1
      application/resources/src/main/res/drawable/video_list_background_selected_dark.xml
  4. 141
      application/vlc-android/res/layout/audio_browser_card_item.xml
  5. 1
      application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.kt
  6. 16
      application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt

2
application/resources/src/main/res/drawable/ic_play_circle_card.xml
View File

@ -31,7 +31,7 @@
android:pathData="M20,12a8,8 90,1 0,-16 -0a8,8 90,1 0,16 -0z"
android:strokeAlpha="1"
android:strokeWidth="0.1"
android:fillColor="@color/standard_selection"
android:fillColor="@color/white"
android:strokeColor="?attr/colorControlNormal"
android:fillType="nonZero"
android:fillAlpha="1" />

2
application/resources/src/main/res/drawable/video_list_background_selected.xml
View File

@ -25,6 +25,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<corners android:radius="8dp"/>
<solid android:color="@color/orange200transparent"/>
</shape>

1
application/resources/src/main/res/drawable/video_list_background_selected_dark.xml
View File

@ -26,5 +26,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<corners android:radius="8dp"/>
<solid android:color="@color/white_transparent_10"/>
</shape>

141
application/vlc-android/res/layout/audio_browser_card_item.xml
View File

@ -53,58 +53,66 @@
type="boolean" />
</data>
<com.google.android.material.card.MaterialCardView
android:id="@+id/container"
style="@style/VLCCardView.NoShadow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:longClickable="true"
android:onClick="@{holder::onClick}"
android:onLongClick="@{holder::onLongClick}">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container"
selected="@{selected}"
vlc:selectedPadding="@{selected}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
selected="@{selected}"
android:background="?attr/video_list_background"
android:minHeight="@dimen/audio_browser_item_size">
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:longClickable="true"
android:minHeight="@dimen/audio_browser_item_size"
android:onClick="@{holder::onClick}"
android:onLongClick="@{holder::onLongClick}">
<!-- Image loading is handled by org.videolan.vlc.gui.helpers.ImageLoader.loadImage() -->
<org.videolan.vlc.gui.view.FadableImageView
android:id="@+id/media_cover"
<com.google.android.material.card.MaterialCardView
android:id="@+id/media_cover_container"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="center"
android:background="?attr/card_background"
android:scaleType="@{scaleType}"
android:src="@{cover}"
tools:srcCompat="@tools:sample/avatars"
tools:visibility="visible"
vlc:card="@{true}"
vlc:imageWidth="@{imageWidth}"
android:background="@color/transparent"
vlc:cardCornerRadius="4dp"
vlc:selectedElevation="@{selected}"
vlc:cardUseCompatPadding="true"
vlc:layout_constraintDimensionRatio="1"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintStart_toStartOf="parent"
vlc:layout_constraintTop_toTopOf="parent"
vlc:media="@{item}" />
vlc:layout_constraintTop_toTopOf="parent">
<org.videolan.vlc.gui.view.FadableImageView
android:id="@+id/media_cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="?attr/background_default"
android:scaleType="@{scaleType}"
android:src="@{cover}"
tools:srcCompat="@tools:sample/avatars"
tools:visibility="visible"
vlc:card="@{true}"
vlc:imageWidth="@{imageWidth}"
vlc:media="@{item}" />
<ImageView
android:id="@+id/ml_item_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/video_overlay_selected"
android:visibility="@{selected ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="@+id/media_cover_container"
vlc:layout_constraintEnd_toEndOf="@+id/media_cover_container"
vlc:layout_constraintStart_toStartOf="@+id/media_cover_container"
vlc:layout_constraintTop_toTopOf="@+id/media_cover_container"
vlc:layout_constraintVertical_bias="1.0" />
</com.google.android.material.card.MaterialCardView>
<ImageView
android:id="@+id/ml_item_overlay"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="fitXY"
android:src="@drawable/video_overlay_selected"
android:visibility="@{selected ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="@+id/media_cover"
vlc:layout_constraintEnd_toEndOf="@+id/media_cover"
vlc:layout_constraintStart_toStartOf="@+id/media_cover"
vlc:layout_constraintTop_toTopOf="@+id/media_cover"
vlc:layout_constraintVertical_bias="1.0" />
<View
android:id="@+id/network_off_overlay"
@ -112,10 +120,10 @@
android:layout_height="0dp"
android:background="@color/grey400transparent"
android:visibility="@{isNetwork &amp;&amp; !isPresent ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="@id/media_cover"
vlc:layout_constraintEnd_toEndOf="@id/media_cover"
vlc:layout_constraintStart_toStartOf="@id/media_cover"
vlc:layout_constraintTop_toTopOf="@id/media_cover" />
vlc:layout_constraintBottom_toBottomOf="@id/media_cover_container"
vlc:layout_constraintEnd_toEndOf="@id/media_cover_container"
vlc:layout_constraintStart_toStartOf="@id/media_cover_container"
vlc:layout_constraintTop_toTopOf="@id/media_cover_container" />
<ImageView
android:id="@+id/network_media"
@ -126,8 +134,8 @@
android:background="@drawable/rounded_corners_black_more_transparent"
android:padding="3dp"
android:visibility="@{isNetwork &amp;&amp; isPresent ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="@id/media_cover"
vlc:layout_constraintStart_toStartOf="@id/media_cover"
vlc:layout_constraintBottom_toBottomOf="@id/media_cover_container"
vlc:layout_constraintStart_toStartOf="@id/media_cover_container"
vlc:srcCompat="@drawable/ic_network_media" />
<ImageView
@ -139,39 +147,29 @@
android:background="@drawable/rounded_corners_black_more_transparent"
android:padding="3dp"
android:visibility="@{isNetwork &amp;&amp; !isPresent ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="@id/media_cover"
vlc:layout_constraintStart_toStartOf="@id/media_cover"
vlc:layout_constraintBottom_toBottomOf="@id/media_cover_container"
vlc:layout_constraintStart_toStartOf="@id/media_cover_container"
vlc:srcCompat="@drawable/ic_network_media_off" />
<View
android:id="@+id/view3"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?attr/card_border"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintHorizontal_bias="0.0"
vlc:layout_constraintStart_toStartOf="parent"
vlc:layout_constraintTop_toBottomOf="@+id/media_cover" />
<!-- TextView must be set to singleLine
see https://code.google.com/p/android/issues/detail?id=33868 -->
<org.videolan.vlc.gui.view.FadableImageView
android:id="@+id/imageButton"
android:id="@+id/mainActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:onClick="@{holder::onMainActionClick}"
vlc:srcCompat="@drawable/ic_play_circle_card"
vlc:layout_constraintBottom_toBottomOf="@+id/media_cover"
vlc:layout_constraintRight_toRightOf="@+id/media_cover" />
vlc:layout_constraintBottom_toBottomOf="@+id/media_cover_container"
vlc:layout_constraintRight_toRightOf="@+id/media_cover_container" />
<TextView
android:id="@+id/title"
style="@style/VLC.TextViewTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_vertical"
@ -180,9 +178,9 @@
tools:text="Title"
vlc:asyncText="@{item.title}"
vlc:ellipsizeMode="@{true}"
vlc:layout_constraintEnd_toStartOf="@+id/item_more"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintStart_toStartOf="parent"
vlc:layout_constraintTop_toBottomOf="@id/media_cover"
vlc:layout_constraintTop_toBottomOf="@id/media_cover_container"
vlc:placeholder="@{item}" />
<TextView
@ -190,44 +188,41 @@
style="@style/VLC.TextViewDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:maxLines="1"
tools:text="Subitle"
vlc:asyncText="@{item}"
vlc:layout_constraintBottom_toBottomOf="parent"
vlc:layout_constraintEnd_toStartOf="@id/item_more"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintStart_toStartOf="parent"
vlc:layout_constraintTop_toBottomOf="@+id/title"
vlc:placeholder="@{item}" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/item_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/more_actions"
android:onClick="@{holder::onMoreClick}"
android:scaleType="center"
android:visibility="@{isPresent &amp;&amp; !inSelection ? View.VISIBLE : View.GONE}"
vlc:layout_constraintBottom_toBottomOf="parent"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintTop_toTopOf="@+id/title"
vlc:srcCompat="@drawable/ic_more" />
<ImageView
vlc:layout_constraintTop_toTopOf="@+id/media_cover_container"
vlc:srcCompat="@drawable/ic_more_w" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/selected_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
vlc:selectedElevation="@{selected}"
android:visibility="@{selected ? View.VISIBLE : View.GONE}"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintTop_toTopOf="parent"
vlc:srcCompat="@drawable/ic_video_grid_check" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>

1
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.kt
View File

@ -297,6 +297,7 @@ class AudioBrowserAdapter @JvmOverloads constructor(
super.selectView(selected)
binding.setVariable(BR.selected, selected)
binding.itemMore.visibility = if (multiSelectHelper.inActionMode) View.INVISIBLE else View.VISIBLE
binding.mainActionButton.visibility = if (multiSelectHelper.inActionMode) View.INVISIBLE else View.VISIBLE
}
override fun setItem(item: MediaLibraryItem?) {

16
application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
View File

@ -51,6 +51,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ActionMode
import androidx.cardview.widget.CardView
import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
import androidx.core.net.toUri
@ -74,6 +75,7 @@ import org.videolan.resources.util.launchForeground
import org.videolan.tools.KEY_APP_THEME
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.Settings
import org.videolan.tools.dp
import org.videolan.tools.isStarted
import org.videolan.vlc.MediaParsingService
import org.videolan.vlc.R
@ -712,6 +714,20 @@ fun isSelected(v: View, isSelected: Boolean?) {
v.isSelected = isSelected!!
}
@BindingAdapter("selectedPadding")
fun selectedPadding(v: View, isSelected: Boolean?) {
val padding = if (isSelected == true) 16.dp else 0.dp
v.setPadding(padding, padding, padding, padding)
}
@BindingAdapter("selectedElevation")
fun selectedElevation(v: View, isSelected: Boolean?) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
val elevation = if (isSelected == true) 0.dp else 4.dp
if (v is CardView) v.cardElevation = elevation.toFloat() else v.elevation = elevation.toFloat()
}
}
fun BaseActivity.applyTheme() {
forcedTheme()?.let {
setTheme(it)

Write Preview
Loading…
Cancel
Save