mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-05-09 09:27:42 +02:00
Merge branch 'develop' into steve/add_setup_project_script
This commit is contained in:
SBiOSoftWhare
GitHub
+40
-3
@@ -5,13 +5,47 @@ Changes to be released in next version
|
||||
*
|
||||
|
||||
🙌 Improvements
|
||||
* Room: Added support for Voice Messages (#4090, #4091, #4092, #4094, #4095, #4096)
|
||||
* Remove the directory section from the Rooms tab.
|
||||
* Notifications: Show decrypted content is enabled by default (#4519).
|
||||
* Tools: Add a script to initialize quickly and easily the project.
|
||||
|
||||
🐛 Bugfix
|
||||
*
|
||||
|
||||
⚠️ API Changes
|
||||
*
|
||||
|
||||
🗣 Translations
|
||||
*
|
||||
|
||||
🧱 Build
|
||||
*
|
||||
|
||||
Others
|
||||
*
|
||||
|
||||
Changes in 1.4.8 (2021-07-29)
|
||||
=================================================
|
||||
|
||||
✨ Features
|
||||
*
|
||||
|
||||
🙌 Improvements
|
||||
* Room: Added support for Voice Messages (#4090, #4091, #4092, #4094, #4095, #4096)
|
||||
* Rooms Tab: Remove the directory section (#4521).
|
||||
* Notifications: Show decrypted content is enabled by default (#4519).
|
||||
* People Tab: Remove the local contacts section (#4523).
|
||||
* Contacts: Delay access to local contacts until they're needed for display (#4616).
|
||||
* RecentsDataSource: Factorize section reset in one place (target #4591).
|
||||
* Voice Messages: Tap/hold to send voice messages isn't intuitive (#4601).
|
||||
* Voice Messages: copy could be improved (#4604).
|
||||
* Slide to lock should be more generous (#4602).
|
||||
|
||||
🐛 Bugfix
|
||||
* Room: Fixed mentioning users from room info member details (#4583)
|
||||
* Settings: Disabled autocorrection when entering an identity server (#4593).
|
||||
* Room Notification Settings: Fix Crash when opening the new Room Notification Settings Screen (Not yet released) (#4599).
|
||||
* AuthenticationViewController: Fix crash on authentication if an intermediate view was presented (#4606).
|
||||
* Room: Fixed crash when opening a read-only room (#4620).
|
||||
* Voice Messages: Tapping on waveform in composer glitches UI (#4603).
|
||||
|
||||
⚠️ API Changes
|
||||
*
|
||||
@@ -26,6 +60,9 @@ Others
|
||||
* Separated CI jobs into individual actions
|
||||
* Update Gemfile.lock
|
||||
|
||||
Improvements:
|
||||
* Upgrade MatrixKit version ([v0.15.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.6)).
|
||||
|
||||
Changes in 1.4.7 (2021-07-22)
|
||||
=================================================
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
|
||||
APPLICATION_SCHEME = element
|
||||
|
||||
// Version
|
||||
MARKETING_VERSION = 1.4.8
|
||||
CURRENT_PROJECT_VERSION = 1.4.8
|
||||
MARKETING_VERSION = 1.4.9
|
||||
CURRENT_PROJECT_VERSION = 1.4.9
|
||||
|
||||
|
||||
// Team
|
||||
|
||||
@@ -11,7 +11,7 @@ use_frameworks!
|
||||
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
|
||||
#
|
||||
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
|
||||
$matrixKitVersion = '= 0.15.5'
|
||||
$matrixKitVersion = '= 0.15.6'
|
||||
# $matrixKitVersion = :local
|
||||
# $matrixKitVersion = {'develop' => 'develop'}
|
||||
|
||||
|
||||
+13
-13
@@ -58,29 +58,29 @@ PODS:
|
||||
- MatomoTracker (7.4.1):
|
||||
- MatomoTracker/Core (= 7.4.1)
|
||||
- MatomoTracker/Core (7.4.1)
|
||||
- MatrixKit (0.15.5):
|
||||
- MatrixKit (0.15.6):
|
||||
- Down (~> 0.11.0)
|
||||
- DTCoreText (~> 1.6.25)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixKit/Core (= 0.15.5)
|
||||
- MatrixSDK (= 0.19.5)
|
||||
- MatrixKit/Core (0.15.5):
|
||||
- MatrixKit/Core (= 0.15.6)
|
||||
- MatrixSDK (= 0.19.6)
|
||||
- MatrixKit/Core (0.15.6):
|
||||
- Down (~> 0.11.0)
|
||||
- DTCoreText (~> 1.6.25)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixSDK (= 0.19.5)
|
||||
- MatrixSDK (0.19.5):
|
||||
- MatrixSDK/Core (= 0.19.5)
|
||||
- MatrixSDK/Core (0.19.5):
|
||||
- MatrixSDK (= 0.19.6)
|
||||
- MatrixSDK (0.19.6):
|
||||
- MatrixSDK/Core (= 0.19.6)
|
||||
- MatrixSDK/Core (0.19.6):
|
||||
- AFNetworking (~> 4.0.0)
|
||||
- GZIP (~> 1.3.0)
|
||||
- libbase58 (~> 0.1.4)
|
||||
- OLMKit (~> 3.2.4)
|
||||
- Realm (= 10.7.6)
|
||||
- SwiftyBeaver (= 1.9.5)
|
||||
- MatrixSDK/JingleCallStack (0.19.5):
|
||||
- MatrixSDK/JingleCallStack (0.19.6):
|
||||
- JitsiMeetSDK (= 3.5.0)
|
||||
- MatrixSDK/Core
|
||||
- OLMKit (3.2.4):
|
||||
@@ -124,7 +124,7 @@ DEPENDENCIES:
|
||||
- KeychainAccess (~> 4.2.2)
|
||||
- KTCenterFlowLayout (~> 1.3.1)
|
||||
- MatomoTracker (~> 7.4.1)
|
||||
- MatrixKit (= 0.15.5)
|
||||
- MatrixKit (= 0.15.6)
|
||||
- MatrixSDK
|
||||
- MatrixSDK/JingleCallStack
|
||||
- OLMKit
|
||||
@@ -204,8 +204,8 @@ SPEC CHECKSUMS:
|
||||
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
|
||||
MatrixKit: 7606227237cf58c1a1a2235547222c5d75b464c4
|
||||
MatrixSDK: 9fa30f9ca2504c4251b99212dcf4ff569bbf45b1
|
||||
MatrixKit: 740fee40187fe84099678c56b2f080d877dd7a65
|
||||
MatrixSDK: 04a7f15b03b3def5af644444f3364b8272fb8efc
|
||||
OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
|
||||
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
|
||||
Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
|
||||
@@ -219,6 +219,6 @@ SPEC CHECKSUMS:
|
||||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||
|
||||
PODFILE CHECKSUM: c7386ecfb38fc4302613c915aef79eebdb98a53d
|
||||
PODFILE CHECKSUM: c1f1d1137ebacb6c74706cb28d5c10f26d6fe655
|
||||
|
||||
COCOAPODS: 1.10.1
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
runPostActionsOnFailure = "NO">
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
"title_people" = "Lidé";
|
||||
"title_rooms" = "Místnosti";
|
||||
"title_groups" = "Komunity";
|
||||
"warning" = "Varování!";
|
||||
"warning" = "Varování";
|
||||
// Actions
|
||||
"view" = "Zobrazit zdroj";
|
||||
"view" = "Zobrazit";
|
||||
"next" = "Další";
|
||||
"back" = "Pro zabezpečení se při odhlašování odstraní všechny šifrovací klíče typu end-to-end, a i po přihlašení bude historie šifrovaných kanálů nečitelná.\nZvolte export, chcete-li je zálohovat, než se odhlásíte.";
|
||||
"back" = "Zpět";
|
||||
"continue" = "Pokračovat";
|
||||
"create" = "Vytvořit";
|
||||
"start" = "Spustit";
|
||||
@@ -52,7 +52,7 @@
|
||||
"auth_repeat_password_placeholder" = "Zopakovat heslo";
|
||||
"auth_repeat_new_password_placeholder" = "Potvrďte své nové heslo";
|
||||
"auth_home_server_placeholder" = "URL (např. https://matrix.org)";
|
||||
"auth_identity_server_placeholder" = "URL (např. https://matrix.org)";
|
||||
"auth_identity_server_placeholder" = "URL (např. https://vector.im)";
|
||||
"auth_invalid_login_param" = "Nesprávné uživatelské jméno nebo heslo";
|
||||
"auth_invalid_user_name" = "Uživatelské jméno může obsahovat pouze písmena, číslice, tečky, pomlčky a podtržítka";
|
||||
"auth_invalid_password" = "Heslo je velmi krátké (min 6)";
|
||||
@@ -130,7 +130,7 @@
|
||||
// Directory
|
||||
"directory_cell_title" = "Procházet adresář";
|
||||
"directory_cell_description" = "%tu místnosti";
|
||||
"directory_search_results_title" = "Procházet výsledky výhledávání v adresáři";
|
||||
"directory_search_results_title" = "Procházet výsledky v adresáři";
|
||||
"directory_search_results" = "%tu výsledky nalezeny pro %@";
|
||||
"directory_search_results_more_than" = ">%tu výsledky nalezeny pro %@";
|
||||
"directory_searching_title" = "Vyhledávání v adresáři…";
|
||||
@@ -139,7 +139,7 @@
|
||||
"contacts_address_book_section" = "LOKÁLNÍ KONTAKTY";
|
||||
"contacts_address_book_matrix_users_toggle" = "Pouze Matrix uživatelé";
|
||||
"contacts_address_book_no_contact" = "Žádné lokální kontakty";
|
||||
"contacts_address_book_permission_denied" = "Nepovolil jste přístup aplikace Riot k místním kontaktům";
|
||||
"contacts_address_book_permission_denied" = "Nepovolil jste přístup aplikace Element k místním kontaktům";
|
||||
"contacts_user_directory_section" = "UŽIVATELSKÝ ADRESÁŘ";
|
||||
"contacts_user_directory_offline_section" = "UŽIVATELSKÝ ADRESÁŘ (offline)";
|
||||
// Chat participants
|
||||
@@ -162,8 +162,8 @@
|
||||
"room_participants_ago" = "před";
|
||||
"room_participants_action_section_admin_tools" = "Nástroje pro správce";
|
||||
"room_participants_action_section_direct_chats" = "Přímé chaty";
|
||||
"room_participants_action_section_devices" = "Zařízení";
|
||||
"room_participants_action_section_other" = "Další";
|
||||
"room_participants_action_section_devices" = "Relace";
|
||||
"room_participants_action_section_other" = "Možnosti";
|
||||
"room_participants_action_invite" = "Pozvat";
|
||||
"room_participants_action_leave" = "Odejít z místnosti";
|
||||
"room_participants_action_remove" = "Odebrat z této místnosti";
|
||||
@@ -178,7 +178,7 @@
|
||||
"room_participants_action_start_video_call" = "Začít video hovor";
|
||||
"room_participants_action_mention" = "Zmínka";
|
||||
// Chat
|
||||
"room_jump_to_first_unread" = "Přeskočit na první nepřečtenou zprávu";
|
||||
"room_jump_to_first_unread" = "Přeskočit na nepřečtenou zprávu";
|
||||
"room_new_message_notification" = "%d nová zpráva";
|
||||
"room_new_messages_notification" = "%d nových zpráv";
|
||||
"room_one_user_is_typing" = "%@ právě píše…";
|
||||
@@ -196,7 +196,7 @@
|
||||
"room_delete_unsent_messages" = "Smazat neodeslané zprávy";
|
||||
"room_event_action_copy" = "Kopírovat";
|
||||
"room_event_action_quote" = "Citovat";
|
||||
"room_event_action_redact" = "Redigovat";
|
||||
"room_event_action_redact" = "Odstranit";
|
||||
"room_event_action_more" = "Víc";
|
||||
"room_event_action_share" = "Sdílet";
|
||||
"room_event_action_permalink" = "Trvalý odkaz";
|
||||
@@ -211,12 +211,12 @@
|
||||
"room_event_action_view_encryption" = "Informace o šifrování";
|
||||
"room_event_failed_to_send" = "Odeslání se nezdařilo";
|
||||
// Unknown devices
|
||||
"unknown_devices_alert_title" = "V místnosti jsou neznámá zařízení";
|
||||
"unknown_devices_alert_title" = "V místnosti jsou neznámé relace";
|
||||
"unknown_devices_send_anyway" = "Přesto poslat";
|
||||
"unknown_devices_call_anyway" = "Přesto zavolat";
|
||||
"unknown_devices_answer_anyway" = "Přesto přijmout";
|
||||
"unknown_devices_verify" = "Ověřit…";
|
||||
"unknown_devices_title" = "Neznámá zařízení";
|
||||
"unknown_devices_title" = "Neznámé relace";
|
||||
// Room Title
|
||||
"room_title_new_room" = "Nová místnost";
|
||||
"room_participants_invite_another_user" = "Hledat / Pozvat podle uživatelského ID, jména nebo emailu";
|
||||
@@ -231,10 +231,117 @@
|
||||
"settings_title" = "Nastavení";
|
||||
"account_logout_all" = "Odhlásit všechny účty";
|
||||
"settings_report_bug" = "Nahlásit chybu";
|
||||
"settings_config_home_server" = "Domácího serveru je %@";
|
||||
"settings_config_home_server" = "Domácí server je %@";
|
||||
"settings_config_identity_server" = "Server identit je %@";
|
||||
"settings_config_user_id" = "Přihlášen/a jako %@";
|
||||
"auth_msisdn_validation_message" = "Odeslali jsme vám SMS aktivační kod. Prosím, zadejte jej níže.";
|
||||
"auth_msisdn_validation_error" = "Nelze ověřit telefonní číslo.";
|
||||
"auth_reset_password_success_message" = "Vaše heslo bylo úspěšně resetováno.\n\nByl jste právě odhlášen na všech vašich zařízeních a nebudete vánm nadále zasíláno oznámení. Pro znovu povolení zasílání oznámení, přihlašte se znovu na každém zařízení.";
|
||||
"auth_reset_password_success_message" = "Vaše heslo bylo úspěšně resetováno.\n\nByl jste právě odhlášen na všech vašich relací a nebudete vánm nadále zasíláno oznámení. Pro znovu povolení zasílání oznámení, přihlašte se znovu na každém zařízení.";
|
||||
"store_full_description" = "Element je novým typem komunikátoru a propojovací aplikace která:\n\n1. Dává vám kontrolu nad vaším soukromím\n2. Vás nechá komunikovat s kýmkoli v Matrix síti a dokonce mimo ni, díky integrace s aplikacemi jako je například Slack\n3. Vás chrání před reklamou, těžbou Vašich dat, nechráněnými přístupy nebo nezdokumentovanými fukncemi\n4. Zabezpečuje Vaši komunikaci pomocí koncového šifrování s distribuovaným ověřením ostatních\n\nElement se liší od ostatních komunikačních řešeních především tím, že je decentralizovaný a open-source\n\nElement vám umožňuje provozovat vlastní server anebo si vybrat nějakyý z veřejných, takže máte controlu nad vašimi konverzacemi a soukromím. Dává vám přístup do otevřené sítě, takže nejste odkázání jen ke komunikaci s ostatními uživateli Elementu. A je vysoce bezpečný.\n\nElement je toho všeho schopen díky svému operačnímu protokolu - Matrix, otevřeného standartu pro decentralizovanou komunikaci.\n\nElement vás nechává vybrat, kdo bude hostovat vaše konverzace. Přímo z aplikace si můžete vybrat několik rozdílných řešení:\n\n1. Účet zdarma na veřejném serveru matrix.org\n2. Vlastní hosting serveru na vlastním hardwaru\n3. Účet na přizpůsobeném serveru jednodýúchým přihlášením na hosting Element Matrix Services\n\nProč Element?\n\nVLASTNĚTE SVÁ DATA: Vy rozhodujete kde jsou vaše data a zprávy uchovávány. Svá data vlastníte a spravujete Vy, ne nějaká obří korporace, která o vás sbírá osobní data nebo poskytuje přístup dalším stranám.\n\nOTEVŘENÁ KOMUNIKACE A SPOLUPRÁCE: Máte možnost spojit se s kýmkoli v síti Matrix bez ohledu na jeho softwarové řešení, a dokonce se můžete připojit i na jiné komunikační protokoly, jako je Slack, IRC nebo XMPP (Jabber). Komunita podporuje i komunikátory jako Whatsapp, Telegram nebo iMessage.\n\nNEPROLOMITELNÉ ŠIFROVÁNÍ: Skutečné koncové šifrování (pouze přímí účastníci konverzace mají možnost rozšifrovat jejich zprávy) a pokročilé ověřování kontaktů.\n\nVŠESTRANNÉ KOMUNIKAČNÍ MOŽNOSTI: Textové zprávy, hlasové nebo videohovory, přenos souborů, sdílení obrazovky a mnoho dalších funkcí a možností pro implementaci. Vytvářejte místnosti a komunity a zůstaňte v kontaktu.\n\nKDEKOLI SE NACHÁZÍTE: Přístup k plně synchronizované historii konverzací máte kdekoli se nacházíte, ať už z aplikace anebo webového rozhraní na https://element.io/app.";
|
||||
"user_verification_sessions_list_session_untrusted" = "Nedůvěryhodná";
|
||||
"user_verification_sessions_list_session_trusted" = "Důvěryhodná";
|
||||
"user_verification_sessions_list_table_title" = "Relace";
|
||||
"user_verification_sessions_list_information" = "Zprávy s tímto uživatelem v této místnosti jsou šifrovány end-to-end a nemohou je číst třetí strany.";
|
||||
"user_verification_sessions_list_user_trust_level_unknown_title" = "Není známo";
|
||||
"user_verification_sessions_list_user_trust_level_warning_title" = "Varování";
|
||||
|
||||
// Sessions list
|
||||
|
||||
"user_verification_sessions_list_user_trust_level_trusted_title" = "Důvěryhodný";
|
||||
"user_verification_start_additional_information" = "Abyste byli v bezpečí, dělejte to osobně nebo použijte jiný způsob komunikace.";
|
||||
"user_verification_start_waiting_partner" = "Čekám na %@…";
|
||||
"user_verification_start_information_part2" = " kontrolou jednorázového kódu na obou zařízeních.";
|
||||
"user_verification_start_information_part1" = "Pro větší bezpečnost ověřit ";
|
||||
|
||||
// MARK: - User verification
|
||||
|
||||
// Start
|
||||
|
||||
"user_verification_start_verify_action" = "Spustit ověřování";
|
||||
"key_verification_user_title" = "Ověřit je";
|
||||
"room_participants_security_information_room_encrypted" = "Zprávy v této místnosti jsou šifrovány end-to-end.\n\nVaše zprávy jsou zabezpečeny zámky a jedinečnými klíči je můžete odemknout pouze vy a příjemce.";
|
||||
"room_participants_security_information_room_not_encrypted" = "Zprávy v této místnosti nejsou šifrovány end-to-end.";
|
||||
"room_participants_security_loading" = "Načítání…";
|
||||
"room_participants_action_security_status_warning" = "Varování";
|
||||
"room_participants_action_security_status_verify" = "Ověřit";
|
||||
"room_participants_action_security_status_verified" = "Ověřeno";
|
||||
"room_participants_action_section_security" = "Zabezpečení";
|
||||
"room_participants_action_ban" = "Vyhodit z této místnosti";
|
||||
"room_creation_error_invite_user_by_email_without_identity_server" = "Není nakonfigurován žádný server identity, takže nemůžete přidat účastníka pomocí e-mailu.";
|
||||
"auth_softlogout_recover_encryption_keys" = "Přihlaste se a obnovte šifrovací klíče uložené výhradně v tomto zařízení. Potřebujete je ke čtení všech zabezpečených zpráv na jakémkoli zařízení.";
|
||||
"auth_softlogout_reason" = "Váš správce domovského serveru (%1$@) vás odhlásil z vašeho účtu %2 @ (%3$@).";
|
||||
"auth_softlogout_signed_out" = "Jste odhlášeni";
|
||||
"auth_autodiscover_invalid_response" = "Neplatná odpověď na objevení domovského serveru";
|
||||
"auth_accept_policies" = "Přečtěte si a přijměte zásady tohoto domovského serveru:";
|
||||
"auth_add_email_and_phone_warning" = "Registrace pomocí e-mailu a telefonního čísla najednou ještě není podporována, dokud neexistuje rozhraní API. Zohledněno bude pouze telefonní číslo. Svůj e-mail můžete přidat do svého profilu v nastavení.";
|
||||
"auth_reset_password_error_is_required" = "Není nakonfigurován žádný server identity: pro obnovení hesla přidejte jeden server z možností .";
|
||||
"auth_forgot_password_error_no_configured_identity_server" = "Není nakonfigurován žádný server identity: pro obnovení hesla jeden přidejte .";
|
||||
"settings_key_backup_button_delete" = "Smazat zálohu";
|
||||
"settings_key_backup_button_restore" = "Obnovit ze zálohy";
|
||||
"auth_login_single_sign_on" = "Přihlásit se";
|
||||
|
||||
// Accessibility
|
||||
"accessibility_checkbox_label" = "zaškrtávací políčko";
|
||||
"callbar_only_single_active_group" = "Klepnutím se připojíte ke skupinovému hovoru (%@)";
|
||||
"callbar_return" = "Vrátit se";
|
||||
"callbar_only_multiple_paused" = "%@ pozastavené hovory";
|
||||
"callbar_only_single_paused" = "Pozastavený hovor";
|
||||
"callbar_active_and_multiple_paused" = "1 aktivní hovor (%@) · %@ pozastavené hovory";
|
||||
"callbar_active_and_single_paused" = "1 aktivní hovor (%@) · 1 pozastavený hovor";
|
||||
|
||||
// Call Bar
|
||||
"callbar_only_single_active" = "Klepnutím se vrátíte k hovoru (%@)";
|
||||
"less" = "Méně";
|
||||
"more" = "Více";
|
||||
"switch" = "Přepnout";
|
||||
"joined" = "Připojil se";
|
||||
"skip" = "Přeskočit";
|
||||
"close" = "Zavřít";
|
||||
"store_promotional_text" = "Aplikace pro chat a spolupráci chránící soukromí v otevřené síti. Žádný sběr dat, žádná zadní vrátka a žádný přístup třetích stran.";
|
||||
// String for App Store
|
||||
"store_short_description" = "Zabezpečený decentralizovaný chat/VoIP";
|
||||
"e2e_key_backup_wrong_version_button_settings" = "Nastavení";
|
||||
"side_menu_action_settings" = "Nastavení";
|
||||
"room_details_photo" = "Obrázek místnosti";
|
||||
"room_details_settings" = "Nastavení";
|
||||
"room_details_integrations" = "Integrace";
|
||||
"room_details_search" = "Vyhledat místnost";
|
||||
"room_details_files" = "Nahrávání";
|
||||
"room_details_people" = "Členové";
|
||||
"room_details_title_for_dm" = "Podrobnosti";
|
||||
"room_avatar_view_accessibility_hint" = "Změnit avatar místnosti";
|
||||
"room_creation_appearance_picture" = "Obrázek chatu (volitelné)";
|
||||
|
||||
// Errors
|
||||
"error_user_already_logged_in" = "Vypadá to, že se pokoušíte připojit k jinému domovskému serveru. Chcete se odhlásit?";
|
||||
"social_login_button_title_sign_up" = "Zaregistrovat se pomocí %@";
|
||||
"social_login_button_title_sign_in" = "Přihlásit se pomocí %@";
|
||||
"social_login_button_title_continue" = "Pokračovat s %@";
|
||||
"social_login_list_title_sign_up" = "nebo";
|
||||
"social_login_list_title_sign_in" = "nebo";
|
||||
|
||||
// Social login
|
||||
|
||||
"social_login_list_title_continue" = "Pokračovat s";
|
||||
"auth_softlogout_clear_data_sign_out" = "Odhlásit se";
|
||||
"auth_softlogout_clear_data_sign_out_msg" = "Opravdu chcete vymazat všechny údaje aktuálně uložené v tomto zařízení? Chcete-li získat přístup k údajům a zprávám svého účtu, znovu se přihlaste.";
|
||||
"auth_softlogout_clear_data_sign_out_title" = "Jste si jisti?";
|
||||
"auth_softlogout_clear_data_button" = "Vymazat všechny údaje";
|
||||
"auth_softlogout_clear_data_message_2" = "Vymažte, pokud jste s tímto zařízením skončili nebo se chcete přihlásit k jinému účtu.";
|
||||
"auth_softlogout_clear_data_message_1" = "Varování: Vaše osobní údaje (včetně šifrovacích klíčů) jsou stále uloženy v tomto zařízení.";
|
||||
"auth_softlogout_clear_data" = "Vymazat osobní údaje";
|
||||
"auth_softlogout_sign_in" = "Přihlásit se";
|
||||
"biometrics_setup_subtitle" = "Ušetřete si čas";
|
||||
"biometrics_setup_enable_button_title_x" = "Povolit %@";
|
||||
"biometrics_setup_title_x" = "Povolit %@";
|
||||
"biometrics_settings_enable_x" = "Povolit %@";
|
||||
"biometrics_mode_face_id" = "Face ID";
|
||||
"biometrics_cant_unlocked_alert_title" = "Aplikaci nelze odemknout";
|
||||
"biometrics_usage_reason" = "Pro přístup k vaší aplikaci je nutné ověření";
|
||||
"biometrics_desetup_disable_button_title_x" = "Zakázat %@";
|
||||
"biometrics_desetup_title_x" = "Zakázat %@";
|
||||
"public_room_section_title" = "Veřejné místnosti (v %@):";
|
||||
"homeserver_connection_lost" = "Nelze se připojit k domovskému serveru.";
|
||||
"network_offline_prompt" = "Zdá se, že připojení k internetu je offline.";
|
||||
"yesterday" = "Včera";
|
||||
"today" = "Dnes";
|
||||
|
||||
@@ -1686,4 +1686,4 @@ Tap the + to start adding people.";
|
||||
|
||||
"voice_message_release_to_send" = "Hold to record, release to send";
|
||||
"voice_message_remaining_recording_time" = "%@s left";
|
||||
"voice_message_stop_locked_mode_recording" = "Tap on the wavelength to stop and playback";
|
||||
"voice_message_stop_locked_mode_recording" = "Tap on your recording to stop or listen";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "Kaameraga salvestatakse pilte ning videosid ja tehakse videokõnesid.";
|
||||
"NSPhotoLibraryUsageDescription" = "Fotogaleriid kasutatakse fotode ja videote saatmiseks teistele kasutajatele.";
|
||||
"NSMicrophoneUsageDescription" = "Mikrofoni kasutatakse videote salvestamisel ning kõnede tegemisel.";
|
||||
"NSMicrophoneUsageDescription" = "Kõnede tegemiseks, videote ja häälsõnumite salvestamiseks vajab Element ligipääsu sinu seadme mikrofonile.";
|
||||
"NSCalendarsUsageDescription" = "Vaata päevakavasse lisatud koosolekuid vastvast rakendusest.";
|
||||
"NSContactsUsageDescription" = "Selleks, et leida Matrixi võrgu kasutajaid, võib Element saata sinu aadressiraamatus leiduvad e-posti aadressid ja telefoninumbrid sinu valitud Matrixi isikutuvastusserverile. Kui server seda toetab, siis andmed muudetakse enne saatmist räsideks - täpsema teabe leiad oma isikutuvastusserveri privaatsuspoliitikast.";
|
||||
"NSFaceIDUsageDescription" = "Ligipääsuks sinu rakendusele on kasutusel Face ID.";
|
||||
|
||||
@@ -1096,7 +1096,7 @@
|
||||
"deactivate_account_informations_part3" = "\n\nSinu konto kustutamine ";
|
||||
"deactivate_account_informations_part4_emphasize" = "vaikimisi ei tähenda, et unustatakse ka sinu saadetud sõnumid. ";
|
||||
"deactivate_account_informations_part5" = "Kui sa siiski soovid seda, siis palun tee märge alljärgnevasse kasti.\n\nMatrix'i sõnumite nähtavus on sarnane e-posti kirjadega. Sõnumite unustamine tegelikult tähendab seda, et sinu varemsaadetud sõnumeid ei jagata uute või veel registreerumata kasutajatega, kuid registeerunud kasutajad, kes juba on need sõnumid saanud, võivad neid ka jätkuvalt lugeda.";
|
||||
"rerequest_keys_alert_message" = "Palun käivita Element mõnes muus seadmes, mis suudab neid sõnumeid dekrüptoda ja seega saata krüptovõtmeid siia sessiooni.";
|
||||
"rerequest_keys_alert_message" = "Palun käivita Element mõnes muus seadmes, mis suudab neid sõnumeid dekrüptida ja seega saata krüptovõtmeid siia sessiooni.";
|
||||
"settings_discovery_three_pids_management_information_part1" = "Halda missuguse e-posti aadressi ja telefoninumbri alusel teised kasutajad saavad sind kutsuda jututubadesse. Lisa või eemalda e-posti aadresse ja telefoninumbreid sellest loendist ";
|
||||
"settings_discovery_three_pid_details_information_email" = "Halda selle e-posti aadressi eelistusi, mille alusel teised kasutajad saavad sind leida ja kutsuda jututubade liikmeks. E-posti aadresse lisada ja muuta saad kasutajakonto seadistustest.";
|
||||
"settings_discovery_three_pid_details_title_phone_number" = "Halda telefoninumbrit";
|
||||
@@ -1361,3 +1361,10 @@
|
||||
// Room Notification Settings
|
||||
"room_notifs_settings_notify_me_for" = "Teavita mind";
|
||||
"room_details_notifs" = "Teavitused";
|
||||
"voice_message_stop_locked_mode_recording" = "Salvestuse peatamiseks ja taasesituseks vajuta lainekese nuppu";
|
||||
"voice_message_remaining_recording_time" = "salvestusaega jäänud %@s";
|
||||
|
||||
// Mark: - Voice Messages
|
||||
|
||||
"voice_message_release_to_send" = "Salvestamiseks vajuta nuppu, saatmiseks lase nupp lahti";
|
||||
"settings_labs_voice_messages" = "Häälsõnumid";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "A kamera fényképek, videók készítéséhez és videóhívásokhoz lesz használva.";
|
||||
"NSPhotoLibraryUsageDescription" = "A fénykép galéria fényképek és videók küldéséhez lesz használva.";
|
||||
"NSMicrophoneUsageDescription" = "A mikrofon videók készítéséhez és hívásokhoz lesz használva.";
|
||||
"NSMicrophoneUsageDescription" = "A hívás indításához és fogadásához, videó és hangüzenet felvételéhez az Elementnek hozzáférési engedélyre van szüksége a mikrofonhoz.";
|
||||
"NSContactsUsageDescription" = "Az olyan ismerősök felderítéséhez akik már használják a Matrixot, Elementet el tudja küldeni a címjegyzékben található e-mail címeket és telefonszámokat az általad választott Matrix azonosítási szervernek. Ahol lehetséges a személyes adatok hash-elve lesznek - kérlek ellenőrizd az azonosítási szervered adatvédelmi szabályait.";
|
||||
"NSCalendarsUsageDescription" = "Nézd meg a találkozóidat az alkalmazásban.";
|
||||
"NSFaceIDUsageDescription" = "Arc felismerés használata az alkalmazás eléréséhez.";
|
||||
|
||||
@@ -1411,3 +1411,23 @@
|
||||
"settings_ui_theme_picker_message_invert_colours" = "„Autó” az eszközöd „invertált színek” beállítását használja";
|
||||
"room_recents_unknown_room_error_message" = "A szoba nem található. Győződj meg róla, hogy létezik";
|
||||
"room_creation_dm_error" = "Nem lehet elkészíteni a közvetlen beszélgetést. Ellenőrizd a meghívni kívánt felhasználót és próbáld újra.";
|
||||
"key_verification_verify_qr_code_scan_code_other_device_action" = "Beolvasás ezzel az eszközzel";
|
||||
"room_notifs_settings_encrypted_room_notice" = "Megjegyzendő, hogy titkosított szobákban a megemlítésekre és kulcsszavakra való értesítés mobil eszközökön nem érhető el.";
|
||||
"room_notifs_settings_account_settings" = "Fiók beállítások";
|
||||
"room_notifs_settings_manage_notifications" = "Értesítések kezelése itt: %@";
|
||||
"room_notifs_settings_cancel_action" = "Mégsem";
|
||||
"room_notifs_settings_done_action" = "Kész";
|
||||
"room_notifs_settings_none" = "Semmi";
|
||||
"room_notifs_settings_mentions_and_keywords" = "Csak megemlítések és kulcsszavak";
|
||||
"room_notifs_settings_all_messages" = "Minden üzenet";
|
||||
|
||||
// Room Notification Settings
|
||||
"room_notifs_settings_notify_me_for" = "Értesítés ezért:";
|
||||
"room_details_notifs" = "Értesítések";
|
||||
"voice_message_stop_locked_mode_recording" = "Megállításhoz és visszajátszáshoz koppints a hullámhosszra";
|
||||
"voice_message_remaining_recording_time" = "%@s távozott";
|
||||
|
||||
// Mark: - Voice Messages
|
||||
|
||||
"voice_message_release_to_send" = "Felvételhez tartsd nyomva, a küldéshez engedd el";
|
||||
"settings_labs_voice_messages" = "Hang üzenetek";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "A câmera é usada para tirar fotos e vídeos, fazer chamadas de vídeo.";
|
||||
"NSPhotoLibraryUsageDescription" = "A biblioteca de fotos é usada para enviar fotos e vídeos.";
|
||||
"NSMicrophoneUsageDescription" = "O microfone é usado para tirar vídeos, fazer chamadas.";
|
||||
"NSMicrophoneUsageDescription" = "Element precisa acessar seu microfone para fazer e receber chamadas, tirar vídeos, e gravar mensagens de voz.";
|
||||
"NSContactsUsageDescription" = "Para descobrir contatos já usando Matrix, Element pode enviar endereços de email e números de telefone em seu livro de endereços para seu servidor de identidade Matrix escolhido. Onde suportado, dados pessoais são hashados antes do envio - por favor cheque a política de privacidade de seu servidor de identidade para mais detalhes.";
|
||||
"NSCalendarsUsageDescription" = "Ver suas reuniões agendadas no app.";
|
||||
"NSFaceIDUsageDescription" = "Face ID é usada para acessar seu app.";
|
||||
|
||||
@@ -1392,3 +1392,10 @@
|
||||
// Room Notification Settings
|
||||
"room_notifs_settings_notify_me_for" = "Notifique-me para";
|
||||
"room_details_notifs" = "Notificações";
|
||||
"voice_message_remaining_recording_time" = "%@s restando";
|
||||
"voice_message_stop_locked_mode_recording" = "Toque no comprimento de onda para parar e dar playback";
|
||||
|
||||
// Mark: - Voice Messages
|
||||
|
||||
"voice_message_release_to_send" = "Segure para gravar, solte para enviar";
|
||||
"settings_labs_voice_messages" = "Mensagens de voz";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "Камера використовується для знімків фото і відео, а також для відео-викликів.";
|
||||
"NSPhotoLibraryUsageDescription" = "Фотографії використовуються для надсилання фото і відео.";
|
||||
"NSMicrophoneUsageDescription" = "Мікрофон використовується для відео і викликів.";
|
||||
"NSMicrophoneUsageDescription" = "Element потребує доступу до вашого мікрофона, щоб здійснювати та отримувати виклики, знімати відео та записувати голосові повідомлення.";
|
||||
"NSContactsUsageDescription" = "Щоб показати, які з ваших контактів вже використовують Matrix, Element може надіслати адреси електронної пошти і номери телефонів з вашої адресної книги до вашого ідентифікаційного сервера Matrix. При наявності підтримки, перед надсиланням створюється хеш особистих даних. Для докладних відомостей ознайомтеся з політикою приватності свого ідентифікаційного сервера.";
|
||||
"NSCalendarsUsageDescription" = "Переглядайте свої заплановані зустрічі в додатку.";
|
||||
"NSFaceIDUsageDescription" = "Face ID використовується для доступу до вашого додатку.";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "摄像头权限用于拍摄照片、录制视频或进行视频聊天。";
|
||||
"NSPhotoLibraryUsageDescription" = "照片库访问权限用于发送图片与视频。";
|
||||
"NSMicrophoneUsageDescription" = "麦克风权限用于录制视频或进行通话。";
|
||||
"NSMicrophoneUsageDescription" = "Element 需要访问您的麦克风才能拨打和接听电话、拍摄视频和录制语音消息。";
|
||||
"NSContactsUsageDescription" = "为了发现已在使用 Matrix 的联系人，Element 可以把你地址簿里的邮箱地址和电话号码发送到你所选择的 Matrix 身份认证服务器。如果支持的话，个人数据在发送前会被哈希处理——请检查你的身份认证服务器的隐私政策以获取详细信息。";
|
||||
"NSCalendarsUsageDescription" = "在此应用中查看你计划的会议。";
|
||||
"NSFaceIDUsageDescription" = "Face ID 权限用于访问您的应用。";
|
||||
|
||||
@@ -1426,3 +1426,23 @@
|
||||
"settings_ui_theme_picker_message_invert_colours" = "“自动”使用您设备的“反转颜色”设置";
|
||||
"room_recents_unknown_room_error_message" = "找不到这个房间。 确保它存在";
|
||||
"room_creation_dm_error" = "我们无法创建您的 DM。 请检查您要邀请的用户，然后重试。";
|
||||
"voice_message_stop_locked_mode_recording" = "轻按波长停止和回放消息";
|
||||
"voice_message_remaining_recording_time" = "剩 %@s";
|
||||
|
||||
// Mark: - Voice Messages
|
||||
|
||||
"voice_message_release_to_send" = "按住录音，松开发送";
|
||||
"key_verification_verify_qr_code_scan_code_other_device_action" = "用这部设备扫描";
|
||||
"room_notifs_settings_encrypted_room_notice" = "请注意，移动设备上的加密聊天室不提供提及和关键字通知。";
|
||||
"room_notifs_settings_account_settings" = "账户设置";
|
||||
"room_notifs_settings_manage_notifications" = "你可以管理 %@ 中的消息";
|
||||
"room_notifs_settings_cancel_action" = "取消";
|
||||
"room_notifs_settings_done_action" = "完成";
|
||||
"room_notifs_settings_none" = "无";
|
||||
"room_notifs_settings_mentions_and_keywords" = "仅提及和关键词";
|
||||
"room_notifs_settings_all_messages" = "所有消息";
|
||||
|
||||
// Room Notification Settings
|
||||
"room_notifs_settings_notify_me_for" = "通知内容";
|
||||
"room_details_notifs" = "通知";
|
||||
"settings_labs_voice_messages" = "语音消息";
|
||||
|
||||
@@ -4890,7 +4890,7 @@ internal enum VectorL10n {
|
||||
internal static func voiceMessageRemainingRecordingTime(_ p1: String) -> String {
|
||||
return VectorL10n.tr("Vector", "voice_message_remaining_recording_time", p1)
|
||||
}
|
||||
/// Tap on the wavelength to stop and playback
|
||||
/// Tap on your recording to stop or listen
|
||||
internal static var voiceMessageStopLockedModeRecording: String {
|
||||
return VectorL10n.tr("Vector", "voice_message_stop_locked_mode_recording")
|
||||
}
|
||||
|
||||
@@ -1854,16 +1854,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
[account addObserver:self forKeyPath:@"enableInAppNotifications" options:0 context:nil];
|
||||
}
|
||||
|
||||
// Load the local contacts on first account creation.
|
||||
if ([MXKAccountManager sharedManager].accounts.count == 1)
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
|
||||
[self refreshLocalContacts];
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
[self.delegate legacyAppDelegate:self didAddAccount:account];
|
||||
}];
|
||||
|
||||
@@ -1976,14 +1966,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
// during this blocking task.
|
||||
dispatch_after(dispatch_walltime(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
|
||||
[[MXKContactManager sharedManager] addMatrixSession:mxSession];
|
||||
|
||||
// Load the local contacts on first account
|
||||
if ([MXKAccountManager sharedManager].accounts.count == 1)
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self refreshLocalContacts];
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Register the session to the widgets manager
|
||||
@@ -2939,54 +2921,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)refreshLocalContacts
|
||||
{
|
||||
if (!BuildSettings.allowLocalContactsAccess)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Do not scan local contacts in background if the user has not decided yet about using
|
||||
// an identity server
|
||||
BOOL doRefreshLocalContacts = NO;
|
||||
for (MXSession *session in mxSessionArray)
|
||||
{
|
||||
if (session.hasAccountDataIdentityServerValue)
|
||||
{
|
||||
doRefreshLocalContacts = YES;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Check whether the application is allowed to access the local contacts.
|
||||
if (doRefreshLocalContacts
|
||||
&& [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized)
|
||||
{
|
||||
// Check the user permission for syncing local contacts. This permission was handled independently on previous application version.
|
||||
if (![MXKAppSettings standardAppSettings].syncLocalContacts)
|
||||
{
|
||||
// Check whether it was not requested yet.
|
||||
if (![MXKAppSettings standardAppSettings].syncLocalContactsPermissionRequested)
|
||||
{
|
||||
[MXKAppSettings standardAppSettings].syncLocalContactsPermissionRequested = YES;
|
||||
|
||||
[MXKContactManager requestUserConfirmationForLocalContactsSyncInViewController:self.presentedViewController completionHandler:^(BOOL granted) {
|
||||
|
||||
if (granted)
|
||||
{
|
||||
// Allow local contacts sync in order to discover matrix users.
|
||||
[MXKAppSettings standardAppSettings].syncLocalContacts = YES;
|
||||
}
|
||||
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh the local contacts list.
|
||||
[[MXKContactManager sharedManager] refreshLocalContacts];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Matrix Groups handling
|
||||
|
||||
- (void)showGroup:(MXGroup*)group withMatrixSession:(MXSession*)mxSession
|
||||
|
||||
@@ -354,8 +354,6 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
|
||||
{
|
||||
[_keyboardAvoider stopAvoiding];
|
||||
|
||||
[self.authenticationActivityIndicator removeObserver:self forKeyPath:@"hidden"];
|
||||
|
||||
[super viewDidDisappear:animated];
|
||||
}
|
||||
|
||||
@@ -384,6 +382,8 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:universalLinkDidChangeNotificationObserver];
|
||||
universalLinkDidChangeNotificationObserver = nil;
|
||||
}
|
||||
|
||||
[self.authenticationActivityIndicator removeObserver:self forKeyPath:@"hidden"];
|
||||
|
||||
autoDiscovery = nil;
|
||||
_keyVerificationCoordinatorBridgePresenter = nil;
|
||||
|
||||
@@ -71,17 +71,9 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
|
||||
processingQueue = dispatch_queue_create("RecentsDataSource", DISPATCH_QUEUE_SERIAL);
|
||||
|
||||
_crossSigningBannerDisplay = CrossSigningBannerDisplayNone;
|
||||
crossSigningBannerSection = -1;
|
||||
|
||||
_secureBackupBannerDisplay = SecureBackupBannerDisplayNone;
|
||||
secureBackupBannerSection = -1;
|
||||
directorySection = -1;
|
||||
invitesSection = -1;
|
||||
favoritesSection = -1;
|
||||
peopleSection = -1;
|
||||
conversationSection = -1;
|
||||
lowPrioritySection = -1;
|
||||
serverNoticeSection = -1;
|
||||
|
||||
[self resetSectionIndexes];
|
||||
|
||||
_areSectionsShrinkable = NO;
|
||||
shrinkedSectionsBitMask = 0;
|
||||
@@ -96,6 +88,19 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)resetSectionIndexes
|
||||
{
|
||||
crossSigningBannerSection = -1;
|
||||
secureBackupBannerSection = -1;
|
||||
directorySection = -1;
|
||||
invitesSection = -1;
|
||||
favoritesSection = -1;
|
||||
peopleSection = -1;
|
||||
conversationSection = -1;
|
||||
lowPrioritySection = -1;
|
||||
serverNoticeSection = -1;
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
@@ -445,7 +450,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
|
||||
// Check whether all data sources are ready before rendering recents
|
||||
if (self.state == MXKDataSourceStateReady)
|
||||
{
|
||||
crossSigningBannerSection = secureBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = invitesSection = serverNoticeSection = -1;
|
||||
[self resetSectionIndexes];
|
||||
|
||||
if (self.crossSigningBannerDisplay != CrossSigningBannerDisplayNone)
|
||||
{
|
||||
@@ -1119,10 +1124,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
|
||||
|
||||
#pragma mark - MXKDataSourceDelegate
|
||||
|
||||
- (void)refreshRoomsSection:(void (^)(void))onComplete;
|
||||
- (void)refreshRoomsSection:(void (^)(void))onComplete
|
||||
{
|
||||
secureBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = serverNoticeSection = invitesSection = -1;
|
||||
|
||||
if (displayedRecentsDataSourceArray.count > 0)
|
||||
{
|
||||
// FIXME manage multi accounts
|
||||
|
||||
@@ -174,6 +174,15 @@
|
||||
[self refreshContactsTable];
|
||||
}
|
||||
|
||||
- (void)viewDidAppear:(BOOL)animated
|
||||
{
|
||||
[super viewDidAppear:animated];
|
||||
|
||||
// Load the local contacts for display.
|
||||
// In viewDidAppear as it may trigger a request for contacts access.
|
||||
[self refreshLocalContacts];
|
||||
}
|
||||
|
||||
- (void)viewWillDisappear:(BOOL)animated
|
||||
{
|
||||
[super viewWillDisappear:animated];
|
||||
@@ -212,6 +221,54 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (void)refreshLocalContacts
|
||||
{
|
||||
if (!BuildSettings.allowLocalContactsAccess)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Do not scan local contacts in background if the user has not decided yet about using
|
||||
// an identity server
|
||||
BOOL doRefreshLocalContacts = NO;
|
||||
for (MXSession *session in self.mxSessions)
|
||||
{
|
||||
if (session.hasAccountDataIdentityServerValue)
|
||||
{
|
||||
doRefreshLocalContacts = YES;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Check whether the application is allowed to access the local contacts.
|
||||
if (doRefreshLocalContacts
|
||||
&& [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized)
|
||||
{
|
||||
// Check the user permission for syncing local contacts. This permission was handled independently on previous application version.
|
||||
if (![MXKAppSettings standardAppSettings].syncLocalContacts)
|
||||
{
|
||||
// Check whether it was not requested yet.
|
||||
if (![MXKAppSettings standardAppSettings].syncLocalContactsPermissionRequested)
|
||||
{
|
||||
[MXKAppSettings standardAppSettings].syncLocalContactsPermissionRequested = YES;
|
||||
|
||||
[MXKContactManager requestUserConfirmationForLocalContactsSyncInViewController:self completionHandler:^(BOOL granted) {
|
||||
|
||||
if (granted)
|
||||
{
|
||||
// Allow local contacts sync in order to discover matrix users.
|
||||
[MXKAppSettings standardAppSettings].syncLocalContacts = YES;
|
||||
}
|
||||
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh the local contacts list.
|
||||
[[MXKContactManager sharedManager] refreshLocalContacts];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)refreshContactsTable
|
||||
{
|
||||
[self.contactsTableView reloadData];
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
/**
|
||||
'PeopleViewController' instance is used to display/filter the direct rooms and a list of contacts.
|
||||
*/
|
||||
@interface PeopleViewController : RecentsViewController <UITableViewDataSource, MXKDataSourceDelegate>
|
||||
@interface PeopleViewController : RecentsViewController
|
||||
|
||||
+ (instancetype)instantiate;
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
#import <Contacts/Contacts.h>
|
||||
#import "PeopleViewController.h"
|
||||
|
||||
#import "UIViewController+RiotSearch.h"
|
||||
@@ -25,17 +24,11 @@
|
||||
#import "RecentTableViewCell.h"
|
||||
#import "InviteRecentTableViewCell.h"
|
||||
|
||||
#import "ContactTableViewCell.h"
|
||||
|
||||
#import "Riot-Swift.h"
|
||||
|
||||
@interface PeopleViewController ()
|
||||
{
|
||||
NSInteger directRoomsSectionNumber;
|
||||
|
||||
ContactsDataSource *contactsDataSource;
|
||||
NSInteger contactsSectionNumber;
|
||||
|
||||
RecentsDataSource *recentsDataSource;
|
||||
}
|
||||
|
||||
@@ -55,7 +48,6 @@
|
||||
[super finalizeInit];
|
||||
|
||||
directRoomsSectionNumber = 0;
|
||||
contactsSectionNumber = 0;
|
||||
|
||||
self.screenName = @"People";
|
||||
}
|
||||
@@ -76,14 +68,6 @@
|
||||
plusButtonImageView = [self vc_addFABWithImage:[UIImage imageNamed:@"people_floating_action"]
|
||||
target:self
|
||||
action:@selector(onPlusButtonPressed)];
|
||||
|
||||
// Register table view cell for contacts.
|
||||
[self.recentsTableView registerClass:ContactTableViewCell.class forCellReuseIdentifier:ContactTableViewCell.defaultReuseIdentifier];
|
||||
|
||||
// Change the table data source. It must be the people view controller itself.
|
||||
self.recentsTableView.dataSource = self;
|
||||
|
||||
self.enableStickyHeaders = YES;
|
||||
}
|
||||
|
||||
- (void)didReceiveMemoryWarning
|
||||
@@ -92,302 +76,36 @@
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
- (void)destroy
|
||||
{
|
||||
contactsDataSource.delegate = nil;
|
||||
[contactsDataSource destroy];
|
||||
contactsDataSource = nil;
|
||||
|
||||
[super destroy];
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated
|
||||
{
|
||||
[super viewWillAppear:animated];
|
||||
|
||||
if (BuildSettings.allowLocalContactsAccess)
|
||||
{
|
||||
// Check whether the access to the local contacts has not been already asked
|
||||
// and check that the user has decided to use or not to use an identity server
|
||||
if ([CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusNotDetermined
|
||||
|| !contactsDataSource.mxSession.hasAccountDataIdentityServerValue)
|
||||
{
|
||||
// Allow by default the local contacts sync in order to discover matrix users.
|
||||
// This setting change will trigger the loading of the local contacts, which will automatically
|
||||
// ask user permission to access their local contacts.
|
||||
[MXKAppSettings standardAppSettings].syncLocalContacts = YES;
|
||||
}
|
||||
|
||||
// Refresh the local contacts list.
|
||||
[[MXKContactManager sharedManager] refreshLocalContacts];
|
||||
}
|
||||
|
||||
[AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_people", @"Vector", nil);
|
||||
[AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
|
||||
|
||||
if (recentsDataSource)
|
||||
if ([self.dataSource isKindOfClass:RecentsDataSource.class])
|
||||
{
|
||||
// Take the lead on the shared data source.
|
||||
recentsDataSource = (RecentsDataSource*)self.dataSource;
|
||||
recentsDataSource.areSectionsShrinkable = NO;
|
||||
[recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModePeople];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
- (void)displayList:(MXKRecentsDataSource *)listDataSource
|
||||
{
|
||||
[super displayList:listDataSource];
|
||||
|
||||
// Change the table data source. It must be the people view controller itself.
|
||||
self.recentsTableView.dataSource = self;
|
||||
|
||||
// Keep a ref on the recents data source
|
||||
if ([listDataSource isKindOfClass:RecentsDataSource.class])
|
||||
{
|
||||
recentsDataSource = (RecentsDataSource*)listDataSource;
|
||||
}
|
||||
|
||||
if (BuildSettings.allowLocalContactsAccess)
|
||||
{
|
||||
if (!contactsDataSource)
|
||||
{
|
||||
// Prepare its contacts data source
|
||||
contactsDataSource = [[ContactsDataSource alloc] initWithMatrixSession:listDataSource.mxSession];
|
||||
contactsDataSource.contactCellAccessoryImage = [[UIImage imageNamed: @"disclosure_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textSecondaryColor];
|
||||
contactsDataSource.delegate = self;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - MXKDataSourceDelegate
|
||||
|
||||
- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
|
||||
{
|
||||
if ([cellData isKindOfClass:MXKContact.class])
|
||||
{
|
||||
return ContactTableViewCell.class;
|
||||
}
|
||||
|
||||
return [super cellViewClassForCellData:cellData];
|
||||
}
|
||||
|
||||
#pragma mark - UITableView data source
|
||||
|
||||
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
|
||||
{
|
||||
// Retrieve the current number of sections related to the direct rooms.
|
||||
// Sanity check: check whether the recents data source is correctly configured.
|
||||
directRoomsSectionNumber = 0;
|
||||
|
||||
if (recentsDataSource.recentsDataSourceMode == RecentsDataSourceModePeople)
|
||||
{
|
||||
directRoomsSectionNumber = [self.dataSource numberOfSectionsInTableView:self.recentsTableView];
|
||||
}
|
||||
|
||||
// Retrieve the current number of sections related to the contacts
|
||||
contactsSectionNumber = [contactsDataSource numberOfSectionsInTableView:self.recentsTableView];
|
||||
|
||||
return (directRoomsSectionNumber + contactsSectionNumber);
|
||||
}
|
||||
|
||||
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
|
||||
{
|
||||
NSInteger count = 0;
|
||||
|
||||
if (section < directRoomsSectionNumber)
|
||||
{
|
||||
count = [self.dataSource tableView:tableView numberOfRowsInSection:section];
|
||||
}
|
||||
else
|
||||
{
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
count = [contactsDataSource tableView:tableView numberOfRowsInSection:section];
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
NSInteger section = indexPath.section;
|
||||
|
||||
if (section < directRoomsSectionNumber)
|
||||
{
|
||||
return [self.dataSource tableView:tableView cellForRowAtIndexPath:indexPath];
|
||||
}
|
||||
else
|
||||
{
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
return [contactsDataSource tableView:tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:section]];
|
||||
}
|
||||
}
|
||||
|
||||
// Return a fake cell to prevent app from crashing.
|
||||
return [[UITableViewCell alloc] init];
|
||||
}
|
||||
|
||||
- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
NSInteger section = indexPath.section;
|
||||
|
||||
if (section < directRoomsSectionNumber)
|
||||
{
|
||||
return [self.dataSource tableView:tableView canEditRowAtIndexPath:indexPath];
|
||||
}
|
||||
else
|
||||
{
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
return [contactsDataSource tableView:tableView canEditRowAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:section]];
|
||||
}
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
#pragma mark - UITableView delegate
|
||||
|
||||
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
|
||||
{
|
||||
if (section >= directRoomsSectionNumber)
|
||||
{
|
||||
// Let the contact dataSource provide the height of the section header.
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
return [contactsDataSource heightForHeaderInSection:section];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
return [super tableView:tableView heightForHeaderInSection:section];
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
|
||||
{
|
||||
if (section >= directRoomsSectionNumber)
|
||||
{
|
||||
// Let the contact dataSource provide the section header.
|
||||
CGRect frame = [tableView rectForHeaderInSection:section];
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
UIView *sectionHeader = [contactsDataSource viewForHeaderInSection:section withFrame:frame];
|
||||
sectionHeader.tag = section + directRoomsSectionNumber;
|
||||
|
||||
if (self.enableStickyHeaders)
|
||||
{
|
||||
while (sectionHeader.gestureRecognizers.count)
|
||||
{
|
||||
UIGestureRecognizer *gestureRecognizer = sectionHeader.gestureRecognizers.lastObject;
|
||||
[sectionHeader removeGestureRecognizer:gestureRecognizer];
|
||||
}
|
||||
|
||||
// Handle tap gesture
|
||||
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapOnSectionHeader:)];
|
||||
[tap setNumberOfTouchesRequired:1];
|
||||
[tap setNumberOfTapsRequired:1];
|
||||
[sectionHeader addGestureRecognizer:tap];
|
||||
}
|
||||
|
||||
return sectionHeader;
|
||||
}
|
||||
else
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
|
||||
return [super tableView:tableView viewForHeaderInSection:section];
|
||||
}
|
||||
|
||||
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
NSInteger section = indexPath.section;
|
||||
if (section >= directRoomsSectionNumber)
|
||||
{
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
if ([contactsDataSource contactAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:section]])
|
||||
{
|
||||
// Return the default height of the contact cell
|
||||
return 74.0;
|
||||
}
|
||||
|
||||
return 50;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
return [super tableView:tableView heightForRowAtIndexPath:indexPath];
|
||||
}
|
||||
|
||||
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
NSInteger section = indexPath.section;
|
||||
if (section >= directRoomsSectionNumber)
|
||||
{
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
MXKContact *mxkContact = [contactsDataSource contactAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:section]];
|
||||
|
||||
if (mxkContact)
|
||||
{
|
||||
[[AppDelegate theDelegate].masterTabBarController selectContact:mxkContact];
|
||||
|
||||
// Keep selected the cell by default.
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
[tableView deselectRowAtIndexPath:indexPath animated:NO];
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
return [super tableView:tableView didSelectRowAtIndexPath:indexPath];
|
||||
return nil;
|
||||
}
|
||||
|
||||
#pragma mark - Override RecentsViewController
|
||||
|
||||
- (UIView *)tableView:(UITableView *)tableView viewForStickyHeaderInSection:(NSInteger)section
|
||||
{
|
||||
CGRect frame = [tableView rectForHeaderInSection:section];
|
||||
frame.size.height = self.stickyHeaderHeight;
|
||||
|
||||
if (section >= directRoomsSectionNumber)
|
||||
{
|
||||
// Let the contact dataSource provide this header.
|
||||
section -= directRoomsSectionNumber;
|
||||
if (section < contactsSectionNumber)
|
||||
{
|
||||
return [contactsDataSource viewForStickyHeaderInSection:section withFrame:frame];
|
||||
}
|
||||
}
|
||||
else if (recentsDataSource)
|
||||
{
|
||||
return [recentsDataSource viewForStickyHeaderInSection:section withFrame:frame];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (void)refreshCurrentSelectedCell:(BOOL)forceVisible
|
||||
{
|
||||
// Check whether the recents data source is correctly configured.
|
||||
@@ -396,41 +114,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Update here the index of the current selected cell (if any) - Useful in landscape mode with split view controller.
|
||||
NSIndexPath *currentSelectedCellIndexPath = nil;
|
||||
MasterTabBarController *masterTabBarController = [AppDelegate theDelegate].masterTabBarController;
|
||||
if (masterTabBarController.currentContactDetailViewController)
|
||||
{
|
||||
// Look for the rank of this selected contact
|
||||
currentSelectedCellIndexPath = [contactsDataSource cellIndexPathWithContact:masterTabBarController.selectedContact];
|
||||
|
||||
if (currentSelectedCellIndexPath)
|
||||
{
|
||||
// Select the right row
|
||||
currentSelectedCellIndexPath = [NSIndexPath indexPathForRow:currentSelectedCellIndexPath.row inSection:(directRoomsSectionNumber + currentSelectedCellIndexPath.section)];
|
||||
[self.recentsTableView selectRowAtIndexPath:currentSelectedCellIndexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
|
||||
|
||||
if (forceVisible)
|
||||
{
|
||||
// Scroll table view to make the selected row appear at second position
|
||||
NSInteger topCellIndexPathRow = currentSelectedCellIndexPath.row ? currentSelectedCellIndexPath.row - 1: currentSelectedCellIndexPath.row;
|
||||
NSIndexPath* indexPath = [NSIndexPath indexPathForRow:topCellIndexPathRow inSection:currentSelectedCellIndexPath.section];
|
||||
[self.recentsTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionTop animated:NO];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
NSIndexPath *indexPath = [self.recentsTableView indexPathForSelectedRow];
|
||||
if (indexPath)
|
||||
{
|
||||
[self.recentsTableView deselectRowAtIndexPath:indexPath animated:NO];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
[super refreshCurrentSelectedCell:forceVisible];
|
||||
}
|
||||
[super refreshCurrentSelectedCell:forceVisible];
|
||||
}
|
||||
|
||||
- (void)onPlusButtonPressed
|
||||
@@ -449,24 +133,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - UISearchBarDelegate
|
||||
|
||||
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
|
||||
{
|
||||
// Apply filter on contact source
|
||||
[contactsDataSource searchWithPattern:searchText forceReset:NO];
|
||||
|
||||
[super searchBar:searchBar textDidChange:searchText];
|
||||
}
|
||||
|
||||
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
|
||||
{
|
||||
// Reset filtering
|
||||
[contactsDataSource searchWithPattern:nil forceReset:NO];
|
||||
|
||||
[super searchBarCancelButtonClicked:searchBar];
|
||||
}
|
||||
|
||||
#pragma mark - Empty view management
|
||||
|
||||
- (void)updateEmptyView
|
||||
@@ -503,35 +169,7 @@
|
||||
- (NSUInteger)totalItemCounts
|
||||
{
|
||||
return recentsDataSource.invitesCellDataArray.count
|
||||
+ recentsDataSource.conversationCellDataArray.count
|
||||
+ recentsDataSource.peopleCellDataArray.count
|
||||
+ [self numberOfContactsInContactsDataSource];
|
||||
}
|
||||
|
||||
- (NSUInteger)numberOfContactsInContactsDataSource
|
||||
{
|
||||
BOOL areLocalContactsAccessAuthorized = [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized;
|
||||
|
||||
NSInteger nbOfItemsInContactDataSource = 0;
|
||||
|
||||
for (NSInteger i = 0; i < contactsSectionNumber; i++)
|
||||
{
|
||||
nbOfItemsInContactDataSource += [contactsDataSource tableView:self.recentsTableView numberOfRowsInSection:i];
|
||||
}
|
||||
|
||||
NSInteger numberOfContactsInContactsDataSource;
|
||||
|
||||
// No local contacts to show and no search in directory
|
||||
if (!areLocalContactsAccessAuthorized && contactsSectionNumber == 1 && nbOfItemsInContactDataSource <= 1)
|
||||
{
|
||||
numberOfContactsInContactsDataSource = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
numberOfContactsInContactsDataSource = nbOfItemsInContactDataSource;
|
||||
}
|
||||
|
||||
return numberOfContactsInContactsDataSource;
|
||||
+ recentsDataSource.conversationCellDataArray.count;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -264,11 +264,17 @@ fileprivate extension MXRoom {
|
||||
}
|
||||
|
||||
var overridePushRule: MXPushRule? {
|
||||
getRoomRule(from: mxSession.notificationCenter.rules.global.override)
|
||||
guard let overrideRules = mxSession.notificationCenter.rules.global.override else {
|
||||
return nil
|
||||
}
|
||||
return getRoomRule(from: overrideRules)
|
||||
}
|
||||
|
||||
var roomPushRule: MXPushRule? {
|
||||
getRoomRule(from: mxSession.notificationCenter.rules.global.room)
|
||||
guard let roomRules = mxSession.notificationCenter.rules.global.room else {
|
||||
return nil
|
||||
}
|
||||
return getRoomRule(from: roomRules)
|
||||
}
|
||||
|
||||
var notificationState: RoomNotificationState {
|
||||
|
||||
@@ -1126,7 +1126,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
||||
{
|
||||
[super setRoomInputToolbarViewClass:roomInputToolbarViewClass];
|
||||
|
||||
[(RoomInputToolbarView *)self.inputToolbarView setVoiceMessageToolbarView:self.voiceMessageController.voiceMessageToolbarView];
|
||||
// The voice message toolbar cannot be set on DisabledInputToolbarView.
|
||||
if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class])
|
||||
{
|
||||
[(RoomInputToolbarView *)self.inputToolbarView setVoiceMessageToolbarView:self.voiceMessageController.voiceMessageToolbarView];
|
||||
}
|
||||
|
||||
[self updateInputToolBarViewHeight];
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ struct VoiceMessageToolbarViewDetails {
|
||||
class VoiceMessageToolbarView: PassthroughView, NibLoadable, Themable, UIGestureRecognizerDelegate, VoiceMessagePlaybackViewDelegate {
|
||||
|
||||
private enum Constants {
|
||||
static let longPressMinimumDuration: TimeInterval = 1.0
|
||||
static let longPressMinimumDuration: TimeInterval = 0.0
|
||||
static let animationDuration: TimeInterval = 0.25
|
||||
static let lockModeTransitionAnimationDuration: TimeInterval = 0.5
|
||||
static let panDirectionChangeThreshold: CGFloat = 20.0
|
||||
@@ -145,7 +145,7 @@ class VoiceMessageToolbarView: PassthroughView, NibLoadable, Themable, UIGesture
|
||||
convertedFrame = self.convert(lockChevron.frame, from: lockContainerView)
|
||||
lockChevronToRecordButtonDistance = recordButtonsContainerView.frame.midY + convertedFrame.maxY
|
||||
|
||||
lockChevronToLockButtonDistance = lockChevron.frame.minY - lockButtonsContainerView.frame.midY
|
||||
lockChevronToLockButtonDistance = (lockChevron.frame.minY - lockButtonsContainerView.frame.midY) / 2
|
||||
|
||||
startAnimatingRecordingIndicator()
|
||||
default:
|
||||
@@ -393,6 +393,10 @@ class VoiceMessageToolbarView: PassthroughView, NibLoadable, Themable, UIGesture
|
||||
}
|
||||
|
||||
@objc private func handleWaveformTap(_ gestureRecognizer: UITapGestureRecognizer) {
|
||||
guard self.lastUIState == .lockedModeRecord else {
|
||||
return
|
||||
}
|
||||
|
||||
delegate?.voiceMessageToolbarViewDidRequestRecordingFinish(self)
|
||||
}
|
||||
}
|
||||
|
||||
+8
-11
@@ -1,11 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YCb-yR-1Km">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YCb-yR-1Km">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
@@ -19,7 +17,7 @@
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Oz-k6-Zyh">
|
||||
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lG2-Xw-KPE">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="500"/>
|
||||
@@ -38,9 +36,8 @@
|
||||
</label>
|
||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="https://vector.im" textAlignment="right" minimumFontSize="15" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Zwv-XP-gEA">
|
||||
<rect key="frame" x="140" y="16" width="215" height="19"/>
|
||||
<nil key="textColor"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="15"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="done" enablesReturnKeyAutomatically="YES" textContentType="url"/>
|
||||
</textField>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
@@ -63,7 +60,7 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h8a-2s-H3K">
|
||||
<rect key="frame" x="0.0" y="167" width="375" height="50"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kPC-YQ-MGL">
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kPC-YQ-MGL">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="50" id="T9R-QE-nBi"/>
|
||||
@@ -102,7 +99,7 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O79-u4-Mig">
|
||||
<rect key="frame" x="0.0" y="367" width="375" height="50"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Tg-0G-cBC">
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Tg-0G-cBC">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="50" id="haa-Jh-EDc"/>
|
||||
@@ -170,6 +167,7 @@
|
||||
</constraints>
|
||||
</scrollView>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="0Gf-da-iK5"/>
|
||||
<color key="backgroundColor" red="0.94509803920000002" green="0.96078431369999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="8Oz-k6-Zyh" firstAttribute="leading" secondItem="0Gf-da-iK5" secondAttribute="leading" id="059-y1-rPd"/>
|
||||
@@ -177,7 +175,6 @@
|
||||
<constraint firstItem="0Gf-da-iK5" firstAttribute="top" secondItem="8Oz-k6-Zyh" secondAttribute="top" id="lkR-P4-U2b"/>
|
||||
<constraint firstItem="0Gf-da-iK5" firstAttribute="trailing" secondItem="8Oz-k6-Zyh" secondAttribute="trailing" id="vL8-o9-5PR"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="0Gf-da-iK5"/>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="addOrChangeButton" destination="kPC-YQ-MGL" id="Ebk-ko-ay1"/>
|
||||
|
||||
@@ -142,7 +142,6 @@ final class SettingsIdentityServerViewController: UIViewController {
|
||||
self.identityServerLabel.text = VectorL10n.identityServerSettingsTitle
|
||||
|
||||
self.identityServerTextField.placeholder = VectorL10n.identityServerSettingsPlaceHolder
|
||||
self.identityServerTextField.keyboardType = .URL
|
||||
self.identityServerTextField.addTarget(self, action: #selector(identityServerTextFieldDidChange(_:)), for: .editingChanged)
|
||||
self.identityServerTextField.addTarget(self, action: #selector(identityServerTextFieldDidEndOnExit(_:)), for: .editingDidEndOnExit)
|
||||
|
||||
@@ -346,7 +345,12 @@ final class SettingsIdentityServerViewController: UIViewController {
|
||||
private func addOrChangeAction() {
|
||||
self.identityServerTextField.resignFirstResponder()
|
||||
|
||||
guard let displayMode = self.displayMode, let identityServer = self.identityServerTextField.text else {
|
||||
guard
|
||||
let displayMode = displayMode,
|
||||
let identityServer = identityServerTextField.text?.trimmingCharacters(in: .whitespaces),
|
||||
!identityServer.isEmpty
|
||||
else {
|
||||
viewModel.process(viewAction: .load)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user