moving some video related icons to Commons
|
@ -78,7 +78,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.simplemobiletools:commons:5.26.14'
|
implementation 'com.simplemobiletools:commons:5.26.15'
|
||||||
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
|
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
|
||||||
implementation 'androidx.multidex:multidex:2.0.1'
|
implementation 'androidx.multidex:multidex:2.0.1'
|
||||||
implementation 'it.sephiroth.android.exif:library:1.0.1'
|
implementation 'it.sephiroth.android.exif:library:1.0.1'
|
||||||
|
|
|
@ -130,7 +130,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList
|
||||||
mIsPlaying = true
|
mIsPlaying = true
|
||||||
resumeVideo()
|
resumeVideo()
|
||||||
} else {
|
} else {
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
}
|
}
|
||||||
video_toggle_play_pause.beVisible()
|
video_toggle_play_pause.beVisible()
|
||||||
}
|
}
|
||||||
|
@ -190,7 +190,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resumeVideo() {
|
private fun resumeVideo() {
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_pause_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_pause_outline_vector)
|
||||||
if (mCurrTime == mDuration) {
|
if (mCurrTime == mDuration) {
|
||||||
setVideoProgress(0)
|
setVideoProgress(0)
|
||||||
mPlayOnReady = true
|
mPlayOnReady = true
|
||||||
|
@ -203,7 +203,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList
|
||||||
|
|
||||||
private fun pauseVideo() {
|
private fun pauseVideo() {
|
||||||
vr_video_view.pauseVideo()
|
vr_video_view.pauseVideo()
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList
|
||||||
}
|
}
|
||||||
explore.requestLayout()
|
explore.requestLayout()
|
||||||
}
|
}
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
|
|
||||||
cardboard.setOnClickListener {
|
cardboard.setOnClickListener {
|
||||||
vr_video_view.displayMode = CARDBOARD_DISPLAY_MODE
|
vr_video_view.displayMode = CARDBOARD_DISPLAY_MODE
|
||||||
|
|
|
@ -290,7 +290,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen
|
||||||
if (config.autoplayVideos) {
|
if (config.autoplayVideos) {
|
||||||
resumeVideo()
|
resumeVideo()
|
||||||
} else {
|
} else {
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -305,7 +305,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resumeVideo() {
|
private fun resumeVideo() {
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_pause_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_pause_outline_vector)
|
||||||
if (mExoPlayer == null) {
|
if (mExoPlayer == null) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -322,7 +322,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun pauseVideo() {
|
private fun pauseVideo() {
|
||||||
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline)
|
video_toggle_play_pause.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
if (mExoPlayer == null) {
|
if (mExoPlayer == null) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -500,7 +500,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
|
||||||
view.apply {
|
view.apply {
|
||||||
play_outline.beVisibleIf(medium.isVideo() || medium.isPortrait())
|
play_outline.beVisibleIf(medium.isVideo() || medium.isPortrait())
|
||||||
if (medium.isVideo()) {
|
if (medium.isVideo()) {
|
||||||
play_outline.setImageResource(R.drawable.img_play_outline)
|
play_outline.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
play_outline.beVisible()
|
play_outline.beVisible()
|
||||||
} else if (medium.isPortrait()) {
|
} else if (medium.isPortrait()) {
|
||||||
play_outline.setImageResource(R.drawable.ic_portrait_photo_vector)
|
play_outline.setImageResource(R.drawable.ic_portrait_photo_vector)
|
||||||
|
|
|
@ -634,7 +634,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wasEnded || !mConfig.loopVideos) {
|
if (!wasEnded || !mConfig.loopVideos) {
|
||||||
mPlayPauseButton.setImageResource(R.drawable.ic_pause_outline)
|
mPlayPauseButton.setImageResource(R.drawable.ic_pause_outline_vector)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mWasVideoStarted) {
|
if (!mWasVideoStarted) {
|
||||||
|
@ -660,7 +660,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
|
||||||
mExoPlayer?.playWhenReady = false
|
mExoPlayer?.playWhenReady = false
|
||||||
}
|
}
|
||||||
|
|
||||||
mPlayPauseButton.setImageResource(R.drawable.ic_play_outline)
|
mPlayPauseButton.setImageResource(R.drawable.ic_play_outline_vector)
|
||||||
activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
||||||
mPositionAtPause = mExoPlayer?.currentPosition ?: 0L
|
mPositionAtPause = mExoPlayer?.currentPosition ?: 0L
|
||||||
releaseExoPlayer()
|
releaseExoPlayer()
|
||||||
|
|
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 6.7 KiB |
|
@ -16,7 +16,7 @@
|
||||||
android:layout_marginTop="@dimen/activity_margin"
|
android:layout_marginTop="@dimen/activity_margin"
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
android:padding="@dimen/normal_margin"
|
android:padding="@dimen/normal_margin"
|
||||||
android:src="@drawable/ic_prev_outline"
|
android:src="@drawable/ic_prev_outline_vector"
|
||||||
android:visibility="invisible"/>
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
android:layout_marginTop="@dimen/activity_margin"
|
android:layout_marginTop="@dimen/activity_margin"
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
android:padding="@dimen/small_margin"
|
android:padding="@dimen/small_margin"
|
||||||
android:src="@drawable/ic_pause_outline"
|
android:src="@drawable/ic_pause_outline_vector"
|
||||||
android:visibility="invisible"/>
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
android:layout_marginEnd="@dimen/small_margin"
|
android:layout_marginEnd="@dimen/small_margin"
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
android:padding="@dimen/normal_margin"
|
android:padding="@dimen/normal_margin"
|
||||||
android:src="@drawable/ic_next_outline"
|
android:src="@drawable/ic_next_outline_vector"
|
||||||
android:visibility="invisible"/>
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
android:layout_height="@dimen/play_outline_size_big"
|
android:layout_height="@dimen/play_outline_size_big"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
android:padding="20dp"
|
android:padding="20dp"
|
||||||
android:src="@drawable/ic_play_outline"/>
|
android:src="@drawable/ic_play_outline_vector"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/panorama_outline"
|
android:id="@+id/panorama_outline"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:layout_margin="@dimen/small_margin"
|
android:layout_margin="@dimen/small_margin"
|
||||||
android:src="@drawable/img_play_outline"
|
android:src="@drawable/ic_play_outline_vector"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_marginEnd="@dimen/small_margin"
|
android:layout_marginEnd="@dimen/small_margin"
|
||||||
android:paddingBottom="6dp"
|
android:paddingBottom="6dp"
|
||||||
android:src="@drawable/img_play_outline_empty"
|
android:src="@drawable/ic_play_outline_vector"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|