mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
* feat: start new app theming feature * feat: add some theming colours * refactor: start refactoring themes and colours to use dynamic attributes * feat: adding more colours and switching over default colours to be theme based instead of hard-coded or day/night specific * refactor: take a look at ocean light and logo colour * feat: global search colours for light and dark ocean * feat: more styling * feat: adding themes to conversation activity and refactoring the base theme to apply over the top of the activity's theme so it retains noActionBar etc * feat: add dynamic accent color * docs: add todo for changing how accent colour is applied * feat: update new theming to use override primary style so that the regular colorAccent attribute can be used in existing layouts * feat: coordinating styles across layouts, fixing up pinned icons and naming for conversation list items * refactor: re-styling layouts to match new themes and attributes. Need to figure out action mode close button * refactor: remove @color/text and replace with ?android:textColorPrimary to override in themes * refactor: add context theme wrapper to bottom sheet dialog that references accent color * fix: input bar bug fix and preference activity themes * refactor: new settings menu options * fix: crash for PNModeActivity.kt refactor: move ordering in seed dialog to match designs, copy changes to match new settings menu * feat: add new appearance settings activity * refactor: title and VM changes * fix: correct override * feat: add theme appearance screen UI features and start VM implementation. re-add legacy theme utils to get default for migration * fix: compile errors and missing themes from emoji features * refactor: remove background shape alteration and old bottom sheet styles, re-add the theme mode attr * feat: appearance screen wired up, just need to refresh theme * feat: add theme state recreation and fix match system settings option * refactor: add bottom margin * feat: explore custom preference category * feat: add the customized session theme for CorrectedPreferenceFragment * feat: replace AppProtectionPreferenceFragment to extend ListSummaryPreferenceFragment * refactor: change drawable style and remove explicit dividers * refactor: remove divider in CorrectedPreferenceFragment * feat: add theme state check on resume, might be jarring currently * feat: add preference divider elements for settings menu * refactor: settings menu redesigns * refactor: change led preference to integer and refactor TextSecurePreferences.kt * feat: add scroll parcel to save/restore hierarchy on restart with appearance changes * feat: add the conversations blocked contacts and refactor preference order and copy * feat: add blocked contacts activity, basic layout and vm * feat: add unblock DB functions and storage protocol, start working on the DB query state flow, might have to just implement recipient on modified listener * feat: add blocked contacts and notif recipient listeners * feat: add recipient db reader * feat: add blocked contact interactions and fix a theming crash for notifications * feat: introduce better equals and hashcode implementations to recipient, replace home diff util content check with hashcode-based comparison * feat: add settings menu vectors * fix: preview compile error * refactor: migrating settings menu to new designs * feat: help menu * refactor: simplify link opening * refactor: remove space * feat: refactor preferences and start theming for light mode options * refactor: fixing dark and light modes with dialogs * refactor: popup dialogs use proper themes now * refactor: alert dialogs and media edit fragments use attribute references * refactor: use input bar button attribute instead color control normal in vector tint * refactor: transparency, dialog fixes, notification fix * refactor: attrs and styles for buttons * fix: use prominent button color on the outline button's border * fix: fix the trash * refactor: remove the appearance * refactor: avatar placeholder generation, chips and element border styles * refactor: use colors instead of style references * refactor: theming changes to match designs and feedback * refactor: the titles are bold and the categories are tertiary coloured now * fix: appearance settings match preferences, search bottom bar uses themed attributes * refactor: increase setting button height * Update clear all data dialog * Update seed dialog * refactor: more qa feedback changes * feat: add new TLs and fa-rIR TLs * Update notification content dialog * Fix message requests clear all button text color * feat: re-add screenshot observer * refactor: make send tint accent color * feat: add unread background differences * fix: change unread count indicator * build: upgrade build numbers * Fix message requests popupmenu background color * fix: crash from attr reference in color attribute * build: upgrade build number * fix: message bubbles, thumbnail backgrounds, search bar visibility with input bar, attachment buttons * fix: tertiary text for keyboard page search view * fix: emoji overflow colour differences * fix: reaction pill dialog background is now correct colour * Add style to reactions tab layout * fix: appearance activity reverting primary color at correct time * fix: show call privacy warning every time instead of just once * fix: gradient background(?) and audio autoplay disable * fix: crash in all media containing documents * fix: reaction dialog heading fixes * Add style to reactions tab layout * fix: remove gradient backgrounds * fix: adding new reaction normal text attribute to try correct the tab layout * fix: ocean dark unread/read colours * build; update build number * build: update build number Co-authored-by: charles <charles@oxen.io>
195 lines
6 KiB
Kotlin
195 lines
6 KiB
Kotlin
package org.thoughtcrime.securesms.keyboard.emoji
|
|
|
|
import android.animation.Animator
|
|
import android.content.Context
|
|
import android.content.res.ColorStateList
|
|
import android.graphics.drawable.ColorDrawable
|
|
import android.util.AttributeSet
|
|
import android.view.View
|
|
import android.widget.EditText
|
|
import androidx.appcompat.widget.AppCompatImageView
|
|
import androidx.constraintlayout.widget.ConstraintLayout
|
|
import androidx.core.content.ContextCompat
|
|
import androidx.core.content.res.use
|
|
import androidx.core.view.ViewCompat
|
|
import androidx.core.view.isVisible
|
|
import androidx.core.widget.ImageViewCompat
|
|
import androidx.core.widget.doAfterTextChanged
|
|
import network.loki.messenger.R
|
|
import org.thoughtcrime.securesms.animation.AnimationCompleteListener
|
|
import org.thoughtcrime.securesms.animation.ResizeAnimation
|
|
import org.thoughtcrime.securesms.conversation.v2.ViewUtil
|
|
|
|
private const val REVEAL_DURATION = 250L
|
|
|
|
/**
|
|
* Search bar to be used in the various keyboard views (emoji, sticker, gif)
|
|
*/
|
|
class KeyboardPageSearchView @JvmOverloads constructor(
|
|
context: Context,
|
|
attrs: AttributeSet? = null,
|
|
defStyleAttr: Int = 0
|
|
) : ConstraintLayout(context, attrs, defStyleAttr) {
|
|
|
|
var callbacks: Callbacks? = null
|
|
|
|
private var state: State = State.HIDE_REQUESTED
|
|
private var targetInputWidth: Int = -1
|
|
|
|
private val navButton: AppCompatImageView
|
|
private val clearButton: AppCompatImageView
|
|
private val input: EditText
|
|
|
|
init {
|
|
inflate(context, R.layout.keyboard_pager_search_bar, this)
|
|
|
|
navButton = findViewById(R.id.emoji_search_nav_icon)
|
|
clearButton = findViewById(R.id.emoji_search_clear_icon)
|
|
input = findViewById(R.id.emoji_search_entry)
|
|
|
|
input.doAfterTextChanged {
|
|
if (it.isNullOrEmpty()) {
|
|
clearButton.setImageDrawable(null)
|
|
clearButton.isClickable = false
|
|
} else {
|
|
clearButton.setImageResource(R.drawable.ic_x)
|
|
clearButton.isClickable = true
|
|
}
|
|
|
|
if (it.isNullOrEmpty()) {
|
|
callbacks?.onQueryChanged("")
|
|
} else {
|
|
callbacks?.onQueryChanged(it.toString())
|
|
}
|
|
}
|
|
|
|
input.setOnFocusChangeListener { _, hasFocus ->
|
|
if (hasFocus) {
|
|
callbacks?.onFocusGained()
|
|
} else {
|
|
callbacks?.onFocusLost()
|
|
}
|
|
}
|
|
|
|
clearButton.setOnClickListener { clearQuery() }
|
|
|
|
context.obtainStyledAttributes(attrs, R.styleable.KeyboardPageSearchView, 0, 0).use { typedArray ->
|
|
val showAlways: Boolean = typedArray.getBoolean(R.styleable.KeyboardPageSearchView_show_always, false)
|
|
if (showAlways) {
|
|
alpha = 1f
|
|
state = State.SHOW_REQUESTED
|
|
} else {
|
|
alpha = 0f
|
|
input.layoutParams = input.layoutParams.apply { width = 1 }
|
|
state = State.HIDE_REQUESTED
|
|
}
|
|
|
|
input.hint = typedArray.getString(R.styleable.KeyboardPageSearchView_search_hint) ?: ""
|
|
|
|
val backgroundTint = typedArray.getColor(R.styleable.KeyboardPageSearchView_search_bar_tint, ContextCompat.getColor(context, R.color.signal_background_primary))
|
|
val backgroundTintList = ColorStateList.valueOf(backgroundTint)
|
|
input.background = ColorDrawable(backgroundTint)
|
|
ViewCompat.setBackgroundTintList(findViewById(R.id.emoji_search_nav), backgroundTintList)
|
|
ViewCompat.setBackgroundTintList(findViewById(R.id.emoji_search_clear), backgroundTintList)
|
|
|
|
val iconTint = typedArray.getColorStateList(R.styleable.KeyboardPageSearchView_search_icon_tint) ?: ContextCompat.getColorStateList(context, R.color.signal_icon_tint_tab_selected)
|
|
ImageViewCompat.setImageTintList(navButton, iconTint)
|
|
ImageViewCompat.setImageTintList(clearButton, iconTint)
|
|
|
|
val clickOnly: Boolean = typedArray.getBoolean(R.styleable.KeyboardPageSearchView_click_only, false)
|
|
if (clickOnly) {
|
|
val clickIntercept: View = findViewById(R.id.keyboard_search_click_only)
|
|
clickIntercept.isVisible = true
|
|
clickIntercept.setOnClickListener { callbacks?.onClicked() }
|
|
}
|
|
}
|
|
}
|
|
|
|
fun showRequested(): Boolean = state == State.SHOW_REQUESTED
|
|
|
|
fun enableBackNavigation(enable: Boolean = true) {
|
|
navButton.setImageResource(if (enable) R.drawable.ic_arrow_left_24 else R.drawable.ic_search_24)
|
|
if (enable) {
|
|
navButton.setImageResource(R.drawable.ic_arrow_left_24)
|
|
navButton.setOnClickListener { callbacks?.onNavigationClicked() }
|
|
} else {
|
|
navButton.setImageResource(R.drawable.ic_search_24)
|
|
navButton.setOnClickListener(null)
|
|
}
|
|
}
|
|
|
|
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
|
|
targetInputWidth = w - ViewUtil.dpToPx(32) - ViewUtil.dpToPx(90)
|
|
}
|
|
|
|
fun show() {
|
|
if (state == State.SHOW_REQUESTED) {
|
|
return
|
|
}
|
|
|
|
visibility = VISIBLE
|
|
state = State.SHOW_REQUESTED
|
|
|
|
post {
|
|
animate()
|
|
.setDuration(REVEAL_DURATION)
|
|
.alpha(1f)
|
|
.setListener(null)
|
|
|
|
val resizeAnimation = ResizeAnimation(input, targetInputWidth, input.measuredHeight)
|
|
resizeAnimation.duration = REVEAL_DURATION
|
|
input.startAnimation(resizeAnimation)
|
|
}
|
|
}
|
|
|
|
fun hide() {
|
|
if (state == State.HIDE_REQUESTED) {
|
|
return
|
|
}
|
|
|
|
state = State.HIDE_REQUESTED
|
|
|
|
post {
|
|
animate()
|
|
.setDuration(REVEAL_DURATION)
|
|
.alpha(0f)
|
|
.setListener(object : AnimationCompleteListener() {
|
|
override fun onAnimationEnd(animation: Animator?) {
|
|
visibility = INVISIBLE
|
|
}
|
|
})
|
|
|
|
val resizeAnimation = ResizeAnimation(input, 1, input.measuredHeight)
|
|
resizeAnimation.duration = REVEAL_DURATION
|
|
input.startAnimation(resizeAnimation)
|
|
}
|
|
}
|
|
|
|
fun presentForEmojiSearch() {
|
|
ViewUtil.focusAndShowKeyboard(input)
|
|
enableBackNavigation()
|
|
}
|
|
|
|
override fun clearFocus() {
|
|
super.clearFocus()
|
|
clearChildFocus(input)
|
|
}
|
|
|
|
fun clearQuery() {
|
|
input.text.clear()
|
|
}
|
|
|
|
interface Callbacks {
|
|
fun onFocusLost() = Unit
|
|
fun onFocusGained() = Unit
|
|
fun onNavigationClicked() = Unit
|
|
fun onQueryChanged(query: String) = Unit
|
|
fun onClicked() = Unit
|
|
}
|
|
|
|
enum class State {
|
|
SHOW_REQUESTED,
|
|
HIDE_REQUESTED
|
|
}
|
|
}
|