mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +01:00
Merge remote-tracking branch 'origin/master' into view-bindings-2
This commit is contained in:
@@ -140,6 +140,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
|
||||
override val clearCurrentMessageIntent: Subject<Boolean> = PublishSubject.create()
|
||||
override val messageLinkAskIntent: Subject<Uri> by lazy { messageAdapter.messageLinkClicks }
|
||||
override val reactionClickIntent: Subject<Long> by lazy { messageAdapter.reactionClicks }
|
||||
override val speechRecogniserIntent by lazy { binding.speechToTextIcon.clicks() }
|
||||
override val shadeIntent by lazy { binding.shadeBackground.clicks() }
|
||||
override val recordAudioStartStopRecording: Subject<Boolean> = PublishSubject.create()
|
||||
@@ -708,6 +709,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
.show()
|
||||
}
|
||||
|
||||
override fun showReactionsDialog(reactions: List<String>) {
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.compose_reactions_title)
|
||||
.setMessage(reactions.joinToString("\n"))
|
||||
.show()
|
||||
}
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||
menuInflater.inflate(R.menu.compose, menu)
|
||||
return super.onCreateOptionsMenu(menu)
|
||||
|
||||
@@ -77,6 +77,7 @@ interface ComposeView : QkView<ComposeState> {
|
||||
val confirmDeleteIntent: Observable<List<Long>>
|
||||
val clearCurrentMessageIntent: Subject<Boolean>
|
||||
val messageLinkAskIntent: Observable<Uri>
|
||||
val reactionClickIntent: Subject<Long>
|
||||
val speechRecogniserIntent: Observable<*>
|
||||
val shadeIntent: Observable<Unit>
|
||||
val recordAudioStartStopRecording: Subject<Boolean>
|
||||
@@ -111,6 +112,7 @@ interface ComposeView : QkView<ComposeState> {
|
||||
fun showQksmsPlusSnackbar(@StringRes message: Int)
|
||||
fun showDeleteDialog( messages: List<Long>)
|
||||
fun showClearCurrentMessageDialog()
|
||||
fun showReactionsDialog(reactions: List<String>)
|
||||
fun startSpeechRecognition()
|
||||
fun focusMessage()
|
||||
}
|
||||
@@ -759,6 +759,23 @@ class ComposeViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showMessageLinkAskDialog(it) }
|
||||
|
||||
// Show reaction details popup
|
||||
view.reactionClickIntent
|
||||
.mapNotNull { messageId -> messageRepo.getMessage(messageId) }
|
||||
.withLatestFrom(conversation) { message, conv ->
|
||||
message.emojiReactions.map { reaction ->
|
||||
val contactName = conv.recipients
|
||||
.firstOrNull { recipient ->
|
||||
phoneNumberUtils.compare(recipient.address, reaction.senderAddress)
|
||||
}
|
||||
?.getDisplayName()
|
||||
?: reaction.senderAddress
|
||||
"${reaction.emoji} $contactName"
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { reactions -> view.showReactionsDialog(reactions) }
|
||||
|
||||
// Set the current conversation
|
||||
Observables
|
||||
.combineLatest(
|
||||
|
||||
@@ -110,6 +110,7 @@ class MessagesAdapter @Inject constructor(
|
||||
val sendNowClicks: Subject<Long> = PublishSubject.create()
|
||||
val resendClicks: Subject<Long> = PublishSubject.create()
|
||||
val partContextMenuRegistrar: Subject<View> = PublishSubject.create()
|
||||
val reactionClicks: Subject<Long> = PublishSubject.create()
|
||||
|
||||
var data: Pair<Conversation, RealmResults<Message>>? = null
|
||||
set(value) {
|
||||
@@ -431,40 +432,25 @@ class MessagesAdapter @Inject constructor(
|
||||
val hasReactions = reactions.isNotEmpty()
|
||||
|
||||
if (hasReactions) {
|
||||
val reactionCounts = reactions.groupBy { it.emoji }
|
||||
.mapValues { it.value.size }
|
||||
.toList()
|
||||
.sortedByDescending { it.second } // Sort by count, most reactions first
|
||||
val uniqueEmojis = reactions.map { it.emoji }.distinct()
|
||||
val totalCount = reactions.size
|
||||
|
||||
// For now, show just the first (most popular) reaction
|
||||
val topReaction = reactionCounts.first()
|
||||
val reactionText = if (topReaction.second == 1) {
|
||||
topReaction.first
|
||||
// Show unique emojis followed by total count
|
||||
val reactionText = if (totalCount == 1) {
|
||||
uniqueEmojis.first()
|
||||
} else {
|
||||
// Use a non-breaking space to keep the emoji and count together
|
||||
"${topReaction.first}\u00A0${topReaction.second}"
|
||||
"${uniqueEmojis.joinToString("")}\u00A0$totalCount"
|
||||
}
|
||||
|
||||
reactionTextView.text = reactionText
|
||||
reactionTextView.setOnClickListener { reactionClicks.onNext(message.id) }
|
||||
reactionsContainer.setVisible(true)
|
||||
makeRoomForEmojis(reactionsContainer)
|
||||
} else {
|
||||
reactionsContainer.setVisible(false)
|
||||
reactionTextView.setOnClickListener(null)
|
||||
}
|
||||
}
|
||||
|
||||
private fun makeRoomForEmojis(reactionsContainer: View) {
|
||||
val paddingBottom = 25.dpToPx(context)
|
||||
|
||||
(reactionsContainer.parent?.parent as? ViewGroup)?.let { parent ->
|
||||
parent.setPadding(
|
||||
parent.paddingLeft,
|
||||
parent.paddingTop,
|
||||
parent.paddingRight,
|
||||
paddingBottom
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun bindStatus(
|
||||
statusView: TextView,
|
||||
|
||||
+1
-1
@@ -47,4 +47,4 @@ class MessageUtilsActivity : QkThemedActivity() {
|
||||
super.onBackPressed()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+38
-1
@@ -2,6 +2,7 @@ package dev.octoshrimpy.quik.feature.messageutils
|
||||
|
||||
import android.animation.ObjectAnimator
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
@@ -11,19 +12,33 @@ import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkController
|
||||
import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
|
||||
import dev.octoshrimpy.quik.databinding.MessageUtilsControllerBinding
|
||||
import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.Single
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||
import kotlinx.coroutines.withContext
|
||||
import javax.inject.Inject
|
||||
import kotlin.coroutines.resume
|
||||
|
||||
class MessageUtilsController : QkController<MessageUtilsControllerBinding, MessageUtilsView, MessageUtilsState, MessageUtilsPresenter>(), MessageUtilsView {
|
||||
|
||||
override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup): MessageUtilsControllerBinding =
|
||||
MessageUtilsControllerBinding.inflate(inflater, container, false)
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject override lateinit var presenter: MessageUtilsPresenter
|
||||
private val autoDeleteDialog: AutoDeleteDialog by lazy {
|
||||
AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
|
||||
}
|
||||
private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
|
||||
override val autoDeduplicateClickIntent by lazy { binding.autoDeduplicate.clicks() }
|
||||
override val deduplicateClickIntent by lazy { binding.deduplicateMessages.clicks() }
|
||||
override val autoDeleteClickIntent by lazy { binding.autoDelete.clicks() }
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
@@ -70,6 +85,12 @@ class MessageUtilsController : QkController<MessageUtilsControllerBinding, Messa
|
||||
state.deduplicationProgress.indeterminate
|
||||
}
|
||||
}
|
||||
|
||||
binding!!.autoDelete.summary = when (state.autoDelete) {
|
||||
0 -> context.getString(R.string.settings_auto_delete_never)
|
||||
else -> context.resources.getQuantityString(
|
||||
R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
|
||||
}
|
||||
}
|
||||
|
||||
override fun showDeduplicationConfirmationDialog(): Single<Boolean> = Single.create { emitter ->
|
||||
@@ -82,8 +103,24 @@ class MessageUtilsController : QkController<MessageUtilsControllerBinding, Messa
|
||||
.show()
|
||||
}
|
||||
|
||||
override fun handleResult(resIdString: Int) {
|
||||
override fun handleDeduplicationResult(resIdString: Int) {
|
||||
binding.deduplicationProgressText.isVisible = true
|
||||
binding.deduplicationProgressText.setText(resIdString)
|
||||
}
|
||||
|
||||
override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
|
||||
|
||||
override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
|
||||
|
||||
override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
|
||||
suspendCancellableCoroutine { cont ->
|
||||
androidx.appcompat.app.AlertDialog.Builder(activity!!)
|
||||
.setTitle(R.string.settings_auto_delete_warning)
|
||||
.setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
|
||||
.setOnCancelListener { cont.resume(false) }
|
||||
.setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
|
||||
.setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
|
||||
.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+46
-6
@@ -1,23 +1,29 @@
|
||||
package dev.octoshrimpy.quik.feature.messageutils
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.interactor.DeduplicateMessages
|
||||
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.service.AutoDeleteService
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import timber.log.Timber
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageUtilsPresenter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val deduplicateMessages: DeduplicateMessages,
|
||||
private val prefs: Preferences,
|
||||
messageRepo: MessageRepository
|
||||
private val deleteOldMessages: DeleteOldMessages,
|
||||
private val messageRepo: MessageRepository
|
||||
) : QkPresenter<MessageUtilsView, MessageUtilsState>(MessageUtilsState()) {
|
||||
init {
|
||||
disposables += messageRepo.deduplicationProgress
|
||||
@@ -27,6 +33,9 @@ class MessageUtilsPresenter @Inject constructor(
|
||||
|
||||
disposables += prefs.autoDeduplicate.asObservable()
|
||||
.subscribe { enabled -> newState { copy(autoDeduplicateMessages = enabled) } }
|
||||
|
||||
disposables += prefs.autoDelete.asObservable()
|
||||
.subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
|
||||
}
|
||||
|
||||
override fun bindIntents(view: MessageUtilsView) {
|
||||
@@ -43,16 +52,16 @@ class MessageUtilsPresenter @Inject constructor(
|
||||
.subscribe { result ->
|
||||
when (result) {
|
||||
is MessageRepository.DeduplicationResult.Success -> {
|
||||
view.handleResult(R.string.deduplicating_messages_finished)
|
||||
view.handleDeduplicationResult(R.string.deduplicating_messages_finished)
|
||||
}
|
||||
|
||||
is MessageRepository.DeduplicationResult.NoDuplicates -> {
|
||||
view.handleResult(R.string.deduplicating_messages_no_messages)
|
||||
view.handleDeduplicationResult(R.string.deduplicating_messages_no_messages)
|
||||
}
|
||||
|
||||
is MessageRepository.DeduplicationResult.Failure -> {
|
||||
view.handleResult(R.string.deduplicating_messages_failed)
|
||||
Timber.e("Error: ${result.error.localizedMessage}")
|
||||
view.handleDeduplicationResult(R.string.deduplicating_messages_failed)
|
||||
Timber.e("Error while deduplicating messages: ${result.error}")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -61,5 +70,36 @@ class MessageUtilsPresenter @Inject constructor(
|
||||
view.autoDeduplicateClickIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.autoDeduplicate.set(!prefs.autoDeduplicate.get()) }
|
||||
|
||||
view.autoDeleteClickIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showAutoDeleteDialog(prefs.autoDelete.get()) }
|
||||
|
||||
view.autoDeleteChanged()
|
||||
.observeOn(Schedulers.io())
|
||||
.filter { maxAge ->
|
||||
if (maxAge == 0) {
|
||||
return@filter true
|
||||
}
|
||||
|
||||
val counts = messageRepo.getOldMessageCounts(maxAge)
|
||||
if (counts.values.sum() == 0) {
|
||||
return@filter true
|
||||
}
|
||||
|
||||
runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
|
||||
}
|
||||
.doOnNext { maxAge ->
|
||||
when (maxAge == 0) {
|
||||
true -> AutoDeleteService.cancelJob(context)
|
||||
false -> {
|
||||
AutoDeleteService.scheduleJob(context)
|
||||
deleteOldMessages.execute(Unit)
|
||||
}
|
||||
}
|
||||
}
|
||||
.doOnNext(prefs.autoDelete::set)
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,5 +4,7 @@ import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
|
||||
data class MessageUtilsState(
|
||||
val autoDeduplicateMessages: Boolean = false,
|
||||
val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle
|
||||
val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle,
|
||||
|
||||
val autoDelete: Int = 0,
|
||||
)
|
||||
|
||||
@@ -7,7 +7,12 @@ import io.reactivex.Single
|
||||
interface MessageUtilsView: QkViewContract<MessageUtilsState> {
|
||||
val autoDeduplicateClickIntent: Observable<*>
|
||||
val deduplicateClickIntent: Observable<Unit>
|
||||
val autoDeleteClickIntent: Observable<Unit>
|
||||
|
||||
fun showDeduplicationConfirmationDialog(): Single<Boolean>
|
||||
fun handleResult(resIdString: Int)
|
||||
}
|
||||
fun handleDeduplicationResult(resIdString: Int)
|
||||
|
||||
fun autoDeleteChanged(): Observable<Int>
|
||||
fun showAutoDeleteDialog(days: Int)
|
||||
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ import android.text.format.DateFormat
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.view.isVisible
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
@@ -48,7 +47,6 @@ import dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
import dev.octoshrimpy.quik.common.widget.TextInputDialog
|
||||
import dev.octoshrimpy.quik.databinding.SettingsControllerBinding
|
||||
import dev.octoshrimpy.quik.feature.settings.about.AboutController
|
||||
import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog
|
||||
import dev.octoshrimpy.quik.feature.settings.swipe.SwipeActionsController
|
||||
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
@@ -57,11 +55,7 @@ import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||
import kotlinx.coroutines.withContext
|
||||
import javax.inject.Inject
|
||||
import kotlin.coroutines.resume
|
||||
|
||||
class SettingsController : QkController<SettingsControllerBinding, SettingsView, SettingsState, SettingsPresenter>(), SettingsView {
|
||||
|
||||
@@ -81,15 +75,11 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
private val signatureDialog: TextInputDialog by lazy {
|
||||
TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
|
||||
}
|
||||
private val autoDeleteDialog: AutoDeleteDialog by lazy {
|
||||
AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
|
||||
}
|
||||
|
||||
private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
|
||||
private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
private val signatureSubject: Subject<String> = PublishSubject.create()
|
||||
private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
|
||||
|
||||
private val progressAnimator by lazy { ObjectAnimator.ofInt(binding.syncingProgress, "progress", 0, 0) }
|
||||
|
||||
@@ -148,8 +138,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
|
||||
override fun signatureChanged(): Observable<String> = signatureSubject
|
||||
|
||||
override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
|
||||
|
||||
override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
|
||||
|
||||
override fun messageLinkHandlingSelected(): Observable<Int> = messageLinkHandlingDialog.adapter.menuItemClicks
|
||||
@@ -190,12 +178,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
binding.unicode.checkbox?.isChecked = state.stripUnicodeEnabled
|
||||
binding.mobileOnly.checkbox?.isChecked = state.mobileOnly
|
||||
|
||||
binding.autoDelete.summary = when (state.autoDelete) {
|
||||
0 -> context.getString(R.string.settings_auto_delete_never)
|
||||
else -> context.resources.getQuantityString(
|
||||
R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
|
||||
}
|
||||
|
||||
binding.longAsMms.checkbox?.isChecked = state.longAsMms
|
||||
|
||||
binding.mmsSize.summary = state.maxMmsSizeSummary
|
||||
@@ -256,20 +238,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
|
||||
override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
|
||||
|
||||
override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
|
||||
|
||||
override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
|
||||
suspendCancellableCoroutine { cont ->
|
||||
AlertDialog.Builder(activity!!)
|
||||
.setTitle(R.string.settings_auto_delete_warning)
|
||||
.setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
|
||||
.setOnCancelListener { cont.resume(false) }
|
||||
.setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
|
||||
.setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
|
||||
.show()
|
||||
}
|
||||
}
|
||||
|
||||
override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
|
||||
|
||||
override fun showMessageLinkHandlingDialogPicker() = messageLinkHandlingDialog.show(activity!!)
|
||||
|
||||
@@ -27,17 +27,12 @@ import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.makeToast
|
||||
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
|
||||
import dev.octoshrimpy.quik.interactor.SyncMessages
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.service.AutoDeleteService
|
||||
import dev.octoshrimpy.quik.util.NightModeManager
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import timber.log.Timber
|
||||
import java.util.Calendar
|
||||
import java.util.concurrent.TimeUnit
|
||||
@@ -49,8 +44,6 @@ class SettingsPresenter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val billingManager: BillingManager,
|
||||
private val dateFormatter: DateFormatter,
|
||||
private val deleteOldMessages: DeleteOldMessages,
|
||||
private val messageRepo: MessageRepository,
|
||||
private val navigator: Navigator,
|
||||
private val nightModeManager: NightModeManager,
|
||||
private val prefs: Preferences,
|
||||
@@ -124,9 +117,6 @@ class SettingsPresenter @Inject constructor(
|
||||
disposables += prefs.mobileOnly.asObservable()
|
||||
.subscribe { enabled -> newState { copy(mobileOnly = enabled) } }
|
||||
|
||||
disposables += prefs.autoDelete.asObservable()
|
||||
.subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
|
||||
|
||||
disposables += prefs.longAsMms.asObservable()
|
||||
.subscribe { enabled -> newState { copy(longAsMms = enabled) } }
|
||||
|
||||
@@ -218,8 +208,6 @@ class SettingsPresenter @Inject constructor(
|
||||
|
||||
R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get())
|
||||
|
||||
R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get())
|
||||
|
||||
R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get())
|
||||
|
||||
R.id.mmsSize -> view.showMmsSizePicker()
|
||||
@@ -288,33 +276,6 @@ class SettingsPresenter @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.autoDeleteChanged()
|
||||
.observeOn(Schedulers.io())
|
||||
.filter { maxAge ->
|
||||
if (maxAge == 0) {
|
||||
return@filter true
|
||||
}
|
||||
|
||||
val counts = messageRepo.getOldMessageCounts(maxAge)
|
||||
if (counts.values.sum() == 0) {
|
||||
return@filter true
|
||||
}
|
||||
|
||||
runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
|
||||
}
|
||||
.doOnNext { maxAge ->
|
||||
when (maxAge == 0) {
|
||||
true -> AutoDeleteService.cancelJob(context)
|
||||
false -> {
|
||||
AutoDeleteService.scheduleJob(context)
|
||||
deleteOldMessages.execute(Unit)
|
||||
}
|
||||
}
|
||||
}
|
||||
.doOnNext(prefs.autoDelete::set)
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.mmsSizeSelected()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe(prefs.mmsSize::set)
|
||||
|
||||
@@ -45,7 +45,6 @@ data class SettingsState(
|
||||
val splitSmsEnabled: Boolean = false,
|
||||
val stripUnicodeEnabled: Boolean = false,
|
||||
val mobileOnly: Boolean = false,
|
||||
val autoDelete: Int = 0,
|
||||
val longAsMms: Boolean = false,
|
||||
val maxMmsSizeSummary: String = "100KB",
|
||||
val maxMmsSizeId: Int = 100,
|
||||
|
||||
@@ -32,7 +32,6 @@ interface SettingsView : QkViewContract<SettingsState> {
|
||||
fun textSizeSelected(): Observable<Int>
|
||||
fun sendDelaySelected(): Observable<Int>
|
||||
fun signatureChanged(): Observable<String>
|
||||
fun autoDeleteChanged(): Observable<Int>
|
||||
fun mmsSizeSelected(): Observable<Int>
|
||||
fun messageLinkHandlingSelected(): Observable<Int>
|
||||
|
||||
@@ -43,8 +42,6 @@ interface SettingsView : QkViewContract<SettingsState> {
|
||||
fun showTextSizePicker()
|
||||
fun showDelayDurationDialog()
|
||||
fun showSignatureDialog(signature: String)
|
||||
fun showAutoDeleteDialog(days: Int)
|
||||
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
|
||||
fun showMmsSizePicker()
|
||||
fun showMessageLinkHandlingDialogPicker()
|
||||
fun showSwipeActions()
|
||||
|
||||
@@ -23,13 +23,17 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/selectableItemBackground">
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="36dp"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -132,10 +136,10 @@
|
||||
android:id="@+id/reactions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignBottom="@id/body"
|
||||
android:layout_below="@id/body"
|
||||
android:layout_alignEnd="@id/body"
|
||||
android:layout_marginEnd="-12dp"
|
||||
android:layout_marginBottom="-20dp"
|
||||
android:layout_marginTop="-10dp"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
@@ -148,12 +148,13 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<FrameLayout
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dp"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
android:clipChildren="false">
|
||||
android:orientation="vertical">
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.TightTextView
|
||||
android:id="@+id/body"
|
||||
@@ -171,9 +172,8 @@
|
||||
android:id="@+id/reactions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|start"
|
||||
android:layout_marginStart="-16dp"
|
||||
android:layout_marginBottom="-20dp"
|
||||
android:layout_marginTop="-10dp"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
@@ -196,7 +196,7 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/contentView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
@@ -72,6 +73,18 @@
|
||||
app:title="@string/auto_deduplicate_messages_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
style="@style/PreferenceCategory"
|
||||
android:text="@string/settings_category_general" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/autoDelete"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_baseline_history_toggle_off_24"
|
||||
app:title="@string/settings_auto_delete"
|
||||
tools:summary="Never" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
</ScrollView>
|
||||
|
||||
@@ -194,14 +194,6 @@
|
||||
app:title="@string/settings_mobile_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/autoDelete"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_baseline_history_toggle_off_24"
|
||||
app:title="@string/settings_auto_delete"
|
||||
tools:summary="Never" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/longAsMms"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
</resources>
|
||||
@@ -513,4 +513,15 @@
|
||||
<string name="compose_send_group_summary_off">Zprávy budou odeslány samostatně všem příjemcům</string>
|
||||
<string name="notification_foreground_worker_title">Příjem zprávy</string>
|
||||
<string name="notification_foreground_worker_text">V systému Android 12 a starších verzích je pro práci na pozadí, která umožňuje příjem zpráv, vyžadováno oznámení.</string>
|
||||
<string name="main_sync_emojis">Analýza reakcí pomocí emodži…</string>
|
||||
<string name="message_management_title">Správa zpráv</string>
|
||||
<string name="deduplicate_messages_category">Odstranění duplicitních zpráv</string>
|
||||
<string name="deduplicate_messages_title">Odebrat duplicitní zprávy</string>
|
||||
<string name="deduplicate_messages_summary">Prohledá databázi zpráv a odstraní všechny zprávy, které přesně odpovídají původním zprávám</string>
|
||||
<string name="deduplicate_message_confirmation_dialog_message">Vaše databáze zpráv bude prohledána na duplicity a tyto duplicity budou odstraněny.\nTím dojde k automatickému smazání zpráv. Pokračujte pouze v případě, že rozumíte důsledkům.</string>
|
||||
<string name="auto_deduplicate_messages_title">Automatické odstraňování duplicitních zpráv</string>
|
||||
<string name="auto_deduplicate_messages_summary">Během synchronizace bude provedena deduplikace. Upozorňujeme, že tím dojde k automatickému smazání zpráv a i když je pravděpodobnost výskytu falešných duplikátů velmi nízká, stále je to možné.\nBuďte prosím opatrní.</string>
|
||||
<string name="deduplicating_messages_finished">Dokončeno deduplikování zpráv!</string>
|
||||
<string name="deduplicating_messages_no_messages">Nebyly nalezeny žádné duplicitní zprávy.</string>
|
||||
<string name="deduplicating_messages_failed">Deduplikace zpráv se nezdařila, zkuste to znovu</string>
|
||||
</resources>
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
<string name="title_settings">Einstellungen</string>
|
||||
<string name="title_notification_prefs">Benachrichtigungen</string>
|
||||
<string name="title_theme">Erscheinungsbild</string>
|
||||
<string name="title_conversations">In Posteingang suchen…</string>
|
||||
<string name="title_conversations">Im Posteingang suchen…</string>
|
||||
<string name="title_compose">Verfassen</string>
|
||||
<string name="setup_skip">Überspringen</string>
|
||||
<string name="setup_next">Weiter</string>
|
||||
<string name="menu_add_person">Person hinzufügen</string>
|
||||
<string name="menu_call">Anrufen</string>
|
||||
<string name="menu_info">Details</string>
|
||||
<string name="menu_mms_part_save">In Galerie speichern</string>
|
||||
<string name="menu_mms_part_save">In der Galerie speichern</string>
|
||||
<string name="compose_menu_share">Text teilen</string>
|
||||
<string name="main_drawer_open_cd">Navigationsmenü öffnen</string>
|
||||
<string name="main_title_selected">%d ausgewählt</string>
|
||||
@@ -39,7 +39,7 @@
|
||||
<string name="main_menu_archive">Archivieren</string>
|
||||
<string name="main_menu_unarchive">Wiederherstellen</string>
|
||||
<string name="main_menu_delete">Löschen</string>
|
||||
<string name="main_menu_add_contact">Zu Kontakten hinzufügen</string>
|
||||
<string name="main_menu_add_contact">Zu den Kontakten hinzufügen</string>
|
||||
<string name="main_menu_pin">Oben anheften</string>
|
||||
<string name="main_menu_unpin">Loslösen</string>
|
||||
<string name="main_menu_read">Als gelesen markieren</string>
|
||||
@@ -67,9 +67,9 @@
|
||||
<string name="drawer_blocking">Blockiert</string>
|
||||
<string name="drawer_more">Mehr</string>
|
||||
<string name="drawer_settings">Einstellungen</string>
|
||||
<string name="drawer_help">Hilfe & Feedback</string>
|
||||
<string name="drawer_help">Hilfe & Rückmeldung</string>
|
||||
<string name="drawer_invite">Freunde einladen</string>
|
||||
<string name="drawer_plus_banner_summary">Schalte erstaunliche neue Funktionen frei und unterstütze die Entwicklung</string>
|
||||
<string name="drawer_plus_banner_summary">Schalte tolle neue Funktionen frei und unterstütze die Entwicklung</string>
|
||||
<string name="rate_title">Gefällt dir QUIK?</string>
|
||||
<string name="rate_summary">Teile etwas von deiner Liebe und gib uns einen Stern auf GitHub!</string>
|
||||
<string name="rate_okay">OKAY!</string>
|
||||
@@ -97,7 +97,7 @@
|
||||
<string name="compose_scheduled_for">Geplante Zeit:</string>
|
||||
<string name="compose_scheduled_future">Gewählte Zeit muss in der Zukunft liegen!</string>
|
||||
<string name="compose_scheduled_plus">Du musst QUIK+ freischalten, um geplante Nachrichten nutzen zu können</string>
|
||||
<string name="compose_scheduled_toast">Zu geplanten Nachrichten hinzugefügt</string>
|
||||
<string name="compose_scheduled_toast">Zu den geplanten Nachrichten hinzugefügt</string>
|
||||
<string name="compose_hint">Schreibe eine Nachricht…</string>
|
||||
<string name="compose_menu_copy">Text kopieren</string>
|
||||
<string name="compose_menu_forward">Weiterleiten</string>
|
||||
@@ -140,7 +140,7 @@
|
||||
<string name="info_unblock">Entsperren</string>
|
||||
<string name="info_delete">Unterhaltung löschen</string>
|
||||
<string name="gallery_error">Mediendatei konnte nicht geladen werden</string>
|
||||
<string name="gallery_toast_saved">In Galerie gespeichert</string>
|
||||
<string name="gallery_toast_saved">In der Galerie gespeichert</string>
|
||||
<string name="backup_title">Sichern und Wiederherstellen</string>
|
||||
<string name="backup_backing_up">Sichere Nachrichten</string>
|
||||
<string name="backup_restoring">Aus Sicherung wiederherstellen</string>
|
||||
@@ -176,7 +176,7 @@
|
||||
<string name="scheduled_empty_description">Nachricht genau dann senden, wenn du magst</string>
|
||||
<string name="scheduled_empty_message_1">Hey! Wann war dein Geburtstag nochmal?</string>
|
||||
<string name="scheduled_empty_message_2">Er ist am 23. Dezember</string>
|
||||
<string name="scheduled_empty_message_3">Alles Gute zum Geburtstag! Schau was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke</string>
|
||||
<string name="scheduled_empty_message_3">Alles Gute zum Geburtstag! Schau, was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke</string>
|
||||
<!--  is a special character required at the end of this string to fix it's formatting in the app -->
|
||||
<string name="scheduled_empty_message_3_timestamp">Am 23. Dezember senden </string>
|
||||
<string name="scheduled_compose_cd">Eine Nachricht planen</string>
|
||||
@@ -250,7 +250,7 @@
|
||||
<string name="settings_long_as_mms_summary">Wenn deine längeren Textnachrichten nicht gesendet oder in der falsche Reihenfolge gesendet werden, kannst du sie stattdessen als MMS-Nachrichten senden. Dafür können zusätzliche Gebühren anfallen</string>
|
||||
<string name="settings_mms_size_title">MMS-Anhänge automatisch komprimieren</string>
|
||||
<string name="settings_sync_title">Nachrichten synchronisieren</string>
|
||||
<string name="settings_sync_summary">Nachrichten mit der Android SMS-Datenbank abgleichen</string>
|
||||
<string name="settings_sync_summary">Nachrichten mit der Android-SMS-Datenbank abgleichen</string>
|
||||
<string name="settings_about_title">Über QUIK</string>
|
||||
<string name="settings_version">Version %s</string>
|
||||
<string name="settings_logging_enabled">Protokollierung zur Fehlerbehebung aktiviert</string>
|
||||
@@ -258,9 +258,9 @@
|
||||
<string name="settings_delay_duration_hint">Dauer eingeben (in Sekunden)</string>
|
||||
<string name="blocking_title">Blockieren</string>
|
||||
<string name="blocking_drop_title">Nachrichten verwerfen</string>
|
||||
<string name="blocking_drop_summary">Eingehende Nachrichten von blockierten Absendern verwefen, anstatt sie auszublenden</string>
|
||||
<string name="blocking_drop_summary">Eingehende Nachrichten von blockierten Absendern verwerfen, anstatt sie auszublenden</string>
|
||||
<string name="blocking_conversations">Blockierte Unterhaltungen</string>
|
||||
<string name="blocking_manager_title">Blockiermanager</string>
|
||||
<string name="blocking_manager_title">Blockierverwaltung</string>
|
||||
<string name="blocking_manager_qksms_summary">In QUIK integrierte Blockierfunktion</string>
|
||||
<string name="blocking_manager_call_blocker_summary">Spam-Nachrichten und Nummern & unbekannte Anrufe mit Sperrliste & Zeitplan blockieren</string>
|
||||
<string name="blocking_manager_call_control_summary">Filtere deine Anrufe und Nachrichten automatisch an einem praktischen Ort! Mit Community IQ™ kannst du unerwünschte Nachrichten von bekannten Community-Spammern verhindern</string>
|
||||
@@ -302,11 +302,11 @@
|
||||
<string name="qksms_plus_thanks_title">Vielen Dank für die Unterstützung von QUIK!</string>
|
||||
<string name="qksms_plus_thanks_summary">Du kannst jetzt alle QUIK+ Funktionen verwenden</string>
|
||||
<string name="qksms_plus_error">Ein Fehler ist aufgetreten, bitte versuche es erneut</string>
|
||||
<string name="qksms_plus_free_title">QUIK+ ist für Nutzer von F-Droid kostenfrei! Spende gerne um die Entwicklung zu Unterstützen.</string>
|
||||
<string name="qksms_plus_free_title">QUIK+ ist für Nutzer von F-Droid kostenfrei! Spende gerne, um die Entwicklung zu unterstützen.</string>
|
||||
<string name="qksms_plus_donate">Spenden per PayPal</string>
|
||||
<string name="qksms_plus_coming_soon">Demnächst verfügbar</string>
|
||||
<string name="qksms_plus_themes_title">Premium-Erscheinungsbilder</string>
|
||||
<string name="qksms_plus_themes_summary">Wundervolle Farben, die kein Teil der Material Design-Farbpalette sind, für das Erscheinungsbild freischalten</string>
|
||||
<string name="qksms_plus_themes_summary">Wundervolle Farben, die kein Teil der \"Material Design\"-Farbpalette sind, für das Erscheinungsbild freischalten</string>
|
||||
<string name="qksms_plus_emoji_title">Benutzerdefinierte Auto-Emoji</string>
|
||||
<string name="qksms_plus_emoji_summary">Benutzerdefinierte Auto-Emoji-Verknüpfungen erstellen</string>
|
||||
<string name="qksms_plus_backup_title">Nachrichtensicherung</string>
|
||||
@@ -314,7 +314,7 @@
|
||||
<string name="qksms_plus_scheduled_title">Geplante Nachrichten</string>
|
||||
<string name="qksms_plus_scheduled_summary">Den automatischen Versand von Nachrichten zu einem bestimmen Zeitpunkt planen</string>
|
||||
<string name="qksms_plus_delayed_title">Verzögertes Senden</string>
|
||||
<string name="qksms_plus_delayed_summary">Wartet einige Sekunden, bevor deine Nachricht gesendet wird</string>
|
||||
<string name="qksms_plus_delayed_summary">Einige Sekunden warten, bevor deine Nachricht gesendet wird</string>
|
||||
<string name="qksms_plus_night_title">Automatischer Nachtmodus</string>
|
||||
<string name="qksms_plus_night_summary">Nachtmodus basierend auf der Uhrzeit aktivieren</string>
|
||||
<string name="qksms_plus_blacklist_title">Erweitertes Blockieren</string>
|
||||
@@ -447,21 +447,21 @@
|
||||
<string name="compose_message_sim">SIM-Nummer</string>
|
||||
<string name="compose_message_item">Nachrichtenelement</string>
|
||||
<string name="compose_message_attachment">Anhang</string>
|
||||
<string name="compose_toast_drag_stt">Verschiebe den Sprache-zu-Text-Knopf an eine beliebige Stelle</string>
|
||||
<string name="message_body_too_long_to_display">⚠ Die Nachricht ist lang. Kopieren oder speichern für den vollständigen Text</string>
|
||||
<string name="compose_toast_drag_stt">Verschiebe den \"Sprache zu Text\"-Knopf an eine beliebige Stelle</string>
|
||||
<string name="message_body_too_long_to_display">⚠ Die Nachricht ist lang. Kopieren oder Speichern für den vollständigen Text</string>
|
||||
<string name="clipboard_too_large_to_copy">Datengröße überschreitet Zwischenablagegrenze</string>
|
||||
<string name="clipboard_unable_to_copy_to">In Zwischenablage kopieren nicht möglich</string>
|
||||
<string name="clipboard_unable_to_copy_to">In die Zwischenablage kopieren nicht möglich</string>
|
||||
<string name="scheduled_send_cd">Diese Nachricht planen</string>
|
||||
<string name="attachment_missing">Fehlt</string>
|
||||
<string name="settings_system_show_stt_title">„Sprache-zu-Text“-Knopf anzeigen</string>
|
||||
<string name="settings_system_show_stt_title">„Sprache zu Text“-Knopf anzeigen</string>
|
||||
<string name="settings_notification_previews_summary">Name und Nachricht anzeigen</string>
|
||||
<string name="settings_notification_silent_title">Stumm, wenn kein Kontakt</string>
|
||||
<string name="settings_notification_silent_summary">Stummschalten von Benachrichtigungen für Nachrichten ohne Empfänger in deinen Kontakten</string>
|
||||
<string name="settings_unread_at_top_title">Ungelesene oben</string>
|
||||
<string name="settings_unread_at_top_summary">Ungelesene Unterhaltungen oben anzeigen</string>
|
||||
<string name="settings_mms_weblink_title">Linkverarbeitung in Nachrichten</string>
|
||||
<string name="settings_disable_screenshots_title">Screenshots deaktivieren</string>
|
||||
<string name="settings_diable_screenshots_summary">Verhindert, dass dein Betriebssystem und andere Apps Screenshots der App machen.</string>
|
||||
<string name="settings_disable_screenshots_title">Bildschirmfotos deaktivieren</string>
|
||||
<string name="settings_diable_screenshots_summary">Verhindert, dass dein Betriebssystem und andere Apps Bildschirmfotos der App machen.</string>
|
||||
<string name="message_content_filters_title">Nachrichteninhaltsfilter</string>
|
||||
<string name="message_content_filters_empty">Hier werden deine Nachrichteninhaltsfilter angezeigt</string>
|
||||
<string name="message_content_filters_add_cd">Neuen Filter erstellen</string>
|
||||
@@ -484,11 +484,11 @@
|
||||
<string name="notification_message_failed_action">Erneut senden</string>
|
||||
<string name="speak_no_messages">Keine Nachrichten</string>
|
||||
<string name="speak_unseen_messages">Ungesehene Nachrichten vorlesen</string>
|
||||
<string name="messageLinkHandling_dialog_title">Warnung vor externem Link</string>
|
||||
<string name="messageLinkHandling_dialog_title">Warnung vor externen Links</string>
|
||||
<string name="messageLinkHandling_dialog_body">Einige Links können unsicher sein oder dich unerwartet weiterleiten. Überprüfe den untenstehenden Link, bevor du fortfährst:\n\n%1$s\n\nWillst du weitermachen?</string>
|
||||
<string name="messageLinkHandling_dialog_positive">Ja, Link öffnen</string>
|
||||
<string name="messageLinkHandling_dialog_negative">Nein</string>
|
||||
<string name="error_stt_toast">Leider ist beim Laden des Sprache-zu-Text-Anbieters ein Fehler aufgetreten.</string>
|
||||
<string name="error_stt_toast">Leider ist beim Laden des \"Sprache zu Text\"-Anbieters ein Fehler aufgetreten.</string>
|
||||
<string name="stt_toast_extra_prompt">Sprich deine Nachricht</string>
|
||||
<string name="messages_text_share_file_error">Ups! Beim Teilen ist etwas schief gelaufen</string>
|
||||
<string name="compose_send_group_summary_on">Empfänger und Antworten sind für alle sichtbar</string>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<string name="menu_mms_part_share">Partager</string>
|
||||
<string name="menu_mms_part_forward">Transférer</string>
|
||||
<string name="menu_mms_part_open">Ouvrir en dehors de l\'appli</string>
|
||||
<string name="main_drawer_open_cd">Ouvrir le tiroir de navigation</string>
|
||||
<string name="main_drawer_open_cd">Ouvrir le panneau de navigation</string>
|
||||
<string name="main_title_selected">%d sélectionnée</string>
|
||||
<string name="main_menu_clear">Effacer</string>
|
||||
<string name="main_menu_select_all">Sélectionner tout</string>
|
||||
@@ -129,7 +129,7 @@
|
||||
<string name="compose_hint">Écrire un message…</string>
|
||||
<string name="compose_no_valid_recipients">Impossible d’envoyer aux autres participants</string>
|
||||
<string name="compose_menu_copy">Copier le texte</string>
|
||||
<string name="compose_menu_share">Partager</string>
|
||||
<string name="compose_menu_share">Partager le texte</string>
|
||||
<string name="compose_menu_forward">Transférer</string>
|
||||
<string name="compose_menu_show_status">Afficher l’état</string>
|
||||
<string name="compose_menu_delete">Supprimer</string>
|
||||
@@ -299,7 +299,7 @@
|
||||
<item quantity="other">Après %d jours</item>
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Envoyer les messages longs en MMS</string>
|
||||
<string name="settings_long_as_mms_summary">Si vos messages texte plus longs ne parviennent pas à être envoyés, ou s’ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s’appliquer.</string>
|
||||
<string name="settings_long_as_mms_summary">Si vos messages texte plus longs ne parviennent pas à être envoyés ou s’ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s’appliquer.</string>
|
||||
<string name="settings_mms_size_title">Compresser automatiquement les pièces jointes des MMS</string>
|
||||
<string name="settings_mms_weblink_title">Gestion des liens dans les messages</string>
|
||||
<string name="settings_disable_screenshots_title">Désactiver les captures d’écran</string>
|
||||
@@ -443,6 +443,7 @@
|
||||
<string name="toast_qksms_plus">Vous devez déverrouiller QUIK+ pour utiliser cela</string>
|
||||
<plurals name="notification_new_messages">
|
||||
<item quantity="one">Nouveau message</item>
|
||||
<item quantity="many">%s nouveaux messages</item>
|
||||
<item quantity="other">%s nouveaux messages</item>
|
||||
</plurals>
|
||||
<string name="notification_message_failed_title">Message non envoyé</string>
|
||||
@@ -543,7 +544,8 @@
|
||||
<item quantity="other">%d conversations désarchivées</item>
|
||||
</plurals>
|
||||
<string name="notification_message_failed_action">Réenvoyer</string>
|
||||
<string name="compose_send_group_summary_on">Les destinataires et les réponses seront visibles par tous</string>
|
||||
<string name="compose_send_group_summary_on">Les destinataires et les réponses seront visibles de tous</string>
|
||||
<string name="compose_send_group_summary_off">Les messages seront envoyés séparément à tous les destinataires</string>
|
||||
<string name="notification_foreground_worker_text">Sous Android 12 et les versions antérieures, une notification est requise pour le fonctionnement en arrière-plan qui permet de recevoir des messages.</string>
|
||||
<string name="notification_foreground_worker_title">Réception du message</string>
|
||||
</resources>
|
||||
|
||||
@@ -495,4 +495,15 @@
|
||||
<string name="compose_send_group_summary_off">Az üzenetek külön-külön lesznek elküldve minden címzettnek</string>
|
||||
<string name="notification_foreground_worker_text">Android 12 és régebbi verziók esetén értesítés szükséges a háttérmunkához, amely lehetővé teszi az üzenetek fogadását.</string>
|
||||
<string name="notification_foreground_worker_title">Üzenet fogadása</string>
|
||||
<string name="main_sync_emojis">Emodzsi reakciók elemzése…</string>
|
||||
<string name="message_management_title">Üzenetkezelés</string>
|
||||
<string name="deduplicate_messages_category">Ismétlődő üzenetek kiszűrése</string>
|
||||
<string name="deduplicate_messages_title">Ismétlődő üzenetek eltávolítása</string>
|
||||
<string name="deduplicate_messages_summary">Átvizsgálja az üzenetadatbázist, és törli az összes olyan üzenetet, amely pontosan megegyezik az eredeti üzenetekkel</string>
|
||||
<string name="deduplicate_message_confirmation_dialog_message">Az üzenetadatbázis át lesz vizsgálva az ismétlődő üzenetek felkutatása érdekében, majd ezek el lesznek távolítva.\nEz a művelet automatikusan töröl üzeneteket, ezért csak akkor folytassa, ha tisztában van a következményekkel.</string>
|
||||
<string name="auto_deduplicate_messages_title">Ismétlődő üzenetek automatikus kiszűrése</string>
|
||||
<string name="auto_deduplicate_messages_summary">Az ismétlődések kiszűrése a szinkronizálás során történik. Fontos tudni, hogy a művelet automatikusan töröl üzeneteket, és bár a téves ismétlődés felismerésének esélye nagyon alacsony, nem zárható ki teljesen.\nKellő körültekintéssel járjon el.</string>
|
||||
<string name="deduplicating_messages_finished">Az ismétlődő üzenetek eltávolítása befejeződött!</string>
|
||||
<string name="deduplicating_messages_no_messages">Nem találhatók ismétlődő üzenetek.</string>
|
||||
<string name="deduplicating_messages_failed">Az ismétlődések kiszűrése sikertelen, próbálja meg újra</string>
|
||||
</resources>
|
||||
|
||||
@@ -500,4 +500,5 @@
|
||||
<string name="notification_foreground_worker_text">Messaggio in arrivo</string>
|
||||
<string name="dialog_clear_compose_title">Pulisci messaggio</string>
|
||||
<string name="button_clear">Pulisci</string>
|
||||
<string name="notification_foreground_worker_title">Ricezione messaggio</string>
|
||||
</resources>
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<string name="main_permission_required">Yêu cầu quyền truy cập</string>
|
||||
<string name="main_permission_sms">QUIK cần cấp quyền để gửi và xem tin nhắn SMS</string>
|
||||
<string name="main_permission_contacts">QUIK cần cấp quyền để xem danh bạ</string>
|
||||
<string name="main_permission_notifications">QUIK needs permission to display notifications</string>
|
||||
<string name="main_permission_notifications">QUIK cần cấp quyền để hiển thị thông báo</string>
|
||||
<string name="main_permission_allow">Cho phép</string>
|
||||
<string name="drawer_inbox">Trò chuyện</string>
|
||||
<string name="drawer_archived">Lưu trữ</string>
|
||||
@@ -93,7 +93,7 @@
|
||||
<string name="compose_send_group_summary">Người nhận và các câu trả lời sẽ được hiển thị với mọi người</string>
|
||||
<string name="compose_messages_empty">Đây là sự khởi đầu của một cuộc trò chuyện. Hãy nói điều gì đó tốt đẹp nhé!</string>
|
||||
<string name="compose_vcard_label">Thẻ danh thiếp</string>
|
||||
<string name="compose_scheduled_for">Hẹn giờ cho</string>
|
||||
<string name="compose_scheduled_for">Thời gian dự kiến:</string>
|
||||
<string name="compose_scheduled_future">Thời gian chọn phải trong tương lai!</string>
|
||||
<string name="compose_scheduled_plus">Bạn phải mở khoá QUIK+ để dùng tính năng hẹn giờ</string>
|
||||
<string name="compose_scheduled_toast">Đã hẹn giờ cho tin nhắn</string>
|
||||
@@ -145,8 +145,8 @@
|
||||
<string name="backup_restoring">Đang khôi phục từ bản sao lưu</string>
|
||||
<string name="backup_loading">Đang tải…</string>
|
||||
<string name="backup_never">Chưa bao giờ</string>
|
||||
<string name="backup_location_title">Backup location</string>
|
||||
<string name="backup_location_summary">Set folder</string>
|
||||
<string name="backup_location_title">Vị trí sao lưu</string>
|
||||
<string name="backup_location_summary">Chọn thư mục</string>
|
||||
<string name="backup_restore_title">Khôi phục</string>
|
||||
<string name="backup_restore_summary">Chọn một bản sao lưu</string>
|
||||
<string name="backup_restore_error_plus">Vui lòng mở khoá QUIK+ để dùng tính năng sao lưu và khôi phục</string>
|
||||
@@ -155,12 +155,12 @@
|
||||
<string name="backup_restore_confirm_title">Khôi phục từ bản sao lưu này</string>
|
||||
<string name="backup_restore_stop_title">Dừng khôi phục</string>
|
||||
<string name="backup_restore_stop_message">Tin nhắn đã được khôi phục sẽ vẫn còn trên thiết bị của bạn</string>
|
||||
<string name="backup_select_location_rationale_title">Select backup location</string>
|
||||
<string name="backup_select_location_rationale_message">Please select a folder to save your backups to</string>
|
||||
<string name="backup_select_location_rationale_title">Chọn vị trí sao lưu</string>
|
||||
<string name="backup_select_location_rationale_message">Vui lòng chọn thư mục để lưu bản sao lưu</string>
|
||||
<string name="backup_details">%1$s\n%2$d messages</string>
|
||||
<string name="backup_selected_backup_error_title">Error</string>
|
||||
<string name="backup_selected_backup_error_message">Couldn\'t read backup file</string>
|
||||
<string name="backup_selected_backup_details_title">Backup details</string>
|
||||
<string name="backup_selected_backup_error_title">Lỗi</string>
|
||||
<string name="backup_selected_backup_error_message">Không thể đọc tệp sao lưu</string>
|
||||
<string name="backup_selected_backup_details_title">Thông tin bản sao lưu</string>
|
||||
<string name="backup_restore_dialog_title">Các bản sao lưu</string>
|
||||
<string name="backup_restore_dialog_empty">Không tìm thấy bản sao lưu nào</string>
|
||||
<string name="backup_disclaimer">Hiện tại, tính năng sao lưu và khôi phục chỉ hỗ trợ SMS. Việc hỗ trợ MMS và tính năng sao lưu định kì sẽ có sớm!</string>
|
||||
@@ -349,7 +349,7 @@
|
||||
<string name="button_stop">Dừng</string>
|
||||
<string name="button_more">Xem thêm</string>
|
||||
<string name="button_set">Chọn</string>
|
||||
<string name="button_undo">Undo</string>
|
||||
<string name="button_undo">Hoàn tác</string>
|
||||
<string name="toast_copied">Đã sao chép</string>
|
||||
<string name="toast_qksms_plus">Bạn phải mở khóa QUIK+ để sử dụng chức năng này</string>
|
||||
<plurals name="notification_new_messages">
|
||||
@@ -404,4 +404,24 @@
|
||||
<item>LOL</item>
|
||||
<item>Không sao đâu</item>
|
||||
</string-array>
|
||||
<string name="menu_mms_part_share">Chia sẻ</string>
|
||||
<string name="menu_mms_part_forward">Chuyển tiếp</string>
|
||||
<string name="main_menu_select_all">Chọn tất cả</string>
|
||||
<string name="main_menu_edit_message">Chỉnh sửa tin nhắn</string>
|
||||
<string name="main_menu_rename_conversation">Đổi tên cuộc trò chuyện</string>
|
||||
<string name="dialog_edit_scheduled_message_title">Chỉnh sửa tin nhắn</string>
|
||||
<string name="dialog_clear_compose_title">Xóa nội dung</string>
|
||||
<string name="scheduled_send_cd">Hẹn giờ tin nhắn này</string>
|
||||
<string name="settings_system_show_stt_title">Hiển thị nút chuyển đổi văn bản thành giọng nói</string>
|
||||
<string name="settings_notification_previews_summary">Hiện tên và tin nhắn</string>
|
||||
<string name="menu_mms_part_open">Mở bằng ứng dụng khác</string>
|
||||
<string name="main_menu_send_now">Gửi ngay</string>
|
||||
<string name="main_sender_draft">Bản nháp: %s</string>
|
||||
<string name="scheduled_menu_send_now">Gửi ngay</string>
|
||||
<string name="scheduled_menu_edit_message">Chỉnh sửa tin nhắn</string>
|
||||
<string name="dialog_edit_scheduled_message">Chỉnh sửa sẽ xóa tin nhắn khỏi lịch hẹn.\n\nHãy gửi lại ở màn hình tiếp theo, nếu không tin nhắn sẽ mất.\n\nBạn có muốn tiếp tục không?</string>
|
||||
<string name="dialog_edit_scheduled_message_positive_button">Tiếp tục chỉnh sửa</string>
|
||||
<string name="dialog_clear_compose">Xóa nội dung? Thao tác này không thể phục hồi.</string>
|
||||
<string name="compose_scheduled_view">Hẹn giờ tin nhắn cho cuộc trò chuyện này</string>
|
||||
<string name="compose_no_valid_recipients">Không thể gửi đến người nhận</string>
|
||||
</resources>
|
||||
|
||||
@@ -489,4 +489,15 @@
|
||||
<string name="compose_send_group_summary_off">訊息將分別傳送給所有收件者</string>
|
||||
<string name="notification_foreground_worker_title">正在接收訊息</string>
|
||||
<string name="notification_foreground_worker_text">在 Android 12 及以下版本中,啟用接收訊息的背景作業需要顯示通知。</string>
|
||||
<string name="main_sync_emojis">解析表情符號反應…</string>
|
||||
<string name="message_management_title">訊息管理</string>
|
||||
<string name="deduplicate_messages_category">訊息去重</string>
|
||||
<string name="deduplicate_messages_title">移除重複訊息</string>
|
||||
<string name="deduplicate_messages_summary">掃描訊息資料庫並刪除所有完全符合原始訊息的訊息</string>
|
||||
<string name="deduplicate_message_confirmation_dialog_message">你的訊息資料庫會被掃描是否有重複的,然後這些重複的就會被移除。\n這會自動刪除訊息,只有在你了解後果後才繼續進行。</string>
|
||||
<string name="auto_deduplicate_messages_title">自動去重訊息</string>
|
||||
<string name="auto_deduplicate_messages_summary">同步時會進行重複刪除。請注意,這會自動刪除訊息,雖然出現虛假重複的機率很低,但仍有可能。\n請多加小心。</string>
|
||||
<string name="deduplicating_messages_finished">訊息去重已完成!</string>
|
||||
<string name="deduplicating_messages_no_messages">未發現重複訊息。</string>
|
||||
<string name="deduplicating_messages_failed">訊息去重失敗,請再試一次</string>
|
||||
</resources>
|
||||
|
||||
@@ -154,6 +154,7 @@
|
||||
<string name="compose_menu_next">Next</string>
|
||||
<string name="compose_menu_clear">Clear</string>
|
||||
<string name="compose_details_title">Message details</string>
|
||||
<string name="compose_reactions_title">Reactions</string>
|
||||
<string name="compose_details_type">Type: %s</string>
|
||||
<string name="compose_details_from">From: %s</string>
|
||||
<string name="compose_details_to">To: %s</string>
|
||||
|
||||
Reference in New Issue
Block a user