Commit 844bf393 authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣

fix photo close dubble clck

parent f9625f6d
...@@ -7,6 +7,7 @@ import android.os.Bundle ...@@ -7,6 +7,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar import android.widget.ProgressBar
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
...@@ -21,6 +22,7 @@ import com.bumptech.glide.request.RequestListener ...@@ -21,6 +22,7 @@ import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.target.Target
import com.github.chrisbanes.photoview.PhotoView import com.github.chrisbanes.photoview.PhotoView
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import timber.log.Timber
/** /**
...@@ -45,7 +47,6 @@ class PhotoDialogController : Controller { ...@@ -45,7 +47,6 @@ class PhotoDialogController : Controller {
val progress = view.findViewById<ProgressBar>(R.id.photo_load_progress_bar) val progress = view.findViewById<ProgressBar>(R.id.photo_load_progress_bar)
progress.visibility = View.VISIBLE progress.visibility = View.VISIBLE
view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
...@@ -81,6 +82,13 @@ class PhotoDialogController : Controller { ...@@ -81,6 +82,13 @@ class PhotoDialogController : Controller {
}) })
.into(photoView) .into(photoView)
} }
view.findViewById<ImageView>(R.id.close_current_button).setOnClickListener {
Timber.d("Clicked")
handleBack()
}
return view return view
} }
......
...@@ -289,7 +289,8 @@ class AlbumsScreenController : ...@@ -289,7 +289,8 @@ class AlbumsScreenController :
private fun loadGlideBlurred(url:String, context: Context, drawable: Target<Drawable>) = private fun loadGlideBlurred(url:String, context: Context, drawable: Target<Drawable>) =
Glide.with(context) Glide.with(context)
.load(url) .load(url)
.transform(BlurTransformation(13, 2)) .centerCrop()
.transform(BlurTransformation(13, 8))
.transform(ColorFilterTransformation(0xCC000000.toInt())) .transform(ColorFilterTransformation(0xCC000000.toInt()))
.into(drawable) .into(drawable)
......
...@@ -22,16 +22,18 @@ ...@@ -22,16 +22,18 @@
<ImageView <ImageView
android:id="@+id/close_current_button" android:id="@+id/close_current_button"
android:layout_width="32dp" android:layout_width="56dp"
android:layout_height="32dp" android:layout_height="64dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dp" android:layout_marginTop="0dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="0dp"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/content_description_close" android:contentDescription="@string/content_description_close"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="false"
android:padding="16dp"
android:paddingEnd="8dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_close_circled" /> android:src="@drawable/ic_close_circled" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment