Skip to content
Snippets Groups Projects
Commit 98366949 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Duncan McNamara
Browse files

Fix HeaderMediaListActivity top margin and editor

parent fe7c687a
No related branches found
No related tags found
1 merge request!1668Backport 3.5.x: !1667
Pipeline #307118 passed with stage
in 6 minutes and 37 seconds
......@@ -23,6 +23,9 @@
<variable
name="releaseYear"
type="String" />
<variable
name="topmargin"
type="Integer" />
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout
......@@ -59,6 +62,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header_layout"
android:layout_width="@dimen/default_content_width"
tools:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:clipChildren="false"
......@@ -81,7 +85,8 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginTop="86dp"
tools:layout_marginTop="86dp"
vlc:layoutMarginTop="@{topmargin}"
android:layout_marginEnd="@dimen/default_margin"
android:fitsSystemWindows="true"
android:scaleType="fitCenter"
......@@ -219,6 +224,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/songs"
android:layout_width="@dimen/default_content_width"
tools:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal|top"
android:background="?attr/background_default"
......
......@@ -104,6 +104,10 @@ open class HeaderMediaListActivity : AudioPlayerContainerActivity(), IEventsHand
originalBottomPadding = fragmentContainer.paddingBottom
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.title = ""
binding.topmargin = 86.dp
toolbar.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom ->
binding.topmargin = bottom + 8.dp
}
val playlist = if (savedInstanceState != null)
savedInstanceState.getParcelable<Parcelable>(AudioBrowserFragment.TAG_ITEM) as MediaLibraryItem?
......
......@@ -14,6 +14,7 @@ import android.text.style.DynamicDrawableSpan
import android.text.style.ImageSpan
import android.util.DisplayMetrics
import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import android.widget.TextView
import androidx.annotation.WorkerThread
import androidx.appcompat.app.AppCompatActivity
......@@ -208,6 +209,13 @@ fun asyncTextItem(view: TextView, item: MediaLibraryItem?) {
setTextAsync(view, text, params)
}
@BindingAdapter("layoutMarginTop")
fun setLayoutMarginTop(view: View, dimen: Int) {
val layoutParams = view.layoutParams as MarginLayoutParams
layoutParams.topMargin = dimen
view.layoutParams = layoutParams
}
private fun setTextAsync(view: TextView, text: CharSequence, params: PrecomputedTextCompat.Params) {
val ref = WeakReference(view)
AppScope.launch(Dispatchers.Default) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment