* spelling: activity

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: animation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: detailed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: hierarchy

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: javascript

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: memory

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: notification

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: opened

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: preferable

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: repetitive

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: spoiler

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: thumbnail

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: visibility

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: whitespace

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2022-11-09 13:32:39 -05:00 committed by GitHub
commit 98092e6ff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 222 additions and 222 deletions

View file

@ -215,7 +215,7 @@ class ViewImageFragment : ViewMediaFragment() {
.dontAnimate()
.onlyRetrieveFromCache(true)
.centerInside()
.addListener(ImageRequestListener(true, isThumnailRequest = true))
.addListener(ImageRequestListener(true, isThumbnailRequest = true))
)
else it
}
@ -223,10 +223,10 @@ class ViewImageFragment : ViewMediaFragment() {
.error(
glide.load(url)
.centerInside()
.addListener(ImageRequestListener(false, isThumnailRequest = false))
.addListener(ImageRequestListener(false, isThumbnailRequest = false))
)
.centerInside()
.addListener(ImageRequestListener(true, isThumnailRequest = false))
.addListener(ImageRequestListener(true, isThumbnailRequest = false))
.into(photoView)
}
@ -252,7 +252,7 @@ class ViewImageFragment : ViewMediaFragment() {
*/
private inner class ImageRequestListener(
private val isCacheRequest: Boolean,
private val isThumnailRequest: Boolean
private val isThumbnailRequest: Boolean
) : RequestListener<Drawable> {
override fun onLoadFailed(
@ -262,7 +262,7 @@ class ViewImageFragment : ViewMediaFragment() {
isFirstResource: Boolean
): Boolean {
// If cache for full image failed complete transition
if (isCacheRequest && !isThumnailRequest && shouldStartTransition &&
if (isCacheRequest && !isThumbnailRequest && shouldStartTransition &&
!startedTransition
) {
photoActionsListener.onBringUp()
@ -296,7 +296,7 @@ class ViewImageFragment : ViewMediaFragment() {
}
} else {
// This wait for transition. If there's no transition then we should hit
// another branch. take() will unsubscribe after we have it to not leak menmory
// another branch. take() will unsubscribe after we have it to not leak memory
transition
.take(1)
.subscribe {

View file

@ -22,7 +22,7 @@ import com.keylesspalace.tusky.ViewMediaActivity
import com.keylesspalace.tusky.entity.Attachment
abstract class ViewMediaFragment : Fragment() {
private var toolbarVisibiltyDisposable: Function0<Boolean>? = null
private var toolbarVisibilityDisposable: Function0<Boolean>? = null
abstract fun setupMediaView(
url: String,
@ -83,14 +83,14 @@ abstract class ViewMediaFragment : Fragment() {
isDescriptionVisible = showingDescription
setupMediaView(url, previewUrl, description, showingDescription && mediaActivity.isToolbarVisible)
toolbarVisibiltyDisposable = (activity as ViewMediaActivity)
toolbarVisibilityDisposable = (activity as ViewMediaActivity)
.addToolbarVisibilityListener { isVisible ->
onToolbarVisibilityChange(isVisible)
}
}
override fun onDestroyView() {
toolbarVisibiltyDisposable?.invoke()
toolbarVisibilityDisposable?.invoke()
super.onDestroyView()
}
}