mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4849 from vector-im/feature/bma/fix_lint

Browse source 
Fix lint after #4843
This commit is contained in:
Benoit Marty 2022-01-04 15:24:56 +01:00 committed by GitHub
commit e724c2e26c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
176 changed files with 2088 additions and 3878 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="PollResultLineView">
<attr name="optionName" format="string" localization="suggested" />
<attr name="optionCount" format="string" />
<attr name="optionSelected" format="boolean" />
<attr name="optionIsWinner" format="boolean" />
</declare-styleable>
</resources>

1
vector/lint.xml
View file

@ -72,6 +72,7 @@
<!-- Wording -->
<issue id="Typos" severity="error" />
<issue id="TypographyDashes" severity="error" />
<!-- Ignore lint issue in generated resource file from templates.
https://github.com/LikeTheSalad/android-string-reference generates string from the default language

6
vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
View file

@ -134,10 +134,10 @@ class ElementRobot {
activity.runOnUiThread { popup.performClick() }
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
waitUntilViewVisible(ViewMatchers.withText(R.string.skip))
clickOn(R.string.skip)
waitUntilViewVisible(ViewMatchers.withText(R.string.action_skip))
clickOn(R.string.action_skip)
assertDisplayed(R.string.are_you_sure)
clickOn(R.string.skip)
clickOn(R.string.action_skip)
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
}.onFailure { Timber.w("Verification popup missing", it) }
}

2
vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
View file

@ -56,7 +56,7 @@ object ConfirmationDialogBuilder {
?.takeIf { it.isNotBlank() }
confirmation(reason)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

2
vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
View file

@ -113,7 +113,7 @@ class GalleryOrCameraDialogHelper(
)) { _, which ->
onAvatarTypeSelected(if (which == 0) Type.Camera else Type.Gallery)
}
.setPositiveButton(R.string.cancel, null)
.setPositiveButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
View file

@ -34,7 +34,7 @@ object ManuallyVerifyDialog {
.setPositiveButton(R.string.encryption_information_verify) { _, _ ->
onVerified()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
views.encryptedDeviceInfoDeviceName.text = cryptoDeviceInfo.displayName()
views.encryptedDeviceInfoDeviceId.text = cryptoDeviceInfo.deviceId

6
vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
View file

@ -57,7 +57,7 @@ class PhotoOrVideoDialog(
.setPositiveButton(R.string._continue) { _, _ ->
submit(views, vectorPreferences, listener)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}
@ -98,11 +98,11 @@ class PhotoOrVideoDialog(
MaterialAlertDialogBuilder(activity)
.setTitle(R.string.option_take_photo_video)
.setView(dialogLayout)
.setPositiveButton(R.string.save) { _, _ ->
.setPositiveButton(R.string.action_save) { _, _ ->
submitSettings(views)
listener.onUpdated()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
View file

@ -151,7 +151,7 @@ class UnrecognizedCertificateDialog @Inject constructor(
}
builder.setNeutralButton(R.string.ssl_logout_account) { _, _ -> callback.onReject() }
} else {
builder.setNegativeButton(R.string.cancel) { _, _ -> callback.onReject() }
builder.setNegativeButton(R.string.action_cancel) { _, _ -> callback.onReject() }
}
builder.setOnDismissListener {

2
vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
View file

@ -68,7 +68,7 @@ fun Context.showIdentityServerConsentDialog(identityServerWithTerms: ServerAndPo
MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.identity_server_consent_dialog_title_2, identityServerWithTerms?.serverUrl.orEmpty()))
.setMessage(content)
.setPositiveButton(R.string.reactions_agree) { _, _ ->
.setPositiveButton(R.string.action_agree) { _, _ ->
consentCallBack.invoke()
}
.setNegativeButton(R.string.action_not_now, null)

4
vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
View file

@ -308,7 +308,7 @@ fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
val chooserIntent = ShareCompat.IntentBuilder(context)
.setType(mediaMimeType)
.setStream(mediaUri)
.setChooserTitle(R.string.share)
.setChooserTitle(R.string.action_share)
.createChooserIntent()
createChooser(context, chooserIntent)
@ -318,7 +318,7 @@ fun shareText(context: Context, text: String) {
val chooserIntent = ShareCompat.IntentBuilder(context)
.setType("text/plain")
.setText(text)
.setChooserTitle(R.string.share)
.setChooserTitle(R.string.action_share)
.createChooserIntent()
createChooser(context, chooserIntent)

2
vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
View file

@ -168,6 +168,6 @@ fun FragmentActivity.onPermissionDeniedDialog(@StringRes rationaleMessage: Int)
.setPositiveButton(R.string.open_settings) { _, _ ->
openAppSettingsPage(this)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/MainActivity.kt
View file

@ -209,7 +209,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
.setTitle(R.string.dialog_title_error)
.setMessage(errorFormatter.toHumanReadable(failure))
.setPositiveButton(R.string.global_retry) { _, _ -> doCleanUp() }
.setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) }
.setNegativeButton(R.string.action_cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) }
.setCancelable(false)
.show()
}

2
vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
View file

@ -135,7 +135,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
.setPositiveButton(R.string.action_switch) { _, _ ->
jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(action.args, false))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
View file

@ -78,7 +78,7 @@ class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSetti
.setPositiveButton(R.string.keys_backup_settings_delete_confirm_title) { _, _ ->
viewModel.handle(KeyBackupSettingsAction.DeleteKeyBackup)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setCancelable(true)
.show()
}

4
vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
View file

@ -177,8 +177,8 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
MaterialAlertDialogBuilder(this)
.setTitle(R.string.keys_backup_setup_skip_title)
.setMessage(R.string.keys_backup_setup_skip_msg)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.leave) { _, _ ->
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.action_leave) { _, _ ->
finish()
}
.show()

2
vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
View file

@ -119,7 +119,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
.setTitle(R.string.are_you_sure)
.setMessage(R.string.bootstrap_cancel_text)
.setPositiveButton(R.string._continue, null)
.setNegativeButton(R.string.skip) { _, _ ->
.setNegativeButton(R.string.action_skip) { _, _ ->
bottomSheetResult = ResultListener.RESULT_CANCEL
dismiss()
}

2
vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
View file

@ -92,7 +92,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
tx.cancel()
}
addButton(
context.getString(R.string.ignore),
context.getString(R.string.action_ignore),
{ tx.cancel() }
)
addButton(

2
vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
View file

@ -80,7 +80,7 @@ class VerificationCancelController @Inject constructor(
bottomSheetVerificationActionItem {
id("cancel")
title(host.stringProvider.getString(R.string.skip))
title(host.stringProvider.getString(R.string.action_skip))
titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))

2
vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
View file

@ -56,7 +56,7 @@ class VerificationNotMeController @Inject constructor(
bottomSheetVerificationActionItem {
id("skip")
title(host.stringProvider.getString(R.string.skip))
title(host.stringProvider.getString(R.string.action_skip))
titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))

2
vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
View file

@ -93,7 +93,7 @@ class VerificationRequestController @Inject constructor(
bottomSheetVerificationActionItem {
id("skip")
title(host.stringProvider.getString(R.string.skip))
title(host.stringProvider.getString(R.string.action_skip))
titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))

6
vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
View file

@ -153,7 +153,7 @@ class DiscoverySettingsFragment @Inject constructor(
.setTitle(R.string.change_identity_server)
.setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer()))
.setPositiveButton(R.string._continue) { _, _ -> navigateToChangeIdentityServerFragment() }
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
Unit
} else {
@ -177,8 +177,8 @@ class DiscoverySettingsFragment @Inject constructor(
MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.disconnect_identity_server)
.setMessage(message)
.setPositiveButton(R.string.disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) }
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.action_disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) }
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

2
vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
View file

@ -119,7 +119,7 @@ class SetIdentityServerFragment @Inject constructor(
.setPositiveButton(R.string._continue) { _, _ ->
processIdentityServerChange()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
Unit
}

2
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
View file

@ -400,7 +400,7 @@ class HomeActivity :
dismissedAction = Runnable {
homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed)
}
addButton(getString(R.string.dismiss), {
addButton(getString(R.string.action_dismiss), {
homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed)
}, true)
addButton(getString(R.string.settings), {

16
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View file

@ -397,7 +397,7 @@ class RoomDetailFragment @Inject constructor(
when (mode) {
is SendMode.Regular -> renderRegularMode(mode.text)
is SendMode.Edit -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
is SendMode.Quote -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
is SendMode.Quote -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.action_quote, mode.text)
is SendMode.Reply -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
is SendMode.Voice -> renderVoiceMessageMode(mode.text)
}
@ -1054,7 +1054,7 @@ class RoomDetailFragment @Inject constructor(
.setPositiveButton(R.string.settings) { _, _ ->
navigator.openSettings(requireActivity(), VectorSettingsActivity.EXTRA_DIRECT_ACCESS_GENERAL)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
@ -1062,7 +1062,7 @@ class RoomDetailFragment @Inject constructor(
autoCompleter.exitSpecialMode()
views.composerLayout.collapse()
views.composerLayout.setTextIfDifferent(content)
views.composerLayout.views.sendButton.contentDescription = getString(R.string.send)
views.composerLayout.views.sendButton.contentDescription = getString(R.string.action_send)
}
private fun renderSpecialMode(event: TimelineEvent,
@ -1574,7 +1574,7 @@ class RoomDetailFragment @Inject constructor(
val reason = views.dialogReportContentInput.text.toString()
roomDetailViewModel.handle(RoomDetailAction.ReportContent(action.eventId, action.senderId, reason))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
@ -1584,7 +1584,7 @@ class RoomDetailFragment @Inject constructor(
activity = requireActivity(),
askForReason = action.askForReason,
confirmationRes = action.dialogDescriptionRes,
positiveRes = R.string.remove,
positiveRes = R.string.action_remove,
reasonHintRes = R.string.delete_event_dialog_reason_hint,
titleRes = action.dialogTitleRes
) { reason ->
@ -1704,7 +1704,7 @@ class RoomDetailFragment @Inject constructor(
.setPositiveButton(R.string._continue) { _, _ ->
openUrlInExternalBrowser(requireContext(), url)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
// Open in external browser, in a new Tab
@ -2076,7 +2076,7 @@ class RoomDetailFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog)
.setTitle(R.string.end_poll_confirmation_title)
.setMessage(R.string.end_poll_confirmation_description)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.end_poll_confirmation_approve_button) { _, _ ->
roomDetailViewModel.handle(RoomDetailAction.EndPoll(eventId))
}
@ -2087,7 +2087,7 @@ class RoomDetailFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.room_participants_action_ignore_title)
.setMessage(R.string.room_participants_action_ignore_prompt_msg)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.room_participants_action_ignore) { _, _ ->
roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(senderId))
}

4
vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
View file

@ -97,7 +97,7 @@ class StartCallActionsHandler(
// create the widget, then navigate to it..
roomDetailViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall))
}
.setNegativeButton(fragment.getString(R.string.cancel), null)
.setNegativeButton(fragment.getString(R.string.action_cancel), null)
.show()
}
}
@ -112,7 +112,7 @@ class StartCallActionsHandler(
.setPositiveButton(if (isVideoCall) R.string.start_video_call else R.string.start_voice_call) { _, _ ->
safeStartCall2(isVideoCall)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
safeStartCall2(isVideoCall)

10
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
View file

@ -43,28 +43,28 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
EventSharedAction(R.string.edit, R.drawable.ic_edit)
data class Quote(val eventId: String) :
EventSharedAction(R.string.quote, R.drawable.ic_quote)
EventSharedAction(R.string.action_quote, R.drawable.ic_quote)
data class Reply(val eventId: String) :
EventSharedAction(R.string.reply, R.drawable.ic_reply)
data class Share(val eventId: String, val messageContent: MessageContent) :
EventSharedAction(R.string.share, R.drawable.ic_share)
EventSharedAction(R.string.action_share, R.drawable.ic_share)
data class Save(val eventId: String, val messageContent: MessageWithAttachmentContent) :
EventSharedAction(R.string.save, R.drawable.ic_material_save)
EventSharedAction(R.string.action_save, R.drawable.ic_material_save)
data class Resend(val eventId: String) :
EventSharedAction(R.string.global_retry, R.drawable.ic_refresh_cw)
data class Remove(val eventId: String) :
EventSharedAction(R.string.remove, R.drawable.ic_trash, true)
EventSharedAction(R.string.action_remove, R.drawable.ic_trash, true)
data class Redact(val eventId: String, val askForReason: Boolean, val dialogTitleRes: Int, val dialogDescriptionRes: Int) :
EventSharedAction(R.string.message_action_item_redact, R.drawable.ic_delete, true)
data class Cancel(val eventId: String, val force: Boolean) :
EventSharedAction(R.string.cancel, R.drawable.ic_close_round)
EventSharedAction(R.string.action_cancel, R.drawable.ic_close_round)
data class ViewSource(val content: String) :
EventSharedAction(R.string.view_source, R.drawable.ic_view_source)

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
View file

@ -56,7 +56,7 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
val spannableStr = if (vectorPreferences.developerMode()) {
val errorDescription =
if (cryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
stringProvider.getString(R.string.notice_crypto_error_unkwown_inbound_session_id)
stringProvider.getString(R.string.notice_crypto_error_unknown_inbound_session_id)
} else {
// TODO i18n
cryptoError?.name

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
View file

@ -142,7 +142,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
when {
attributes.callKind == CallKind.CONFERENCE -> {
holder.rejectView.isVisible = true
holder.rejectView.setText(R.string.leave)
holder.rejectView.setText(R.string.action_leave)
holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
holder.rejectView.onClick {
attributes.callback?.onTimelineItemAction(RoomDetailAction.LeaveJitsiCall)
@ -176,7 +176,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
}
holder.acceptView.isVisible = true
holder.rejectView.isVisible = false
holder.acceptView.setText(R.string.join)
holder.acceptView.setText(R.string.action_join)
holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
}
!attributes.informationData.sentByMe && attributes.isStillActive -> {

74
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
View file

@ -1,74 +0,0 @@
/*
* Copyright 2020 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.features.home.room.detail.timeline.item
import android.content.Context
import android.graphics.Typeface
import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
import androidx.core.content.withStyledAttributes
import im.vector.app.R
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.databinding.ViewPollResultLineBinding
class PollResultLineView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : LinearLayout(context, attrs, defStyleAttr) {
private val views: ViewPollResultLineBinding
var label: String? = null
set(value) {
field = value
views.pollResultItemLabel.setTextOrHide(value)
}
var percent: String? = null
set(value) {
field = value
views.pollResultItemPercent.setTextOrHide(value)
}
var optionSelected: Boolean = false
set(value) {
field = value
views.pollResultItemSelectedIcon.visibility = if (value) View.VISIBLE else View.INVISIBLE
}
var isWinner: Boolean = false
set(value) {
field = value
// Text in main color
views.pollResultItemLabel.setTypeface(views.pollResultItemLabel.typeface, if (value) Typeface.BOLD else Typeface.NORMAL)
views.pollResultItemPercent.setTypeface(views.pollResultItemPercent.typeface, if (value) Typeface.BOLD else Typeface.NORMAL)
}
init {
inflate(context, R.layout.view_poll_result_line, this)
views = ViewPollResultLineBinding.bind(this)
orientation = HORIZONTAL
context.withStyledAttributes(attrs, R.styleable.PollResultLineView) {
label = getString(R.styleable.PollResultLineView_optionName) ?: ""
percent = getString(R.styleable.PollResultLineView_optionCount) ?: ""
optionSelected = getBoolean(R.styleable.PollResultLineView_optionSelected, false)
isWinner = getBoolean(R.styleable.PollResultLineView_optionIsWinner, false)
}
}
}

4
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
View file

@ -404,10 +404,10 @@ class RoomListFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.room_participants_leave_prompt_title)
.setMessage(message)
.setPositiveButton(R.string.leave) { _, _ ->
.setPositiveButton(R.string.action_leave) { _, _ ->
roomListViewModel.handle(RoomListAction.LeaveRoom(roomId))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
View file

@ -72,7 +72,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
)
.buttonLabel(
if (error != null) stringProvider.getString(R.string.global_retry)
else stringProvider.getString(R.string.join)
else stringProvider.getString(R.string.action_join)
)
.loading(suggestedRoomJoiningStates[spaceChildInfo.childRoomId] is Loading)
.memberCount(spaceChildInfo.activeMemberCount ?: 0)

2
vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
View file

@ -121,7 +121,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
.setMessage(R.string.error_user_already_logged_in)
.setCancelable(false)
.setPositiveButton(R.string.logout) { _, _ -> safeSignout(uri) }
.setNegativeButton(R.string.cancel) { _, _ -> finish() }
.setNegativeButton(R.string.action_cancel) { _, _ -> finish() }
.show()
}

2
vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
View file

@ -88,7 +88,7 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment<F
.setPositiveButton(R.string.login_reset_password_warning_submit) { _, _ ->
doSubmit()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
doSubmit()

2
vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
View file

@ -79,7 +79,7 @@ class LoginSplashFragment @Inject constructor(
.setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ ->
loginViewModel.handle(LoginAction.OnGetStarted(resetLoginConfig = true))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
super.onError(throwable)

2
vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
View file

@ -124,7 +124,7 @@ class LoginResetPasswordFragment2 @Inject constructor() : AbstractLoginFragment2
showWarning = false
doSubmit()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
doSubmit()

2
vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
View file

@ -107,7 +107,7 @@ class AccountCreatedFragment @Inject constructor(
val newName = views.editText.text.toString()
viewModel.handle(AccountCreatedAction.SetDisplayName(newName))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
View file

@ -108,7 +108,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
views.matrixToCardMainButton.isVisible = true
views.matrixToCardSecondaryButton.isVisible = true
views.matrixToCardMainButton.button.text = getString(joinTextRes)
views.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
views.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline)
}
Membership.JOIN -> {
views.matrixToCardMainButton.isVisible = true

4
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
View file

@ -691,7 +691,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
addAction(
R.drawable.vector_notification_reject_invitation,
stringProvider.getString(R.string.reject),
stringProvider.getString(R.string.action_reject),
rejectIntentPendingIntent
)
@ -708,7 +708,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
)
addAction(
R.drawable.vector_notification_accept_invitation,
stringProvider.getString(R.string.join),
stringProvider.getString(R.string.action_join),
joinIntentPendingIntent
)

2
vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
View file

@ -162,7 +162,7 @@ class PinFragment @Inject constructor(
.setPositiveButton(getString(R.string.auth_pin_new_pin_action)) { _, _ ->
launchResetPinFlow()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
View file

@ -302,7 +302,7 @@ class RoomMemberProfileController @Inject constructor(
return if (isIgnored) {
stringProvider.getString(R.string.unignore)
} else {
stringProvider.getString(R.string.ignore)
stringProvider.getString(R.string.action_ignore)
}
}
}

2
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
View file

@ -168,7 +168,7 @@ class RoomMemberProfileFragment @Inject constructor(
.withArgs(roomId = null, otherUserId = startVerification.userId)
.show(parentFragmentManager, "VERIF")
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

4
vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
View file

@ -61,7 +61,7 @@ object EditPowerLevelDialogs {
}
listener(newValue)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setOnKeyListener(DialogInterface.OnKeyListener
{ dialog, keyCode, event ->
if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
@ -96,7 +96,7 @@ object EditPowerLevelDialogs {
.setPositiveButton(R.string.room_participants_power_level_demote) { _, _ ->
onValidate()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

6
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
View file

@ -235,7 +235,7 @@ class RoomProfileFragment @Inject constructor(
MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.room_settings_enable_encryption_dialog_title)
.setMessage(R.string.room_settings_enable_encryption_dialog_content)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.room_settings_enable_encryption_dialog_submit) { _, _ ->
roomProfileViewModel.handle(RoomProfileAction.EnableEncryption)
}
@ -284,10 +284,10 @@ class RoomProfileFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.room_participants_leave_prompt_title)
.setMessage(message)
.setPositiveButton(R.string.leave) { _, _ ->
.setPositiveButton(R.string.action_leave) { _, _ ->
roomProfileViewModel.handle(RoomProfileAction.LeaveRoom)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

6
vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
View file

@ -135,7 +135,7 @@ class RoomAliasFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.dialog_title_confirmation)
.setMessage(getString(R.string.room_alias_unpublish_confirmation, alias))
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.action_unpublish) { _, _ ->
viewModel.handle(RoomAliasAction.UnpublishAlias(alias))
}
@ -190,8 +190,8 @@ class RoomAliasFragment @Inject constructor(
MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.dialog_title_confirmation)
.setMessage(getString(R.string.room_alias_delete_confirmation, alias))
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.delete) { _, _ ->
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.action_delete) { _, _ ->
viewModel.handle(RoomAliasAction.RemoveLocalAlias(alias))
}
.show()

4
vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
View file

@ -28,7 +28,7 @@ sealed class RoomAliasBottomSheetSharedAction(
VectorSharedAction {
data class ShareAlias(val matrixTo: String) : RoomAliasBottomSheetSharedAction(
R.string.share,
R.string.action_share,
R.drawable.ic_material_share
)
@ -41,7 +41,7 @@ sealed class RoomAliasBottomSheetSharedAction(
)
data class DeleteAlias(val alias: String) : RoomAliasBottomSheetSharedAction(
R.string.delete,
R.string.action_delete,
R.drawable.ic_trash_24,
true
)

4
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
View file

@ -126,8 +126,8 @@ class RoomMemberListFragment @Inject constructor(
MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.three_pid_revoke_invite_dialog_title)
.setMessage(getString(R.string.three_pid_revoke_invite_dialog_content, content.displayName))
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.revoke) { _, _ ->
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.action_revoke) { _, _ ->
viewModel.handle(RoomMemberListAction.RevokeThreePidInvite(stateKey))
}
.show()

2
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
View file

@ -231,7 +231,7 @@ class RoomSettingsFragment @Inject constructor(
.setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
viewModel.handle(RoomSettingsAction.Cancel)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
true
} else {

4
vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
View file

@ -60,7 +60,7 @@ class RoomJoinRuleFragment @Inject constructor(
.setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
requireActivity().finish()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
return true
}
@ -75,7 +75,7 @@ class RoomJoinRuleFragment @Inject constructor(
views.cancelButton.isVisible = true
views.positiveButton.text = getString(R.string.warning_unsaved_change_discard)
views.positiveButton.isVisible = true
views.positiveButton.text = getString(R.string.save)
views.positiveButton.text = getString(R.string.action_save)
views.positiveButton.debouncedClicks {
viewModel.handle(RoomJoinRuleChooseRestrictedActions.DoUpdateJoinRules)
}

2
vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt
View file

@ -35,7 +35,7 @@ class BackgroundSyncModeChooserDialog : DialogFragment() {
val dialog = MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.settings_background_fdroid_sync_mode)
.setView(view)
.setPositiveButton(R.string.cancel, null)
.setPositiveButton(R.string.action_cancel, null)
.create()
views.backgroundSyncModeBattery.setOnClickListener {

2
vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
View file

@ -371,7 +371,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
.setView(view)
.setCancelable(false)
.setPositiveButton(R.string.settings_change_password, null)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setOnDismissListener {
view.hideKeyboard()
}

2
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
View file

@ -187,7 +187,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
.setTitle(R.string.font_size)
.setView(layout)
.setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
val index = FontScale.getFontScaleValue(activity).index

2
vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
View file

@ -272,7 +272,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("rename")
title(host.stringProvider.getString(R.string.rename))
title(host.stringProvider.getString(R.string.action_rename))
titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))

2
vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
View file

@ -136,7 +136,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
viewModel.handle(DevicesAction.Rename(deviceInfo.deviceId!!, newName))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

6
vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
View file

@ -82,10 +82,10 @@ class AccountDataFragment @Inject constructor(
override fun didLongTap(data: UserAccountDataEvent) {
MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.delete)
.setTitle(R.string.action_delete)
.setMessage(getString(R.string.delete_account_data_warning, data.type))
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.delete) { _, _ ->
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.action_delete) { _, _ ->
viewModel.handle(AccountDataAction.DeleteAccountData(data.type))
}
.show()

4
vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
View file

@ -184,10 +184,10 @@ class ThreePidsSettingsFragment @Inject constructor(
override fun deleteThreePid(threePid: ThreePid) {
MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.getFormattedValue()))
.setPositiveButton(R.string.remove) { _, _ ->
.setPositiveButton(R.string.action_remove) { _, _ ->
viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid))
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

4
vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
View file

@ -200,10 +200,10 @@ class IncomingShareFragment @Inject constructor(
MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.send_attachment)
.setMessage(getString(R.string.share_confirm_room, roomSummary.displayName))
.setPositiveButton(R.string.send) { _, _ ->
.setPositiveButton(R.string.action_send) { _, _ ->
navigator.openRoomForSharingAndFinish(requireActivity(), roomSummary.roomId, sharedData)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
View file

@ -127,7 +127,7 @@ class SoftLogoutFragment @Inject constructor(
MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.soft_logout_clear_data_dialog_title)
.setMessage(messageResId)
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.setPositiveButton(R.string.soft_logout_clear_data_submit) { _, _ ->
softLogoutViewModel.handle(SoftLogoutAction.ClearData)
}

2
vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
View file

@ -156,7 +156,7 @@ class SpaceDirectoryController @Inject constructor(
when {
error != null -> host.stringProvider.getString(R.string.global_retry)
isJoined -> host.stringProvider.getString(R.string.action_open)
else -> host.stringProvider.getString(R.string.join)
else -> host.stringProvider.getString(R.string.action_join)
}
)
apply {

2
vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
View file

@ -215,7 +215,7 @@ class SpaceDirectoryFragment @Inject constructor(
.setPositiveButton(R.string._continue) { _, _ ->
openUrlInExternalBrowser(requireContext(), url)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
} else {
// Open in external browser, in a new Tab

4
vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
View file

@ -120,8 +120,8 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
spaceCardRenderer.render(summary, state.peopleYouKnow.invoke().orEmpty(), null, views.spaceCard)
views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.accept)
views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.action_accept)
views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline)
when (state.joinActionState) {
Uninitialized -> {

2
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
View file

@ -138,7 +138,7 @@ class SpaceAddRoomFragment @Inject constructor(
.setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
is SpaceAddRoomsViewEvents.SaveFailed -> {

2
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
View file

@ -165,7 +165,7 @@ class SpaceSettingsFragment @Inject constructor(
.setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
viewModel.handle(RoomSettingsAction.Cancel)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
true
} else {

4
vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
View file

@ -309,10 +309,10 @@ class WidgetFragment @Inject constructor() :
private fun deleteWidget() {
MaterialAlertDialogBuilder(requireContext())
.setMessage(R.string.widget_delete_message_confirmation)
.setPositiveButton(R.string.remove) { _, _ ->
.setPositiveButton(R.string.action_remove) { _, _ ->
viewModel.handle(WidgetAction.DeleteWidget)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

2
vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
View file

@ -43,7 +43,7 @@ class SignOutUiWorker(private val activity: FragmentActivity) {
.setPositiveButton(R.string.action_sign_out) { _, _ ->
doSignOut()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

2
vector/src/main/res/layout/bottom_sheet_leave_space.xml
View file

@ -100,6 +100,6 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/cancel" />
android:text="@string/action_cancel" />
</LinearLayout>

2
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
View file

@ -102,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin"
android:text="@string/decline"
android:text="@string/action_decline"
android:textAllCaps="true" />
<Button

2
vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
View file

@ -74,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/skip"
android:text="@string/action_skip"
android:textAllCaps="true" />
<Button

2
vector/src/main/res/layout/bottom_sheet_space_invite.xml
View file

@ -50,7 +50,7 @@
android:layout_marginBottom="16dp"
app:icon="@drawable/ic_add_people"
app:iconTint="?vctr_content_secondary"
app:title="@string/invite_by_mxid_or_mail" />
app:title="@string/invite_by_username_or_mail" />
<im.vector.app.features.spaces.create.WizardButtonView
android:id="@+id/inviteByLinkButton"

2
vector/src/main/res/layout/bottom_sheet_tombstone_join.xml
View file

@ -41,7 +41,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="@dimen/layout_vertical_margin_big"
app:bsv_button_text="@string/join"
app:bsv_button_text="@string/action_join"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true" />

4
vector/src/main/res/layout/composer_layout.xml
View file

@ -72,7 +72,7 @@
android:layout_width="22dp"
android:layout_height="22dp"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/cancel"
android:contentDescription="@string/action_cancel"
android:src="@drawable/ic_close_round"
app:tint="?colorError"
tools:ignore="MissingConstraints,MissingPrefix" />
@ -127,7 +127,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_send"
android:contentDescription="@string/send"
android:contentDescription="@string/action_send"
android:src="@drawable/ic_send"
tools:ignore="MissingConstraints" />

4
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View file

@ -87,7 +87,7 @@
android:layout_width="22dp"
android:layout_height="22dp"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/cancel"
android:contentDescription="@string/action_cancel"
android:src="@drawable/ic_close_round"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="parent"
@ -169,7 +169,7 @@
android:layout_height="@dimen/composer_min_height"
android:layout_marginEnd="2dp"
android:background="@drawable/bg_send"
android:contentDescription="@string/send"
android:contentDescription="@string/action_send"
android:scaleType="center"
android:src="@drawable/ic_send"
android:visibility="invisible"

4
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View file

@ -101,7 +101,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/cancel"
android:contentDescription="@string/action_cancel"
android:src="@drawable/ic_close_round"
app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
app:layout_constraintEnd_toEndOf="parent"
@ -181,7 +181,7 @@
android:layout_height="@dimen/composer_min_height"
android:layout_marginEnd="2dp"
android:background="@drawable/bg_send"
android:contentDescription="@string/send"
android:contentDescription="@string/action_send"
android:scaleType="center"
android:src="@drawable/ic_send"
android:visibility="invisible"

2
vector/src/main/res/layout/fragment_attachments_preview.xml
View file

@ -74,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/send"
android:contentDescription="@string/action_send"
android:src="@drawable/ic_send"
app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_bootstrap_reauth.xml
View file

@ -43,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/cancel"
android:text="@string/action_cancel"
tools:ignore="MissingConstraints" />
<Button

4
vector/src/main/res/layout/fragment_join_rules_recycler.xml
View file

@ -35,14 +35,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/cancel" />
android:text="@string/action_cancel" />
<Button
android:id="@+id/positiveButton"
style="@style/Widget.Vector.Button.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/save" />
android:text="@string/action_save" />
</LinearLayout>
<FrameLayout

2
vector/src/main/res/layout/fragment_login_terms.xml
View file

@ -58,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="36dp"
android:text="@string/accept"
android:text="@string/action_accept"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

2
vector/src/main/res/layout/fragment_login_terms_2.xml
View file

@ -62,7 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="36dp"
android:text="@string/accept"
android:text="@string/action_accept"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

4
vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
View file

@ -219,7 +219,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="@dimen/layout_vertical_margin_big"
app:bsv_button_text="@string/accept"
app:bsv_button_text="@string/action_accept"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false"
app:layout_constraintEnd_toEndOf="parent"
@ -260,7 +260,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="@dimen/layout_vertical_margin_big"
app:bsv_button_text="@string/dismiss"
app:bsv_button_text="@string/action_dismiss"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true"
app:layout_constraintEnd_toEndOf="parent"

4
vector/src/main/res/layout/fragment_review_terms.xml
View file

@ -34,13 +34,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/decline" />
android:text="@string/action_decline" />
<Button
android:id="@+id/reviewTermsAccept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accept" />
android:text="@string/action_accept" />
</LinearLayout>

2
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View file

@ -139,7 +139,7 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin"
android:minWidth="120dp"
app:bsv_button_text="@string/join"
app:bsv_button_text="@string/action_join"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false" />

2
vector/src/main/res/layout/fragment_space_leave_advanced.xml
View file

@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:text="@string/cancel" />
android:text="@string/action_cancel" />
<Button
android:id="@+id/spaceLeaveButton"

4
vector/src/main/res/layout/fragment_space_preview.xml
View file

@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:text="@string/decline" />
android:text="@string/action_decline" />
<Button
android:id="@+id/spacePreviewAcceptInviteButton"
@ -114,7 +114,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/accept" />
android:text="@string/action_accept" />
</LinearLayout>

4
vector/src/main/res/layout/fragment_ssss_reset_all.xml
View file

@ -91,7 +91,7 @@
style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:text="@string/action_cancel"
tools:ignore="MissingConstraints" />
<Button
@ -99,7 +99,7 @@
style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:text="@string/action_reset"
tools:ignore="MissingConstraints" />
<androidx.constraintlayout.helper.widget.Flow

2
vector/src/main/res/layout/item_form_text_input_with_delete.xml
View file

@ -34,7 +34,7 @@
android:layout_height="24dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:background="@drawable/circle"
android:contentDescription="@string/delete"
android:contentDescription="@string/action_delete"
android:scaleType="center"
android:src="@drawable/ic_delete_10dp"
app:layout_constraintBottom_toBottomOf="@id/formTextInputTextInputLayout"

2
vector/src/main/res/layout/item_generic_list.xml
View file

@ -127,7 +127,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
app:layout_constraintTop_toBottomOf="@id/item_generic_action_button"
tools:text="@string/delete"
tools:text="@string/action_delete"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/layout/item_public_room.xml
View file

@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
app:bsv_button_text="@string/join"
app:bsv_button_text="@string/action_join"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/item_pushgateway.xml
View file

@ -130,6 +130,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/remove" />
android:text="@string/action_remove" />
</LinearLayout>

2
vector/src/main/res/layout/item_room_directory_server.xml
View file

@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:contentDescription="@string/remove"
android:contentDescription="@string/action_remove"
android:padding="8dp"
android:src="@drawable/ic_delete"
android:visibility="gone"

4
vector/src/main/res/layout/item_room_invitation.xml
View file

@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:minWidth="122dp"
app:bsv_button_text="@string/accept"
app:bsv_button_text="@string/action_accept"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false"
app:layout_constraintEnd_toEndOf="@id/roomInvitationNameView"
@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin"
android:minWidth="122dp"
app:bsv_button_text="@string/reject"
app:bsv_button_text="@string/action_reject"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true"
app:layout_constraintEnd_toStartOf="@id/roomInvitationAccept"

2
vector/src/main/res/layout/item_settings_continue_cancel.xml
View file

@ -14,7 +14,7 @@
style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:text="@string/action_cancel"
android:textColor="?colorError"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
vector/src/main/res/layout/item_settings_three_pid.xml
View file

@ -42,7 +42,7 @@
android:id="@+id/item_settings_three_pid_delete"
android:layout_width="@dimen/layout_touch_size"
android:layout_height="@dimen/layout_touch_size"
android:contentDescription="@string/delete"
android:contentDescription="@string/action_delete"
android:scaleType="center"
android:src="@drawable/ic_trash_24"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/item_suggested_room.xml
View file

@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:maxWidth="@dimen/button_max_width"
android:text="@string/join"
android:text="@string/action_join"
app:layout_constraintBottom_toTopOf="@id/inlineErrorText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
View file

@ -61,7 +61,7 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/itemCallRejectView"
app:layout_constraintTop_toTopOf="@id/itemCallRejectView"
tools:text="@string/join" />
tools:text="@string/action_join" />
<Button
android:id="@+id/itemCallRejectView"
@ -74,7 +74,7 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/ignore" />
tools:text="@string/action_ignore" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
View file

@ -23,7 +23,7 @@
android:id="@+id/messageMediaPlayView"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="@string/play_video"
android:contentDescription="@string/action_play"
android:src="@drawable/ic_material_play_circle"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/messageThumbnailView"

4
vector/src/main/res/layout/item_timeline_event_verification_stub.xml
View file

@ -47,14 +47,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/decline" />
android:text="@string/action_decline" />
<Button
android:id="@+id/sas_verification_verified_accept_button"
style="@style/Widget.Vector.Button.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accept" />
android:text="@string/action_accept" />
</LinearLayout>

4
vector/src/main/res/layout/item_uploads_file.xml
View file

@ -56,7 +56,7 @@
android:id="@+id/uploadsFileActionDownload"
android:layout_width="@dimen/layout_touch_size"
android:layout_height="@dimen/layout_touch_size"
android:contentDescription="@string/download"
android:contentDescription="@string/action_download"
android:scaleType="center"
android:src="@drawable/ic_download"
app:layout_constraintBottom_toBottomOf="parent"
@ -70,7 +70,7 @@
android:layout_width="@dimen/layout_touch_size"
android:layout_height="@dimen/layout_touch_size"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:contentDescription="@string/share"
android:contentDescription="@string/action_share"
android:scaleType="center"
android:src="@drawable/ic_material_share"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/item_uploads_video.xml
View file

@ -24,7 +24,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/play_video"
android:contentDescription="@string/action_play"
android:src="@drawable/ic_material_play_circle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/item_verification_wait.xml
View file

@ -90,7 +90,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/or_other_mx_capabale_client"
android:text="@string/or_other_mx_capable_client"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/merge_image_attachment_overlay.xml
View file

@ -74,7 +74,7 @@
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/share"
android:contentDescription="@string/action_share"
android:focusable="true"
android:padding="6dp"
app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
@ -107,7 +107,7 @@
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/play_video"
android:contentDescription="@string/action_play"
android:focusable="true"
android:padding="6dp"
android:scaleType="centerInside"

4
vector/src/main/res/layout/vector_invite_view.xml
View file

@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:minWidth="120dp"
app:bsv_button_text="@string/accept"
app:bsv_button_text="@string/action_accept"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false"
app:layout_constraintEnd_toEndOf="parent"
@ -80,7 +80,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="4dp"
android:minWidth="120dp"
app:bsv_button_text="@string/reject"
app:bsv_button_text="@string/action_reject"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true"
app:layout_constraintEnd_toStartOf="@id/inviteAcceptView"

Some files were not shown because too many files have changed in this diff Show more