aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle8
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt23
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt8
-rw-r--r--build.gradle3
-rw-r--r--buildSrc/src/main/kotlin/Versions.kt4
5 files changed, 20 insertions, 26 deletions
diff --git a/app/build.gradle b/app/build.gradle
index ba0b2018..2655f695 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -274,9 +274,9 @@ 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 "com.github.piasy:BigImageViewer:${Versions.bigImageViewer}"
+ implementation "com.github.piasy:GlideImageLoader:${Versions.bigImageViewer}"
+ implementation "com.github.piasy:GlideImageViewFactory:${Versions.bigImageViewer}"
implementation kau.Dependencies.hilt
kapt kau.Dependencies.hiltCompiler
@@ -318,8 +318,6 @@ 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 "androidx.room:room-ktx:${Versions.room}"
implementation "androidx.room:room-runtime:${Versions.room}"
kapt "androidx.room:room-compiler:${Versions.room}"
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 0f1cf4a5..e1a6a931 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -219,6 +219,18 @@ class ImageActivity : KauBaseActivity() {
setOnClickListener { state.onClick(this@ImageActivity) }
}
+ imageProgress.tint(foregroundTint)
+ error.apply {
+ invisible()
+ setState(FabStates.ERROR)
+ }
+ download.apply {
+ setState(FabStates.DOWNLOAD)
+ }
+ share.apply {
+ setState(FabStates.SHARE)
+ }
+
imagePhoto.setImageLoaderCallback(object : ImageLoader.Callback {
override fun onCacheHit(imageType: Int, image: File?) {}
@@ -237,17 +249,6 @@ class ImageActivity : KauBaseActivity() {
}
})
- imageProgress.tint(foregroundTint)
- error.apply {
- invisible()
- setState(FabStates.ERROR)
- }
- download.apply {
- setState(FabStates.DOWNLOAD)
- }
- share.apply {
- setState(FabStates.SHARE)
- }
activityThemer.setFrostColors {
themeWindow = false
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
index 37f8fab3..70f911a8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
@@ -31,15 +31,12 @@ import kotlinx.coroutines.withTimeout
/**
* Attempts to get the fbcdn url of the supplied image redirect url
*/
-suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): String? {
- L.v { "Image full size 1 from $url" }
- return withContext(Dispatchers.IO) {
+suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): String? =
+ withContext(Dispatchers.IO) {
try {
withTimeout(timeout) {
- L.v { "Image full size from $url" }
val redirect = requestBuilder().url(url).get().call()
.execute().body?.string() ?: return@withTimeout null
- L.v { "Image full size from redirect $redirect" }
FB_REDIRECT_URL_MATCHER.find(redirect)[1]?.formattedFbUrl
}
} catch (e: Exception) {
@@ -47,4 +44,3 @@ suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): Stri
null
}
}
-}
diff --git a/build.gradle b/build.gradle
index c309a2e7..5a21959f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,12 +9,11 @@ buildscript {
dependencies {
classpath kau.Plugins.android
-// classpath kau.Plugins.kotlin
+ classpath kau.Plugins.kotlin
classpath kau.Plugins.spotless
classpath kau.Plugins.dexCount
classpath kau.Plugins.hilt
classpath kau.Plugins.gitVersion
- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
}
wrapper.setDistributionType(Wrapper.DistributionType.ALL)
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 5c68a01d..a8069507 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -19,8 +19,8 @@ object Versions {
const val room = "2.3.0"
// http://robolectric.org/getting-started/
const val roboelectric = "4.6"
- // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
- const val scaleImageView = "3.10.0"
+ // https://github.com/Piasy/BigImageViewer#add-the-dependencies
+ const val bigImageViewer = "1.8.1"
// https://github.com/node-gradle/gradle-node-plugin/releases
const val nodeGradle = "3.1.1"
} \ No newline at end of file