From 8c343fd09cdf80cfbcdf49fd5cc72bec759478cf Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Fri, 19 Nov 2021 20:30:19 -0800 Subject: Test image activity --- app/build.gradle | 6 +- .../main/kotlin/com/pitchedapps/frost/FrostApp.kt | 5 + .../pitchedapps/frost/activities/ImageActivity.kt | 28 +- .../frost/activities/ImageActivityOrig.kt | 438 +++++++++++++++++++++ app/src/main/res/layout/activity_image.xml | 2 + app/src/main/res/layout/activity_image_2.xml | 72 ++++ 6 files changed, 537 insertions(+), 14 deletions(-) create mode 100644 app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivityOrig.kt create mode 100644 app/src/main/res/layout/activity_image_2.xml (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 8779069a..ba0b2018 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -274,6 +274,10 @@ dependencies { implementation "androidx.biometric:biometric:${Versions.andxBiometric}" + implementation 'com.github.piasy:BigImageViewer:1.8.1' + implementation 'com.github.piasy:GlideImageLoader:1.8.1' + implementation 'com.github.piasy:GlideImageViewFactory:1.8.1' + implementation kau.Dependencies.hilt kapt kau.Dependencies.hiltCompiler testImplementation kau.Dependencies.hiltTest @@ -314,7 +318,7 @@ dependencies { testImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}" androidTestImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}" - implementation "com.davemorrissey.labs:subsampling-scale-image-view:${Versions.scaleImageView}" +// implementation "com.davemorrissey.labs:subsampling-scale-image-view:${Versions.scaleImageView}" implementation "androidx.room:room-ktx:${Versions.room}" implementation "androidx.room:room-runtime:${Versions.room}" diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt index f5ef0b74..d444d225 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt @@ -22,8 +22,11 @@ import android.os.Bundle import android.util.Log import ca.allanwang.kau.logging.KL import ca.allanwang.kau.utils.buildIsLollipopAndUp +import com.github.piasy.biv.BigImageViewer +import com.github.piasy.biv.loader.glide.GlideImageLoader import com.pitchedapps.frost.db.CookieDao import com.pitchedapps.frost.db.NotificationDao +import com.pitchedapps.frost.facebook.requests.httpClient import com.pitchedapps.frost.injectors.ThemeProvider import com.pitchedapps.frost.prefs.Prefs import com.pitchedapps.frost.services.scheduleNotificationsFromPrefs @@ -66,6 +69,8 @@ class FrostApp : Application() { scheduleNotificationsFromPrefs(prefs) + BigImageViewer.initialize(GlideImageLoader.with(this, httpClient)) + if (BuildConfig.DEBUG) { registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks { override fun onActivityPaused(activity: Activity) {} diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index b8a71fa1..b5e41751 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -20,6 +20,7 @@ import android.content.Context import android.content.Intent import android.content.res.ColorStateList import android.graphics.Color +import android.net.Uri import android.os.Bundle import android.view.View import android.widget.ImageView @@ -42,14 +43,12 @@ import ca.allanwang.kau.utils.tint import ca.allanwang.kau.utils.toast import ca.allanwang.kau.utils.withAlpha import ca.allanwang.kau.utils.withMinAlpha -import com.davemorrissey.labs.subscaleview.ImageSource -import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.floatingactionbutton.FloatingActionButton import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.pitchedapps.frost.R -import com.pitchedapps.frost.databinding.ActivityImageBinding +import com.pitchedapps.frost.databinding.ActivityImage2Binding import com.pitchedapps.frost.facebook.FB_IMAGE_ID_MATCHER import com.pitchedapps.frost.facebook.get import com.pitchedapps.frost.facebook.requests.call @@ -134,7 +133,7 @@ class ImageActivity : KauBaseActivity() { "${abs(FB_IMAGE_ID_MATCHER.find(imageUrl)[1]?.hashCode() ?: 0)}_${abs(imageUrl.hashCode())}" } - lateinit var binding: ActivityImageBinding + lateinit var binding: ActivityImage2Binding private var bottomBehavior: BottomSheetBehavior? = null private val baseBackgroundColor: Int @@ -170,19 +169,22 @@ class ImageActivity : KauBaseActivity() { L.v { "Launching with true url $result" } result } - binding = ActivityImageBinding.inflate(layoutInflater) + binding = ActivityImage2Binding.inflate(layoutInflater) setContentView(binding.root) binding.init() launch(CoroutineExceptionHandler { _, throwable -> loadError(throwable) }) { val tempFile = downloadTempImage() this@ImageActivity.tempFile = tempFile binding.imageProgress.fadeOut() - binding.imagePhoto.setImage(ImageSource.uri(frostUriFromFile(tempFile))) +// binding.imagePhoto.setImageURI(frostUriFromFile(tempFile)) +// Glide.with(binding.imagePhoto).asFile().load(trueImageUrl) + binding.imagePhoto.showImage(Uri.parse(trueImageUrl.await())) +// binding.imagePhoto.setImage(ImageSource.uri(frostUriFromFile(tempFile))) binding.imagePhoto.animate().alpha(1f).scaleXY(1f).start() } } - private fun ActivityImageBinding.init() { + private fun ActivityImage2Binding.init() { imageContainer.setBackgroundColor(baseBackgroundColor) toolbar.setBackgroundColor(baseBackgroundColor) this@ImageActivity.imageText.also { text -> @@ -226,12 +228,12 @@ class ImageActivity : KauBaseActivity() { share.apply { setState(FabStates.SHARE) } - imagePhoto.setOnImageEventListener(object : - SubsamplingScaleImageView.DefaultOnImageEventListener() { - override fun onImageLoadError(e: Exception) { - loadError(e) - } - }) +// imagePhoto.setOnImageEventListener(object : +// SubsamplingScaleImageView.DefaultOnImageEventListener() { +// override fun onImageLoadError(e: Exception) { +// loadError(e) +// } +// }) activityThemer.setFrostColors { themeWindow = false } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivityOrig.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivityOrig.kt new file mode 100644 index 00000000..3f6a90fe --- /dev/null +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivityOrig.kt @@ -0,0 +1,438 @@ +/* + * Copyright 2018 Allan Wang + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.pitchedapps.frost.activities + +import android.content.Context +import android.content.Intent +import android.content.res.ColorStateList +import android.graphics.Color +import android.os.Bundle +import android.view.View +import android.widget.ImageView +import androidx.customview.widget.ViewDragHelper +import ca.allanwang.kau.internal.KauBaseActivity +import ca.allanwang.kau.logging.KauLoggerExtension +import ca.allanwang.kau.utils.adjustAlpha +import ca.allanwang.kau.utils.colorToForeground +import ca.allanwang.kau.utils.copyFromInputStream +import ca.allanwang.kau.utils.fadeIn +import ca.allanwang.kau.utils.fadeOut +import ca.allanwang.kau.utils.gone +import ca.allanwang.kau.utils.invisible +import ca.allanwang.kau.utils.isHidden +import ca.allanwang.kau.utils.isVisible +import ca.allanwang.kau.utils.materialDialog +import ca.allanwang.kau.utils.scaleXY +import ca.allanwang.kau.utils.setIcon +import ca.allanwang.kau.utils.tint +import ca.allanwang.kau.utils.toast +import ca.allanwang.kau.utils.withAlpha +import ca.allanwang.kau.utils.withMinAlpha +import com.davemorrissey.labs.subscaleview.ImageSource +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.floatingactionbutton.FloatingActionButton +import com.mikepenz.iconics.typeface.IIcon +import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial +import com.pitchedapps.frost.R +import com.pitchedapps.frost.databinding.ActivityImageBinding +import com.pitchedapps.frost.facebook.FB_IMAGE_ID_MATCHER +import com.pitchedapps.frost.facebook.get +import com.pitchedapps.frost.facebook.requests.call +import com.pitchedapps.frost.facebook.requests.getFullSizedImageUrl +import com.pitchedapps.frost.facebook.requests.requestBuilder +import com.pitchedapps.frost.injectors.ThemeProvider +import com.pitchedapps.frost.prefs.Prefs +import com.pitchedapps.frost.services.LocalService +import com.pitchedapps.frost.utils.ARG_COOKIE +import com.pitchedapps.frost.utils.ARG_IMAGE_URL +import com.pitchedapps.frost.utils.ARG_TEXT +import com.pitchedapps.frost.utils.ActivityThemer +import com.pitchedapps.frost.utils.frostDownload +import com.pitchedapps.frost.utils.frostSnackbar +import com.pitchedapps.frost.utils.frostUriFromFile +import com.pitchedapps.frost.utils.isIndirectImageUrl +import com.pitchedapps.frost.utils.logFrostEvent +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.io.FileNotFoundException +import java.io.IOException +import javax.inject.Inject +import kotlin.math.abs +import kotlin.math.max + +/** + * Created by Allan Wang on 2017-07-15. + */ +@AndroidEntryPoint +class ImageActivityOrig : KauBaseActivity() { + + @Inject + lateinit var activityThemer: ActivityThemer + + @Inject + lateinit var prefs: Prefs + + @Inject + lateinit var themeProvider: ThemeProvider + + @Volatile + internal var errorRef: Throwable? = null + + /** + * Reference to the temporary file path + */ + internal var tempFile: File? = null + + private lateinit var dragHelper: ViewDragHelper + + companion object { + /** + * Cache folder to store images + * Linked to the uri provider + */ + private const val IMAGE_FOLDER = "images" + private const val TIME_FORMAT = "yyyyMMdd_HHmmss" + private const val IMG_TAG = "Frost" + const val PURGE_TIME: Long = 10 * 60 * 1000 // 10 min block + private val L = KauLoggerExtension("Image", com.pitchedapps.frost.utils.L) + + fun cacheDir(context: Context): File = + File(context.cacheDir, IMAGE_FOLDER) + } + + private val cookie: String? by lazy { intent.getStringExtra(ARG_COOKIE) } + + val imageUrl: String by lazy { intent.getStringExtra(ARG_IMAGE_URL)?.trim('"') ?: "" } + + private lateinit var trueImageUrl: Deferred + + private val imageText: String? by lazy { intent.getStringExtra(ARG_TEXT) } + + // a unique image identifier based on the id (if it exists), and its hash + private val imageHash: String by lazy { + "${abs(FB_IMAGE_ID_MATCHER.find(imageUrl)[1]?.hashCode() ?: 0)}_${abs(imageUrl.hashCode())}" + } + + lateinit var binding: ActivityImageBinding + private var bottomBehavior: BottomSheetBehavior? = null + + private val baseBackgroundColor: Int + get() = if (prefs.blackMediaBg) Color.BLACK + else themeProvider.bgColor.withMinAlpha(235) + + private fun loadError(e: Throwable) { + if (e.message?.contains("") == true) { + applicationContext.toast(R.string.image_not_found) + finish() + return + } + errorRef = e + e.logFrostEvent("Image load error") + with(binding) { + if (imageProgress.isVisible) + imageProgress.fadeOut() + } + tempFile?.delete() + binding.error.fadeIn() + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (imageUrl.isEmpty()) { + return finish() + } + L.i { "Displaying image" } + trueImageUrl = async(Dispatchers.IO) { + val result = if (!imageUrl.isIndirectImageUrl) imageUrl + else cookie?.getFullSizedImageUrl(imageUrl) ?: imageUrl + if (result != imageUrl) + L.v { "Launching with true url $result" } + result + } + binding = ActivityImageBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.init() + launch(CoroutineExceptionHandler { _, throwable -> loadError(throwable) }) { + val tempFile = downloadTempImage() + this@ImageActivityOrig.tempFile = tempFile + binding.imageProgress.fadeOut() +// binding.imagePhoto.setImageURI(frostUriFromFile(tempFile)) + binding.imagePhoto.setImage(ImageSource.uri(frostUriFromFile(tempFile))) + binding.imagePhoto.animate().alpha(1f).scaleXY(1f).start() + } + } + + private fun ActivityImageBinding.init() { + imageContainer.setBackgroundColor(baseBackgroundColor) + toolbar.setBackgroundColor(baseBackgroundColor) + this@ImageActivityOrig.imageText.also { text -> + if (text.isNullOrBlank()) { + imageText.gone() + } else { + imageText.setTextColor(if (prefs.blackMediaBg) Color.WHITE else themeProvider.textColor) + imageText.setBackgroundColor( + baseBackgroundColor.colorToForeground(0.2f).withAlpha(255) + ) + imageText.text = text + bottomBehavior = BottomSheetBehavior.from(imageText).apply { + addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { + override fun onSlide(bottomSheet: View, slideOffset: Float) { + imageText.alpha = slideOffset / 2 + 0.5f + } + + override fun onStateChanged(bottomSheet: View, newState: Int) { + // No op + } + }) + } + imageText.bringToFront() + } + } + val foregroundTint = if (prefs.blackMediaBg) Color.WHITE else themeProvider.accentColor + + fun ImageView.setState(state: FabStatesOrig) { + setIcon(state.iicon, color = foregroundTint, sizeDp = 24) + setOnClickListener { state.onClick(this@ImageActivityOrig) } + } + + imageProgress.tint(foregroundTint) + error.apply { + invisible() + setState(FabStatesOrig.ERROR) + } + download.apply { + setState(FabStatesOrig.DOWNLOAD) + } + share.apply { + setState(FabStatesOrig.SHARE) + } +// imagePhoto.setOnImageEventListener(object : +// SubsamplingScaleImageView.DefaultOnImageEventListener() { +// override fun onImageLoadError(e: Exception) { +// loadError(e) +// } +// }) + activityThemer.setFrostColors { + themeWindow = false + } + dragHelper = ViewDragHelper.create(imageDrag, ViewDragCallback()).apply { + setEdgeTrackingEnabled(ViewDragHelper.EDGE_TOP or ViewDragHelper.EDGE_BOTTOM) + } + imageDrag.dragHelper = dragHelper + imageDrag.viewToIgnore = imageText + } + + private inner class ViewDragCallback : ViewDragHelper.Callback() { + private var scrollPercent: Float = 0f + private var scrollThreshold = 0.5f + private var scrollToTop = false + + override fun tryCaptureView(view: View, i: Int): Boolean { + L.d { "Try capture ${view.id} $i ${binding.imagePhoto.id} ${binding.imageText.id}" } + return view === binding.imagePhoto + } + + override fun getViewHorizontalDragRange(child: View): Int = 0 + + override fun getViewVerticalDragRange(child: View): Int = child.height + + override fun onViewPositionChanged( + changedView: View, + left: Int, + top: Int, + dx: Int, + dy: Int + ) { + super.onViewPositionChanged(changedView, left, top, dx, dy) + with(binding) { + // make sure that we are using the proper axis + scrollPercent = abs(top.toFloat() / imageContainer.height) + scrollToTop = top < 0 + val multiplier = max(1f - scrollPercent, 0f) + + toolbar.alpha = multiplier + bottomBehavior?.also { + imageText.alpha = + multiplier * (if (it.state == BottomSheetBehavior.STATE_COLLAPSED) 0.5f else 1f) + } + imageContainer.setBackgroundColor(baseBackgroundColor.adjustAlpha(multiplier)) + + if (scrollPercent >= 1) { + if (!isFinishing) { + finish() + overridePendingTransition(0, 0) + } + } + } + } + + override fun onViewReleased(releasedChild: View, xvel: Float, yvel: Float) { + val overScrolled = scrollPercent > scrollThreshold + val maxOffset = releasedChild.height + 10 + val finalTop = when { + scrollToTop && (overScrolled || yvel < -dragHelper.minVelocity) -> -maxOffset + !scrollToTop && (overScrolled || yvel > dragHelper.minVelocity) -> maxOffset + else -> 0 + } + dragHelper.settleCapturedViewAt(0, finalTop) + binding.imageDrag.invalidate() + } + + override fun clampViewPositionHorizontal(child: View, left: Int, dx: Int): Int = 0 + + override fun clampViewPositionVertical(child: View, top: Int, dy: Int): Int = top + } + + private fun getImageExtension(type: String?): String? { + if (type?.startsWith("image/") != true) { + return null + } + return when (type.substring(6)) { + "jpeg" -> "jpg" + "png" -> "png" + "gif" -> "gif" + else -> null + } + } + + @Throws(IOException::class) + private suspend fun downloadTempImage(): File = withContext(Dispatchers.IO) { + + // We assume all images are jpg + // Activity launcher may be able to provide specifics, but this beats sending a request + // just to get the content header + val file = File(cacheDir(this@ImageActivityOrig), "$imageHash.jpg") + + if (!file.isFile) { + file.parentFile?.mkdirs() + file.createNewFile() + } else { + file.setLastModified(System.currentTimeMillis()) + } + + // Forbid overwrites + if (file.isFile && file.length() > 0) { + L.i { "Forbid image overwrite" } + return@withContext file + } + + val response = cookie.requestBuilder() + .url(trueImageUrl.await()) + .get() + .call() + .execute() + + if (!response.isSuccessful) { + throw IOException("Unsuccessful response for image: ${response.peekBody(128).string()}") + } + + val body = response.body ?: throw IOException("Failed to retrieve image body") + file.copyFromInputStream(body.byteStream()) + file + } + + internal suspend fun saveImage() { + frostDownload(cookie = cookie, url = trueImageUrl.await()) + } + + override fun onDestroy() { + LocalService.schedule(this, LocalService.Flag.PURGE_IMAGE) + super.onDestroy() + } +} + +internal enum class FabStatesOrig( + val iicon: IIcon, + val iconColorProvider: (ThemeProvider) -> Int = { it.iconColor }, + val backgroundTint: Int = Int.MAX_VALUE +) { + ERROR(GoogleMaterial.Icon.gmd_error, { Color.WHITE }, Color.RED) { + override fun onClick(activity: ImageActivityOrig) { + val err = + activity.errorRef?.takeIf { it !is FileNotFoundException && it.message != "Image failed to decode using JPEG decoder" } + ?: return + activity.materialDialog { + title(R.string.kau_error) + message(text = err.message ?: err.javaClass.name) + } + } + }, + NOTHING(GoogleMaterial.Icon.gmd_adjust) { + override fun onClick(activity: ImageActivityOrig) {} + }, + DOWNLOAD(GoogleMaterial.Icon.gmd_file_download) { + override fun onClick(activity: ImageActivityOrig) { + activity.launch { + activity.binding.download.fadeOut() + activity.saveImage() + } + } + }, + SHARE(GoogleMaterial.Icon.gmd_share) { + override fun onClick(activity: ImageActivityOrig) { + val file = activity.tempFile ?: return + try { + val photoURI = activity.frostUriFromFile(file) + val intent = Intent(Intent.ACTION_SEND).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK + putExtra(Intent.EXTRA_STREAM, photoURI) + type = "image/png" + } + activity.startActivity(intent) + } catch (e: Exception) { + activity.errorRef = e + e.logFrostEvent("Image share failed") + activity.frostSnackbar(R.string.image_share_failed, activity.themeProvider) + } + } + }; + + /** + * Change the fab look + * If it's in view, give it some animations + * + * TODO investigate what is wrong with fadeScaleTransition + * + * https://github.com/AllanWang/KAU/issues/184 + * + */ + fun update(fab: FloatingActionButton, themeProvider: ThemeProvider) { + val tint = + if (backgroundTint != Int.MAX_VALUE) backgroundTint else themeProvider.accentColor + val iconColor = iconColorProvider(themeProvider) + if (fab.isHidden) { + fab.setIcon(iicon, color = iconColor) + fab.backgroundTintList = ColorStateList.valueOf(tint) + fab.show() + } else { + fab.hide(object : FloatingActionButton.OnVisibilityChangedListener() { + override fun onHidden(fab: FloatingActionButton) { + fab.setIcon(iicon, color = iconColor) + fab.show() + } + }) + } + } + + abstract fun onClick(activity: ImageActivityOrig) +} diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml index 6530dc4a..7e19dabf 100644 --- a/app/src/main/res/layout/activity_image.xml +++ b/app/src/main/res/layout/activity_image.xml @@ -17,6 +17,8 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3