weblate
/
Husky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ViewImageFragment: fix thumbnail being shown under main image, fix scaling

This commit is contained in:
Alibek Omarov 2020-10-05 15:52:13 +03:00
parent 8774d2e476
commit bba5c06166
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
View File

@ -40,6 +40,7 @@ import java.io.File
import java.lang.Exception
import kotlin.math.abs
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.github.piasy.biv.view.BigImageView
class ViewImageFragment : ViewMediaFragment() {
@ -248,7 +249,7 @@ class ViewImageFragment : ViewMediaFragment() {
// if we had preview, load full image, as transition has ended
if (showingPreview) {
showingPreview = false
photoView.loadMainImageNow()
photoView.showImage(uri)
}
}
@ -256,6 +257,8 @@ class ViewImageFragment : ViewMediaFragment() {
override fun onSuccess(image: File?) {
if(!showingPreview) {
progressBar?.hide()
photoView.setInitScaleType(BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE)
photoView.ssiv?.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
photoView.mainView?.setOnTouchListener(imageOnTouchListener)
}

3
app/src/main/res/layout/fragment_view_image.xml
View File

@ -11,8 +11,7 @@
android:id="@+id/photoView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:initScaleType="fitCenter"
app:optimizeDisplay="false" />
app:optimizeDisplay="true" />
<ProgressBar
android:id="@+id/progressBar"