Add UI for image-attachment "focus" #2620
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* Copyright 2019 Tusky Contributors | ||
| * | ||
| * This file is a part of Tusky. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under the terms of the | ||
| * GNU General Public License as published by the Free Software Foundation; either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even | ||
| * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
| * Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with Tusky; if not, | ||
| * see <http://www.gnu.org/licenses>. */ | ||
|
|
||
| package com.keylesspalace.tusky.components.compose.dialog | ||
|
|
||
| import android.app.Activity | ||
| import android.content.DialogInterface | ||
| import android.graphics.drawable.Drawable | ||
| import android.net.Uri | ||
| import android.view.WindowManager | ||
| import android.widget.FrameLayout | ||
| import android.widget.Toast | ||
| import androidx.appcompat.app.AlertDialog | ||
| import androidx.lifecycle.LifecycleOwner | ||
| import androidx.lifecycle.lifecycleScope | ||
| import com.bumptech.glide.Glide | ||
| import com.bumptech.glide.load.DataSource | ||
| import com.bumptech.glide.load.engine.GlideException | ||
| import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy | ||
| import com.bumptech.glide.request.RequestListener | ||
| import com.bumptech.glide.request.target.Target | ||
| import com.keylesspalace.tusky.R | ||
| import com.keylesspalace.tusky.databinding.DialogFocusBinding | ||
| import com.keylesspalace.tusky.entity.Attachment.Focus | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| fun <T> T.makeFocusDialog( | ||
| existingFocus: Focus?, | ||
| previewUri: Uri, | ||
| onUpdateFocus: suspend (Focus) -> Boolean | ||
| ) where T : Activity, T : LifecycleOwner { | ||
| val focus = existingFocus ?: Focus(0.0f, 0.0f) // Default to center | ||
|
|
||
| val dialogBinding = DialogFocusBinding.inflate(layoutInflater) | ||
|
|
||
| dialogBinding.focusIndicator.setFocus(focus) | ||
|
|
||
| Glide.with(this) | ||
| .load(previewUri) | ||
| .downsample(DownsampleStrategy.CENTER_INSIDE) | ||
| .listener(object : RequestListener<Drawable> { | ||
| override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target<Drawable?>?, p3: Boolean): Boolean { | ||
| return false | ||
| } | ||
|
|
||
| override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable?>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { | ||
| val width = resource!!.getIntrinsicWidth() | ||
| val height = resource.getIntrinsicHeight() | ||
|
|
||
| dialogBinding.focusIndicator.setImageSize(width, height) | ||
|
|
||
| // We want the dialog to be a little taller than the image, so you can slide your thumb past the image border, | ||
| // but if it's *too* much taller that looks weird. See if a threshold has been crossed: | ||
| if (width > height) { | ||
| val maxHeight = dialogBinding.focusIndicator.maxAttractiveHeight() | ||
|
|
||
| if (dialogBinding.imageView.getHeight() > maxHeight) { | ||
| val verticalShrinkLayout = FrameLayout.LayoutParams(width, maxHeight) | ||
| dialogBinding.imageView.setLayoutParams(verticalShrinkLayout) | ||
| dialogBinding.focusIndicator.setLayoutParams(verticalShrinkLayout) | ||
| } | ||
| } | ||
| return false // Pass through | ||
| } | ||
| }) | ||
| .into(dialogBinding.imageView) | ||
|
|
||
| val okListener = { dialog: DialogInterface, _: Int -> | ||
| lifecycleScope.launch { | ||
| if (!onUpdateFocus(dialogBinding.focusIndicator.getFocus())) { | ||
| showFailedFocusMessage() | ||
| } | ||
| } | ||
| dialog.dismiss() | ||
| } | ||
|
|
||
| val dialog = AlertDialog.Builder(this) | ||
| .setView(dialogBinding.root) | ||
| .setPositiveButton(android.R.string.ok, okListener) | ||
| .setNegativeButton(android.R.string.cancel, null) | ||
| .create() | ||
|
|
||
| val window = dialog.window | ||
| window?.setSoftInputMode( | ||
| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | ||
| ) | ||
|
|
||
| dialog.show() | ||
| } | ||
|
|
||
| private fun Activity.showFailedFocusMessage() { | ||
| Toast.makeText(this, R.string.error_failed_set_focus, Toast.LENGTH_SHORT).show() | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this the best approach? We could do something weird where we try to calculate where/whether the focal point is within the cropped area, but this feels like second guessing the user so I just reset.