From 4aed05a8923a7f76799bbaa254f407f7e11fef0b Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 12 Nov 2017 04:03:41 -0500 Subject: Translations (#482) * Update translators * Remove translation for some other texts * Update kau * Fix build and optimize * Add translations * Update readme and changelog * Clean unnecessary strings * Fix translations * Add korean translations for kau --- .../pitchedapps/frost/contracts/VideoViewHolder.kt | 54 ++++++++++++++++++++++ .../frost/contracts/VideoViewerContract.kt | 54 ---------------------- 2 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewHolder.kt delete mode 100644 app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewerContract.kt (limited to 'app/src/main/kotlin/com/pitchedapps/frost/contracts') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewHolder.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewHolder.kt new file mode 100644 index 00000000..6440cbb2 --- /dev/null +++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewHolder.kt @@ -0,0 +1,54 @@ +package com.pitchedapps.frost.contracts + +import android.app.Activity +import android.widget.FrameLayout +import ca.allanwang.kau.utils.inflate +import com.pitchedapps.frost.R +import com.pitchedapps.frost.utils.L +import com.pitchedapps.frost.views.FrostVideoContainerContract +import com.pitchedapps.frost.views.FrostVideoViewer + +/** + * Created by Allan Wang on 2017-11-10. + */ +interface VideoViewHolder : FrameWrapper, FrostVideoContainerContract { + + var videoViewer: FrostVideoViewer? + + fun showVideo(url: String) + = showVideo(url, false) + + /** + * Create new viewer and reuse existing one + * The url will be formatted upon loading + */ + fun showVideo(url: String, repeat: Boolean) { + if (videoViewer != null) + videoViewer?.setVideo(url, repeat) + else + videoViewer = FrostVideoViewer.showVideo(url, repeat, this) + } + + fun videoOnStop() = videoViewer?.pause() + + fun videoOnBackPress() = videoViewer?.onBackPressed() ?: false + + override val videoContainer: FrameLayout + get() = frameWrapper + + override fun onVideoFinished() { + L.d("Video view released") + videoViewer = null + } +} + +interface FrameWrapper { + + val frameWrapper: FrameLayout + + fun Activity.setFrameContentView(layoutRes: Int) { + setContentView(R.layout.activity_frame_wrapper) + frameWrapper.inflate(layoutRes, true) + } + +} diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewerContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewerContract.kt deleted file mode 100644 index 2e6ad04f..00000000 --- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/VideoViewerContract.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.pitchedapps.frost.contracts - -import android.app.Activity -import android.widget.FrameLayout -import ca.allanwang.kau.utils.inflate -import com.pitchedapps.frost.R -import com.pitchedapps.frost.utils.L -import com.pitchedapps.frost.views.FrostVideoContainerContract -import com.pitchedapps.frost.views.FrostVideoViewer - -/** - * Created by Allan Wang on 2017-11-10. - */ -interface VideoViewerContract : FrameWrapper, FrostVideoContainerContract { - - var videoViewer: FrostVideoViewer? - - fun showVideo(url: String) - = showVideo(url, false) - - /** - * Create new viewer and reuse existing one - * The url will be formatted upon loading - */ - fun showVideo(url: String, repeat: Boolean) { - if (videoViewer != null) - videoViewer?.setVideo(url, repeat) - else - videoViewer = FrostVideoViewer.showVideo(url, repeat, this) - } - - fun videoOnStop() = videoViewer?.pause() - - fun videoOnBackPress() = videoViewer?.onBackPressed() ?: false - - override val videoContainer: FrameLayout - get() = frameWrapper - - override fun onVideoFinished() { - L.d("Video view released") - videoViewer = null - } -} - -interface FrameWrapper { - - val frameWrapper: FrameLayout - - fun Activity.setFrameContentView(layoutRes: Int) { - setContentView(R.layout.activity_frame_wrapper) - frameWrapper.inflate(layoutRes, true) - } - -} -- cgit v1.2.3