diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsRangeSelectorView.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsRangeSelectorView.java
index 6462cfa3c..b25062614 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsRangeSelectorView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsRangeSelectorView.java
@@ -181,11 +181,6 @@ public final class VideoThumbnailsRangeSelectorView extends VideoThumbnailsView
@Override
protected void onDraw(final Canvas canvas) {
- if (thumbHintTextSize > 0) {
- thumbTimeTextPaint.getTextBounds("0", 0, "0".length(), tempDrawRect);
- canvas.translate(0, tempDrawRect.height());
- }
-
super.onDraw(canvas);
canvas.translate(getPaddingLeft(), getPaddingTop());
@@ -252,7 +247,10 @@ public final class VideoThumbnailsRangeSelectorView extends VideoThumbnailsView
drawTimeHint(canvas, drawableWidth, drawableHeight, lastDragThumb, true);
}
+ canvas.save();
+ canvas.translate(0, drawableHeight * 2);
drawDurationAndSizeHint(canvas, drawableWidth);
+ canvas.restore();
}
// draw current position marker
@@ -292,7 +290,7 @@ public final class VideoThumbnailsRangeSelectorView extends VideoThumbnailsView
}
canvas.translate(0, drawableHeight + halfPillHeight);
canvas.scale(scaleIn, scaleIn);
- thumbTimeBackgroundPaint.setAlpha(alpha);
+ thumbTimeBackgroundPaint.setAlpha(Math.round(alpha * 0.6f));
thumbTimeTextPaint.setAlpha(alpha);
canvas.translate(leftRightPadding - halfPillWidth, halfPillHeight);
canvas.drawRoundRect(timePillRect, halfPillHeight, halfPillHeight, thumbTimeBackgroundPaint);
@@ -332,7 +330,7 @@ public final class VideoThumbnailsRangeSelectorView extends VideoThumbnailsView
canvas.translate(Math.max(halfPillWidth, Math.min((right + left) / 2f, drawableWidth - halfPillWidth)), - 2 * halfPillHeight);
canvas.scale(scaleIn, scaleIn);
- thumbTimeBackgroundPaint.setAlpha(alpha);
+ thumbTimeBackgroundPaint.setAlpha(Math.round(alpha * 0.6f));
thumbTimeTextPaint.setAlpha(alpha);
canvas.translate(leftRightPadding - halfPillWidth, halfPillHeight);
canvas.drawRoundRect(timePillRect, halfPillHeight, halfPillHeight, thumbTimeBackgroundPaint);
diff --git a/app/src/main/res/drawable/circle_transparent_black_60.xml b/app/src/main/res/drawable/circle_transparent_black_60.xml
new file mode 100644
index 000000000..3ea46f8b6
--- /dev/null
+++ b/app/src/main/res/drawable/circle_transparent_black_60.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/res/layout/video_editor_hud.xml b/app/src/main/res/layout/video_editor_hud.xml
index 2c1bb7ba5..58cb2246d 100644
--- a/app/src/main/res/layout/video_editor_hud.xml
+++ b/app/src/main/res/layout/video_editor_hud.xml
@@ -17,7 +17,9 @@
android:id="@+id/video_timeline"
android:layout_width="match_parent"
android:layout_height="72dp"
- android:layout_margin="16dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="60dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
app:cursorColor="#fff"
@@ -28,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent"
app:thumbColor="@color/core_white"
app:thumbColorEdited="#ff0"
- app:thumbHintBackgroundColor="@color/core_grey_90"
+ app:thumbHintBackgroundColor="@color/transparent_black_60"
app:thumbHintTextColor="@color/core_white"
app:thumbHintTextSize="14sp"
app:thumbTouchRadius="24dp"
@@ -36,11 +38,11 @@
+ android:scaleType="fitCenter"
+ app:srcCompat="@drawable/exo_icon_play" />