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>
151 lines
6.9 KiB
Kotlin
151 lines
6.9 KiB
Kotlin
package org.thoughtcrime.securesms.home
|
|
|
|
import android.annotation.SuppressLint
|
|
import android.content.ClipData
|
|
import android.content.ClipboardManager
|
|
import android.content.Context
|
|
import android.content.Intent
|
|
import android.os.Bundle
|
|
import android.view.ContextThemeWrapper
|
|
import android.view.LayoutInflater
|
|
import android.view.View
|
|
import android.view.ViewGroup
|
|
import android.view.inputmethod.EditorInfo
|
|
import android.view.inputmethod.InputMethodManager
|
|
import android.widget.Toast
|
|
import androidx.core.view.isVisible
|
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
|
import dagger.hilt.android.AndroidEntryPoint
|
|
import network.loki.messenger.R
|
|
import network.loki.messenger.databinding.FragmentUserDetailsBottomSheetBinding
|
|
import org.session.libsession.messaging.MessagingModuleConfiguration
|
|
import org.session.libsession.messaging.contacts.Contact
|
|
import org.session.libsession.utilities.Address
|
|
import org.session.libsession.utilities.recipients.Recipient
|
|
import org.session.libsignal.utilities.IdPrefix
|
|
import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
|
|
import org.thoughtcrime.securesms.database.ThreadDatabase
|
|
import org.thoughtcrime.securesms.dependencies.DatabaseComponent
|
|
import org.thoughtcrime.securesms.mms.GlideApp
|
|
import org.thoughtcrime.securesms.util.UiModeUtilities
|
|
import javax.inject.Inject
|
|
|
|
@AndroidEntryPoint
|
|
class UserDetailsBottomSheet: BottomSheetDialogFragment() {
|
|
|
|
@Inject lateinit var threadDb: ThreadDatabase
|
|
|
|
private lateinit var binding: FragmentUserDetailsBottomSheetBinding
|
|
companion object {
|
|
const val ARGUMENT_PUBLIC_KEY = "publicKey"
|
|
const val ARGUMENT_THREAD_ID = "threadId"
|
|
}
|
|
|
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
|
|
val wrappedContext = ContextThemeWrapper(requireActivity(), requireActivity().theme)
|
|
val themedInflater = inflater.cloneInContext(wrappedContext)
|
|
binding = FragmentUserDetailsBottomSheetBinding.inflate(themedInflater, container, false)
|
|
return binding.root
|
|
}
|
|
|
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
super.onViewCreated(view, savedInstanceState)
|
|
val publicKey = arguments?.getString(ARGUMENT_PUBLIC_KEY) ?: return dismiss()
|
|
val threadID = arguments?.getLong(ARGUMENT_THREAD_ID) ?: return dismiss()
|
|
val recipient = Recipient.from(requireContext(), Address.fromSerialized(publicKey), false)
|
|
val threadRecipient = threadDb.getRecipientForThreadId(threadID) ?: return dismiss()
|
|
with(binding) {
|
|
profilePictureView.root.publicKey = publicKey
|
|
profilePictureView.root.glide = GlideApp.with(this@UserDetailsBottomSheet)
|
|
profilePictureView.root.isLarge = true
|
|
profilePictureView.root.update(recipient)
|
|
nameTextViewContainer.visibility = View.VISIBLE
|
|
nameTextViewContainer.setOnClickListener {
|
|
nameTextViewContainer.visibility = View.INVISIBLE
|
|
nameEditTextContainer.visibility = View.VISIBLE
|
|
nicknameEditText.text = null
|
|
nicknameEditText.requestFocus()
|
|
showSoftKeyboard()
|
|
}
|
|
cancelNicknameEditingButton.setOnClickListener {
|
|
nicknameEditText.clearFocus()
|
|
hideSoftKeyboard()
|
|
nameTextViewContainer.visibility = View.VISIBLE
|
|
nameEditTextContainer.visibility = View.INVISIBLE
|
|
}
|
|
saveNicknameButton.setOnClickListener {
|
|
saveNickName(recipient)
|
|
}
|
|
nicknameEditText.setOnEditorActionListener { _, actionId, _ ->
|
|
when (actionId) {
|
|
EditorInfo.IME_ACTION_DONE -> {
|
|
saveNickName(recipient)
|
|
return@setOnEditorActionListener true
|
|
}
|
|
else -> return@setOnEditorActionListener false
|
|
}
|
|
}
|
|
nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
|
|
|
|
publicKeyTextView.isVisible = !threadRecipient.isOpenGroupRecipient && !threadRecipient.isOpenGroupInboxRecipient
|
|
messageButton.isVisible = !threadRecipient.isOpenGroupRecipient || IdPrefix.fromValue(publicKey) == IdPrefix.BLINDED
|
|
publicKeyTextView.text = publicKey
|
|
publicKeyTextView.setOnLongClickListener {
|
|
val clipboard =
|
|
requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
|
val clip = ClipData.newPlainText("Session ID", publicKey)
|
|
clipboard.setPrimaryClip(clip)
|
|
Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT)
|
|
.show()
|
|
true
|
|
}
|
|
messageButton.setOnClickListener {
|
|
val threadId = MessagingModuleConfiguration.shared.storage.getThreadId(recipient)
|
|
val intent = Intent(
|
|
context,
|
|
ConversationActivityV2::class.java
|
|
)
|
|
intent.putExtra(ConversationActivityV2.ADDRESS, recipient.address)
|
|
intent.putExtra(ConversationActivityV2.THREAD_ID, threadId ?: -1)
|
|
intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID)
|
|
startActivity(intent)
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
|
|
override fun onStart() {
|
|
super.onStart()
|
|
val window = dialog?.window ?: return
|
|
val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
|
|
window.setDimAmount(if (isLightMode) 0.1f else 0.75f)
|
|
}
|
|
|
|
fun saveNickName(recipient: Recipient) = with(binding) {
|
|
nicknameEditText.clearFocus()
|
|
hideSoftKeyboard()
|
|
nameTextViewContainer.visibility = View.VISIBLE
|
|
nameEditTextContainer.visibility = View.INVISIBLE
|
|
var newNickName: String? = null
|
|
if (nicknameEditText.text.isNotEmpty()) {
|
|
newNickName = nicknameEditText.text.toString()
|
|
}
|
|
val publicKey = recipient.address.serialize()
|
|
val contactDB = DatabaseComponent.get(requireContext()).sessionContactDatabase()
|
|
val contact = contactDB.getContactWithSessionID(publicKey) ?: Contact(publicKey)
|
|
contact.nickname = newNickName
|
|
contactDB.setContact(contact)
|
|
nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
|
|
}
|
|
|
|
@SuppressLint("ServiceCast")
|
|
fun showSoftKeyboard() {
|
|
val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
|
|
imm?.showSoftInput(binding.nicknameEditText, 0)
|
|
}
|
|
|
|
fun hideSoftKeyboard() {
|
|
val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
|
|
imm?.hideSoftInputFromWindow(binding.nicknameEditText.windowToken, 0)
|
|
}
|
|
} |