From 643c63c629de9a6426ed620a16ba812ebcfb3557 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 16 Jan 2025 17:47:51 +0100 Subject: [PATCH] feat: show toast message after version text copied --- .../com/github/libretube/helpers/ClipboardHelper.kt | 13 ++++++++++++- .../github/libretube/ui/activities/AboutActivity.kt | 2 +- .../libretube/ui/adapters/CommentPagingAdapter.kt | 5 ++--- .../com/github/libretube/ui/dialogs/ErrorDialog.kt | 4 +--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt b/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt index 3a9ce13395..77a25c80b4 100644 --- a/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt +++ b/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt @@ -3,12 +3,23 @@ package com.github.libretube.helpers import android.content.ClipData import android.content.ClipboardManager import android.content.Context +import android.os.Build +import android.widget.Toast import androidx.core.content.getSystemService import com.github.libretube.R object ClipboardHelper { - fun save(context: Context, label: String = context.getString(R.string.copied), text: String) { + fun save( + context: Context, + label: String = context.getString(R.string.copied), + text: String, + notify: Boolean = false + ) { val clip = ClipData.newPlainText(label, text) context.getSystemService()!!.setPrimaryClip(clip) + + if (notify && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + Toast.makeText(context, context.getString(R.string.copied), Toast.LENGTH_SHORT).show() + } } } diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt index 80c2978013..ef63febe3a 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt @@ -41,7 +41,7 @@ class AboutActivity : BaseActivity() { val versionText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})" binding.versionTv.text = versionText binding.versionCard.setOnClickListener { - ClipboardHelper.save(this, text = versionText) + ClipboardHelper.save(this, text = versionText, notify = true) } setupCard(binding.donate, DONATE_URL) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt index 82e99d13a8..e74f344b1c 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt @@ -3,7 +3,6 @@ package com.github.libretube.ui.adapters import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.appcompat.content.res.AppCompatResources import androidx.core.os.bundleOf import androidx.core.text.method.LinkMovementMethodCompat @@ -127,9 +126,9 @@ class CommentPagingAdapter( root.setOnLongClickListener { ClipboardHelper.save( root.context, - text = comment.commentText.orEmpty().parseAsHtml().toString() + text = comment.commentText.orEmpty().parseAsHtml().toString(), + notify = true ) - Toast.makeText(root.context, R.string.copied, Toast.LENGTH_SHORT).show() true } } diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt index ad505335d9..fd68147394 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt @@ -3,7 +3,6 @@ package com.github.libretube.ui.dialogs import android.annotation.SuppressLint import android.app.Dialog import android.os.Bundle -import android.widget.Toast import androidx.fragment.app.DialogFragment import com.github.libretube.R import com.github.libretube.helpers.ClipboardHelper @@ -22,8 +21,7 @@ class ErrorDialog : DialogFragment() { .setMessage(errorLog) .setNegativeButton(R.string.okay, null) .setPositiveButton(androidx.preference.R.string.copy) { _, _ -> - ClipboardHelper.save(requireContext(), text = errorLog) - Toast.makeText(context, R.string.copied, Toast.LENGTH_SHORT).show() + ClipboardHelper.save(requireContext(), text = errorLog, notify = true) } .show() }