From 1bc4ce47bb7be05364276df999386e3c1beac30f Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 3 Jan 2019 23:45:59 +0100 Subject: [PATCH] move the video player bottom gradient in a different view --- .../gallery/pro/activities/PanoramaVideoActivity.kt | 1 + .../gallery/pro/activities/VideoPlayerActivity.kt | 1 + app/src/main/res/layout/activity_video_player.xml | 13 ++++++++++++- .../main/res/layout/bottom_video_time_holder.xml | 3 +-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt index 8183613d4..c442bd718 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt @@ -244,6 +244,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList } video_time_holder.setPadding(0, 0, right, bottom) + video_time_holder.background = resources.getDrawable(R.drawable.gradient_background) video_time_holder.onGlobalLayout { val newBottomMargin = video_time_holder.height - resources.getDimension(R.dimen.video_player_play_pause_size).toInt() - resources.getDimension(R.dimen.activity_margin).toInt() (explore.layoutParams as RelativeLayout.LayoutParams).bottomMargin = newBottomMargin diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt index 7ffe3930d..0ed0c69cc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt @@ -399,6 +399,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen val newAlpha = if (isFullScreen) 0f else 1f top_shadow.animate().alpha(newAlpha).start() video_time_holder.animate().alpha(newAlpha).start() + video_bottom_gradient.animate().alpha(newAlpha).start() video_seekbar.setOnSeekBarChangeListener(if (mIsFullscreen) null else this) arrayOf(video_toggle_play_pause, video_curr_time, video_duration).forEach { it.isClickable = !mIsFullscreen diff --git a/app/src/main/res/layout/activity_video_player.xml b/app/src/main/res/layout/activity_video_player.xml index a9208d1f2..8da8fc15d 100644 --- a/app/src/main/res/layout/activity_video_player.xml +++ b/app/src/main/res/layout/activity_video_player.xml @@ -1,6 +1,7 @@ @@ -46,6 +47,16 @@ android:textColor="@android:color/white" android:textSize="@dimen/extra_big_text_size"/> - + + + diff --git a/app/src/main/res/layout/bottom_video_time_holder.xml b/app/src/main/res/layout/bottom_video_time_holder.xml index 69acead92..1972b1c53 100644 --- a/app/src/main/res/layout/bottom_video_time_holder.xml +++ b/app/src/main/res/layout/bottom_video_time_holder.xml @@ -5,8 +5,7 @@ android:id="@+id/video_time_holder" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="@drawable/gradient_background"> + android:layout_alignParentBottom="true">