Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ fun ChangeEmailContent(
inputTransformation = InputTransformation.forceLowercase(),
state = computeEmailErrorState(state.flowState),
keyboardOptions = KeyboardOptions.DefaultEmailDone,
readOnly = state.flowState is ChangeEmailState.FlowState.Loading,
onKeyboardAction = { keyboardController?.hide() },
modifier = Modifier.padding(
horizontal = MaterialTheme.wireDimensions.spacing16x
Expand Down Expand Up @@ -191,8 +192,6 @@ private fun computeEmailErrorState(state: ChangeEmailState.FlowState): WireTextF
stringResource(id = R.string.settings_myaccount_email_generic_error)
)

ChangeEmailState.FlowState.Loading -> WireTextFieldState.ReadOnly

else -> WireTextFieldState.Default
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.zIndex
import com.wire.android.BuildConfig
import com.wire.android.ui.authentication.login.WireAuthBackgroundLayout
import com.wire.android.ui.common.bottomsheet.WireBottomSheetDefaults
Expand Down Expand Up @@ -82,6 +83,7 @@ fun NewAuthContainer(
Surface(
color = WireBottomSheetDefaults.WireSheetContainerColor,
shadowElevation = scrollState.rememberTopBarElevationState().value,
modifier = Modifier.zIndex(1f) // to ensure the header is above the column content when scrolled
) {
header()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ fun UserProfileInfo(
targetState = userAvatarData to showPlaceholderIfNoAsset.value,
label = "UserProfileInfoAvatar"
) { (userAvatarData, showPlaceholderIfNoAsset) ->
val onAvatarClickDescription = stringResource(R.string.content_description_change_it_label)
val onAvatarClickDescription = stringResource(commonR.string.content_description_change_it_label)
val contentDescription = if (editableState is EditableState.IsEditable) {
stringResource(R.string.content_description_self_profile_avatar)
} else {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@
<string name="content_description_edit_self_delete_back_btn">Zurück zu Unterhaltungsdetails</string>
<string name="content_description_accept_or_ignore_connection_label">Anfrage akzeptieren oder ignorieren</string>
<string name="content_description_alert">Hinweis</string>
<string name="content_description_drop_down">Auswahlliste</string>
<string name="content_description_close_dropdown">Dropdown schließen</string>
<string name="content_description_open_notification_settings_label">Benachrichtigungseinstellungen öffnen</string>
<string name="content_description_new_conversation_close_btn">Ansicht neue Unterhaltung schließen</string>
<string name="content_description_new_conversation_back_btn">Zurück zur Ansicht neue Unterhaltung</string>
Expand Down Expand Up @@ -1129,9 +1127,6 @@
<string name="team_settings_changed">Team-Einstellungen geändert</string>
<string name="sharing_files_enabled">Das Teilen und Empfangen von Dateien jeder Art ist jetzt aktiviert</string>
<string name="sharing_files_disabled">Das Teilen und Empfangen von Dateien jeder Art ist jetzt deaktiviert</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (Standard)"</string>
<string name="wire_dropdown_placeholder">Bitte auswählen</string>
<string name="change">Ändern</string>
<string name="allow_guests">Gäste zulassen</string>
<string name="allow_guest_switch_description">Öffnen Sie diese Unterhaltung für Personen außerhalb Ihres Teams. Diese Einstellung kann später jederzeit geändert werden.</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,6 @@ Un mensaje eliminado no puede ser restaurado.</string>
<string name="team_settings_changed">Configuraci&#243;n del equipo cambiada</string>
<string name="sharing_files_enabled">Ahora est&#225; habilitada la compartici&#243;n y recepci&#243;n de todo tipo de archivos</string>
<string name="sharing_files_disabled">Ahora est&#225; deshabilitada la compartici&#243;n y recepci&#243;n de todo tipo de archivos</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (predeterminado)"</string>
<string name="wire_dropdown_placeholder">Seleccionar una opci&#243;n</string>
<string name="change">Cambiar</string>
<string name="allow_guests">Permitir invitados</string>
<string name="allow_guest_switch_description">Abra esta conversaci&#243;n a personas fuera de su equipo. Siempre puede cambiarlo m&#225;s tarde.</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@
<!--sso dialog-->
<string name="asset_download_dialog_default_title">Preuzmite datoteku</string>
<!--prohibited asset messages -->
<!--wire dropdown-->
<string name="wire_dropdown_placeholder">Izaberi stavku</string>
<string name="change">Promijeni</string>
<string name="allow_guests">Dopustite goste</string>
<!--block user dialog -->
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@
<string name="content_description_edit_guests_option_back_btn">Vissza a beszélgetés részleteihez</string>
<string name="content_description_edit_self_delete_back_btn">Vissza a beszélgetés részleteihez</string>
<string name="content_description_accept_or_ignore_connection_label">a kérelem elfogadása vagy elutasítása</string>
<string name="content_description_change_it_label">megváltoztatás</string>
<string name="content_description_alert">Riasztás</string>
<string name="content_description_drop_down">Lenyitás</string>
<string name="content_description_close_dropdown">lenyíló elem összecsukása</string>
<string name="content_description_open_notification_settings_label">értesítési beállítások megnyitása</string>
<string name="content_description_new_conversation_close_btn">Az új beszélgetés lap bezárása</string>
<string name="content_description_new_conversation_back_btn">Vissza az új beszélgetés lapra</string>
Expand Down Expand Up @@ -968,9 +965,6 @@
<string name="team_settings_changed">A csapatbeállítások módosultak</string>
<string name="sharing_files_enabled">Bármilyen típusú fájl megosztása és fogadása mostantól engedélyezve</string>
<string name="sharing_files_disabled">Bármilyen típusú fájl megosztása és fogadása mostantól tiltva</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (alapértelmezett)"</string>
<string name="wire_dropdown_placeholder">Jelöljön ki egy elemet</string>
<string name="change">Módosítás</string>
<string name="allow_guests">Vendégek engedélyezése</string>
<string name="allow_guest_switch_description">Megnyitja a beszélgetést a csapatán kívüli személyek számára is. Ezt később bármikor megváltoztathatja.</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -717,9 +717,6 @@ Rispondendo qui, verr&#224; riagganciata l\'altra chiamata.</string>
<string name="team_settings_changed">Impostazioni del team modificate</string>
<string name="sharing_files_enabled">La condivisione e la ricezione di file di qualsiasi tipo sono ora abilitate</string>
<string name="sharing_files_disabled">La condivisione e la ricezione di file di qualsiasi tipo sono ora disabilitate</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (predefinito)"</string>
<string name="wire_dropdown_placeholder">Seleziona un elemento</string>
<string name="change">Cambia</string>
<string name="allow_guests">Consenti ospiti</string>
<string name="allow_guest_switch_description">Apri questa conversazione a persone esterne al tuo team. Puoi sempre cambiarla successivamente.</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -612,9 +612,6 @@ Do&#322;&#261;czenie do tego po&#322;&#261;czenia spowoduje zako&#324;czenie tam
<string name="team_settings_changed">Ustawienia zespo&#322;u zmienione</string>
<string name="sharing_files_enabled">Udost&#281;pnianie i odbieranie plik&#243;w dowolnego typu s&#261; teraz w&#322;&#261;czone</string>
<string name="sharing_files_disabled">Udost&#281;pnianie i odbieranie plik&#243;w dowolnego typu s&#261; teraz wy&#322;&#261;czone</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (domy&#347;lnie)"</string>
<string name="wire_dropdown_placeholder">Wybierz</string>
<string name="change">Zmie&#324;</string>
<string name="allow_guests">Zezw&#243;l na go&#347;ci</string>
<string name="allow_guest_switch_description">Otw&#243;rz t&#281; rozmow&#281; dla os&#243;b spoza twojego zespo&#322;u. Zawsze mo&#380;esz to zmieni&#263; p&#243;&#378;niej.</string>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@
<string name="content_description_edit_guests_option_back_btn">Voltar para os detalhes da conversa</string>
<string name="content_description_edit_self_delete_back_btn">Voltar para os detalhes da conversa</string>
<string name="content_description_accept_or_ignore_connection_label">aceitar ou ignorar a solicitação</string>
<string name="content_description_change_it_label">alterar isto</string>
<string name="content_description_alert">Alerta</string>
<string name="content_description_drop_down">Menu suspenso</string>
<string name="content_description_close_dropdown">fechar menu suspenso</string>
<string name="content_description_open_notification_settings_label">abrir configurações de notificação</string>
<string name="content_description_new_conversation_close_btn">Fechar visualização de novas conversas</string>
<string name="content_description_new_conversation_name_back_btn">Voltar à visualização de nova conversa</string>
Expand Down Expand Up @@ -916,9 +913,6 @@ Uma mensagem excluída não pode ser restaurada.</string>
<string name="team_settings_changed">Configurações do time mudaram</string>
<string name="sharing_files_enabled">Compartilhar e receber arquivos de todos os tipos está habilitado</string>
<string name="sharing_files_disabled">Compartilhar e receber arquivos de todos os tipos está desabilitado</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (padrão)"</string>
<string name="wire_dropdown_placeholder">Selecione um item</string>
<string name="change">Trocar</string>
<string name="allow_guests">Permitir convidados</string>
<string name="allow_guest_switch_description">Abrir esta conversa para pessoas fora do seu time. Você pode sempre alterar isso depois.</string>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,7 @@
<string name="content_description_edit_guests_option_back_btn">Вернуться к сведениям о беседе</string>
<string name="content_description_edit_self_delete_back_btn">Вернуться к сведениям о беседе</string>
<string name="content_description_accept_or_ignore_connection_label">принять или игнорировать запрос</string>
<string name="content_description_change_it_label">изменить</string>
<string name="content_description_alert">Оповещение</string>
<string name="content_description_drop_down">Раскрывающийся список</string>
<string name="content_description_close_dropdown">закрыть раскрывающийся список</string>
<string name="content_description_open_notification_settings_label">открыть настройки уведомлений</string>
<string name="content_description_new_conversation_close_btn">Закрыть просмотр новой беседы</string>
<string name="content_description_new_conversation_back_btn">Вернуться к просмотру новой беседы</string>
Expand Down Expand Up @@ -1189,9 +1186,6 @@
<string name="team_settings_changed">Настройки команды изменены</string>
<string name="sharing_files_enabled">Обмен и получение файлов любого типа теперь включены</string>
<string name="sharing_files_disabled">Обмен и получение файлов любого типа теперь отключены</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (по умолчанию)"</string>
<string name="wire_dropdown_placeholder">Выбрать элемент</string>
<string name="change">Изменить</string>
<string name="allow_guests">Разрешить гостей</string>
<string name="allow_guest_switch_description">Открыть эту беседу для пользователей не из вашей команды. Вы всегда сможете изменить это позже.</string>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values-si/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@
<string name="content_description_edit_guests_option_back_btn">සංවාද විස්තර වෙත ආපසු යන්න</string>
<string name="content_description_edit_self_delete_back_btn">සංවාද විස්තර වෙත ආපසු යන්න</string>
<string name="content_description_accept_or_ignore_connection_label">ඉල්ලීම පිළිගන්න හෝ නොසලකා හරින්න</string>
<string name="content_description_change_it_label">එය වෙනස් කරන්න</string>
<string name="content_description_alert">අනතුරු ඇඟවීම</string>
<string name="content_description_drop_down">පතන</string>
<string name="content_description_close_dropdown">පතන ලැයිස්තුව වසන්න</string>
<string name="content_description_open_notification_settings_label">දැනුම්දීම් සැකසුම් විවෘත කරන්න</string>
<string name="content_description_new_conversation_close_btn">නව සංවාද දසුන වසන්න</string>
<string name="content_description_new_conversation_back_btn">නව සංවාද දසුනට ආපසු යන්න</string>
Expand Down Expand Up @@ -982,9 +979,6 @@
<string name="team_settings_changed">කණ්ඩායමේ සැකසුම් සංශෝධිතයි</string>
<string name="sharing_files_enabled">ඕනෑම වර්ගයක ගොනු බෙදාගැනීම සහ ලැබීම සබල කර ඇත</string>
<string name="sharing_files_disabled">ඕනෑම වර්ගයක ගොනු බෙදාගැනීම සහ ලැබීම අබල කර ඇත</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (පෙරනිමි)"</string>
<string name="wire_dropdown_placeholder">අථකයක් තෝරන්න</string>
<string name="change">සංශෝධනය</string>
<string name="allow_guests">අමුත්තන්ට ඉඩදෙන්න</string>
<string name="allow_guest_switch_description">ඔබගේ කණ්ඩායමෙන් පිටත පුද්ගලයින්ට මෙම සංවාදය විවෘත කරන්න. මෙය පසුව වෙනස් කිරීමට හැකිය.</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@
<string name="content_description_edit_guests_option_back_btn">Konuşma detaylarına geri dön</string>
<string name="content_description_edit_self_delete_back_btn">Konuşma detaylarına geri dön</string>
<string name="content_description_accept_or_ignore_connection_label">isteği kabul et veya yok say</string>
<string name="content_description_change_it_label">değiştir</string>
<string name="content_description_alert">Uyarı</string>
<string name="content_description_drop_down">Açılır liste</string>
<string name="content_description_close_dropdown">açılır listeyi kapat</string>
<string name="content_description_open_notification_settings_label">bildirim ayarlarını aç</string>
<string name="content_description_new_conversation_close_btn">Yeni konuşma görünümünü kapat</string>
<string name="content_description_new_conversation_back_btn">Yeni konuşma görünümüne geri dön</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@
<!--prohibited asset messages -->
<string name="sharing_files_enabled">Отримання та надсилання файлів будь-якого типу було увімкнено</string>
<string name="sharing_files_disabled">Отримання та надсилання файлів будь-якого типу було вимкнено</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (за замовчуванням)"</string>
<string name="wire_dropdown_placeholder">Виберіть елемент</string>
<string name="change">Змінити</string>
<string name="allow_guests">Дозволити гостям</string>
<string name="allow_guest_switch_description">Відкрийте цю бесіду людям, які не належать до вашої команди. Ви завжди можете змінити це пізніше.</string>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@
<string name="content_description_edit_guests_option_back_btn">Go back to conversation details</string>
<string name="content_description_edit_self_delete_back_btn">Go back to conversation details</string>
<string name="content_description_accept_or_ignore_connection_label">accept or ignore the request</string>
<string name="content_description_change_it_label">change it</string>
<string name="content_description_alert">Alert</string>
<string name="content_description_drop_down">Dropdown</string>
<string name="content_description_close_dropdown">close dropdown</string>
<string name="content_description_open_notification_settings_label">open notification settings</string>
<string name="content_description_new_conversation_close_btn">Close new conversation view</string>
<string name="content_description_new_conversation_back_btn">Go back to new conversation view</string>
Expand Down Expand Up @@ -1194,9 +1191,6 @@
<string name="team_settings_changed">Team Settings Changed</string>
<string name="sharing_files_enabled">Sharing and receiving files of any type is now enabled</string>
<string name="sharing_files_disabled">Sharing and receiving files of any type is now disabled</string>
<!--wire dropdown-->
<string name="wire_dropdown_default_indicator">" (default)"</string>
<string name="wire_dropdown_placeholder">Select an Item</string>
<string name="change">Change</string>
<string name="allow_guests">Allow guests</string>
<string name="allow_guest_switch_description">Open this conversation to people outside your team. You can always change it later.</string>
Expand Down
Loading
Loading