mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
7a773016da
* 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>
274 lines
13 KiB
Kotlin
274 lines
13 KiB
Kotlin
package org.thoughtcrime.securesms.home
|
|
|
|
import android.content.BroadcastReceiver
|
|
import android.content.Context
|
|
import android.content.Intent
|
|
import android.content.IntentFilter
|
|
import android.net.Uri
|
|
import android.os.Bundle
|
|
import android.os.Handler
|
|
import android.util.AttributeSet
|
|
import android.util.TypedValue
|
|
import android.view.Gravity
|
|
import android.view.View
|
|
import android.widget.LinearLayout
|
|
import android.widget.RelativeLayout
|
|
import android.widget.TextView
|
|
import android.widget.Toast
|
|
import androidx.annotation.ColorRes
|
|
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
|
import network.loki.messenger.R
|
|
import network.loki.messenger.databinding.ActivityPathBinding
|
|
import org.session.libsession.snode.OnionRequestAPI
|
|
import org.session.libsession.utilities.getColorFromAttr
|
|
import org.session.libsignal.utilities.Snode
|
|
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
|
|
import org.thoughtcrime.securesms.util.GlowViewUtilities
|
|
import org.thoughtcrime.securesms.util.IP2Country
|
|
import org.thoughtcrime.securesms.util.PathDotView
|
|
import org.thoughtcrime.securesms.util.UiModeUtilities
|
|
import org.thoughtcrime.securesms.util.animateSizeChange
|
|
import org.thoughtcrime.securesms.util.disableClipping
|
|
import org.thoughtcrime.securesms.util.fadeIn
|
|
import org.thoughtcrime.securesms.util.fadeOut
|
|
import org.thoughtcrime.securesms.util.getAccentColor
|
|
import org.thoughtcrime.securesms.util.getColorWithID
|
|
|
|
class PathActivity : PassphraseRequiredActionBarActivity() {
|
|
private lateinit var binding: ActivityPathBinding
|
|
private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
|
|
|
|
// region Lifecycle
|
|
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
|
super.onCreate(savedInstanceState, isReady)
|
|
binding = ActivityPathBinding.inflate(layoutInflater)
|
|
setContentView(binding.root)
|
|
supportActionBar!!.title = resources.getString(R.string.activity_path_title)
|
|
binding.pathRowsContainer.disableClipping()
|
|
binding.learnMoreButton.setOnClickListener { learnMore() }
|
|
update(false)
|
|
registerObservers()
|
|
}
|
|
|
|
private fun registerObservers() {
|
|
val buildingPathsReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
|
|
|
override fun onReceive(context: Context, intent: Intent) {
|
|
handleBuildingPathsEvent()
|
|
}
|
|
}
|
|
broadcastReceivers.add(buildingPathsReceiver)
|
|
LocalBroadcastManager.getInstance(this).registerReceiver(buildingPathsReceiver, IntentFilter("buildingPaths"))
|
|
val pathsBuiltReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
|
|
|
override fun onReceive(context: Context, intent: Intent) {
|
|
handlePathsBuiltEvent()
|
|
}
|
|
}
|
|
broadcastReceivers.add(pathsBuiltReceiver)
|
|
LocalBroadcastManager.getInstance(this).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt"))
|
|
val onionRequestPathCountriesLoadedReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
|
|
|
override fun onReceive(context: Context, intent: Intent) {
|
|
handleOnionRequestPathCountriesLoaded()
|
|
}
|
|
}
|
|
broadcastReceivers.add(onionRequestPathCountriesLoadedReceiver)
|
|
LocalBroadcastManager.getInstance(this).registerReceiver(onionRequestPathCountriesLoadedReceiver, IntentFilter("onionRequestPathCountriesLoaded"))
|
|
}
|
|
|
|
override fun onDestroy() {
|
|
for (receiver in broadcastReceivers) {
|
|
LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver)
|
|
}
|
|
super.onDestroy()
|
|
}
|
|
// endregion
|
|
|
|
// region Updating
|
|
private fun handleBuildingPathsEvent() { update(false) }
|
|
private fun handlePathsBuiltEvent() { update(false) }
|
|
private fun handleOnionRequestPathCountriesLoaded() { update(false) }
|
|
|
|
private fun update(isAnimated: Boolean) {
|
|
binding.pathRowsContainer.removeAllViews()
|
|
if (OnionRequestAPI.paths.isNotEmpty()) {
|
|
val path = OnionRequestAPI.paths.firstOrNull() ?: return finish()
|
|
val dotAnimationRepeatInterval = path.count().toLong() * 1000 + 1000
|
|
val pathRows = path.mapIndexed { index, snode ->
|
|
val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
|
|
getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode)
|
|
}
|
|
val youRow = getPathRow(resources.getString(R.string.activity_path_device_row_title), null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
|
|
val destinationRow = getPathRow(resources.getString(R.string.activity_path_destination_row_title), null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval)
|
|
val rows = listOf( youRow ) + pathRows + listOf( destinationRow )
|
|
for (row in rows) {
|
|
binding.pathRowsContainer.addView(row)
|
|
}
|
|
if (isAnimated) {
|
|
binding.spinner.fadeOut()
|
|
} else {
|
|
binding.spinner.alpha = 0.0f
|
|
}
|
|
} else {
|
|
if (isAnimated) {
|
|
binding.spinner.fadeIn()
|
|
} else {
|
|
binding.spinner.alpha = 1.0f
|
|
}
|
|
}
|
|
}
|
|
// endregion
|
|
|
|
// region General
|
|
private fun getPathRow(title: String, subtitle: String?, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long): LinearLayout {
|
|
val mainContainer = LinearLayout(this)
|
|
mainContainer.orientation = LinearLayout.HORIZONTAL
|
|
mainContainer.gravity = Gravity.CENTER_VERTICAL
|
|
mainContainer.disableClipping()
|
|
val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
|
|
mainContainer.layoutParams = mainContainerLayoutParams
|
|
val lineView = LineView(this, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
|
|
val lineViewLayoutParams = LinearLayout.LayoutParams(resources.getDimensionPixelSize(R.dimen.path_row_expanded_dot_size), resources.getDimensionPixelSize(R.dimen.path_row_height))
|
|
lineView.layoutParams = lineViewLayoutParams
|
|
mainContainer.addView(lineView)
|
|
val titleTextView = TextView(this)
|
|
titleTextView.setTextColor(getColorFromAttr(android.R.attr.textColorPrimary))
|
|
titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.medium_font_size))
|
|
titleTextView.text = title
|
|
titleTextView.textAlignment = TextView.TEXT_ALIGNMENT_VIEW_START
|
|
val titleContainer = LinearLayout(this)
|
|
titleContainer.orientation = LinearLayout.VERTICAL
|
|
titleContainer.addView(titleTextView)
|
|
val titleContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
|
|
titleContainerLayoutParams.marginStart = resources.getDimensionPixelSize(R.dimen.large_spacing)
|
|
titleContainer.layoutParams = titleContainerLayoutParams
|
|
mainContainer.addView(titleContainer)
|
|
if (subtitle != null) {
|
|
val subtitleTextView = TextView(this)
|
|
subtitleTextView.setTextColor(getColorFromAttr(android.R.attr.textColorPrimary))
|
|
subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.small_font_size))
|
|
subtitleTextView.text = subtitle
|
|
subtitleTextView.textAlignment = TextView.TEXT_ALIGNMENT_VIEW_START
|
|
titleContainer.addView(subtitleTextView)
|
|
}
|
|
return mainContainer
|
|
}
|
|
|
|
private fun getPathRow(snode: Snode, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long, isGuardSnode: Boolean): LinearLayout {
|
|
val title = if (isGuardSnode) resources.getString(R.string.activity_path_guard_node_row_title) else resources.getString(R.string.activity_path_service_node_row_title)
|
|
val subtitle = if (IP2Country.isInitialized) {
|
|
IP2Country.shared.countryNamesCache[snode.ip] ?: resources.getString(R.string.activity_path_resolving_progress)
|
|
} else {
|
|
resources.getString(R.string.activity_path_resolving_progress)
|
|
}
|
|
return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
|
|
}
|
|
// endregion
|
|
|
|
// region Interaction
|
|
private fun learnMore() {
|
|
try {
|
|
val url = "https://getsession.org/faq/#onion-routing"
|
|
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
|
|
startActivity(intent)
|
|
} catch (e: Exception) {
|
|
Toast.makeText(this, R.string.invalid_url, Toast.LENGTH_SHORT).show()
|
|
}
|
|
}
|
|
// endregion
|
|
|
|
// region Line View
|
|
private class LineView : RelativeLayout {
|
|
private lateinit var location: Location
|
|
private var dotAnimationStartDelay: Long = 0
|
|
private var dotAnimationRepeatInterval: Long = 0
|
|
|
|
private val dotView by lazy {
|
|
val result = PathDotView(context)
|
|
result.setBackgroundResource(R.drawable.accent_dot)
|
|
result.mainColor = context.getAccentColor()
|
|
result
|
|
}
|
|
|
|
enum class Location {
|
|
Top, Middle, Bottom
|
|
}
|
|
|
|
constructor(context: Context, location: Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long) : super(context) {
|
|
this.location = location
|
|
this.dotAnimationStartDelay = dotAnimationStartDelay
|
|
this.dotAnimationRepeatInterval = dotAnimationRepeatInterval
|
|
setUpViewHierarchy()
|
|
}
|
|
|
|
constructor(context: Context) : super(context) {
|
|
throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
|
|
}
|
|
|
|
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
|
|
throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
|
|
}
|
|
|
|
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
|
|
throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
|
|
}
|
|
|
|
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
|
|
throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
|
|
}
|
|
|
|
private fun setUpViewHierarchy() {
|
|
disableClipping()
|
|
val lineView = View(context)
|
|
lineView.setBackgroundColor(context.getColorFromAttr(android.R.attr.textColorPrimary))
|
|
val lineViewHeight = when (location) {
|
|
Location.Top, Location.Bottom -> resources.getDimensionPixelSize(R.dimen.path_row_height) / 2
|
|
Location.Middle -> resources.getDimensionPixelSize(R.dimen.path_row_height)
|
|
}
|
|
val lineViewLayoutParams = LayoutParams(1, lineViewHeight)
|
|
when (location) {
|
|
Location.Top -> lineViewLayoutParams.addRule(ALIGN_PARENT_BOTTOM)
|
|
Location.Middle, Location.Bottom -> lineViewLayoutParams.addRule(ALIGN_PARENT_TOP)
|
|
}
|
|
lineViewLayoutParams.addRule(CENTER_HORIZONTAL)
|
|
lineView.layoutParams = lineViewLayoutParams
|
|
addView(lineView)
|
|
val dotViewSize = resources.getDimensionPixelSize(R.dimen.path_row_dot_size)
|
|
val dotViewLayoutParams = LayoutParams(dotViewSize, dotViewSize)
|
|
dotViewLayoutParams.addRule(CENTER_IN_PARENT)
|
|
dotView.layoutParams = dotViewLayoutParams
|
|
addView(dotView)
|
|
Handler().postDelayed({
|
|
performAnimation()
|
|
}, dotAnimationStartDelay)
|
|
}
|
|
|
|
private fun performAnimation() {
|
|
expand()
|
|
Handler().postDelayed({
|
|
collapse()
|
|
Handler().postDelayed({
|
|
performAnimation()
|
|
}, dotAnimationRepeatInterval)
|
|
}, 1000)
|
|
}
|
|
|
|
private fun expand() {
|
|
dotView.animateSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
|
|
@ColorRes val startColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
|
|
val startColor = context.resources.getColorWithID(startColorID, context.theme)
|
|
val endColor = context.getAccentColor()
|
|
GlowViewUtilities.animateShadowColorChange(dotView, startColor, endColor)
|
|
}
|
|
|
|
private fun collapse() {
|
|
dotView.animateSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
|
|
@ColorRes val endColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
|
|
val startColor = context.getAccentColor()
|
|
val endColor = context.resources.getColorWithID(endColorID, context.theme)
|
|
GlowViewUtilities.animateShadowColorChange(dotView, startColor, endColor)
|
|
}
|
|
}
|
|
// endregion
|
|
} |