From 725d6a99a07f91f940a07e6b49dd6224a6aa32d1 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 31 Dec 2017 02:44:46 -0500 Subject: Enhancement/proguard (#589) * Add error log * Rewrite logger --- app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt | 6 +++--- app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt index 4e3aa097..6f1c0fe4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt @@ -98,7 +98,7 @@ class FrostVideoView @JvmOverloads constructor( */ private fun mapBounds(): Triple { if (videoDimensions.x <= 0f || videoDimensions.y <= 0f) { - L.d("Attempted to toggle video expansion when points have not been finalized") + L.d { "Attempted to toggle video expansion when points have not been finalized" } val dimen = Math.min(height, width).toFloat() videoDimensions.set(dimen, dimen) } @@ -113,12 +113,12 @@ class FrostVideoView @JvmOverloads constructor( val tY = offsetY / 2 - padding.y videoBounds.set(offsetX, offsetY, width.toFloat(), height.toFloat()) videoBounds.offset(padding.x, padding.y) - L.v("Video bounds: fullwidth $width, fullheight $height, scale $scale, tX $tX, tY $tY") + L.v { "Video bounds: fullwidth $width, fullheight $height, scale $scale, tX $tX, tY $tY" } return Triple(scale, tX, tY) } fun updateLocation() { - L.d("Update video location") + L.d { "Update video location" } val (scale, tX, tY) = if (isExpanded) Triple(1f, 0f, 0f) else mapBounds() scaleXY = scale translationX = tX 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 3a773288..2a7c519e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt @@ -84,7 +84,7 @@ class FrostVideoViewer @JvmOverloads constructor( fun setVideo(url: String, repeat: Boolean = false) { val formattedUrl = url.formattedFbUrl - L.d("Load video view; repeat: $repeat", url) + L.d { "Load video view; repeat: $repeat" } animate().alpha(1f).setDuration(FrostVideoView.ANIMATION_DURATION).start() video.setVideoURI(Uri.parse(formattedUrl)) video.repeat = repeat -- cgit v1.2.3