From d66214b4622500135a0c6165a0302e625211445a Mon Sep 17 00:00:00 2001 From: xabirequejo Date: Thu, 9 May 2024 16:43:07 +0000 Subject: [PATCH 01/17] Translated using Weblate (Basque) Currently translated at 100.0% (630 of 630 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ --- assets/l10n/intl_eu.arb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_eu.arb b/assets/l10n/intl_eu.arb index 668de36c8..dd4d35087 100644 --- a/assets/l10n/intl_eu.arb +++ b/assets/l10n/intl_eu.arb @@ -2689,5 +2689,18 @@ "publicChatAddresses": "Txataren helbide publikoak", "@publicChatAddresses": {}, "createNewAddress": "Sortu helbide berria", - "@createNewAddress": {} + "@createNewAddress": {}, + "files": "Fitxategiak", + "@files": {}, + "gallery": "Galeria", + "@gallery": {}, + "searchIn": "Bilatu {chat}ean...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "searchMore": "Bilatu gehiago...", + "@searchMore": {} } From a845974bd1599f561da339e7355e15f518cf549c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jos=C3=A9=20m?= Date: Fri, 10 May 2024 05:00:17 +0000 Subject: [PATCH 02/17] Translated using Weblate (Galician) Currently translated at 100.0% (630 of 630 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ --- assets/l10n/intl_gl.arb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_gl.arb b/assets/l10n/intl_gl.arb index c1dd896bc..c579c1d70 100644 --- a/assets/l10n/intl_gl.arb +++ b/assets/l10n/intl_gl.arb @@ -2689,5 +2689,18 @@ "placeholders": { "level": {} } - } + }, + "searchIn": "Buscar en {chat}...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "searchMore": "Buscar máis...", + "@searchMore": {}, + "gallery": "Galería", + "@gallery": {}, + "files": "Ficheiros", + "@files": {} } From 206290f3e718cee191c0699b41d34b58f0e515a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Thu, 9 May 2024 16:18:45 +0000 Subject: [PATCH 03/17] Translated using Weblate (Turkish) Currently translated at 100.0% (630 of 630 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/tr/ --- assets/l10n/intl_tr.arb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_tr.arb b/assets/l10n/intl_tr.arb index 6320e082a..ca44ea5b1 100644 --- a/assets/l10n/intl_tr.arb +++ b/assets/l10n/intl_tr.arb @@ -2689,5 +2689,18 @@ "appname": {}, "unread": {} } - } + }, + "searchIn": "{chat} içinde ara...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "searchMore": "Daha fazla ara...", + "@searchMore": {}, + "gallery": "Galeri", + "@gallery": {}, + "files": "Dosyalar", + "@files": {} } From 02c0f32cf5d297d23488c2892e5c1f6a7742cd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=8E=8B=E5=8F=AB=E6=88=91=E6=9D=A5=E5=B7=A1?= =?UTF-8?q?=E5=B1=B1?= Date: Fri, 10 May 2024 01:07:08 +0000 Subject: [PATCH 04/17] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (630 of 630 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ --- assets/l10n/intl_zh.arb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_zh.arb b/assets/l10n/intl_zh.arb index 599974493..a0962d297 100644 --- a/assets/l10n/intl_zh.arb +++ b/assets/l10n/intl_zh.arb @@ -2689,5 +2689,18 @@ "publicChatAddresses": "公开聊天的地址", "@publicChatAddresses": {}, "createNewAddress": "新建地址", - "@createNewAddress": {} + "@createNewAddress": {}, + "searchMore": "搜索更多…", + "@searchMore": {}, + "gallery": "图库", + "@gallery": {}, + "files": "文件", + "@files": {}, + "searchIn": "在 {chat} 中搜索…", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + } } From 198a03d7b9bb857b92aeeb84d286fbf39108d742 Mon Sep 17 00:00:00 2001 From: kdh8219 Date: Fri, 10 May 2024 13:03:17 +0000 Subject: [PATCH 05/17] Translated using Weblate (Korean) Currently translated at 100.0% (630 of 630 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ko/ --- assets/l10n/intl_ko.arb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_ko.arb b/assets/l10n/intl_ko.arb index 9ff14113d..4e47d233d 100644 --- a/assets/l10n/intl_ko.arb +++ b/assets/l10n/intl_ko.arb @@ -2688,5 +2688,18 @@ "createNewAddress": "새 주소 만들기", "@createNewAddress": {}, "hideMemberChangesInPublicChatsBody": "공개채팅에 누군가가 가입하거나 떠날때 타임라인에 표시하지 않습니다.", - "@hideMemberChangesInPublicChatsBody": {} + "@hideMemberChangesInPublicChatsBody": {}, + "searchMore": "더 검색...", + "@searchMore": {}, + "files": "파일", + "@files": {}, + "searchIn": "{chat}에서 검색...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "gallery": "갤러리", + "@gallery": {} } From 75d0fdb122c5109e5416c693f7da7475a89b8627 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 30 May 2024 06:26:56 +0000 Subject: [PATCH 06/17] Translated using Weblate (German) Currently translated at 100.0% (632 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ --- assets/l10n/intl_de.arb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/assets/l10n/intl_de.arb b/assets/l10n/intl_de.arb index fcc360f60..efb0e2d8e 100644 --- a/assets/l10n/intl_de.arb +++ b/assets/l10n/intl_de.arb @@ -2221,7 +2221,7 @@ }, "newSpaceDescription": "Mit Spaces kannst du deine Chats zusammenfassen und private oder öffentliche Communities aufbauen.", "@newSpaceDescription": {}, - "wasDirectChatDisplayName": "Leerer Chat (was {oldDisplayName}", + "wasDirectChatDisplayName": "Leerer Chat (war {oldDisplayName})", "@wasDirectChatDisplayName": { "type": "text", "placeholders": { @@ -2689,5 +2689,22 @@ } }, "publicChatAddresses": "Öffentliche Chat-Adressen", - "@publicChatAddresses": {} + "@publicChatAddresses": {}, + "gallery": "Galerie", + "@gallery": {}, + "files": "Dateien", + "@files": {}, + "restricted": "Beschränkt", + "@restricted": {}, + "knockRestricted": "Anklopfen beschränkt", + "@knockRestricted": {}, + "searchIn": "In {chat} suchen ...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "searchMore": "Weiter suchen ...", + "@searchMore": {} } From f01d507e194845fad689edf05ce5193cd6af51b3 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Thu, 30 May 2024 08:36:08 +0200 Subject: [PATCH 07/17] chore: Disable page transition in column mode --- lib/config/routes.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 3bfbcf91f..d11cd56db 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -445,13 +445,10 @@ abstract class AppRoutes { Widget child, ) => FluffyThemes.isColumnMode(context) - ? CustomTransitionPage( + ? NoTransitionPage( key: state.pageKey, restorationId: state.pageKey.value, child: child, - transitionsBuilder: - (context, animation, secondaryAnimation, child) => - FadeTransition(opacity: animation, child: child), ) : MaterialPage( key: state.pageKey, From 934f1ebe99cf56d87f109f76cd4566e58dbbb1c5 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 30 May 2024 06:53:06 +0000 Subject: [PATCH 08/17] Translated using Weblate (English) Currently translated at 100.0% (632 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/en/ --- assets/l10n/intl_en.arb | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 721dee5b1..f5fbd1926 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -132,6 +132,7 @@ "placeholders": {} }, "appLockDescription": "Lock the app when not using with a pin code", + "@appLockDescription": {}, "archive": "Archive", "@archive": { "type": "text", @@ -761,11 +762,17 @@ "placeholders": {} }, "globalChatId": "Global chat ID", + "@globalChatId": {}, "accessAndVisibility": "Access and visibility", + "@accessAndVisibility": {}, "accessAndVisibilityDescription": "Who is allowed to join this chat and how the chat can be discovered.", + "@accessAndVisibilityDescription": {}, "calls": "Calls", + "@calls": {}, "customEmojisAndStickers": "Custom emojis and stickers", + "@customEmojisAndStickers": {}, "customEmojisAndStickersBody": "Add or share custom emojis or stickers which can be used in any chat.", + "@customEmojisAndStickersBody": {}, "emoteShortcode": "Emote shortcode", "@emoteShortcode": { "type": "text", @@ -937,12 +944,11 @@ "placeholders": {} }, "hideRedactedMessages": "Hide redacted messages", + "@hideRedactedMessages": {}, "hideRedactedMessagesBody": "If someone redacts a message, this message won't be visible in the chat anymore.", + "@hideRedactedMessagesBody": {}, "hideInvalidOrUnknownMessageFormats": "Hide invalid or unknown message formats", - "@hideUnknownEvents": { - "type": "text", - "placeholders": {} - }, + "@hideInvalidOrUnknownMessageFormats": {}, "howOffensiveIsThisContent": "How offensive is this content?", "@howOffensiveIsThisContent": { "type": "text", @@ -1394,10 +1400,15 @@ "placeholders": {} }, "hideMemberChangesInPublicChats": "Hide member changes in public chats", + "@hideMemberChangesInPublicChats": {}, "hideMemberChangesInPublicChatsBody": "Do not show in the chat timeline if someone joins or leaves a public chat to improve readability.", + "@hideMemberChangesInPublicChatsBody": {}, "overview": "Overview", + "@overview": {}, "notifyMeFor": "Notify me for", + "@notifyMeFor": {}, "passwordRecoverySettings": "Password recovery settings", + "@passwordRecoverySettings": {}, "passwordRecovery": "Password recovery", "@passwordRecovery": { "type": "text", @@ -2280,7 +2291,9 @@ } }, "usersMustKnock": "Users must knock", + "@usersMustKnock": {}, "noOneCanJoin": "No one can join", + "@noOneCanJoin": {}, "userWouldLikeToChangeTheChat": "{user} would like to join the chat.", "@userWouldLikeToChangeTheChat": { "placeholders": { @@ -2288,7 +2301,9 @@ } }, "noPublicLinkHasBeenCreatedYet": "No public link has been created yet", + "@noPublicLinkHasBeenCreatedYet": {}, "knock": "Knock", + "@knock": {}, "users": "Users", "@users": {}, "unlockOldMessages": "Unlock old messages", @@ -2464,6 +2479,7 @@ } }, "knocking": "Knocking", + "@knocking": {}, "chatCanBeDiscoveredViaSearchOnServer": "Chat can be discovered via the search on {server}", "@chatCanBeDiscoveredViaSearchOnServer": { "type": "text", @@ -2510,7 +2526,9 @@ "publicLink": "Public link", "@publicLink": {}, "publicChatAddresses": "Public chat addresses", + "@publicChatAddresses": {}, "createNewAddress": "Create new address", + "@createNewAddress": {}, "joinSpace": "Join space", "@joinSpace": {}, "publicSpaces": "Public spaces", @@ -2526,6 +2544,7 @@ "initAppError": "An error occured while init the app", "@initAppError": {}, "userRole": "User role", + "@userRole": {}, "minimumPowerLevel": "{level} is the minimum power level.", "@minimumPowerLevel": { "type": "text", @@ -2533,7 +2552,7 @@ "level": {} } }, - "searchIn": "Search in {chat}...", + "searchIn": "Search in chat \"{chat}\"...", "@searchIn": { "type": "text", "placeholders": { @@ -2541,8 +2560,11 @@ } }, "searchMore": "Search more...", + "@searchMore": {}, "gallery": "Gallery", + "@gallery": {}, "files": "Files", + "@files": {}, "databaseBuildErrorBody": "Unable to build the SQlite database. The app tries to use the legacy database for now. Please report this error to the developers at {url}. The error message is: {error}", "@databaseBuildErrorBody": { "type": "text", @@ -2655,11 +2677,14 @@ } }, "noDatabaseEncryption": "Database encryption is not supported on this platform", + "@noDatabaseEncryption": {}, "thereAreCountUsersBlocked": "Right now there are {count} users blocked.", "@thereAreCountUsersBlocked": { "type": "text", "count": {} }, "restricted": "Restricted", - "knockRestricted": "Knock restricted" + "@restricted": {}, + "knockRestricted": "Knock restricted", + "@knockRestricted": {} } From c7f2cbe450fa9bae937a26f282a29df0a208f8dc Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 30 May 2024 06:53:36 +0000 Subject: [PATCH 09/17] Translated using Weblate (German) Currently translated at 100.0% (632 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ --- assets/l10n/intl_de.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/l10n/intl_de.arb b/assets/l10n/intl_de.arb index efb0e2d8e..adf2d99d0 100644 --- a/assets/l10n/intl_de.arb +++ b/assets/l10n/intl_de.arb @@ -2698,7 +2698,7 @@ "@restricted": {}, "knockRestricted": "Anklopfen beschränkt", "@knockRestricted": {}, - "searchIn": "In {chat} suchen ...", + "searchIn": "In Chat \"{chat}\" suchen ...", "@searchIn": { "type": "text", "placeholders": { From e27b9208134ad69af2d4dbc96a078052e6f4cd99 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Thu, 30 May 2024 08:57:03 +0200 Subject: [PATCH 10/17] chore: Add weblate as codeowner for l10n --- .github/CODEOWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 58c1dad66..81e3deb36 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ -* @krille-chan \ No newline at end of file +* @krille-chan +assets/l10n/*.arb @weblate \ No newline at end of file From 2cc96714cc172478730185d77e635d2d78b9f702 Mon Sep 17 00:00:00 2001 From: Rex_sa Date: Thu, 30 May 2024 09:07:21 +0000 Subject: [PATCH 11/17] Translated using Weblate (Arabic) Currently translated at 100.0% (632 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ --- assets/l10n/intl_ar.arb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_ar.arb b/assets/l10n/intl_ar.arb index 46de8c0ec..8cd5a4080 100644 --- a/assets/l10n/intl_ar.arb +++ b/assets/l10n/intl_ar.arb @@ -2689,5 +2689,22 @@ "placeholders": { "level": {} } - } + }, + "searchIn": "بحث في {chat}...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } + }, + "files": "الملفات", + "@files": {}, + "restricted": "مقيد", + "@restricted": {}, + "knockRestricted": "قيود النقر", + "@knockRestricted": {}, + "searchMore": "ابحث أكثر...", + "@searchMore": {}, + "gallery": "المعرض", + "@gallery": {} } From 06a09fafd036aee915e916d41c0bc7e388acc3f9 Mon Sep 17 00:00:00 2001 From: Rauno Ots Date: Thu, 30 May 2024 09:18:22 +0000 Subject: [PATCH 12/17] Translated using Weblate (Estonian) Currently translated at 99.2% (627 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- assets/l10n/intl_et.arb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb index 130c2f280..db66c99f7 100644 --- a/assets/l10n/intl_et.arb +++ b/assets/l10n/intl_et.arb @@ -2689,5 +2689,12 @@ "@thereAreCountUsersBlocked": { "type": "text", "count": {} + }, + "searchIn": "Otsi vestlusest {chat}...", + "@searchIn": { + "type": "text", + "placeholders": { + "chat": {} + } } } From 229fe890dd471cfb1b998e9ed36b57c5eb8e86b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Thu, 30 May 2024 09:18:42 +0000 Subject: [PATCH 13/17] Translated using Weblate (Estonian) Currently translated at 99.3% (628 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- assets/l10n/intl_et.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb index db66c99f7..12073c9c2 100644 --- a/assets/l10n/intl_et.arb +++ b/assets/l10n/intl_et.arb @@ -2690,7 +2690,7 @@ "type": "text", "count": {} }, - "searchIn": "Otsi vestlusest {chat}...", + "searchIn": "Otsi vestlusest „{chat}“...", "@searchIn": { "type": "text", "placeholders": { From 591cd4997b9efc5a75275659de55a48c1c169044 Mon Sep 17 00:00:00 2001 From: Rauno Ots Date: Thu, 30 May 2024 09:18:46 +0000 Subject: [PATCH 14/17] Translated using Weblate (Estonian) Currently translated at 99.3% (628 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- assets/l10n/intl_et.arb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb index 12073c9c2..b7cadb216 100644 --- a/assets/l10n/intl_et.arb +++ b/assets/l10n/intl_et.arb @@ -2696,5 +2696,7 @@ "placeholders": { "chat": {} } - } + }, + "searchMore": "Otsi veel...", + "@searchMore": {} } From f2d42936ad40cebde2329d72c39c60bf45845a93 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Thu, 30 May 2024 14:55:41 +0200 Subject: [PATCH 15/17] chore: Follow up chat design --- lib/pages/chat/events/message.dart | 2 ++ lib/pages/chat/typing_indicators.dart | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index cba2b9398..9cfdaaf42 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -260,6 +260,8 @@ class Message extends StatelessWidget { : displayname .lightColorText), ), + maxLines: 1, + overflow: TextOverflow.ellipsis, ); }, ), diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart index 47079d4c3..35fbf5d25 100644 --- a/lib/pages/chat/typing_indicators.dart +++ b/lib/pages/chat/typing_indicators.dart @@ -27,14 +27,13 @@ class TypingIndicators extends StatelessWidget { final typingUsers = controller.room.typingUsers ..removeWhere((u) => u.stateKey == Matrix.of(context).client.userID); - const bottomPadding = 4.0; return Container( width: double.infinity, alignment: Alignment.center, child: AnimatedContainer( constraints: const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5), - height: typingUsers.isEmpty ? 0 : avatarSize + bottomPadding, + height: typingUsers.isEmpty ? 0 : avatarSize + 8, duration: FluffyThemes.animationDuration, curve: FluffyThemes.animationCurve, alignment: controller.timeline!.events.isNotEmpty && @@ -44,15 +43,16 @@ class TypingIndicators extends StatelessWidget { : Alignment.topLeft, clipBehavior: Clip.hardEdge, decoration: const BoxDecoration(), - padding: const EdgeInsets.only( - left: 8.0, - bottom: bottomPadding, + padding: const EdgeInsets.symmetric( + horizontal: 8.0, + vertical: 4.0, ), child: Row( children: [ - SizedBox( + Container( + alignment: Alignment.center, height: avatarSize, - width: typingUsers.length < 2 ? avatarSize : avatarSize + 16, + width: Avatar.defaultSize, child: Stack( children: [ if (typingUsers.isNotEmpty) From bd5dc8405d930110be826cb1b9eaa4c427332052 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Thu, 30 May 2024 15:24:11 +0200 Subject: [PATCH 16/17] refactor: Calc avatar font size by avatar size --- lib/pages/chat/seen_by_row.dart | 1 - lib/pages/chat_details/chat_details_view.dart | 1 - lib/pages/chat_list/chat_list_view.dart | 1 - lib/pages/chat_list/client_chooser_button.dart | 2 -- lib/pages/chat_list/space_view.dart | 1 - lib/pages/settings/settings_view.dart | 1 - lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart | 1 - lib/widgets/avatar.dart | 4 +--- lib/widgets/public_room_bottom_sheet.dart | 1 - 9 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart index c2c3cd737..9b1ad8953 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -42,7 +42,6 @@ class SeenByRow extends StatelessWidget { mxContent: user.avatarUrl, name: user.calcDisplayname(), size: 16, - fontSize: 9, ), ), if (seenByUsers.length > maxAvatars) diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 5b9324d0c..4e19e43ca 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -111,7 +111,6 @@ class ChatDetailsView extends StatelessWidget { mxContent: room.avatar, name: displayname, size: Avatar.defaultSize * 2.5, - fontSize: 18 * 2.5, ), ), ), diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index 9cd31e0e0..160db9b86 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -163,7 +163,6 @@ class ChatListView extends StatelessWidget { MatrixLocals(L10n.of(context)!), ), size: 32, - fontSize: 12, ), ); }, diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index e533d37f6..a37901b2f 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -126,7 +126,6 @@ class ClientChooserButton extends StatelessWidget { name: snapshot.data?.displayName ?? client.userID!.localpart, size: 32, - fontSize: 12, ), const SizedBox(width: 12), Expanded( @@ -216,7 +215,6 @@ class ClientChooserButton extends StatelessWidget { name: snapshot.data?.displayName ?? matrix.client.userID!.localpart, size: 32, - fontSize: 12, ), ), ), diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index 40ad71c49..a984b4377 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -461,7 +461,6 @@ class _SpaceViewState extends State { size: 24, mxContent: spaceChild.avatarUrl, name: spaceChild.name, - fontSize: 9, ), ), color: Theme.of(context) diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index a709f46f6..b1d60f142 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -74,7 +74,6 @@ class SettingsView extends StatelessWidget { mxContent: profile?.avatarUrl, name: displayname, size: Avatar.defaultSize * 2.5, - fontSize: 18 * 2.5, ), ), if (profile != null) diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index da60ee597..9e72a4a3f 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -187,7 +187,6 @@ class UserBottomSheetView extends StatelessWidget { mxContent: avatarUrl, name: displayname, size: Avatar.defaultSize * 2.5, - fontSize: 18 * 2.5, ), ), ), diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index a22f3602d..2066536dc 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -13,7 +13,6 @@ class Avatar extends StatelessWidget { final void Function()? onTap; static const double defaultSize = 44; final Client? client; - final double fontSize; final String? presenceUserId; final Color? presenceBackgroundColor; @@ -23,7 +22,6 @@ class Avatar extends StatelessWidget { this.size = defaultSize, this.onTap, this.client, - this.fontSize = 18, this.presenceUserId, this.presenceBackgroundColor, super.key, @@ -48,7 +46,7 @@ class Avatar extends StatelessWidget { fallbackLetters, style: TextStyle( color: noPic ? Colors.white : null, - fontSize: fontSize, + fontSize: (size / 2.5).roundToDouble(), ), ), ); diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart index 3a4f68f3f..8bd354ef5 100644 --- a/lib/widgets/public_room_bottom_sheet.dart +++ b/lib/widgets/public_room_bottom_sheet.dart @@ -133,7 +133,6 @@ class PublicRoomBottomSheet extends StatelessWidget { mxContent: profile.avatarUrl, name: profile.name ?? roomAlias, size: Avatar.defaultSize * 3, - fontSize: 36, ), ), ), From 8616ba6a94c5b295cf263450fac619640ce643db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Thu, 30 May 2024 09:19:31 +0000 Subject: [PATCH 17/17] Translated using Weblate (Estonian) Currently translated at 100.0% (632 of 632 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- assets/l10n/intl_et.arb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb index b7cadb216..f0848b246 100644 --- a/assets/l10n/intl_et.arb +++ b/assets/l10n/intl_et.arb @@ -2698,5 +2698,9 @@ } }, "searchMore": "Otsi veel...", - "@searchMore": {} + "@searchMore": {}, + "knockRestricted": "Koputa piiratud ligipääsuga jututoa uksele", + "@knockRestricted": {}, + "restricted": "Piiratud", + "@restricted": {} }