mirror of
https://gitlab.futo.org/videostreaming/grayjay.git
synced 2026-05-16 04:52:39 +02:00
fix merge
Changelog: changed
This commit is contained in:
-6
@@ -2730,9 +2730,6 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) :
|
|||||||
Logger.i(TAG, "handleFullScreen(fullscreen=$fullscreen)")
|
Logger.i(TAG, "handleFullScreen(fullscreen=$fullscreen)")
|
||||||
|
|
||||||
if(fullscreen) {
|
if(fullscreen) {
|
||||||
_container_content.visibility = GONE
|
|
||||||
_layoutPlayerContainer.setPadding(0, 0, 0, 0);
|
|
||||||
|
|
||||||
val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
|
val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
|
||||||
lp.topMargin = 0;
|
lp.topMargin = 0;
|
||||||
_container_content.layoutParams = lp;
|
_container_content.layoutParams = lp;
|
||||||
@@ -2744,9 +2741,6 @@ class VideoDetailView(fragment: VideoDetailFragment, inflater: LayoutInflater) :
|
|||||||
setProgressBarOverlayed(null);
|
setProgressBarOverlayed(null);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
_container_content.visibility = VISIBLE
|
|
||||||
_layoutPlayerContainer.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6.0f, Resources.getSystem().displayMetrics).toInt());
|
|
||||||
|
|
||||||
val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
|
val lp = _container_content.layoutParams as ConstraintLayout.LayoutParams;
|
||||||
lp.topMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -18.0f, Resources.getSystem().displayMetrics).toInt();
|
lp.topMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -18.0f, Resources.getSystem().displayMetrics).toInt();
|
||||||
_container_content.layoutParams = lp;
|
_container_content.layoutParams = lp;
|
||||||
|
|||||||
Reference in New Issue
Block a user