Skip to content

Tweaks to clipboard close button #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
urikdev merged 1 commit into from
Mar 17, 2026
Merged

Tweaks to clipboard close button #701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions app/src/main/java/com/urik/keyboard/ui/keyboard/components/ClipboardPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.urik.keyboard.ui.keyboard.components

import android.content.Context
import android.graphics.drawable.GradientDrawable
import android.util.TypedValue
import android.view.Gravity
import android.view.View
import android.widget.Button
Expand Down Expand Up @@ -174,12 +173,11 @@ class ClipboardPanel(context: Context, private val themeManager: ThemeManager) :
1f
)
}
val emojiTextSize = calculateResponsiveSuggestionTextSize()
val minTouchTarget = context.resources.getDimensionPixelSize(R.dimen.minimum_touch_target)
closeButton =
TextView(context).apply {
text = "✕"
setTextSize(TypedValue.COMPLEX_UNIT_SP, emojiTextSize)
textSize = 18f
gravity = Gravity.CENTER
contentDescription = context.getString(R.string.clipboard_panel_close)
setOnClickListener {
Expand Down Expand Up @@ -250,16 +248,6 @@ class ClipboardPanel(context: Context, private val themeManager: ThemeManager) :
}
}

// took from SwipeKeyboardView
private fun calculateResponsiveSuggestionTextSize(): Float {
val keyHeight = context.resources.getDimensionPixelSize(R.dimen.key_height)
val baseTextSize = keyHeight * 0.40f / context.resources.displayMetrics.density
val minSize = 15f
val maxSize = 19f

return baseTextSize.coerceIn(minSize, maxSize)
}

private fun createButtonBackground(): GradientDrawable {
val density = context.resources.displayMetrics.density
val cornerRadius = 8 * density
Expand Down Expand Up @@ -319,6 +307,8 @@ class ClipboardPanel(context: Context, private val themeManager: ThemeManager) :
this.onDeleteAllUnpinned = onDeleteAll
this.onClose = onClose

closeButton.setTextColor(themeManager.currentTheme.value.colors.keyTextAction)

consentScreen.isVisible = false
clipboardContentScreen.isVisible = true
visibility = VISIBLE
Expand All @@ -335,6 +325,7 @@ class ClipboardPanel(context: Context, private val themeManager: ThemeManager) :
onItemPinToggled = null
onItemDeleted = null
onDeleteAllUnpinned = null
onClose = null
}

fun refreshContent(pinnedItems: List<ClipboardItem>, recentItems: List<ClipboardItem>) {
Expand Down Expand Up @@ -544,14 +535,6 @@ class ClipboardPanel(context: Context, private val themeManager: ThemeManager) :
onItemDeleted?.invoke(item)
}
}

closeButton.apply {
setTextColor(themeManager.currentTheme.value.colors.keyTextAction)
contentDescription = context.getString(R.string.clipboard_panel_close)
setOnClickListener {
onClose?.invoke()
}
}
}

private fun showDeleteAllConfirmation() {
Expand Down