From 8bfbbac2b8f364bb03866712b113cd2f5de8b9d9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 25 Jan 2018 00:23:44 -0500 Subject: Enhancement/video (#669) * Test stricter video extractor * Mess around with mutations * Revert back to strict click listener * Update theme * Update dependencies * Update theme * Create pip toggle * Add pip disabler * Update theme * Update theme --- .../kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt | 5 ++--- .../main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt | 4 ++-- .../kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt | 11 +++++------ 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt index ce2b8d46..aef9099a 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt @@ -83,11 +83,10 @@ class FrostVideoViewer @JvmOverloads constructor( } fun setVideo(url: String, repeat: Boolean = false) { - val formattedUrl = url.formattedFbUrl L.d { "Load video; repeat: $repeat" } - L._d { "Video Url\t\t\t$url\nformatted\t$formattedUrl" } + L._d { "Video Url: $url" } animate().alpha(1f).setDuration(FrostVideoView.ANIMATION_DURATION).start() - video.setVideoURI(Uri.parse(formattedUrl)) + video.setVideoURI(Uri.parse(url)) video.repeat = repeat } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt index 7972e813..14596935 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt @@ -40,10 +40,10 @@ class FrostWebView @JvmOverloads constructor( @SuppressLint("SetJavaScriptEnabled") override fun bind(container: FrostContentContainer): View { + if (parent.baseEnum != null || parent.baseUrl.shouldUseBasicAgent) + userAgentString = USER_AGENT_BASIC // go through our own agent ref with(settings) { javaScriptEnabled = true - if (parent.baseUrl.shouldUseBasicAgent) - userAgentString = USER_AGENT_BASIC allowFileAccess = true textZoom = Prefs.webTextScaling } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt index 4249cd09..14f77e72 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt @@ -29,15 +29,14 @@ class KPrefTextSeekbar(builder: KPrefSeekbarContract) : KPrefSeekbar(builder) { } @SuppressLint("MissingSuperCall") - override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) { - descOriginalSize = viewHolder.desc?.textSize ?: 1f - viewHolder.desc?.layoutParams + override fun bindView(holder: ViewHolder, payloads: List) { + super.bindView(holder, payloads) + descOriginalSize = holder.desc?.textSize ?: 1f + holder.desc?.layoutParams builder.toText = { - viewHolder.desc?.setTextSize(TypedValue.COMPLEX_UNIT_PX, descOriginalSize * it.toFloat() / 100) + holder.desc?.setTextSize(TypedValue.COMPLEX_UNIT_PX, descOriginalSize * it.toFloat() / 100) "$it%" } - - super.onPostBindView(viewHolder, textColor, accentColor) } override fun unbindView(holder: ViewHolder) { -- cgit v1.2.3