diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt index 135617e02..79ff16a0f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt @@ -386,7 +386,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S mIsPlaying = true mExoPlayer?.playWhenReady = true - mView!!.video_play_outline.setImageDrawable(resources.getDrawable(R.drawable.img_pause_outline_big)) + mView!!.video_play_outline.setImageResource(R.drawable.ic_pause) activity!!.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) mHidePauseHandler.postDelayed({ mView!!.video_play_outline.animate().alpha(0f).start() @@ -403,7 +403,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S mExoPlayer?.playWhenReady = false } - mView?.video_play_outline?.setImageDrawable(resources.getDrawable(R.drawable.img_play_outline_big)) + mView?.video_play_outline?.setImageResource(R.drawable.ic_play) mView!!.video_play_outline.alpha = PLAY_PAUSE_VISIBLE_ALPHA activity!!.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) diff --git a/app/src/main/res/drawable-hdpi/ic_panorama.png b/app/src/main/res/drawable-hdpi/ic_panorama.png index ab2b517b7..513420277 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_panorama.png and b/app/src/main/res/drawable-hdpi/ic_panorama.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_pause.png b/app/src/main/res/drawable-hdpi/ic_pause.png new file mode 100644 index 000000000..eeb009d81 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pause.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_play.png b/app/src/main/res/drawable-hdpi/ic_play.png new file mode 100644 index 000000000..a2efea8dc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play.png differ diff --git a/app/src/main/res/drawable-hdpi/img_pause_outline_big.png b/app/src/main/res/drawable-hdpi/img_pause_outline_big.png deleted file mode 100644 index eda00d096..000000000 Binary files a/app/src/main/res/drawable-hdpi/img_pause_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/img_play_outline_big.png b/app/src/main/res/drawable-hdpi/img_play_outline_big.png deleted file mode 100644 index 67419faa2..000000000 Binary files a/app/src/main/res/drawable-hdpi/img_play_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_panorama.png b/app/src/main/res/drawable-xhdpi/ic_panorama.png index 8d1a82b24..c7f48d89c 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_panorama.png and b/app/src/main/res/drawable-xhdpi/ic_panorama.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pause.png b/app/src/main/res/drawable-xhdpi/ic_pause.png new file mode 100644 index 000000000..7192ad487 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pause.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play.png b/app/src/main/res/drawable-xhdpi/ic_play.png new file mode 100644 index 000000000..bb5d7c623 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_pause_outline_big.png b/app/src/main/res/drawable-xhdpi/img_pause_outline_big.png deleted file mode 100644 index 0dccd18e2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/img_pause_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/img_play_outline_big.png b/app/src/main/res/drawable-xhdpi/img_play_outline_big.png deleted file mode 100644 index e95083552..000000000 Binary files a/app/src/main/res/drawable-xhdpi/img_play_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_panorama.png b/app/src/main/res/drawable-xxhdpi/ic_panorama.png index 7dd982b25..17e7cde47 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_panorama.png and b/app/src/main/res/drawable-xxhdpi/ic_panorama.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause.png b/app/src/main/res/drawable-xxhdpi/ic_pause.png new file mode 100644 index 000000000..fb63ddc5a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pause.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play.png b/app/src/main/res/drawable-xxhdpi/ic_play.png new file mode 100644 index 000000000..b568f7387 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_pause_outline_big.png b/app/src/main/res/drawable-xxhdpi/img_pause_outline_big.png deleted file mode 100644 index 4aa3cd3cc..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/img_pause_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/img_play_outline_big.png b/app/src/main/res/drawable-xxhdpi/img_play_outline_big.png deleted file mode 100644 index 8e32fbd54..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/img_play_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_panorama.png b/app/src/main/res/drawable-xxxhdpi/ic_panorama.png index bc6292769..deaad2e1c 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_panorama.png and b/app/src/main/res/drawable-xxxhdpi/ic_panorama.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause.png b/app/src/main/res/drawable-xxxhdpi/ic_pause.png new file mode 100644 index 000000000..3ea7e03e5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_pause.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play.png b/app/src/main/res/drawable-xxxhdpi/ic_play.png new file mode 100644 index 000000000..0bdaa8d04 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_play.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_pause_outline_big.png b/app/src/main/res/drawable-xxxhdpi/img_pause_outline_big.png deleted file mode 100644 index 57fb987a1..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/img_pause_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_play_outline_big.png b/app/src/main/res/drawable-xxxhdpi/img_play_outline_big.png deleted file mode 100644 index b8d6cff39..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/img_play_outline_big.png and /dev/null differ diff --git a/app/src/main/res/drawable/circle_black_background_with_inset.xml b/app/src/main/res/drawable/circle_black_background_with_inset.xml new file mode 100644 index 000000000..6bab48721 --- /dev/null +++ b/app/src/main/res/drawable/circle_black_background_with_inset.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/layout/pager_photo_item.xml b/app/src/main/res/layout/pager_photo_item.xml index 3a9b587bc..8d35ed318 100644 --- a/app/src/main/res/layout/pager_photo_item.xml +++ b/app/src/main/res/layout/pager_photo_item.xml @@ -23,8 +23,8 @@ android:layout_width="@dimen/play_outline_size_big" android:layout_height="@dimen/play_outline_size_big" android:layout_centerInParent="true" - android:background="@android:color/transparent" - android:padding="@dimen/big_margin" + android:background="@drawable/circle_black_background_with_inset" + android:padding="28dp" android:src="@drawable/ic_panorama" android:visibility="gone"/> diff --git a/app/src/main/res/layout/pager_video_item.xml b/app/src/main/res/layout/pager_video_item.xml index 3845d13e4..26fdf7b1e 100644 --- a/app/src/main/res/layout/pager_video_item.xml +++ b/app/src/main/res/layout/pager_video_item.xml @@ -41,9 +41,9 @@ android:layout_width="@dimen/play_outline_size_big" android:layout_height="@dimen/play_outline_size_big" android:layout_centerInParent="true" - android:background="@android:color/transparent" - android:padding="@dimen/big_margin" - android:src="@drawable/img_play_outline_big"/> + android:background="@drawable/circle_black_background_with_inset" + android:padding="26dp" + android:src="@drawable/ic_play"/> 120dp 30dp 38dp - 200dp 60dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 78adecbeb..3524f5ac0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,7 +5,7 @@ 20dp 22dp 26dp - 130dp + 96dp 60dp 60dp 30dp