-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #272 from BCSDLab/release
Update v3.4.2
- Loading branch information
Showing
18 changed files
with
302 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
core/src/main/java/in/koreatech/koin/core/dialog/ZoomableDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package `in`.koreatech.koin.core.dialog | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.app.Dialog | ||
| import android.content.Context | ||
| import android.graphics.Color | ||
| import android.graphics.Rect | ||
| import android.graphics.drawable.ColorDrawable | ||
| import android.graphics.drawable.Drawable | ||
| import android.os.Bundle | ||
| import android.view.MotionEvent | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.FrameLayout | ||
| import android.widget.ImageView | ||
| import com.bumptech.glide.Glide | ||
| import com.bumptech.glide.load.DataSource | ||
| import com.bumptech.glide.load.engine.GlideException | ||
| import com.bumptech.glide.request.RequestListener | ||
| import com.bumptech.glide.request.target.Target | ||
| import com.github.chrisbanes.photoview.PhotoView | ||
| import `in`.koreatech.koin.core.R | ||
|
|
||
| class ImageZoomableDialog(private val context: Context, private val image: String) : Dialog(context) { | ||
|
|
||
| private var isUserImageInteraction = false | ||
| private lateinit var photoView : PhotoView | ||
| var initialScale = 1f | ||
|
|
||
| override fun onStart() { | ||
| super.onStart() | ||
| window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) | ||
| window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) | ||
| } | ||
|
|
||
| @SuppressLint("ClickableViewAccessibility") | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContentView(R.layout.image_zoomable_dialog) | ||
|
|
||
| photoView = findViewById(R.id.photo_view) | ||
| photoView.apply { | ||
| setOnTouchListener { v, event -> | ||
| attacher.onTouch(v, event) | ||
| if (event?.action == ACTION_POINTER_DOWN || event?.action == MotionEvent.ACTION_UP) | ||
| false | ||
| else true | ||
| } | ||
| minimumScale = initialScale | ||
| } | ||
| } | ||
|
|
||
| override fun onTouchEvent(event: MotionEvent): Boolean { | ||
| if(event.action == ACTION_POINTER_DOWN) | ||
| isUserImageInteraction = true | ||
|
|
||
| // 이미지 영역 밖 터치 시 dismiss | ||
| if(event.action == MotionEvent.ACTION_UP) { | ||
| if (!isUserImageInteraction) { | ||
| val rect = Rect() | ||
| window!!.decorView.getWindowVisibleDisplayFrame(rect) | ||
| val statusBarHeight = rect.top | ||
|
|
||
| if(photoView.displayRect != null) | ||
| if (!photoView.displayRect.contains(event.rawX, event.rawY - statusBarHeight)) { | ||
| dismiss() | ||
| } | ||
| } | ||
| isUserImageInteraction = false | ||
| } | ||
| return super.onTouchEvent(event) | ||
| } | ||
|
|
||
| override fun show() { | ||
| super.show() | ||
| Glide.with(context) | ||
| .load(image) | ||
| .listener(object : RequestListener<Drawable> { | ||
| override fun onLoadFailed( | ||
| e: GlideException?, | ||
| model: Any?, | ||
| target: Target<Drawable>?, | ||
| isFirstResource: Boolean | ||
| ): Boolean = false | ||
|
|
||
| override fun onResourceReady( | ||
| resource: Drawable?, | ||
| model: Any?, | ||
| target: Target<Drawable>?, | ||
| dataSource: DataSource?, | ||
| isFirstResource: Boolean | ||
| ): Boolean { | ||
| photoView.post { | ||
| photoView.scale = initialScale | ||
|
|
||
| val closeButton = findViewById<ImageView>(R.id.dialog_close_button) | ||
| val lp = closeButton.layoutParams as FrameLayout.LayoutParams | ||
| val rectF = photoView.displayRect | ||
| lp.setMargins(0, rectF.top.toInt() - closeButton.height - 8, rectF.left.toInt(), 0) | ||
| closeButton.layoutParams = lp | ||
| closeButton.visibility = View.VISIBLE | ||
| } | ||
| return false | ||
| } | ||
| }) | ||
| .into(photoView) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val ACTION_POINTER_DOWN = 261 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> | ||
|
|
||
| <path android:fillColor="@android:color/white" android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/> | ||
|
|
||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.