ViewImageFragment: fix thumbnail being shown under main image, fix scaling
This commit is contained in:
parent
8774d2e476
commit
bba5c06166
|
@ -40,6 +40,7 @@ import java.io.File
|
||||||
import java.lang.Exception
|
import java.lang.Exception
|
||||||
import kotlin.math.abs
|
import kotlin.math.abs
|
||||||
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
|
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
|
||||||
|
import com.github.piasy.biv.view.BigImageView
|
||||||
|
|
||||||
|
|
||||||
class ViewImageFragment : ViewMediaFragment() {
|
class ViewImageFragment : ViewMediaFragment() {
|
||||||
|
@ -248,7 +249,7 @@ class ViewImageFragment : ViewMediaFragment() {
|
||||||
// if we had preview, load full image, as transition has ended
|
// if we had preview, load full image, as transition has ended
|
||||||
if (showingPreview) {
|
if (showingPreview) {
|
||||||
showingPreview = false
|
showingPreview = false
|
||||||
photoView.loadMainImageNow()
|
photoView.showImage(uri)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,6 +257,8 @@ class ViewImageFragment : ViewMediaFragment() {
|
||||||
override fun onSuccess(image: File?) {
|
override fun onSuccess(image: File?) {
|
||||||
if(!showingPreview) {
|
if(!showingPreview) {
|
||||||
progressBar?.hide()
|
progressBar?.hide()
|
||||||
|
|
||||||
|
photoView.setInitScaleType(BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE)
|
||||||
photoView.ssiv?.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
|
photoView.ssiv?.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
|
||||||
photoView.mainView?.setOnTouchListener(imageOnTouchListener)
|
photoView.mainView?.setOnTouchListener(imageOnTouchListener)
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,8 +11,7 @@
|
||||||
android:id="@+id/photoView"
|
android:id="@+id/photoView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:initScaleType="fitCenter"
|
app:optimizeDisplay="true" />
|
||||||
app:optimizeDisplay="false" />
|
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/progressBar"
|
android:id="@+id/progressBar"
|
||||||
|
|
Loading…
Reference in New Issue