diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 584a875..147b66c 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2825,7 +2825,7 @@ "type": "String", "placeholders": { "user": { - "type": "string" + "type": "String" } } }, @@ -2834,7 +2834,7 @@ "type": "String", "placeholders": { "user": { - "type": "string" + "type": "String" } } }, diff --git a/assets/l10n/intl_ru.arb b/assets/l10n/intl_ru.arb index 7e84803..8d8395d 100644 --- a/assets/l10n/intl_ru.arb +++ b/assets/l10n/intl_ru.arb @@ -2818,7 +2818,7 @@ "type": "String", "placeholders": { "user": { - "type": "string" + "type": "String" } } }, @@ -2827,7 +2827,7 @@ "type": "String", "placeholders": { "user": { - "type": "string" + "type": "String" } } }, diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 5b4bcb0..cc987a9 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -4,39 +4,39 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/archive/archive.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pages/chat_access_settings/chat_access_settings_controller.dart'; -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pages/chat_members/chat_members.dart'; -import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_page.dart'; -import 'package:fluffychat/pages/device_settings/device_settings.dart'; -import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart'; -import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart'; -import 'package:fluffychat/pages/login/login.dart'; -import 'package:fluffychat/pages/new_group/new_group.dart'; -import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart'; -import 'package:fluffychat/pages/settings/settings.dart'; -import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; -import 'package:fluffychat/pages/settings_chat/settings_chat.dart'; -import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart'; -import 'package:fluffychat/pages/settings_homeserver/settings_homeserver.dart'; -import 'package:fluffychat/pages/settings_ignore_list/settings_ignore_list.dart'; -import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; -import 'package:fluffychat/pages/settings_notifications/settings_notifications.dart'; -import 'package:fluffychat/pages/settings_password/settings_password.dart'; -import 'package:fluffychat/pages/settings_security/settings_security.dart'; -import 'package:fluffychat/pages/settings_style/settings_style.dart'; -import 'package:fluffychat/widgets/config_viewer.dart'; -import 'package:fluffychat/widgets/layouts/empty_page.dart'; -import 'package:fluffychat/widgets/layouts/two_column_layout.dart'; -import 'package:fluffychat/widgets/log_view.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/archive/archive.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/pages/chat_access_settings/chat_access_settings_controller.dart'; +import 'package:extera_next/pages/chat_details/chat_details.dart'; +import 'package:extera_next/pages/chat_encryption_settings/chat_encryption_settings.dart'; +import 'package:extera_next/pages/chat_list/chat_list.dart'; +import 'package:extera_next/pages/chat_members/chat_members.dart'; +import 'package:extera_next/pages/chat_permissions_settings/chat_permissions_settings.dart'; +import 'package:extera_next/pages/chat_search/chat_search_page.dart'; +import 'package:extera_next/pages/device_settings/device_settings.dart'; +import 'package:extera_next/pages/homeserver_picker/homeserver_picker.dart'; +import 'package:extera_next/pages/invitation_selection/invitation_selection.dart'; +import 'package:extera_next/pages/login/login.dart'; +import 'package:extera_next/pages/new_group/new_group.dart'; +import 'package:extera_next/pages/new_private_chat/new_private_chat.dart'; +import 'package:extera_next/pages/settings/settings.dart'; +import 'package:extera_next/pages/settings_3pid/settings_3pid.dart'; +import 'package:extera_next/pages/settings_chat/settings_chat.dart'; +import 'package:extera_next/pages/settings_emotes/settings_emotes.dart'; +import 'package:extera_next/pages/settings_homeserver/settings_homeserver.dart'; +import 'package:extera_next/pages/settings_ignore_list/settings_ignore_list.dart'; +import 'package:extera_next/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; +import 'package:extera_next/pages/settings_notifications/settings_notifications.dart'; +import 'package:extera_next/pages/settings_password/settings_password.dart'; +import 'package:extera_next/pages/settings_security/settings_security.dart'; +import 'package:extera_next/pages/settings_style/settings_style.dart'; +import 'package:extera_next/widgets/config_viewer.dart'; +import 'package:extera_next/widgets/layouts/empty_page.dart'; +import 'package:extera_next/widgets/layouts/two_column_layout.dart'; +import 'package:extera_next/widgets/log_view.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/share_scaffold_dialog.dart'; import 'package:matrix/matrix.dart'; abstract class AppRoutes { diff --git a/lib/generated/l10n/l10n.dart b/lib/generated/l10n/l10n.dart index a95959c..b5c4004 100644 --- a/lib/generated/l10n/l10n.dart +++ b/lib/generated/l10n/l10n.dart @@ -3750,7 +3750,7 @@ abstract class L10n { /// No description provided for @banUserDescription. /// /// In en, this message translates to: - /// **'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'** + /// **'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'** String get banUserDescription; /// No description provided for @unbanUserDescription. @@ -3759,10 +3759,22 @@ abstract class L10n { /// **'The user will be able to enter the chat again if they try.'** String get unbanUserDescription; + /// No description provided for @doYouWantToKick. + /// + /// In en, this message translates to: + /// **'Kick {user}'** + String doYouWantToKick(String user); + + /// No description provided for @doYouWantToBan. + /// + /// In en, this message translates to: + /// **'Ban {user}'** + String doYouWantToBan(String user); + /// No description provided for @kickUserDescription. /// /// In en, this message translates to: - /// **'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'** + /// **'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'** String get kickUserDescription; /// No description provided for @makeAdminDescription. diff --git a/lib/generated/l10n/l10n_ar.dart b/lib/generated/l10n/l10n_ar.dart index 0e13eab..cc81251 100644 --- a/lib/generated/l10n/l10n_ar.dart +++ b/lib/generated/l10n/l10n_ar.dart @@ -2060,6 +2060,16 @@ class L10nAr extends L10n { String get unbanUserDescription => 'سيتمكن المستخدم من الدخول إلى المحادثة مرة أخرى إذا حاول.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'يتم طرد المستخدم من المحادثة ولكن لا يتم حظره. في المحادثات العامة، يمكن للمستخدم الانضمام مرة أخرى في أي وقت.'; diff --git a/lib/generated/l10n/l10n_be.dart b/lib/generated/l10n/l10n_be.dart index 95dac35..372051b 100644 --- a/lib/generated/l10n/l10n_be.dart +++ b/lib/generated/l10n/l10n_be.dart @@ -2067,15 +2067,25 @@ class L10nBe extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_bn.dart b/lib/generated/l10n/l10n_bn.dart index e9ed867..7d3cee6 100644 --- a/lib/generated/l10n/l10n_bn.dart +++ b/lib/generated/l10n/l10n_bn.dart @@ -2067,15 +2067,25 @@ class L10nBn extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_bo.dart b/lib/generated/l10n/l10n_bo.dart index 15c0071..70e2325 100644 --- a/lib/generated/l10n/l10n_bo.dart +++ b/lib/generated/l10n/l10n_bo.dart @@ -2067,15 +2067,25 @@ class L10nBo extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_ca.dart b/lib/generated/l10n/l10n_ca.dart index 55bcc57..449e186 100644 --- a/lib/generated/l10n/l10n_ca.dart +++ b/lib/generated/l10n/l10n_ca.dart @@ -2093,6 +2093,16 @@ class L10nCa extends L10n { String get unbanUserDescription => 'L\'usuàrïi ja pot tornar a entrar al xat.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Li usuàrïi ha estat expulsadi però no vetadi. Als xats públics, pot tornar-hi a entrar en qualsevol moment.'; diff --git a/lib/generated/l10n/l10n_cs.dart b/lib/generated/l10n/l10n_cs.dart index 349ce99..ea12b9e 100644 --- a/lib/generated/l10n/l10n_cs.dart +++ b/lib/generated/l10n/l10n_cs.dart @@ -2071,15 +2071,25 @@ class L10nCs extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_de.dart b/lib/generated/l10n/l10n_de.dart index cdb0608..4f2675b 100644 --- a/lib/generated/l10n/l10n_de.dart +++ b/lib/generated/l10n/l10n_de.dart @@ -2087,6 +2087,16 @@ class L10nDe extends L10n { String get unbanUserDescription => 'Der Benutzer kann den Chat dann wieder betreten, wenn er es versucht.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Der Benutzer wird aus dem Chat geworfen, aber nicht gebannt. In öffentlichen Chats kann der Benutzer jederzeit wieder beitreten.'; diff --git a/lib/generated/l10n/l10n_el.dart b/lib/generated/l10n/l10n_el.dart index 1c36a36..07b77cf 100644 --- a/lib/generated/l10n/l10n_el.dart +++ b/lib/generated/l10n/l10n_el.dart @@ -2068,15 +2068,25 @@ class L10nEl extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_en.dart b/lib/generated/l10n/l10n_en.dart index 3ee5a5b..c06013e 100644 --- a/lib/generated/l10n/l10n_en.dart +++ b/lib/generated/l10n/l10n_en.dart @@ -2067,15 +2067,25 @@ class L10nEn extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_eo.dart b/lib/generated/l10n/l10n_eo.dart index 91ab35f..075f0a7 100644 --- a/lib/generated/l10n/l10n_eo.dart +++ b/lib/generated/l10n/l10n_eo.dart @@ -2074,15 +2074,25 @@ class L10nEo extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_es.dart b/lib/generated/l10n/l10n_es.dart index 641c889..47e71e6 100644 --- a/lib/generated/l10n/l10n_es.dart +++ b/lib/generated/l10n/l10n_es.dart @@ -2095,6 +2095,16 @@ class L10nEs extends L10n { String get unbanUserDescription => 'El usuario podrá entrar al chat de nuevo si lo intenta.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Se expulsa al usuario del chat, pero no se le prohíbe volver a entrar. En chats públicos, el usuario podrá volver a entrar en cualquier momento.'; diff --git a/lib/generated/l10n/l10n_et.dart b/lib/generated/l10n/l10n_et.dart index b92ba16..3c5a4e9 100644 --- a/lib/generated/l10n/l10n_et.dart +++ b/lib/generated/l10n/l10n_et.dart @@ -2088,6 +2088,16 @@ class L10nEt extends L10n { String get unbanUserDescription => 'Uuesti proovimisel saab see kasutaja nüüd vestlusega liituda.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'See kasutaja on nüüd jutuoast välja müksatud, kuid talle pole seatud suhtluskeeldu. Avaliku jututoa puhul saab ta alati uuesti liituda.'; diff --git a/lib/generated/l10n/l10n_eu.dart b/lib/generated/l10n/l10n_eu.dart index 03c1ae1..b9c063a 100644 --- a/lib/generated/l10n/l10n_eu.dart +++ b/lib/generated/l10n/l10n_eu.dart @@ -2081,6 +2081,16 @@ class L10nEu extends L10n { String get unbanUserDescription => 'Erabiltzailea txatera berriro sartu ahal izango da berak nahi izanez gero.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Erabiltzailea txatetik kanporatu da baina ez zaio debekua ezarri. Txat publikoen kasuan, edozein momentutan batu daiteke berriro.'; diff --git a/lib/generated/l10n/l10n_fa.dart b/lib/generated/l10n/l10n_fa.dart index 834e581..2b312fe 100644 --- a/lib/generated/l10n/l10n_fa.dart +++ b/lib/generated/l10n/l10n_fa.dart @@ -2070,15 +2070,25 @@ class L10nFa extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_fi.dart b/lib/generated/l10n/l10n_fi.dart index d4a6793..6f7650a 100644 --- a/lib/generated/l10n/l10n_fi.dart +++ b/lib/generated/l10n/l10n_fi.dart @@ -2076,15 +2076,25 @@ class L10nFi extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_fil.dart b/lib/generated/l10n/l10n_fil.dart index c7a65ab..d2867ad 100644 --- a/lib/generated/l10n/l10n_fil.dart +++ b/lib/generated/l10n/l10n_fil.dart @@ -2073,15 +2073,25 @@ class L10nFil extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_fr.dart b/lib/generated/l10n/l10n_fr.dart index 6d49eb5..84e05f4 100644 --- a/lib/generated/l10n/l10n_fr.dart +++ b/lib/generated/l10n/l10n_fr.dart @@ -2108,6 +2108,16 @@ class L10nFr extends L10n { String get unbanUserDescription => 'L\'utilisateur/trice pourra entrer à nouveau dans la discussion si il/elle le souhaite.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'L\'utilisateur/trice est expulsé de la discussion mais n\'est pas banni. Dans les discussions publiques, l\'utilisateur/trice peut revenir à tout moment.'; diff --git a/lib/generated/l10n/l10n_ga.dart b/lib/generated/l10n/l10n_ga.dart index efc9279..a7c7bde 100644 --- a/lib/generated/l10n/l10n_ga.dart +++ b/lib/generated/l10n/l10n_ga.dart @@ -2099,6 +2099,16 @@ class L10nGa extends L10n { String get unbanUserDescription => 'Beidh an t-úsáideoir in ann dul isteach sa chomhrá arís má dhéanann siad iarracht.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Ciceáiltear an t-úsáideoir as an gcomhrá ach níl cosc air. I gcomhráite poiblí, is féidir leis an úsáideoir teacht ar ais ag am ar bith.'; diff --git a/lib/generated/l10n/l10n_gl.dart b/lib/generated/l10n/l10n_gl.dart index 1f6b441..23624de 100644 --- a/lib/generated/l10n/l10n_gl.dart +++ b/lib/generated/l10n/l10n_gl.dart @@ -2085,6 +2085,16 @@ class L10nGl extends L10n { String get unbanUserDescription => 'A usuaria vai poder entrar outra vez na conversa se quere.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'A usuaria foi expulsada pero non vetada. En conversas públicas a usuaria pode volver cando queira.'; diff --git a/lib/generated/l10n/l10n_he.dart b/lib/generated/l10n/l10n_he.dart index 6c31208..adf691f 100644 --- a/lib/generated/l10n/l10n_he.dart +++ b/lib/generated/l10n/l10n_he.dart @@ -2062,15 +2062,25 @@ class L10nHe extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_hi.dart b/lib/generated/l10n/l10n_hi.dart index 499114d..f5b3b21 100644 --- a/lib/generated/l10n/l10n_hi.dart +++ b/lib/generated/l10n/l10n_hi.dart @@ -2067,15 +2067,25 @@ class L10nHi extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_hr.dart b/lib/generated/l10n/l10n_hr.dart index 19d9b17..541fdb8 100644 --- a/lib/generated/l10n/l10n_hr.dart +++ b/lib/generated/l10n/l10n_hr.dart @@ -2080,6 +2080,16 @@ class L10nHr extends L10n { String get unbanUserDescription => 'Korisnik će se ponovo moći pridružiti razgovoru ako pokuša.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Korisnik je izbačen iz razgovora, ali nije blokiran. U javnim razgovorima se korisnik može ponovo pridružiti u bilo kojem trenutku.'; diff --git a/lib/generated/l10n/l10n_hu.dart b/lib/generated/l10n/l10n_hu.dart index f394060..9ed1029 100644 --- a/lib/generated/l10n/l10n_hu.dart +++ b/lib/generated/l10n/l10n_hu.dart @@ -2081,6 +2081,16 @@ class L10nHu extends L10n { String get unbanUserDescription => 'A felhasználó vissza tud jönni a csevegésbe ha akar.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'A felhasználó kirúgásra került a csevegésből, de nincs kitiltva. Publikus csevegés esetén a felhasználó bármikor visszatérhet.'; diff --git a/lib/generated/l10n/l10n_ia.dart b/lib/generated/l10n/l10n_ia.dart index 073f1c1..40e509b 100644 --- a/lib/generated/l10n/l10n_ia.dart +++ b/lib/generated/l10n/l10n_ia.dart @@ -2067,15 +2067,25 @@ class L10nIa extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_id.dart b/lib/generated/l10n/l10n_id.dart index 72717f5..1211317 100644 --- a/lib/generated/l10n/l10n_id.dart +++ b/lib/generated/l10n/l10n_id.dart @@ -2085,6 +2085,16 @@ class L10nId extends L10n { String get unbanUserDescription => 'Pengguna akan dapat memasuki percakapannya lagi jika dicoba.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Pengguna ini dikeluarkan dari percakapan tetapi tidak dicekal. Dalam percakapan publik, penggunanya dapat bergabung ulang kapan pun.'; diff --git a/lib/generated/l10n/l10n_ie.dart b/lib/generated/l10n/l10n_ie.dart index d042c56..777aa89 100644 --- a/lib/generated/l10n/l10n_ie.dart +++ b/lib/generated/l10n/l10n_ie.dart @@ -2066,15 +2066,25 @@ class L10nIe extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_it.dart b/lib/generated/l10n/l10n_it.dart index a2caf87..f3e549b 100644 --- a/lib/generated/l10n/l10n_it.dart +++ b/lib/generated/l10n/l10n_it.dart @@ -2094,6 +2094,16 @@ class L10nIt extends L10n { @override String get unbanUserDescription => 'L\'utente potrà rientrare nella chat.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'L\'utente è stato rimosso, ma non bannato. Nelle chat pubbliche, l\'utente potrà rientrare quando vuole.'; diff --git a/lib/generated/l10n/l10n_ja.dart b/lib/generated/l10n/l10n_ja.dart index 8cba9bd..d59c85c 100644 --- a/lib/generated/l10n/l10n_ja.dart +++ b/lib/generated/l10n/l10n_ja.dart @@ -2036,15 +2036,25 @@ class L10nJa extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_ka.dart b/lib/generated/l10n/l10n_ka.dart index e90e569..1125c7b 100644 --- a/lib/generated/l10n/l10n_ka.dart +++ b/lib/generated/l10n/l10n_ka.dart @@ -2069,15 +2069,25 @@ class L10nKa extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_ko.dart b/lib/generated/l10n/l10n_ko.dart index 7294bff..92c86f7 100644 --- a/lib/generated/l10n/l10n_ko.dart +++ b/lib/generated/l10n/l10n_ko.dart @@ -2029,6 +2029,16 @@ class L10nKo extends L10n { @override String get unbanUserDescription => '유저가 다시 채팅을 입력할 수 있습니다.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => '유저는 채팅에서 추방되지만 영구 추방되지 않습니다. 공개 채팅의 경우, 언제든 유저가 다시 참가할 수 있습니다.'; diff --git a/lib/generated/l10n/l10n_lt.dart b/lib/generated/l10n/l10n_lt.dart index 5810996..cc59768 100644 --- a/lib/generated/l10n/l10n_lt.dart +++ b/lib/generated/l10n/l10n_lt.dart @@ -2073,15 +2073,25 @@ class L10nLt extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_lv.dart b/lib/generated/l10n/l10n_lv.dart index d3b9731..0289898 100644 --- a/lib/generated/l10n/l10n_lv.dart +++ b/lib/generated/l10n/l10n_lv.dart @@ -2087,6 +2087,16 @@ class L10nLv extends L10n { String get unbanUserDescription => 'Lietotājs varēs atkal pievienoties tērzēšanai, ja mēģinās.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Lietotājs ir izmests no tērzēšanas, bet piekļuve nav liegta. Publiskās tērzēšanās lietotājs var atkārtoti pievienoties jebkurā laikā.'; diff --git a/lib/generated/l10n/l10n_nb.dart b/lib/generated/l10n/l10n_nb.dart index be50ecd..cb3e7b1 100644 --- a/lib/generated/l10n/l10n_nb.dart +++ b/lib/generated/l10n/l10n_nb.dart @@ -2070,15 +2070,25 @@ class L10nNb extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_nl.dart b/lib/generated/l10n/l10n_nl.dart index e2f64e3..0b14bc3 100644 --- a/lib/generated/l10n/l10n_nl.dart +++ b/lib/generated/l10n/l10n_nl.dart @@ -2079,6 +2079,16 @@ class L10nNl extends L10n { String get unbanUserDescription => 'De persoon zal weer in staat zijn om de chat te betreden als ze het proberen.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'De persoon is verwijderd uit de chat, maar is niet verbannen. In openbare chats kan de persoon op elk moment opnieuw deelnemen.'; diff --git a/lib/generated/l10n/l10n_pl.dart b/lib/generated/l10n/l10n_pl.dart index 1142e56..6b8a1b7 100644 --- a/lib/generated/l10n/l10n_pl.dart +++ b/lib/generated/l10n/l10n_pl.dart @@ -2085,6 +2085,16 @@ class L10nPl extends L10n { String get unbanUserDescription => 'Użytkownik będzie w stanie dołączyć do czatu ponownie.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Użytkownik jest wyrzucony z czatu, ale nie zbanowany. Do czatu publicznego może dołączyć ponownie.'; diff --git a/lib/generated/l10n/l10n_pt.dart b/lib/generated/l10n/l10n_pt.dart index 3d00c08..8850e00 100644 --- a/lib/generated/l10n/l10n_pt.dart +++ b/lib/generated/l10n/l10n_pt.dart @@ -2067,15 +2067,25 @@ class L10nPt extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_ro.dart b/lib/generated/l10n/l10n_ro.dart index 467abc4..a61512d 100644 --- a/lib/generated/l10n/l10n_ro.dart +++ b/lib/generated/l10n/l10n_ro.dart @@ -2084,15 +2084,25 @@ class L10nRo extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_ru.dart b/lib/generated/l10n/l10n_ru.dart index c490240..a2e368a 100644 --- a/lib/generated/l10n/l10n_ru.dart +++ b/lib/generated/l10n/l10n_ru.dart @@ -1791,7 +1791,7 @@ class L10nRu extends L10n { @override String youHaveWithdrawnTheInvitationFor(String user) { - return 'Вы отозвали приглашение для $user'; + return 'Вы отозвали приглашение для $user.'; } @override @@ -2071,14 +2071,24 @@ class L10nRu extends L10n { @override String get banUserDescription => - 'Забаненные пользователи не смогут зайти в чат.'; + 'Вы уверены что хотите забанить этого пользователя? Они больше не смогут войти в этот чат. Вы также можете указать причину.'; @override String get unbanUserDescription => 'Пользователь сможет зайти в чат снова.'; + @override + String doYouWantToKick(String user) { + return 'Выгнать $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Забанить $user'; + } + @override String get kickUserDescription => - 'Пользователь будет выгнан из чата, но не забанен. В общедоступных чатах пользователь может перезайти когда угодно.'; + 'Вы уверены что хотите выгнать этого пользователя? Если чат общедоступный, они смогут перезайти. Вы также можете указать причину.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_sk.dart b/lib/generated/l10n/l10n_sk.dart index f2e0f5b..e3a39fe 100644 --- a/lib/generated/l10n/l10n_sk.dart +++ b/lib/generated/l10n/l10n_sk.dart @@ -2068,15 +2068,25 @@ class L10nSk extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_sl.dart b/lib/generated/l10n/l10n_sl.dart index 51c4c05..a4dd18c 100644 --- a/lib/generated/l10n/l10n_sl.dart +++ b/lib/generated/l10n/l10n_sl.dart @@ -2071,15 +2071,25 @@ class L10nSl extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_sr.dart b/lib/generated/l10n/l10n_sr.dart index bbbc5ea..47d1e94 100644 --- a/lib/generated/l10n/l10n_sr.dart +++ b/lib/generated/l10n/l10n_sr.dart @@ -2063,15 +2063,25 @@ class L10nSr extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_sv.dart b/lib/generated/l10n/l10n_sv.dart index 75e5530..11936bd 100644 --- a/lib/generated/l10n/l10n_sv.dart +++ b/lib/generated/l10n/l10n_sv.dart @@ -2081,6 +2081,16 @@ class L10nSv extends L10n { String get unbanUserDescription => 'Användaren kommer kunna gå med i chatten igen om den försöker.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Användaren sparkas ut ur chatten men bannlyses inte. I offentliga chattar kan användaren gå med igen när som helst.'; diff --git a/lib/generated/l10n/l10n_ta.dart b/lib/generated/l10n/l10n_ta.dart index c58cdab..43cb658 100644 --- a/lib/generated/l10n/l10n_ta.dart +++ b/lib/generated/l10n/l10n_ta.dart @@ -2101,6 +2101,16 @@ class L10nTa extends L10n { String get unbanUserDescription => 'அவர்கள் முயற்சித்தால் பயனர் மீண்டும் அரட்டையை உள்ளிட முடியும்.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'பயனர் அரட்டையிலிருந்து வெளியேற்றப்படுகிறார், ஆனால் தடை செய்யப்படவில்லை. பொது அரட்டைகளில், பயனர் எந்த நேரத்திலும் மீண்டும் சேரலாம்.'; diff --git a/lib/generated/l10n/l10n_te.dart b/lib/generated/l10n/l10n_te.dart index 052fff8..f5a046a 100644 --- a/lib/generated/l10n/l10n_te.dart +++ b/lib/generated/l10n/l10n_te.dart @@ -2067,15 +2067,25 @@ class L10nTe extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_th.dart b/lib/generated/l10n/l10n_th.dart index d67916c..c532cda 100644 --- a/lib/generated/l10n/l10n_th.dart +++ b/lib/generated/l10n/l10n_th.dart @@ -2069,15 +2069,25 @@ class L10nTh extends L10n { @override String get banUserDescription => - 'The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.'; + 'Do you want to ban this user? They won\'t be able to rejoin. You also can provide a reason.'; @override String get unbanUserDescription => 'The user will be able to enter the chat again if they try.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => - 'The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.'; + 'Do you want to kick this user? If the room is public, they can rejoin anytime. You also can provide a reason.'; @override String get makeAdminDescription => diff --git a/lib/generated/l10n/l10n_tr.dart b/lib/generated/l10n/l10n_tr.dart index ee9ec55..733f35b 100644 --- a/lib/generated/l10n/l10n_tr.dart +++ b/lib/generated/l10n/l10n_tr.dart @@ -2078,6 +2078,16 @@ class L10nTr extends L10n { String get unbanUserDescription => 'Kullanıcı denerse sohbete tekrar girebilecektir.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Kullanıcı sohbetten atılır ancak yasaklanmaz. Herkese açık sohbetlerde kullanıcı istediği zaman yeniden katılabilir.'; diff --git a/lib/generated/l10n/l10n_uk.dart b/lib/generated/l10n/l10n_uk.dart index 8146f22..fdde137 100644 --- a/lib/generated/l10n/l10n_uk.dart +++ b/lib/generated/l10n/l10n_uk.dart @@ -2086,6 +2086,16 @@ class L10nUk extends L10n { String get unbanUserDescription => 'Користувач зможе знову увійти в бесіду, якщо спробує.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Користувача вигнали з бесіди, але не заблокували. До загальнодоступних бесід користувач може приєднатися будь-коли.'; diff --git a/lib/generated/l10n/l10n_vi.dart b/lib/generated/l10n/l10n_vi.dart index 6f203a5..f6d0568 100644 --- a/lib/generated/l10n/l10n_vi.dart +++ b/lib/generated/l10n/l10n_vi.dart @@ -2073,6 +2073,16 @@ class L10nVi extends L10n { String get unbanUserDescription => 'Người dùng sẽ có thể vào lại cuộc trò chuyện nếu họ thử.'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => 'Người dùng bị đuổi khỏi cuộc trò chuyện nhưng không bị cấm. Trong các cuộc trò chuyện công khai, người dùng có thể vào lại bất cứ lúc nào.'; diff --git a/lib/generated/l10n/l10n_zh.dart b/lib/generated/l10n/l10n_zh.dart index a938a85..87a291d 100644 --- a/lib/generated/l10n/l10n_zh.dart +++ b/lib/generated/l10n/l10n_zh.dart @@ -2007,6 +2007,16 @@ class L10nZh extends L10n { @override String get unbanUserDescription => '如果用户尝试加入则可以再次进入聊天。'; + @override + String doYouWantToKick(String user) { + return 'Kick $user'; + } + + @override + String doYouWantToBan(String user) { + return 'Ban $user'; + } + @override String get kickUserDescription => '该用户会被踢出聊天但没被封禁。在公开聊天中，该用户可以随时重新加入。'; diff --git a/lib/main.dart b/lib/main.dart index 9556c29..38151e7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,10 +7,10 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:flutter_vodozemac/flutter_vodozemac.dart' as vod; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/error_widget.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/error_widget.dart'; import 'config/setting_keys.dart'; import 'utils/background_push.dart'; import 'widgets/fluffy_chat_app.dart'; diff --git a/lib/pages/archive/archive.dart b/lib/pages/archive/archive.dart index 7e51ab0..6d4473e 100644 --- a/lib/pages/archive/archive.dart +++ b/lib/pages/archive/archive.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/archive/archive_view.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/archive/archive_view.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; class Archive extends StatefulWidget { const Archive({super.key}); diff --git a/lib/pages/archive/archive_view.dart b/lib/pages/archive/archive_view.dart index 410fd6c..70167d7 100644 --- a/lib/pages/archive/archive_view.dart +++ b/lib/pages/archive/archive_view.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/archive/archive.dart'; -import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/pages/archive/archive.dart'; +import 'package:extera_next/pages/chat_list/chat_list_item.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class ArchiveView extends StatelessWidget { final ArchiveController controller; diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index c1d5ead..16847d5 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/error_reporter.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/error_reporter.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../utils/adaptive_bottom_sheet.dart'; import '../key_verification/key_verification_dialog.dart'; diff --git a/lib/pages/chat/add_widget_tile.dart b/lib/pages/chat/add_widget_tile.dart index b41d500..83af330 100644 --- a/lib/pages/chat/add_widget_tile.dart +++ b/lib/pages/chat/add_widget_tile.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat/add_widget_tile_view.dart'; +import 'package:extera_next/pages/chat/add_widget_tile_view.dart'; class AddWidgetTile extends StatefulWidget { final Room room; diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart index 4777001..4980006 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -1,8 +1,8 @@ -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/pages/chat/add_widget_tile.dart'; +import 'package:extera_next/pages/chat/add_widget_tile.dart'; class AddWidgetTileView extends StatelessWidget { final AddWidgetTileState controller; diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 73a4e7b..8e95006 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -1,11 +1,11 @@ import 'dart:async'; import 'dart:io'; -import 'package:fluffychat/pages/chat/recovered_event_dialog.dart'; -import 'package:fluffychat/pages/chat/translated_event_dialog.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/synapse_admin_extension.dart'; -import 'package:fluffychat/utils/translator.dart'; +import 'package:extera_next/pages/chat/recovered_event_dialog.dart'; +import 'package:extera_next/pages/chat/translated_event_dialog.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/synapse_admin_extension.dart'; +import 'package:extera_next/utils/translator.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -14,7 +14,7 @@ import 'package:collection/collection.dart'; import 'package:desktop_drop/desktop_drop.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:image_picker/image_picker.dart'; import 'package:matrix/matrix.dart'; @@ -23,27 +23,27 @@ import 'package:scroll_to_index/scroll_to_index.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:universal_html/html.dart' as html; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat_view.dart'; -import 'package:fluffychat/pages/chat/event_info_dialog.dart'; -import 'package:fluffychat/pages/chat/recording_dialog.dart'; -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/utils/error_reporter.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/other_party_can_receive.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/show_scaffold_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat_view.dart'; +import 'package:extera_next/pages/chat/event_info_dialog.dart'; +import 'package:extera_next/pages/chat/recording_dialog.dart'; +import 'package:extera_next/pages/chat_details/chat_details.dart'; +import 'package:extera_next/utils/error_reporter.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/other_party_can_receive.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/show_scaffold_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/share_scaffold_dialog.dart'; import '../../utils/account_bundles.dart'; import '../../utils/localized_exception_extension.dart'; import 'send_file_dialog.dart'; diff --git a/lib/pages/chat/chat_app_bar_list_tile.dart b/lib/pages/chat/chat_app_bar_list_tile.dart index a1fc21b..e71554d 100644 --- a/lib/pages/chat/chat_app_bar_list_tile.dart +++ b/lib/pages/chat/chat_app_bar_list_tile.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; +import 'package:extera_next/utils/url_launcher.dart'; class ChatAppBarListTile extends StatelessWidget { final Widget? leading; diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart index 8777e25..1b11bd6 100644 --- a/lib/pages/chat/chat_app_bar_title.dart +++ b/lib/pages/chat/chat_app_bar_title.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/sync_status_localization.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/presence_builder.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/sync_status_localization.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/presence_builder.dart'; class ChatAppBarTitle extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index 213e82e..d0bf91b 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/sticker_picker_dialog.dart'; import 'chat.dart'; class ChatEmojiPicker extends StatelessWidget { diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart index 20290bc..3fc2937 100644 --- a/lib/pages/chat/chat_event_list.dart +++ b/lib/pages/chat/chat_event_list.dart @@ -1,17 +1,17 @@ -import 'package:fluffychat/config/app_config.dart'; +import 'package:extera_next/config/app_config.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:scroll_to_index/scroll_to_index.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pages/chat/events/message.dart'; -import 'package:fluffychat/pages/chat/seen_by_row.dart'; -import 'package:fluffychat/pages/chat/typing_indicators.dart'; -import 'package:fluffychat/utils/account_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/pages/chat/events/message.dart'; +import 'package:extera_next/pages/chat/seen_by_row.dart'; +import 'package:extera_next/pages/chat/typing_indicators.dart'; +import 'package:extera_next/utils/account_config.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; class ChatEventList extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart index 22fa6c7..cc2baad 100644 --- a/lib/pages/chat/chat_input_row.dart +++ b/lib/pages/chat/chat_input_row.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:animations/animations.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/other_party_can_receive.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/other_party_can_receive.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../config/themes.dart'; import 'chat.dart'; import 'input_bar.dart'; diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index d7e2bae..696c4e6 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -4,26 +4,26 @@ import 'package:flutter/material.dart'; import 'package:badges/badges.dart'; import 'package:desktop_drop/desktop_drop.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pages/chat/chat_app_bar_list_tile.dart'; -import 'package:fluffychat/pages/chat/chat_app_bar_title.dart'; -import 'package:fluffychat/pages/chat/chat_event_list.dart'; -import 'package:fluffychat/pages/chat/encryption_button.dart'; -import 'package:fluffychat/pages/chat/pinned_events.dart'; -import 'package:fluffychat/pages/chat/reactions_picker.dart'; -import 'package:fluffychat/pages/chat/reply_display.dart'; -import 'package:fluffychat/utils/account_config.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:fluffychat/widgets/unread_rooms_badge.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/pages/chat/chat_app_bar_list_tile.dart'; +import 'package:extera_next/pages/chat/chat_app_bar_title.dart'; +import 'package:extera_next/pages/chat/chat_event_list.dart'; +import 'package:extera_next/pages/chat/encryption_button.dart'; +import 'package:extera_next/pages/chat/pinned_events.dart'; +import 'package:extera_next/pages/chat/reactions_picker.dart'; +import 'package:extera_next/pages/chat/reply_display.dart'; +import 'package:extera_next/utils/account_config.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/chat_settings_popup_menu.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; +import 'package:extera_next/widgets/unread_rooms_badge.dart'; import '../../utils/stream_extension.dart'; import 'chat_emoji_picker.dart'; import 'chat_input_row.dart'; diff --git a/lib/pages/chat/command_hints.dart b/lib/pages/chat/command_hints.dart index f047810..397f15a 100644 --- a/lib/pages/chat/command_hints.dart +++ b/lib/pages/chat/command_hints.dart @@ -1,6 +1,6 @@ // This file is auto-generated using scripts/generate_command_hints_glue.sh. -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; String commandExample(String command) { switch (command) { diff --git a/lib/pages/chat/encryption_button.dart b/lib/pages/chat/encryption_button.dart index c2c0b91..ef75c6e 100644 --- a/lib/pages/chat/encryption_button.dart +++ b/lib/pages/chat/encryption_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/pages/chat/event_info_dialog.dart b/lib/pages/chat/event_info_dialog.dart index a972221..60517bd 100644 --- a/lib/pages/chat/event_info_dialog.dart +++ b/lib/pages/chat/event_info_dialog.dart @@ -2,13 +2,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/adaptive_bottom_sheet.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/widgets/avatar.dart'; extension EventInfoDialogExtension on Event { void showInfoDialog(BuildContext context) => showAdaptiveBottomSheet( diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index 83a1e6e..ec70023 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:fluffychat/pages/chat/events/html_message.dart'; +import 'package:extera_next/pages/chat/events/html_message.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -11,12 +11,12 @@ import 'package:matrix/matrix.dart'; import 'package:opus_caf_converter_dart/opus_caf_converter_dart.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/error_reporter.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/error_reporter.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/url_launcher.dart'; import '../../../utils/matrix_sdk_extensions/event_extension.dart'; class AudioPlayerWidget extends StatefulWidget { diff --git a/lib/pages/chat/events/cute_events.dart b/lib/pages/chat/events/cute_events.dart index 3ba43a8..42e28e5 100644 --- a/lib/pages/chat/events/cute_events.dart +++ b/lib/pages/chat/events/cute_events.dart @@ -2,10 +2,10 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; +import 'package:extera_next/config/app_config.dart'; class CuteContent extends StatefulWidget { final Event event; diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index 7aca315..cb8dcc1 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -8,8 +8,8 @@ import 'package:html/dom.dart' as dom; import 'package:html/parser.dart' as parser; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../../utils/url_launcher.dart'; class HtmlMessage extends StatelessWidget { @@ -278,26 +278,28 @@ class HtmlMessage extends StatelessWidget { borderRadius: BorderRadius.circular(4), child: SingleChildScrollView( scrollDirection: Axis.horizontal, - child: HighlightView( - node.text, - language: node.className - .split(' ') - .singleWhereOrNull( - (className) => className.startsWith('language-'), - ) - ?.split('language-') - .last ?? - 'md', - theme: shadesOfPurpleTheme, - padding: EdgeInsets.symmetric( - horizontal: 8, - vertical: isInline ? 0 : 8, - ), - textStyle: TextStyle( - fontSize: fontSize, - fontFamily: 'RobotoMono', - ), - ), + child: SelectableRegion( + selectionControls: MaterialTextSelectionControls(), + child: HighlightView( + node.text, + language: node.className + .split(' ') + .singleWhereOrNull( + (className) => className.startsWith('language-'), + ) + ?.split('language-') + .last ?? + 'md', + theme: shadesOfPurpleTheme, + padding: EdgeInsets.symmetric( + horizontal: 8, + vertical: isInline ? 0 : 8, + ), + textStyle: TextStyle( + fontSize: fontSize, + fontFamily: 'RobotoMono', + ), + )), ), ), ); diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart index 72a7172..5a6828e 100644 --- a/lib/pages/chat/events/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -1,14 +1,14 @@ -import 'package:fluffychat/pages/chat/events/html_message.dart'; +import 'package:extera_next/pages/chat/events/html_message.dart'; import 'package:flutter/material.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/image_viewer/image_viewer.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/image_viewer/image_viewer.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../../widgets/blur_hash.dart'; class ImageBubble extends StatelessWidget { diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 532f50e..0f4d26b 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -1,23 +1,23 @@ import 'dart:ui' as ui; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; -import 'package:fluffychat/utils/poll_events.dart'; +import 'package:extera_next/utils/adaptive_bottom_sheet.dart'; +import 'package:extera_next/utils/poll_events.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:swipe_to_action/swipe_to_action.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/events/room_creation_state_event.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/string_color.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/member_actions_popup_menu_button.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/events/room_creation_state_event.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/string_color.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/member_actions_popup_menu_button.dart'; import '../../../config/app_config.dart'; import 'message_content.dart'; import 'message_reactions.dart'; diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 020e854..4de934d 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -1,19 +1,19 @@ import 'dart:math'; -import 'package:fluffychat/pages/chat/events/poll_content.dart'; -import 'package:fluffychat/utils/poll_events.dart'; +import 'package:extera_next/pages/chat/events/poll_content.dart'; +import 'package:extera_next/utils/poll_events.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat/events/video_player.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat/events/video_player.dart'; +import 'package:extera_next/utils/adaptive_bottom_sheet.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../../config/app_config.dart'; import '../../../utils/platform_infos.dart'; import '../../../utils/url_launcher.dart'; diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart index 9237cd3..7ceb864 100644 --- a/lib/pages/chat/events/message_download_content.dart +++ b/lib/pages/chat/events/message_download_content.dart @@ -1,13 +1,13 @@ -import 'package:fluffychat/pages/chat/events/html_message.dart'; +import 'package:extera_next/pages/chat/events/html_message.dart'; import 'package:flutter/material.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:extera_next/utils/url_launcher.dart'; class MessageDownloadContent extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart index e34dad9..16ba911 100644 --- a/lib/pages/chat/events/message_reactions.dart +++ b/lib/pages/chat/events/message_reactions.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; class MessageReactions extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/poll_content.dart b/lib/pages/chat/events/poll_content.dart index 0a062ae..d69b27a 100644 --- a/lib/pages/chat/events/poll_content.dart +++ b/lib/pages/chat/events/poll_content.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/utils/poll_events.dart'; +import 'package:extera_next/utils/poll_events.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 262aeae..4ce4cee 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; class ReplyContent extends StatelessWidget { diff --git a/lib/pages/chat/events/room_creation_state_event.dart b/lib/pages/chat/events/room_creation_state_event.dart index 42215d8..4242dac 100644 --- a/lib/pages/chat/events/room_creation_state_event.dart +++ b/lib/pages/chat/events/room_creation_state_event.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/avatar.dart'; class RoomCreationStateEvent extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/state_message.dart b/lib/pages/chat/events/state_message.dart index 13716f7..e76e285 100644 --- a/lib/pages/chat/events/state_message.dart +++ b/lib/pages/chat/events/state_message.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; class StateMessage extends StatelessWidget { diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart index df24bc2..920db06 100644 --- a/lib/pages/chat/events/video_player.dart +++ b/lib/pages/chat/events/video_player.dart @@ -1,27 +1,27 @@ import 'dart:io'; -import 'package:fluffychat/pages/chat/events/html_message.dart'; -import 'package:fluffychat/pages/image_viewer/image_viewer.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/pages/chat/events/html_message.dart'; +import 'package:extera_next/pages/image_viewer/image_viewer.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:chewie/chewie.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; import 'package:video_player/video_player.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat/events/image_bubble.dart'; -import 'package:fluffychat/utils/file_description.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/blur_hash.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/chat/events/image_bubble.dart'; +import 'package:extera_next/utils/file_description.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/blur_hash.dart'; import '../../../utils/error_reporter.dart'; class EventVideoPlayer extends StatelessWidget { diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index 792fc26..aab1457 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:emojis/emoji.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:matrix/matrix.dart'; import 'package:slugify/slugify.dart'; -import 'package:fluffychat/utils/markdown_context_builder.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/utils/markdown_context_builder.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../widgets/avatar.dart'; import '../../widgets/matrix.dart'; import 'command_hints.dart'; diff --git a/lib/pages/chat/pinned_events.dart b/lib/pages/chat/pinned_events.dart index 7ba0a35..35df4c5 100644 --- a/lib/pages/chat/pinned_events.dart +++ b/lib/pages/chat/pinned_events.dart @@ -2,14 +2,14 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pages/chat/chat_app_bar_list_tile.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/pages/chat/chat_app_bar_list_tile.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; class PinnedEvents extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart index 2610a0d..f77cab1 100644 --- a/lib/pages/chat/reactions_picker.dart +++ b/lib/pages/chat/reactions_picker.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/app_emojis.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/app_emojis.dart'; +import 'package:extera_next/pages/chat/chat.dart'; import '../../config/themes.dart'; class ReactionsPicker extends StatelessWidget { diff --git a/lib/pages/chat/recording_dialog.dart b/lib/pages/chat/recording_dialog.dart index 9c3bc10..03ba75c 100644 --- a/lib/pages/chat/recording_dialog.dart +++ b/lib/pages/chat/recording_dialog.dart @@ -4,16 +4,16 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:path/path.dart' as path_lib; import 'package:path_provider/path_provider.dart'; import 'package:record/record.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/matrix.dart'; import 'events/audio_player.dart'; class RecordingDialog extends StatefulWidget { diff --git a/lib/pages/chat/recovered_event_dialog.dart b/lib/pages/chat/recovered_event_dialog.dart index 0f7a090..abb52b9 100644 --- a/lib/pages/chat/recovered_event_dialog.dart +++ b/lib/pages/chat/recovered_event_dialog.dart @@ -1,10 +1,10 @@ -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/events/message.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/events/message.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; class RecoveredEventDialog extends StatefulWidget { final Event event; diff --git a/lib/pages/chat/reply_display.dart b/lib/pages/chat/reply_display.dart index 123c61a..5f4c47c 100644 --- a/lib/pages/chat/reply_display.dart +++ b/lib/pages/chat/reply_display.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../config/themes.dart'; import 'chat.dart'; import 'events/reply_content.dart'; diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart index 76fa710..8866e77 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/utils/room_status_extension.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/utils/room_status_extension.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; class SeenByRow extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart index 40cef41..49a81f5 100644 --- a/lib/pages/chat/send_file_dialog.dart +++ b/lib/pages/chat/send_file_dialog.dart @@ -1,20 +1,20 @@ -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/matrix.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:cross_file/cross_file.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:mime/mime.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/utils/other_party_can_receive.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/size_string.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/dialog_text_field.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:extera_next/utils/other_party_can_receive.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/size_string.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/dialog_text_field.dart'; import '../../utils/resize_video.dart'; import 'package:matrix/src/utils/markdown.dart'; import 'package:html_unescape/html_unescape.dart'; diff --git a/lib/pages/chat/send_location_dialog.dart b/lib/pages/chat/send_location_dialog.dart index e13eeba..228a482 100644 --- a/lib/pages/chat/send_location_dialog.dart +++ b/lib/pages/chat/send_location_dialog.dart @@ -3,13 +3,13 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:geolocator/geolocator.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat/events/map_bubble.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/pages/chat/events/map_bubble.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; class SendLocationDialog extends StatefulWidget { final Room room; diff --git a/lib/pages/chat/sticker_picker_dialog.dart b/lib/pages/chat/sticker_picker_dialog.dart index 2bf2e31..497a8d8 100644 --- a/lib/pages/chat/sticker_picker_dialog.dart +++ b/lib/pages/chat/sticker_picker_dialog.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../widgets/avatar.dart'; class StickerPickerDialog extends StatefulWidget { diff --git a/lib/pages/chat/translated_event_dialog.dart b/lib/pages/chat/translated_event_dialog.dart index a0b61df..c1e412c 100644 --- a/lib/pages/chat/translated_event_dialog.dart +++ b/lib/pages/chat/translated_event_dialog.dart @@ -1,10 +1,10 @@ -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/events/message.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/events/message.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; class TranslatedEventDialog extends StatefulWidget { final Event event; diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart index 7710ee0..eb5ade1 100644 --- a/lib/pages/chat/typing_indicators.dart +++ b/lib/pages/chat/typing_indicators.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/chat.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; class TypingIndicators extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat_access_settings/chat_access_settings_controller.dart b/lib/pages/chat_access_settings/chat_access_settings_controller.dart index 0b8a987..3840ebb 100644 --- a/lib/pages/chat_access_settings/chat_access_settings_controller.dart +++ b/lib/pages/chat_access_settings/chat_access_settings_controller.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart' hide Visibility; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_access_settings/chat_access_settings_page.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_access_settings/chat_access_settings_page.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; class ChatAccessSettings extends StatefulWidget { final String roomId; diff --git a/lib/pages/chat_access_settings/chat_access_settings_page.dart b/lib/pages/chat_access_settings/chat_access_settings_page.dart index 8445494..dc11925 100644 --- a/lib/pages/chat_access_settings/chat_access_settings_page.dart +++ b/lib/pages/chat_access_settings/chat_access_settings_page.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart' hide Visibility; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_access_settings/chat_access_settings_controller.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/pages/chat_access_settings/chat_access_settings_controller.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class ChatAccessSettingsPageView extends StatelessWidget { final ChatAccessSettingsController controller; diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart index 9f95220..a0efa8c 100644 --- a/lib/pages/chat_details/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -1,20 +1,20 @@ import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:image_picker/image_picker.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_details/chat_details_view.dart'; -import 'package:fluffychat/pages/settings/settings.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_details/chat_details_view.dart'; +import 'package:extera_next/pages/settings/settings.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; enum AliasActions { copy, delete, setCanonical } diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 07527e3..f930ed9 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/pages/chat_details/participant_list_item.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_details/chat_details.dart'; +import 'package:extera_next/pages/chat_details/participant_list_item.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/chat_settings_popup_menu.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../utils/url_launcher.dart'; import '../../widgets/mxc_image_viewer.dart'; import '../../widgets/qr_code_viewer.dart'; diff --git a/lib/pages/chat_details/participant_list_item.dart b/lib/pages/chat_details/participant_list_item.dart index dc11a03..caf636c 100644 --- a/lib/pages/chat_details/participant_list_item.dart +++ b/lib/pages/chat_details/participant_list_item.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/member_actions_popup_menu_button.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/member_actions_popup_menu_button.dart'; import '../../widgets/avatar.dart'; class ParticipantListItem extends StatelessWidget { diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart index 339172b..bf4b645 100644 --- a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings_view.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_encryption_settings/chat_encryption_settings_view.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../key_verification/key_verification_dialog.dart'; class ChatEncryptionSettings extends StatefulWidget { diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart index 4c37f22..409f202 100644 --- a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart @@ -1,15 +1,15 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; -import 'package:fluffychat/utils/beautify_string_extension.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/chat_encryption_settings/chat_encryption_settings.dart'; +import 'package:extera_next/utils/beautify_string_extension.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class ChatEncryptionSettingsView extends StatelessWidget { final ChatEncryptionSettingsController controller; diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 58a0870..7d4fa01 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -6,33 +6,33 @@ import 'package:flutter/services.dart'; import 'package:app_links/app_links.dart'; import 'package:cross_file/cross_file.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/show_scaffold_dialog.dart'; -import 'package:fluffychat/utils/show_update_snackbar.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/chat_list/chat_list_view.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/show_scaffold_dialog.dart'; +import 'package:extera_next/utils/show_update_snackbar.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/share_scaffold_dialog.dart'; import '../../../utils/account_bundles.dart'; import '../../config/setting_keys.dart'; import '../../utils/url_launcher.dart'; import '../../widgets/matrix.dart'; import '../bootstrap/bootstrap_dialog.dart'; -import 'package:fluffychat/utils/tor_stub.dart' +import 'package:extera_next/utils/tor_stub.dart' if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; enum PopupMenuAction { diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index cf4d8ed..0486960 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -1,19 +1,19 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; -import 'package:fluffychat/pages/chat_list/dummy_chat_list_item.dart'; -import 'package:fluffychat/pages/chat_list/search_title.dart'; -import 'package:fluffychat/pages/chat_list/space_view.dart'; -import 'package:fluffychat/pages/chat_list/status_msg_list.dart'; -import 'package:fluffychat/utils/stream_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/public_room_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/chat_list/chat_list.dart'; +import 'package:extera_next/pages/chat_list/chat_list_item.dart'; +import 'package:extera_next/pages/chat_list/dummy_chat_list_item.dart'; +import 'package:extera_next/pages/chat_list/search_title.dart'; +import 'package:extera_next/pages/chat_list/space_view.dart'; +import 'package:extera_next/pages/chat_list/status_msg_list.dart'; +import 'package:extera_next/utils/stream_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/public_room_dialog.dart'; +import 'package:extera_next/widgets/avatar.dart'; import '../../config/themes.dart'; import '../../widgets/adaptive_dialogs/user_dialog.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index 77cd6b0..744f35d 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pages/chat_list/client_chooser_button.dart'; -import 'package:fluffychat/utils/sync_status_localization.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat_list/chat_list.dart'; +import 'package:extera_next/pages/chat_list/client_chooser_button.dart'; +import 'package:extera_next/utils/sync_status_localization.dart'; import '../../widgets/matrix.dart'; class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 0a86513..9ccac97 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/room_status_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/hover_builder.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/room_status_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/hover_builder.dart'; import '../../config/themes.dart'; import '../../utils/date_time_extension.dart'; import '../../widgets/avatar.dart'; diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index cd62a12..c27a9eb 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -1,12 +1,12 @@ -import 'package:fluffychat/config/app_config.dart'; +import 'package:extera_next/config/app_config.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/widgets/navigation_rail.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat_list/chat_list.dart'; +import 'package:extera_next/widgets/navigation_rail.dart'; import 'chat_list_body.dart'; class ChatListView extends StatelessWidget { diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index dbf699b..555df6c 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../utils/fluffy_share.dart'; import 'chat_list.dart'; diff --git a/lib/pages/chat_list/navi_rail_item.dart b/lib/pages/chat_list/navi_rail_item.dart index 0e844e0..d2cc3ae 100644 --- a/lib/pages/chat_list/navi_rail_item.dart +++ b/lib/pages/chat_list/navi_rail_item.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:badges/badges.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/hover_builder.dart'; -import 'package:fluffychat/widgets/unread_rooms_badge.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/hover_builder.dart'; +import 'package:extera_next/widgets/unread_rooms_badge.dart'; import '../../config/themes.dart'; class NaviRailItem extends StatelessWidget { diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index cd6c48a..10698d5 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -1,24 +1,24 @@ import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; -import 'package:fluffychat/pages/chat_list/search_title.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/stream_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/public_room_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat_list/chat_list_item.dart'; +import 'package:extera_next/pages/chat_list/search_title.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/stream_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/public_room_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; enum AddRoomType { chat, subspace } diff --git a/lib/pages/chat_list/status_msg_list.dart b/lib/pages/chat_list/status_msg_list.dart index f37732f..05dda52 100644 --- a/lib/pages/chat_list/status_msg_list.dart +++ b/lib/pages/chat_list/status_msg_list.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/stream_extension.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/hover_builder.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/stream_extension.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/hover_builder.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../widgets/adaptive_dialogs/user_dialog.dart'; class StatusMessageList extends StatelessWidget { diff --git a/lib/pages/chat_members/chat_members_view.dart b/lib/pages/chat_members/chat_members_view.dart index 727a26f..a20ca13 100644 --- a/lib/pages/chat_members/chat_members_view.dart +++ b/lib/pages/chat_members/chat_members_view.dart @@ -1,6 +1,6 @@ -import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart index eada670..ea92291 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart @@ -2,14 +2,14 @@ import 'dart:developer'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings_view.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/permission_slider_dialog.dart'; +import 'package:extera_next/pages/chat_permissions_settings/chat_permissions_settings_view.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/permission_slider_dialog.dart'; class ChatPermissionsSettings extends StatefulWidget { const ChatPermissionsSettings({super.key}); diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index 8e4d038..a79c56a 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart'; -import 'package:fluffychat/pages/chat_permissions_settings/permission_list_tile.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_permissions_settings/chat_permissions_settings.dart'; +import 'package:extera_next/pages/chat_permissions_settings/permission_list_tile.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; class ChatPermissionsSettingsView extends StatelessWidget { final ChatPermissionsSettingsController controller; diff --git a/lib/pages/chat_permissions_settings/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart index 4ac603c..2c02899 100644 --- a/lib/pages/chat_permissions_settings/permission_list_tile.dart +++ b/lib/pages/chat_permissions_settings/permission_list_tile.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; +import 'package:extera_next/config/app_config.dart'; class PermissionsListTile extends StatelessWidget { final String permissionKey; diff --git a/lib/pages/chat_search/chat_search_files_tab.dart b/lib/pages/chat_search/chat_search_files_tab.dart index 836833b..0e2bf5f 100644 --- a/lib/pages/chat_search/chat_search_files_tab.dart +++ b/lib/pages/chat_search/chat_search_files_tab.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; class ChatSearchFilesTab extends StatelessWidget { final Room room; diff --git a/lib/pages/chat_search/chat_search_images_tab.dart b/lib/pages/chat_search/chat_search_images_tab.dart index 4a9b8f8..7109e03 100644 --- a/lib/pages/chat_search/chat_search_images_tab.dart +++ b/lib/pages/chat_search/chat_search_images_tab.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:intl/intl.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat/events/video_player.dart'; -import 'package:fluffychat/pages/image_viewer/image_viewer.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/chat/events/video_player.dart'; +import 'package:extera_next/pages/image_viewer/image_viewer.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; class ChatSearchImagesTab extends StatelessWidget { final Room room; diff --git a/lib/pages/chat_search/chat_search_message_tab.dart b/lib/pages/chat_search/chat_search_message_tab.dart index bbf5459..8dfae94 100644 --- a/lib/pages/chat_search/chat_search_message_tab.dart +++ b/lib/pages/chat_search/chat_search_message_tab.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/avatar.dart'; class ChatSearchMessageTab extends StatelessWidget { final String searchQuery; diff --git a/lib/pages/chat_search/chat_search_page.dart b/lib/pages/chat_search/chat_search_page.dart index 40109d0..792e3d4 100644 --- a/lib/pages/chat_search/chat_search_page.dart +++ b/lib/pages/chat_search/chat_search_page.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_view.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/chat_search/chat_search_view.dart'; +import 'package:extera_next/widgets/matrix.dart'; class ChatSearchPage extends StatefulWidget { final String roomId; diff --git a/lib/pages/chat_search/chat_search_view.dart b/lib/pages/chat_search/chat_search_view.dart index 9a1d9b0..04b2a39 100644 --- a/lib/pages/chat_search/chat_search_view.dart +++ b/lib/pages/chat_search/chat_search_view.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_files_tab.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_images_tab.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_message_tab.dart'; -import 'package:fluffychat/pages/chat_search/chat_search_page.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat_search/chat_search_files_tab.dart'; +import 'package:extera_next/pages/chat_search/chat_search_images_tab.dart'; +import 'package:extera_next/pages/chat_search/chat_search_message_tab.dart'; +import 'package:extera_next/pages/chat_search/chat_search_page.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class ChatSearchView extends StatelessWidget { final ChatSearchController controller; diff --git a/lib/pages/device_settings/device_settings.dart b/lib/pages/device_settings/device_settings.dart index 6f7a235..eedc771 100644 --- a/lib/pages/device_settings/device_settings.dart +++ b/lib/pages/device_settings/device_settings.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:collection/collection.dart' show IterableExtension; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/device_settings/device_settings_view.dart'; -import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/pages/device_settings/device_settings_view.dart'; +import 'package:extera_next/pages/key_verification/key_verification_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../widgets/matrix.dart'; class DevicesSettings extends StatefulWidget { diff --git a/lib/pages/device_settings/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart index 02f10a4..9fa2d4e 100644 --- a/lib/pages/device_settings/device_settings_view.dart +++ b/lib/pages/device_settings/device_settings_view.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/device_settings/device_settings.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/device_settings/device_settings.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; import 'user_device_list_item.dart'; class DevicesSettingsView extends StatelessWidget { diff --git a/lib/pages/device_settings/user_device_list_item.dart b/lib/pages/device_settings/user_device_list_item.dart index 0586f21..58e932e 100644 --- a/lib/pages/device_settings/user_device_list_item.dart +++ b/lib/pages/device_settings/user_device_list_item.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; import '../../utils/date_time_extension.dart'; import '../../utils/matrix_sdk_extensions/device_extension.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index ade0a24..dbd7110 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -24,16 +24,16 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_foreground_task/flutter_foreground_task.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart' hide VideoRenderer; import 'package:just_audio/just_audio.dart'; import 'package:matrix/matrix.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/voip/video_renderer.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/voip/video_renderer.dart'; +import 'package:extera_next/widgets/avatar.dart'; import 'pip/pip_view.dart'; class _StreamView extends StatelessWidget { diff --git a/lib/pages/dialer/pip/pip_view.dart b/lib/pages/dialer/pip/pip_view.dart index 78facfa..b8148b6 100644 --- a/lib/pages/dialer/pip/pip_view.dart +++ b/lib/pages/dialer/pip/pip_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/themes.dart'; +import 'package:extera_next/config/themes.dart'; import 'dismiss_keyboard.dart'; class PIPView extends StatefulWidget { diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart index 911c31c..9c34dbd 100644 --- a/lib/pages/homeserver_picker/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -12,15 +12,15 @@ import 'package:matrix/matrix.dart'; import 'package:universal_html/html.dart' as html; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/homeserver_picker/homeserver_picker_view.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/homeserver_picker/homeserver_picker_view.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/tor_stub.dart' +import 'package:extera_next/utils/tor_stub.dart' if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; class HomeserverPicker extends StatefulWidget { diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart index abe5e73..144acd7 100644 --- a/lib/pages/homeserver_picker/homeserver_picker_view.dart +++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/layouts/login_scaffold.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../config/themes.dart'; import 'homeserver_picker.dart'; diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart index 8443d98..9fe3dbc 100644 --- a/lib/pages/image_viewer/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -3,11 +3,11 @@ import 'package:flutter/services.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/show_scaffold_dialog.dart'; -import 'package:fluffychat/widgets/share_scaffold_dialog.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/image_viewer/image_viewer_view.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/show_scaffold_dialog.dart'; +import 'package:extera_next/widgets/share_scaffold_dialog.dart'; import '../../utils/matrix_sdk_extensions/event_extension.dart'; class ImageViewer extends StatefulWidget { diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart index 45c27a7..9adb2c7 100644 --- a/lib/pages/image_viewer/image_viewer_view.dart +++ b/lib/pages/image_viewer/image_viewer_view.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/pages/image_viewer/video_player.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/hover_builder.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/pages/image_viewer/video_player.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/hover_builder.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import 'image_viewer.dart'; class ImageViewerView extends StatelessWidget { diff --git a/lib/pages/image_viewer/video_player.dart b/lib/pages/image_viewer/video_player.dart index 1d755c4..5d91dea 100644 --- a/lib/pages/image_viewer/video_player.dart +++ b/lib/pages/image_viewer/video_player.dart @@ -9,10 +9,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; import 'package:video_player/video_player.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/blur_hash.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/blur_hash.dart'; import '../../../utils/error_reporter.dart'; import '../../widgets/mxc_image.dart'; diff --git a/lib/pages/invitation_selection/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart index 0d661b5..05b544c 100644 --- a/lib/pages/invitation_selection/invitation_selection.dart +++ b/lib/pages/invitation_selection/invitation_selection.dart @@ -2,12 +2,12 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/invitation_selection/invitation_selection_view.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../utils/localized_exception_extension.dart'; class InvitationSelection extends StatefulWidget { diff --git a/lib/pages/invitation_selection/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart index 2fd25e0..783b38c 100644 --- a/lib/pages/invitation_selection/invitation_selection_view.dart +++ b/lib/pages/invitation_selection/invitation_selection_view.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/invitation_selection/invitation_selection.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../widgets/adaptive_dialogs/user_dialog.dart'; class InvitationSelectionView extends StatelessWidget { diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart index ef7beae..758920c 100644 --- a/lib/pages/key_verification/key_verification_dialog.dart +++ b/lib/pages/key_verification/key_verification_dialog.dart @@ -4,14 +4,14 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; class KeyVerificationDialog extends StatefulWidget { Future show(BuildContext context) => showAdaptiveDialog( diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 5bdafa3..725a437 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -4,12 +4,12 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../utils/platform_infos.dart'; import 'login_view.dart'; diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index bc5bc6e..a1ddd3b 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/widgets/layouts/login_scaffold.dart'; +import 'package:extera_next/widgets/matrix.dart'; import 'login.dart'; class LoginView extends StatelessWidget { diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index 7058ac7..2fb916c 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -2,14 +2,14 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/new_group/new_group_view.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/new_group/new_group_view.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/widgets/matrix.dart'; class NewGroup extends StatefulWidget { final CreateGroupType createGroupType; diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index fc2c10e..f7c5b25 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/new_group/new_group.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/new_group/new_group.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class NewGroupView extends StatelessWidget { final NewGroupController controller; diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart index 02dfef0..3199e49 100644 --- a/lib/pages/new_private_chat/new_private_chat.dart +++ b/lib/pages/new_private_chat/new_private_chat.dart @@ -4,16 +4,16 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:device_info_plus/device_info_plus.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/new_private_chat/new_private_chat_view.dart'; -import 'package:fluffychat/pages/new_private_chat/qr_scanner_modal.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/new_private_chat/new_private_chat_view.dart'; +import 'package:extera_next/pages/new_private_chat/qr_scanner_modal.dart'; +import 'package:extera_next/utils/adaptive_bottom_sheet.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../widgets/adaptive_dialogs/user_dialog.dart'; class NewPrivateChat extends StatefulWidget { diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart index 5b7161b..d6ea35a 100644 --- a/lib/pages/new_private_chat/new_private_chat_view.dart +++ b/lib/pages/new_private_chat/new_private_chat_view.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:pretty_qr_code/pretty_qr_code.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/new_private_chat/new_private_chat.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../../widgets/qr_code_viewer.dart'; class NewPrivateChatView extends StatelessWidget { diff --git a/lib/pages/new_private_chat/qr_scanner_modal.dart b/lib/pages/new_private_chat/qr_scanner_modal.dart index 440b7bd..27c0761 100644 --- a/lib/pages/new_private_chat/qr_scanner_modal.dart +++ b/lib/pages/new_private_chat/qr_scanner_modal.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart'; class QrScannerModal extends StatefulWidget { diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart index 8e1cf14..ff072da 100644 --- a/lib/pages/settings/settings.dart +++ b/lib/pages/settings/settings.dart @@ -3,16 +3,16 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:image_picker/image_picker.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../widgets/matrix.dart'; import '../bootstrap/bootstrap_dialog.dart'; import 'settings_view.dart'; diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index 1cfe37a..f79daa2 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/navigation_rail.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/navigation_rail.dart'; import '../../widgets/mxc_image_viewer.dart'; import 'settings.dart'; diff --git a/lib/pages/settings_3pid/settings_3pid.dart b/lib/pages/settings_3pid/settings_3pid.dart index a7297b1..73bda8d 100644 --- a/lib/pages/settings_3pid/settings_3pid.dart +++ b/lib/pages/settings_3pid/settings_3pid.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import 'settings_3pid_view.dart'; class Settings3Pid extends StatefulWidget { diff --git a/lib/pages/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart index 344420e..003872a 100644 --- a/lib/pages/settings_3pid/settings_3pid_view.dart +++ b/lib/pages/settings_3pid/settings_3pid_view.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/settings_3pid/settings_3pid.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; class Settings3PidView extends StatelessWidget { final Settings3PidController controller; diff --git a/lib/pages/settings_chat/settings_chat_view.dart b/lib/pages/settings_chat/settings_chat_view.dart index b402a4e..dff2ad8 100644 --- a/lib/pages/settings_chat/settings_chat_view.dart +++ b/lib/pages/settings_chat/settings_chat_view.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/settings_switch_list_tile.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/settings_switch_list_tile.dart'; import 'settings_chat.dart'; class SettingsChatView extends StatelessWidget { diff --git a/lib/pages/settings_emotes/import_archive_dialog.dart b/lib/pages/settings_emotes/import_archive_dialog.dart index 0ac1b94..f63ce17 100644 --- a/lib/pages/settings_emotes/import_archive_dialog.dart +++ b/lib/pages/settings_emotes/import_archive_dialog.dart @@ -5,13 +5,13 @@ import 'package:flutter/services.dart'; import 'package:archive/archive.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/settings_emotes/settings_emotes.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; class ImportEmoteArchiveDialog extends StatefulWidget { final EmotesSettingsController controller; diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart index 4216d6d..1964a80 100644 --- a/lib/pages/settings_emotes/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -4,16 +4,16 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart' hide Client; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../widgets/matrix.dart'; import 'import_archive_dialog.dart'; import 'settings_emotes_view.dart'; diff --git a/lib/pages/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart index d4b4c4c..3f50e75 100644 --- a/lib/pages/settings_emotes/settings_emotes_view.dart +++ b/lib/pages/settings_emotes/settings_emotes_view.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../widgets/matrix.dart'; import 'settings_emotes.dart'; diff --git a/lib/pages/settings_homeserver/settings_homeserver_view.dart b/lib/pages/settings_homeserver/settings_homeserver_view.dart index ad13f79..3b26e00 100644 --- a/lib/pages/settings_homeserver/settings_homeserver_view.dart +++ b/lib/pages/settings_homeserver/settings_homeserver_view.dart @@ -2,15 +2,15 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; import 'settings_homeserver.dart'; diff --git a/lib/pages/settings_ignore_list/settings_ignore_list.dart b/lib/pages/settings_ignore_list/settings_ignore_list.dart index 980731e..d3ef869 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../widgets/matrix.dart'; import 'settings_ignore_list_view.dart'; diff --git a/lib/pages/settings_ignore_list/settings_ignore_list_view.dart b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart index 4ae677d..a827f83 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list_view.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; import 'settings_ignore_list.dart'; diff --git a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart index 93fed0a..44c0e0d 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; +import 'package:extera_next/widgets/matrix.dart'; class MultipleEmotesSettingsView extends StatelessWidget { final MultipleEmotesSettingsController controller; diff --git a/lib/pages/settings_notifications/push_rule_extensions.dart b/lib/pages/settings_notifications/push_rule_extensions.dart index 9ea6ac3..a3d8e3e 100644 --- a/lib/pages/settings_notifications/push_rule_extensions.dart +++ b/lib/pages/settings_notifications/push_rule_extensions.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; extension PushRuleExtension on PushRule { diff --git a/lib/pages/settings_notifications/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart index 4d1f149..10ec78b 100644 --- a/lib/pages/settings_notifications/settings_notifications.dart +++ b/lib/pages/settings_notifications/settings_notifications.dart @@ -2,16 +2,16 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/settings_notifications/push_rule_extensions.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_modal_action_popup.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/pages/settings_notifications/push_rule_extensions.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_modal_action_popup.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../../widgets/matrix.dart'; import 'settings_notifications_view.dart'; diff --git a/lib/pages/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_notifications/settings_notifications_view.dart index d73746b..8c388d0 100644 --- a/lib/pages/settings_notifications/settings_notifications_view.dart +++ b/lib/pages/settings_notifications/settings_notifications_view.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/settings_notifications/push_rule_extensions.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/settings_notifications/push_rule_extensions.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; import '../../utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; import 'settings_notifications.dart'; diff --git a/lib/pages/settings_password/settings_password.dart b/lib/pages/settings_password/settings_password.dart index 07b5cca..6ff9011 100644 --- a/lib/pages/settings_password/settings_password.dart +++ b/lib/pages/settings_password/settings_password.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; -import 'package:fluffychat/pages/settings_password/settings_password_view.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/pages/settings_password/settings_password_view.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/matrix.dart'; class SettingsPassword extends StatefulWidget { const SettingsPassword({super.key}); diff --git a/lib/pages/settings_password/settings_password_view.dart b/lib/pages/settings_password/settings_password_view.dart index 2b7a006..bb99960 100644 --- a/lib/pages/settings_password/settings_password_view.dart +++ b/lib/pages/settings_password/settings_password_view.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; -import 'package:fluffychat/pages/settings_password/settings_password.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/pages/settings_password/settings_password.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; class SettingsPasswordView extends StatelessWidget { final SettingsPasswordController controller; diff --git a/lib/pages/settings_security/settings_security.dart b/lib/pages/settings_security/settings_security.dart index f403856..1e6985f 100644 --- a/lib/pages/settings_security/settings_security.dart +++ b/lib/pages/settings_security/settings_security.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/app_lock.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../bootstrap/bootstrap_dialog.dart'; import 'settings_security_view.dart'; diff --git a/lib/pages/settings_security/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart index 5ea476e..43afb7f 100644 --- a/lib/pages/settings_security/settings_security_view.dart +++ b/lib/pages/settings_security/settings_security_view.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/beautify_string_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/settings_switch_list_tile.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/beautify_string_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/settings_switch_list_tile.dart'; import 'settings_security.dart'; class SettingsSecurityView extends StatelessWidget { diff --git a/lib/pages/settings_style/settings_style.dart b/lib/pages/settings_style/settings_style.dart index 49b0b00..3cd6f79 100644 --- a/lib/pages/settings_style/settings_style.dart +++ b/lib/pages/settings_style/settings_style.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/utils/account_config.dart'; -import 'package:fluffychat/utils/file_selector.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/theme_builder.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/utils/account_config.dart'; +import 'package:extera_next/utils/file_selector.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/theme_builder.dart'; import '../../widgets/matrix.dart'; import 'settings_style_view.dart'; diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart index e02bd6e..36b8e6a 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -1,21 +1,21 @@ import 'dart:ui'; -import 'package:fluffychat/widgets/theme_builder.dart'; +import 'package:extera_next/widgets/theme_builder.dart'; import 'package:flutter/material.dart'; import 'package:dynamic_color/dynamic_color.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/events/state_message.dart'; -import 'package:fluffychat/utils/account_config.dart'; -import 'package:fluffychat/utils/color_value.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat/events/state_message.dart'; +import 'package:extera_next/utils/account_config.dart'; +import 'package:extera_next/utils/color_value.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/layouts/max_width_body.dart'; +import 'package:extera_next/widgets/matrix.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; import '../../config/app_config.dart'; import '../../widgets/settings_switch_list_tile.dart'; import 'settings_style.dart'; diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart index db9a11e..387fe05 100644 --- a/lib/utils/adaptive_bottom_sheet.dart +++ b/lib/utils/adaptive_bottom_sheet.dart @@ -2,8 +2,8 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; Future showAdaptiveBottomSheet({ required BuildContext context, diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 3a47eae..5b75da9 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -24,7 +24,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_new_badger/flutter_new_badger.dart'; import 'package:http/http.dart' as http; @@ -32,8 +32,8 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:unifiedpush_ui/unifiedpush_ui.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; +import 'package:extera_next/utils/push_helper.dart'; +import 'package:extera_next/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart'; diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index 51e37f8..f8741f0 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/poll_events.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/utils/poll_events.dart'; import 'package:flutter/foundation.dart'; import 'package:collection/collection.dart'; @@ -15,12 +15,12 @@ import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:universal_html/html.dart' as html; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/utils/custom_http_client.dart'; -import 'package:fluffychat/utils/custom_image_resizer.dart'; -import 'package:fluffychat/utils/init_with_restore.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/utils/custom_http_client.dart'; +import 'package:extera_next/utils/custom_image_resizer.dart'; +import 'package:extera_next/utils/init_with_restore.dart'; +import 'package:extera_next/utils/platform_infos.dart'; import 'matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart'; abstract class ClientManager { diff --git a/lib/utils/custom_http_client.dart b/lib/utils/custom_http_client.dart index 479e5ed..c310fdd 100644 --- a/lib/utils/custom_http_client.dart +++ b/lib/utils/custom_http_client.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:http/http.dart' as http; import 'package:http/io_client.dart'; -import 'package:fluffychat/config/isrg_x1.dart'; +import 'package:extera_next/config/isrg_x1.dart'; class CustomHttpClient { static HttpClient customHttpClient(String? cert) { diff --git a/lib/utils/date_time_extension.dart b/lib/utils/date_time_extension.dart index 3bf363c..145e435 100644 --- a/lib/utils/date_time_extension.dart +++ b/lib/utils/date_time_extension.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:intl/intl.dart'; /// Provides extra functionality for formatting the time. diff --git a/lib/utils/error_reporter.dart b/lib/utils/error_reporter.dart index e17b943..d39ef36 100644 --- a/lib/utils/error_reporter.dart +++ b/lib/utils/error_reporter.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_highlighter/flutter_highlighter.dart'; import 'package:flutter_highlighter/themes/shades-of-purple.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; class ErrorReporter { final BuildContext context; diff --git a/lib/utils/file_selector.dart b/lib/utils/file_selector.dart index 8cc5e75..e6edfbc 100644 --- a/lib/utils/file_selector.dart +++ b/lib/utils/file_selector.dart @@ -3,9 +3,9 @@ import 'package:flutter/widgets.dart'; import 'package:file_picker/file_picker.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/app_lock.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; Future> selectFiles( BuildContext context, { diff --git a/lib/utils/fluffy_share.dart b/lib/utils/fluffy_share.dart index b31f288..e53bf8f 100644 --- a/lib/utils/fluffy_share.dart +++ b/lib/utils/fluffy_share.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:share_plus/share_plus.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/utils/platform_infos.dart'; import '../widgets/matrix.dart'; abstract class FluffyShare { diff --git a/lib/utils/init_with_restore.dart b/lib/utils/init_with_restore.dart index c3a6a0d..19c567c 100644 --- a/lib/utils/init_with_restore.dart +++ b/lib/utils/init_with_restore.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'dart:ui'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/platform_infos.dart'; class SessionBackup { final String? olmAccount; diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart index 7c4779e..453ebc4 100644 --- a/lib/utils/localized_exception_extension.dart +++ b/lib/utils/localized_exception_extension.dart @@ -3,12 +3,12 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:http/http.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/other_party_can_receive.dart'; +import 'package:extera_next/utils/other_party_can_receive.dart'; import 'uia_request_manager.dart'; extension LocalizedExceptionExtension on Object { diff --git a/lib/utils/markdown_context_builder.dart b/lib/utils/markdown_context_builder.dart index e721b34..351bce3 100644 --- a/lib/utils/markdown_context_builder.dart +++ b/lib/utils/markdown_context_builder.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; Widget markdownContextBuilder( BuildContext context, diff --git a/lib/utils/matrix_sdk_extensions/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart index 1782df1..11c2ff3 100644 --- a/lib/utils/matrix_sdk_extensions/event_extension.dart +++ b/lib/utils/matrix_sdk_extensions/event_extension.dart @@ -6,8 +6,8 @@ import 'package:flutter/material.dart'; import 'package:async/async.dart' as async; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/size_string.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/utils/size_string.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import 'matrix_file_extension.dart'; extension LocalizedBody on Event { diff --git a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart index 44b627f..756d23f 100644 --- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/utils/poll_events.dart'; +import 'package:extera_next/utils/poll_events.dart'; import 'package:matrix/matrix.dart'; import '../../config/app_config.dart'; diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart index 1fdd426..7c5f2c1 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter/foundation.dart'; import 'package:matrix/matrix.dart'; @@ -9,10 +9,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:universal_html/html.dart' as html; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/platform_infos.dart'; import 'cipher.dart'; import 'sqlcipher_stub.dart' diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/cipher.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/cipher.dart index 0dc931f..01fa0b5 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/cipher.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/cipher.dart @@ -4,13 +4,13 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:matrix/matrix.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/utils/client_manager.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/utils/client_manager.dart'; const _passwordStorageKey = 'database_password'; diff --git a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart index 62ee625..69adcef 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:file_picker/file_picker.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:share_plus/share_plus.dart'; import 'package:universal_html/html.dart' as html; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/size_string.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/size_string.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; extension MatrixFileExtension on MatrixFile { void save(BuildContext context) async { diff --git a/lib/utils/matrix_sdk_extensions/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart index 9aa9bdb..df92022 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_locals.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_locals.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; /// This is a temporary helper class until there is a proper solution to this with the new system diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index e047c1c..c5f40b8 100644 --- a/lib/utils/platform_infos.dart +++ b/lib/utils/platform_infos.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart index e46b940..f0c7bc2 100644 --- a/lib/utils/push_helper.dart +++ b/lib/utils/push_helper.dart @@ -4,17 +4,17 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; import 'package:matrix/matrix.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/client_download_content_extension.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/client_download_content_extension.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/platform_infos.dart'; Future pushHelper( PushNotification notification, { diff --git a/lib/utils/resize_video.dart b/lib/utils/resize_video.dart index 7686771..f8e6fbf 100644 --- a/lib/utils/resize_video.dart +++ b/lib/utils/resize_video.dart @@ -2,7 +2,7 @@ import 'package:cross_file/cross_file.dart'; import 'package:matrix/matrix.dart'; import 'package:video_compress/video_compress.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/utils/platform_infos.dart'; extension ResizeImage on XFile { static const int max = 1200; diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart index c250e40..f83ba20 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import '../config/app_config.dart'; diff --git a/lib/utils/show_scaffold_dialog.dart b/lib/utils/show_scaffold_dialog.dart index 0c09a70..a2113bd 100644 --- a/lib/utils/show_scaffold_dialog.dart +++ b/lib/utils/show_scaffold_dialog.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; Future showScaffoldDialog({ required BuildContext context, diff --git a/lib/utils/show_update_snackbar.dart b/lib/utils/show_update_snackbar.dart index 0c3f735..4e6ebe9 100644 --- a/lib/utils/show_update_snackbar.dart +++ b/lib/utils/show_update_snackbar.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/platform_infos.dart'; abstract class UpdateNotifier { static const String versionStoreKey = 'last_known_version'; diff --git a/lib/utils/sync_status_localization.dart b/lib/utils/sync_status_localization.dart index ffb372e..303cf00 100644 --- a/lib/utils/sync_status_localization.dart +++ b/lib/utils/sync_status_localization.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; extension SyncStatusLocalization on SyncStatusUpdate { String calcLocalizedString(BuildContext context) { diff --git a/lib/utils/uia_request_manager.dart b/lib/utils/uia_request_manager.dart index 9778757..eb57bc2 100644 --- a/lib/utils/uia_request_manager.dart +++ b/lib/utils/uia_request_manager.dart @@ -1,13 +1,13 @@ import 'dart:async'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/fluffy_chat_app.dart'; +import 'package:extera_next/widgets/matrix.dart'; extension UiaRequestManager on MatrixState { Future uiaRequestHandler(UiaRequest uiaRequest) async { diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index da5914b..221dbd5 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:collection/collection.dart' show IterableExtension; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:punycode/punycode.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/user_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/user_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; import '../widgets/adaptive_dialogs/public_room_dialog.dart'; import 'platform_infos.dart'; diff --git a/lib/utils/voip_plugin.dart b/lib/utils/voip_plugin.dart index c5120d6..f1a0d60 100644 --- a/lib/utils/voip_plugin.dart +++ b/lib/utils/voip_plugin.dart @@ -8,9 +8,9 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as webrtc_impl; import 'package:matrix/matrix.dart'; import 'package:webrtc_interface/webrtc_interface.dart' hide Navigator; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pages/dialer/dialer.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/pages/chat_list/chat_list.dart'; +import 'package:extera_next/pages/dialer/dialer.dart'; +import 'package:extera_next/utils/platform_infos.dart'; import '../../utils/voip/user_media_manager.dart'; import '../widgets/matrix.dart'; diff --git a/lib/widgets/adaptive_dialogs/public_room_dialog.dart b/lib/widgets/adaptive_dialogs/public_room_dialog.dart index 3cbabb3..2add953 100644 --- a/lib/widgets/adaptive_dialogs/public_room_dialog.dart +++ b/lib/widgets/adaptive_dialogs/public_room_dialog.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; import '../../config/themes.dart'; import '../../utils/url_launcher.dart'; import '../avatar.dart'; diff --git a/lib/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart b/lib/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart index 15f60a2..89c77bd 100644 --- a/lib/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart +++ b/lib/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; enum OkCancelResult { ok, cancel } diff --git a/lib/widgets/adaptive_dialogs/show_text_input_dialog.dart b/lib/widgets/adaptive_dialogs/show_text_input_dialog.dart index 68477fb..09f5908 100644 --- a/lib/widgets/adaptive_dialogs/show_text_input_dialog.dart +++ b/lib/widgets/adaptive_dialogs/show_text_input_dialog.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/dialog_text_field.dart'; +import 'package:extera_next/utils/url_launcher.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/dialog_text_field.dart'; Future showTextInputDialog({ required BuildContext context, diff --git a/lib/widgets/adaptive_dialogs/user_dialog.dart b/lib/widgets/adaptive_dialogs/user_dialog.dart index 3c68677..f0f424d 100644 --- a/lib/widgets/adaptive_dialogs/user_dialog.dart +++ b/lib/widgets/adaptive_dialogs/user_dialog.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/presence_builder.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/date_time_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/presence_builder.dart'; import '../../utils/url_launcher.dart'; import '../future_loading_dialog.dart'; import '../hover_builder.dart'; diff --git a/lib/widgets/app_lock.dart b/lib/widgets/app_lock.dart index d337358..58407ed 100644 --- a/lib/widgets/app_lock.dart +++ b/lib/widgets/app_lock.dart @@ -4,8 +4,8 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:matrix/matrix.dart'; import 'package:provider/provider.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/widgets/lock_screen.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/widgets/lock_screen.dart'; class AppLockWidget extends StatefulWidget { const AppLockWidget({ diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index 25952bd..819e8d1 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/string_color.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:fluffychat/widgets/presence_builder.dart'; +import 'package:extera_next/utils/string_color.dart'; +import 'package:extera_next/widgets/mxc_image.dart'; +import 'package:extera_next/widgets/presence_builder.dart'; class Avatar extends StatelessWidget { final Uri? mxContent; diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 76d2607..a1b4569 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -2,12 +2,12 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import 'matrix.dart'; enum ChatPopupMenuActions { details, mute, unmute, leave, search } diff --git a/lib/widgets/config_viewer.dart b/lib/widgets/config_viewer.dart index 5026ec4..ae1e4f7 100644 --- a/lib/widgets/config_viewer.dart +++ b/lib/widgets/config_viewer.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/setting_keys.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; +import 'package:extera_next/widgets/matrix.dart'; class ConfigViewer extends StatelessWidget { const ConfigViewer({super.key}); diff --git a/lib/widgets/error_widget.dart b/lib/widgets/error_widget.dart index b14a18b..6bb8ff1 100644 --- a/lib/widgets/error_widget.dart +++ b/lib/widgets/error_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/utils/error_reporter.dart'; +import 'package:extera_next/utils/error_reporter.dart'; class FluffyChatErrorWidget extends StatefulWidget { final FlutterErrorDetails details; diff --git a/lib/widgets/fluffy_chat_app.dart b/lib/widgets/fluffy_chat_app.dart index f8c62b9..aced7a5 100644 --- a/lib/widgets/fluffy_chat_app.dart +++ b/lib/widgets/fluffy_chat_app.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluffychat/config/routes.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/theme_builder.dart'; +import 'package:extera_next/config/routes.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/widgets/app_lock.dart'; +import 'package:extera_next/widgets/theme_builder.dart'; import '../config/app_config.dart'; import '../utils/custom_scroll_behaviour.dart'; import 'matrix.dart'; diff --git a/lib/widgets/future_loading_dialog.dart b/lib/widgets/future_loading_dialog.dart index 8bcd951..3460c4a 100644 --- a/lib/widgets/future_loading_dialog.dart +++ b/lib/widgets/future_loading_dialog.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:async/async.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/utils/localized_exception_extension.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; /// Displays a loading dialog which reacts to the given [future]. The dialog /// will be dismissed and the value will be returned when the future completes. diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart index 016f353..40ac76a 100644 --- a/lib/widgets/layouts/login_scaffold.dart +++ b/lib/widgets/layouts/login_scaffold.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/platform_infos.dart'; class LoginScaffold extends StatelessWidget { final Widget body; diff --git a/lib/widgets/layouts/max_width_body.dart b/lib/widgets/layouts/max_width_body.dart index 5720d94..2c2ac5a 100644 --- a/lib/widgets/layouts/max_width_body.dart +++ b/lib/widgets/layouts/max_width_body.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; class MaxWidthBody extends StatelessWidget { final Widget child; diff --git a/lib/widgets/layouts/two_column_layout.dart b/lib/widgets/layouts/two_column_layout.dart index 86a6f56..0838f31 100644 --- a/lib/widgets/layouts/two_column_layout.dart +++ b/lib/widgets/layouts/two_column_layout.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/config/themes.dart'; +import 'package:extera_next/config/themes.dart'; class TwoColumnLayout extends StatelessWidget { final Widget mainView; diff --git a/lib/widgets/local_notifications_extension.dart b/lib/widgets/local_notifications_extension.dart index b7fbc30..33ab372 100644 --- a/lib/widgets/local_notifications_extension.dart +++ b/lib/widgets/local_notifications_extension.dart @@ -4,16 +4,16 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:desktop_notifications/desktop_notifications.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:universal_html/html.dart' as html; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/client_download_content_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/client_download_content_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/widgets/matrix.dart'; extension LocalNotificationsExtension on MatrixState { static final html.AudioElement _audioPlayer = html.AudioElement() diff --git a/lib/widgets/lock_screen.dart b/lib/widgets/lock_screen.dart index e343043..5ffca02 100644 --- a/lib/widgets/lock_screen.dart +++ b/lib/widgets/lock_screen.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/widgets/app_lock.dart'; class LockScreen extends StatefulWidget { const LockScreen({super.key}); diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 7b737bd..a4abc65 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -17,16 +17,16 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:universal_html/html.dart' as html; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/init_with_restore.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/uia_request_manager.dart'; -import 'package:fluffychat/utils/voip_plugin.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; +import 'package:extera_next/utils/client_manager.dart'; +import 'package:extera_next/utils/init_with_restore.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:extera_next/utils/platform_infos.dart'; +import 'package:extera_next/utils/uia_request_manager.dart'; +import 'package:extera_next/utils/voip_plugin.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; +import 'package:extera_next/widgets/fluffy_chat_app.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../pages/key_verification/key_verification_dialog.dart'; diff --git a/lib/widgets/member_actions_popup_menu_button.dart b/lib/widgets/member_actions_popup_menu_button.dart index db83ef0..381311f 100644 --- a/lib/widgets/member_actions_popup_menu_button.dart +++ b/lib/widgets/member_actions_popup_menu_button.dart @@ -1,10 +1,10 @@ -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/permission_slider_dialog.dart'; +import 'package:extera_next/widgets/permission_slider_dialog.dart'; import 'adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; import 'adaptive_dialogs/show_text_input_dialog.dart'; import 'adaptive_dialogs/user_dialog.dart'; diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index 6ae7056..56a3565 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -6,10 +6,10 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/client_download_content_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/client_download_content_extension.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:extera_next/widgets/matrix.dart'; class MxcImage extends StatefulWidget { final Uri? uri; diff --git a/lib/widgets/mxc_image_viewer.dart b/lib/widgets/mxc_image_viewer.dart index 41b4481..e1da8f3 100644 --- a/lib/widgets/mxc_image_viewer.dart +++ b/lib/widgets/mxc_image_viewer.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'mxc_image.dart'; diff --git a/lib/widgets/navigation_rail.dart b/lib/widgets/navigation_rail.dart index ed5402e..df6b8ad 100644 --- a/lib/widgets/navigation_rail.dart +++ b/lib/widgets/navigation_rail.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list/navi_rail_item.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/stream_extension.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/pages/chat_list/navi_rail_item.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/utils/stream_extension.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; class SpacesNavigationRail extends StatelessWidget { final String? activeSpaceId; diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index 37b9b23..553eb15 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; -import 'package:fluffychat/widgets/adaptive_dialogs/dialog_text_field.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; +import 'package:extera_next/widgets/adaptive_dialogs/dialog_text_field.dart'; Future showPermissionChooser( BuildContext context, { diff --git a/lib/widgets/presence_builder.dart b/lib/widgets/presence_builder.dart index 7aacc6f..20c413f 100644 --- a/lib/widgets/presence_builder.dart +++ b/lib/widgets/presence_builder.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/widgets/matrix.dart'; class PresenceBuilder extends StatefulWidget { final Widget Function(BuildContext context, CachedPresence? presence) builder; diff --git a/lib/widgets/qr_code_viewer.dart b/lib/widgets/qr_code_viewer.dart index 66593de..66b8c03 100644 --- a/lib/widgets/qr_code_viewer.dart +++ b/lib/widgets/qr_code_viewer.dart @@ -1,16 +1,16 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:image/image.dart'; import 'package:matrix/matrix.dart'; import 'package:pretty_qr_code/pretty_qr_code.dart'; import 'package:qr_image/qr_image.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/widgets/future_loading_dialog.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/utils/fluffy_share.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:extera_next/widgets/future_loading_dialog.dart'; import '../config/themes.dart'; Future showQrCodeViewer( diff --git a/lib/widgets/share_scaffold_dialog.dart b/lib/widgets/share_scaffold_dialog.dart index a9f7404..7ec9d48 100644 --- a/lib/widgets/share_scaffold_dialog.dart +++ b/lib/widgets/share_scaffold_dialog.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:cross_file/cross_file.dart'; -import 'package:fluffychat/generated/l10n/l10n.dart'; +import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +import 'package:extera_next/config/app_config.dart'; +import 'package:extera_next/config/themes.dart'; +import 'package:extera_next/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:extera_next/widgets/avatar.dart'; +import 'package:extera_next/widgets/matrix.dart'; abstract class ShareItem {} diff --git a/lib/widgets/theme_builder.dart b/lib/widgets/theme_builder.dart index c329cdc..4e2cb00 100644 --- a/lib/widgets/theme_builder.dart +++ b/lib/widgets/theme_builder.dart @@ -5,7 +5,7 @@ import 'package:dynamic_color/dynamic_color.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluffychat/utils/color_value.dart'; +import 'package:extera_next/utils/color_value.dart'; class ThemeBuilder extends StatefulWidget { final Widget Function( diff --git a/pubspec.lock b/pubspec.lock index e01895b..9640f34 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1170,10 +1170,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: "996e3b1560959afaa3118ec2b5a06734ad29acf64f9c3c09a605c3ddef22039f" + sha256: "0c033a6ebf4ed2f56ed604769984072961fefc0cb255a802ed441dcaec490196" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7cbe6a2..a795c61 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ -name: fluffychat +name: extera_next description: Chat with your friends. publish_to: none # On version bump also increase the build number for F-Droid -version: 1.26.0+3538 +version: 1.0.0 environment: sdk: ">=3.0.0 <4.0.0" @@ -40,7 +40,7 @@ dependencies: flutter_new_badger: ^1.1.1 flutter_openssl_crypto: ^0.5.0 flutter_rust_bridge: ^2.10.0 - flutter_secure_storage: ^9.2.2 + flutter_secure_storage: ^9.2.4 flutter_shortcuts_new: ^2.0.0 flutter_typeahead: ## Custom fork from flutter_typeahead since the package is not maintain well. git: @@ -63,7 +63,7 @@ dependencies: latlong2: ^0.9.1 linkify: ^5.0.0 material: ^1.0.0+2 - matrix: ^1.0.1 + matrix: ^1.1.1 mime: ^1.0.6 native_imaging: ^0.2.0 opus_caf_converter_dart: ^1.0.1 @@ -121,18 +121,17 @@ flutter: - assets/ - assets/sounds/ - assets/js/ - - assets/js/package/ msix_config: - display_name: FluffyChat - publisher_display_name: FluffyChat - publisher: CN=FluffyChat, O=Head of bad integration tests, L=Matrix, S=Internet, C=EU - identity_name: chat.fluffy.fluffychat + display_name: Extera Next + publisher_display_name: Extera Next + publisher: CN=Extera, O=HQ of bad forks of good things, L=Matrix, S=Internet, C=RU + identity_name: xyz.extera.next logo_path: assets\logo.png capabilities: internetClient, location, microphone, webcam protocol_activation: https - app_uri_handler_hosts: fluffychat.im, matrix.to - execution_alias: fluffychat + app_uri_handler_hosts: extera.xyz, fluffychat.im, matrix.to + execution_alias: exteranext sign_msix: false install_certificate: false diff --git a/replace.js b/replace.js index 8a2838f..bcc1ab0 100644 --- a/replace.js +++ b/replace.js @@ -13,7 +13,7 @@ for (const f of files) { if (f.includes('lib/generated')) continue; const b = fs.readFileSync(`lib/${f}`, 'utf-8'); total ++; - fs.writeFileSync(`lib/${f}`, b.replace(`package:flutter_gen/gen_l10n/l10n.dart`, `package:fluffychat/generated/l10n/l10n.dart`)); + fs.writeFileSync(`lib/${f}`, b.replaceAll(`package:fluffychat`, `package:extera_next`)); console.log(f); } catch (error) {