From 55d60853b3b5ef16203769832750e42d796f11d0 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 6 Oct 2020 22:59:36 +0300 Subject: [PATCH] Forking out --- PRIVACY.md | 2 +- README.md | 5 ++-- android/app/build.gradle | 2 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 4 +-- .../chat/fluffy/fluffychat/Application.kt | 2 +- .../chat/fluffy/fluffychat/MainActivity.kt | 2 +- android/app/src/profile/AndroidManifest.xml | 2 +- android/settings_aar.gradle | 1 + ios/Runner.xcodeproj/project.pbxproj | 6 ++-- lib/components/audio_player.dart | 2 +- lib/components/avatar.dart | 4 +-- lib/components/chat_settings_popup_menu.dart | 6 ++-- lib/components/content_banner.dart | 2 +- lib/components/encryption_button.dart | 4 +-- lib/components/image_bubble.dart | 6 ++-- lib/components/input_bar.dart | 2 +- lib/components/list_items/chat_list_item.dart | 4 +-- lib/components/list_items/message.dart | 12 ++++---- .../list_items/participant_list_item.dart | 6 ++-- .../list_items/public_room_list_item.dart | 2 +- lib/components/list_items/state_message.dart | 2 +- .../list_items/status_list_item.dart | 4 +-- lib/components/matrix.dart | 11 ++++--- lib/components/message_content.dart | 8 ++--- lib/components/message_download_content.dart | 2 +- lib/components/message_reactions.dart | 2 +- lib/components/reply_content.dart | 2 +- lib/components/theme_switcher.dart | 3 +- lib/main.dart | 6 ++-- lib/utils/app_route.dart | 2 +- lib/utils/event_extension.dart | 2 +- lib/utils/famedlysdk_store.dart | 2 +- lib/utils/firebase_controller.dart | 8 ++--- lib/utils/url_launcher.dart | 8 ++--- lib/views/app_info.dart | 8 ++--- lib/views/archive.dart | 6 ++-- lib/views/auth_web_view.dart | 2 +- lib/views/chat.dart | 30 +++++++++---------- lib/views/chat_details.dart | 20 ++++++------- lib/views/chat_encryption_settings.dart | 10 +++---- lib/views/chat_list.dart | 14 ++++----- lib/views/homeserver_picker.dart | 24 ++++----------- lib/views/image_view.dart | 4 +-- lib/views/invitation_selection.dart | 8 ++--- lib/views/login.dart | 18 +++++------ lib/views/new_group.dart | 8 ++--- lib/views/new_private_chat.dart | 10 +++---- lib/views/settings.dart | 10 +++---- lib/views/settings_devices.dart | 2 +- lib/views/settings_emotes.dart | 2 +- lib/views/settings_ignore_list.dart | 6 ++-- lib/views/sign_up.dart | 11 ++++--- lib/views/sign_up_password.dart | 8 ++--- lib/views/status_view.dart | 14 ++++----- linux/CMakeLists.txt | 2 +- macos/Runner/Configs/AppInfo.xcconfig | 2 +- pubspec.yaml | 2 +- ...trix_identifier_string_extension_test.dart | 2 +- 59 files changed, 173 insertions(+), 190 deletions(-) create mode 100644 android/settings_aar.gradle diff --git a/PRIVACY.md b/PRIVACY.md index c7797bc..b79fd9a 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -81,7 +81,7 @@ A typical push notification could look like this: }, "devices": [ { - "app_id": "chat.fluffy.fluffychat", + "app_id": "dev.inex.furrychat", "pushkey": "V2h5IG9uIGVhcnRoIGRpZCB5b3UgZGVjb2RlIHRoaXM/", "pushkey_ts": 12345678, "data": {}, diff --git a/README.md b/README.md index f98c0b5..399cf2a 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ An experimental fork of FluffyChat. # Changes from FluffyChat - * Double check of .well-known - * Get Jitsi from .well-known + * Reworked auth flow * Removed Sentry + * Double check of .well-known + * Get Jitsi instance from .well-known # Features * Single and group chats diff --git a/android/app/build.gradle b/android/app/build.gradle index ed87109..076d605 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { } defaultConfig { - applicationId "chat.fluffy.fluffychat" + applicationId "dev.inex.furrychat" minSdkVersion 18 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index fc480dc..c8fd0e1 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="dev.inex.furrychat"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e3f447f..7da77e1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="dev.inex.furrychat"> diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/android/settings_aar.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 190a43d..5b0b936 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -435,7 +435,7 @@ "-framework", Flutter, ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = dev.inex.furrychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -609,7 +609,7 @@ "-framework", Flutter, ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = dev.inex.furrychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -676,7 +676,7 @@ "-framework", Flutter, ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = dev.inex.furrychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/lib/components/audio_player.dart b/lib/components/audio_player.dart index 940fa0f..3b410af 100644 --- a/lib/components/audio_player.dart +++ b/lib/components/audio_player.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:typed_data'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/message_download_content.dart'; +import 'package:furrychat/components/message_download_content.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_sound/flutter_sound.dart'; diff --git a/lib/components/avatar.dart b/lib/components/avatar.dart index 47ca14b..794f788 100644 --- a/lib/components/avatar.dart +++ b/lib/components/avatar.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/string_color.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/components/chat_settings_popup_menu.dart b/lib/components/chat_settings_popup_menu.dart index 4bc1290..f84f121 100644 --- a/lib/components/chat_settings_popup_menu.dart +++ b/lib/components/chat_settings_popup_menu.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/chat_details.dart'; -import 'package:fluffychat/views/chat_list.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/chat_details.dart'; +import 'package:furrychat/views/chat_list.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart index 16292e0..8c60f59 100644 --- a/lib/components/content_banner.dart +++ b/lib/components/content_banner.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/components/encryption_button.dart b/lib/components/encryption_button.dart index acd7cb9..9dec3d6 100644 --- a/lib/components/encryption_button.dart +++ b/lib/components/encryption_button.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/chat_encryption_settings.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/chat_encryption_settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/image_bubble.dart b/lib/components/image_bubble.dart index 5d12bdd..1ccf74e 100644 --- a/lib/components/image_bubble.dart +++ b/lib/components/image_bubble.dart @@ -1,7 +1,7 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/views/image_view.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/views/image_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_blurhash/flutter_blurhash.dart'; diff --git a/lib/components/input_bar.dart b/lib/components/input_bar.dart index 90e2cc2..84e0f8c 100644 --- a/lib/components/input_bar.dart +++ b/lib/components/input_bar.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:famedlysdk/famedlysdk.dart'; diff --git a/lib/components/list_items/chat_list_item.dart b/lib/components/list_items/chat_list_item.dart index 1111fe5..8b882b0 100644 --- a/lib/components/list_items/chat_list_item.dart +++ b/lib/components/list_items/chat_list_item.dart @@ -1,7 +1,7 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/views/chat.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; +import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:pedantic/pedantic.dart'; diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart index 3c85288..d8c78cd 100644 --- a/lib/components/list_items/message.dart +++ b/lib/components/list_items/message.dart @@ -1,10 +1,10 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/message_content.dart'; -import 'package:fluffychat/components/reply_content.dart'; -import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/event_extension.dart'; -import 'package:fluffychat/utils/string_color.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/message_content.dart'; +import 'package:furrychat/components/reply_content.dart'; +import 'package:furrychat/utils/date_time_extension.dart'; +import 'package:furrychat/utils/event_extension.dart'; +import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/list_items/participant_list_item.dart b/lib/components/list_items/participant_list_item.dart index 5258f2c..22627ab 100644 --- a/lib/components/list_items/participant_list_item.dart +++ b/lib/components/list_items/participant_list_item.dart @@ -1,7 +1,7 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/chat.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/list_items/public_room_list_item.dart b/lib/components/list_items/public_room_list_item.dart index 82f4495..9536c50 100644 --- a/lib/components/list_items/public_room_list_item.dart +++ b/lib/components/list_items/public_room_list_item.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart index 80ab464..8eb2403 100644 --- a/lib/components/list_items/state_message.dart +++ b/lib/components/list_items/state_message.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/list_items/status_list_item.dart b/lib/components/list_items/status_list_item.dart index 1d5f272..7dc82ee 100644 --- a/lib/components/list_items/status_list_item.dart +++ b/lib/components/list_items/status_list_item.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/user_status.dart'; -import 'package:fluffychat/views/status_view.dart'; +import 'package:furrychat/utils/user_status.dart'; +import 'package:furrychat/views/status_view.dart'; import 'package:flutter/material.dart'; import '../avatar.dart'; import '../matrix.dart'; diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart index 62406bd..08b0bf6 100644 --- a/lib/components/matrix.dart +++ b/lib/components/matrix.dart @@ -3,11 +3,11 @@ import 'dart:io'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/utils/firebase_controller.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/user_status.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/utils/firebase_controller.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/user_status.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -15,7 +15,6 @@ import 'package:localstorage/localstorage.dart'; import 'package:universal_html/prefer_universal/html.dart' as html; import 'package:url_launcher/url_launcher.dart'; -import '../main.dart'; import '../utils/app_route.dart'; import '../utils/beautify_string_extension.dart'; import '../utils/famedlysdk_store.dart'; diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart index 3909a76..2db3720 100644 --- a/lib/components/message_content.dart +++ b/lib/components/message_content.dart @@ -1,8 +1,8 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/audio_player.dart'; -import 'package:fluffychat/components/image_bubble.dart'; -import 'package:fluffychat/utils/event_extension.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:furrychat/components/audio_player.dart'; +import 'package:furrychat/components/image_bubble.dart'; +import 'package:furrychat/utils/event_extension.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix_link_text/link_text.dart'; diff --git a/lib/components/message_download_content.dart b/lib/components/message_download_content.dart index 870e0c1..b1d1aed 100644 --- a/lib/components/message_download_content.dart +++ b/lib/components/message_download_content.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/utils/event_extension.dart'; +import 'package:furrychat/utils/event_extension.dart'; class MessageDownloadContent extends StatelessWidget { final Event event; diff --git a/lib/components/message_reactions.dart b/lib/components/message_reactions.dart index cf09add..00aee9c 100644 --- a/lib/components/message_reactions.dart +++ b/lib/components/message_reactions.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/components/reply_content.dart b/lib/components/reply_content.dart index 1ebc3b0..16c34e7 100644 --- a/lib/components/reply_content.dart +++ b/lib/components/reply_content.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/components/theme_switcher.dart b/lib/components/theme_switcher.dart index 9b368bf..7cb2c49 100644 --- a/lib/components/theme_switcher.dart +++ b/lib/components/theme_switcher.dart @@ -219,7 +219,8 @@ class ThemeSwitcherWidgetState extends State { break; } - theme = theme.copyWith(accentColor: Colors.amber, primaryColor: Colors.deepOrange); + theme = theme.copyWith( + accentColor: Colors.amber, primaryColor: Colors.deepOrange); await saveThemeValue(matrix, newTheme); await saveAmoledEnabledValue(matrix, amoled_enabled); diff --git a/lib/main.dart b/lib/main.dart index e09d063..a9975bf 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/homeserver_picker.dart'; +import 'package:furrychat/views/homeserver_picker.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -34,12 +34,12 @@ class App extends StatelessWidget { @override Widget build(BuildContext context) { return Matrix( - clientName: 'FluffyChat $platform', + clientName: 'FurryChat $platform', child: Builder( builder: (BuildContext context) => ThemeSwitcherWidget( child: Builder( builder: (BuildContext context) => MaterialApp( - title: 'FluffyChat', + title: 'FurryChat', builder: BotToastInit(), navigatorObservers: [BotToastNavigatorObserver()], theme: ThemeSwitcherWidget.of(context).themeData, diff --git a/lib/utils/app_route.dart b/lib/utils/app_route.dart index c9f25b8..6ab636e 100644 --- a/lib/utils/app_route.dart +++ b/lib/utils/app_route.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart index b7a60b3..96f3c7a 100644 --- a/lib/utils/event_extension.dart +++ b/lib/utils/event_extension.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'matrix_file_extension.dart'; diff --git a/lib/utils/famedlysdk_store.dart b/lib/utils/famedlysdk_store.dart index b14e4b0..d57559e 100644 --- a/lib/utils/famedlysdk_store.dart +++ b/lib/utils/famedlysdk_store.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; diff --git a/lib/utils/firebase_controller.dart b/lib/utils/firebase_controller.dart index 3d811e7..4b8da45 100644 --- a/lib/utils/firebase_controller.dart +++ b/lib/utils/firebase_controller.dart @@ -4,9 +4,9 @@ import 'dart:io'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/chat.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/chat.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -26,7 +26,7 @@ abstract class FirebaseController { static const String CHANNEL_ID = 'fluffychat_push'; static const String CHANNEL_NAME = 'FluffyChat push channel'; static const String CHANNEL_DESCRIPTION = 'Push notifications for FluffyChat'; - static const String APP_ID = 'chat.fluffy.fluffychat'; + static const String APP_ID = 'dev.inex.furrychat'; static const String GATEWAY_URL = 'https://janian.de:7023/'; static const String PUSHER_FORMAT = 'event_id_only'; diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index 1f99d65..fa76a82 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,8 +1,8 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/chat.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; import 'matrix_identifier_string_extension.dart'; diff --git a/lib/views/app_info.dart b/lib/views/app_info.dart index cd826c9..9772c72 100644 --- a/lib/views/app_info.dart +++ b/lib/views/app_info.dart @@ -1,7 +1,7 @@ -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/beautify_string_extension.dart'; -import 'package:fluffychat/views/chat_list.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/beautify_string_extension.dart'; +import 'package:furrychat/views/chat_list.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:olm/olm.dart' as olm; diff --git a/lib/views/archive.dart b/lib/views/archive.dart index c4fad9c..2276373 100644 --- a/lib/views/archive.dart +++ b/lib/views/archive.dart @@ -1,7 +1,7 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/list_items/chat_list_item.dart'; -import 'package:fluffychat/components/matrix.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/list_items/chat_list_item.dart'; +import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/auth_web_view.dart b/lib/views/auth_web_view.dart index ec5ba7d..2c695a9 100644 --- a/lib/views/auth_web_view.dart +++ b/lib/views/auth_web_view.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/components/matrix.dart'; +import 'package:furrychat/components/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/chat.dart b/lib/views/chat.dart index acaf76d..7566b63 100644 --- a/lib/views/chat.dart +++ b/lib/views/chat.dart @@ -5,21 +5,21 @@ import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/chat_settings_popup_menu.dart'; -import 'package:fluffychat/components/connection_status_header.dart'; -import 'package:fluffychat/components/dialogs/recording_dialog.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/encryption_button.dart'; -import 'package:fluffychat/components/list_items/message.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/components/reply_content.dart'; -import 'package:fluffychat/config/app_emojis.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/room_status_extension.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/chat_settings_popup_menu.dart'; +import 'package:furrychat/components/connection_status_header.dart'; +import 'package:furrychat/components/dialogs/recording_dialog.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/encryption_button.dart'; +import 'package:furrychat/components/list_items/message.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/components/reply_content.dart'; +import 'package:furrychat/config/app_emojis.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/room_status_extension.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart index d702db3..c6bccd7 100644 --- a/lib/views/chat_details.dart +++ b/lib/views/chat_details.dart @@ -3,16 +3,16 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/chat_settings_popup_menu.dart'; -import 'package:fluffychat/components/content_banner.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/list_items/participant_list_item.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/views/chat_list.dart'; -import 'package:fluffychat/views/invitation_selection.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/chat_settings_popup_menu.dart'; +import 'package:furrychat/components/content_banner.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/list_items/participant_list_item.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/utils/matrix_locals.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/views/chat_list.dart'; +import 'package:furrychat/views/invitation_selection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart index 84de318..7bdbf8f 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/lib/views/chat_encryption_settings.dart @@ -1,10 +1,10 @@ import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/beautify_string_extension.dart'; -import 'package:fluffychat/views/chat_list.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/beautify_string_extension.dart'; +import 'package:furrychat/views/chat_list.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart index b0aa931..b56f457 100644 --- a/lib/views/chat_list.dart +++ b/lib/views/chat_list.dart @@ -3,13 +3,13 @@ import 'dart:io'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/connection_status_header.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/list_items/status_list_item.dart'; -import 'package:fluffychat/components/list_items/public_room_list_item.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/views/status_view.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/connection_status_header.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/list_items/status_list_item.dart'; +import 'package:furrychat/components/list_items/public_room_list_item.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/views/status_view.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart index 091a5ca..9ff1057 100644 --- a/lib/views/homeserver_picker.dart +++ b/lib/views/homeserver_picker.dart @@ -1,15 +1,13 @@ import 'dart:math'; import 'package:famedlysdk/matrix_api/model/well_known_informations.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/config/app_config.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/login.dart'; -import 'package:fluffychat/views/sign_up.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/login.dart'; +import 'package:furrychat/views/sign_up.dart'; import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; class HomeserverPicker extends StatefulWidget { @override @@ -17,16 +15,6 @@ class HomeserverPicker extends StatefulWidget { } class _HomeserverPickerState extends State { - Future _setHomeserverAction(BuildContext context) async { - final homeserver = await SimpleDialogs(context).enterText( - titleText: L10n.of(context).enterYourHomeserver, - hintText: AppConfig.defaultHomeserver, - prefixText: 'https://', - keyboardType: TextInputType.url); - if (homeserver?.isEmpty ?? true) return; - _checkHomeserverAction(homeserver, context); - } - void _checkHomeserverAction(String homeserver, BuildContext context) async { if (!_isMXID && !homeserver.startsWith('https://')) { homeserver = 'https://$homeserver'; @@ -51,11 +39,9 @@ class _HomeserverPickerState extends State { ))); } } else { - homeserver = homeserver.trim(); if (homeserver.endsWith('/')) { homeserver = homeserver.substring(0, homeserver.length - 1); - } wellknown = await SimpleDialogs(context).tryRequestWithLoadingDialog( Matrix.of(context) diff --git a/lib/views/image_view.dart b/lib/views/image_view.dart index 72d2fbf..6c128dc 100644 --- a/lib/views/image_view.dart +++ b/lib/views/image_view.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/image_bubble.dart'; -import 'package:fluffychat/components/matrix.dart'; +import 'package:furrychat/components/image_bubble.dart'; +import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:photo_view/photo_view.dart'; import '../utils/event_extension.dart'; diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart index 6952520..4c9b8ab 100644 --- a/lib/views/invitation_selection.dart +++ b/lib/views/invitation_selection.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/login.dart b/lib/views/login.dart index 97d4d80..bdd2ec9 100644 --- a/lib/views/login.dart +++ b/lib/views/login.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/utils/firebase_controller.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/utils/firebase_controller.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -13,11 +13,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'chat_list.dart'; class Login extends StatefulWidget { - Login( - {Key key, - String this.username: null, - WellKnownInformations this.wellknown: null}) - : super(key: key); + Login({Key key, this.username, this.wellknown}) : super(key: key); final String username; final WellKnownInformations wellknown; @@ -85,7 +81,7 @@ class _LoginState extends State { newWellknown.jitsiHomeserver.baseUrl = 'https://${newWellknown.jitsiHomeserver.baseUrl}'; } - Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', + await Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', 'https://${Uri.parse(newWellknown.jitsiHomeserver.baseUrl).host}/'); Matrix.of(context).jitsiInstance = 'https://${Uri.parse(newWellknown.jitsiHomeserver.baseUrl).host}/'; @@ -96,7 +92,7 @@ class _LoginState extends State { widget.wellknown.jitsiHomeserver.baseUrl = 'https://${widget.wellknown.jitsiHomeserver.baseUrl}'; } - Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', + await Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', 'https://${Uri.parse(widget.wellknown.jitsiHomeserver.baseUrl).host}/'); Matrix.of(context).jitsiInstance = 'https://${Uri.parse(widget.wellknown.jitsiHomeserver.baseUrl).host}/'; diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart index b02d27d..3e74db2 100644 --- a/lib/views/new_group.dart +++ b/lib/views/new_group.dart @@ -1,8 +1,8 @@ import 'package:famedlysdk/matrix_api.dart' as api; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:pedantic/pedantic.dart'; diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart index 46e9fd3..276f7bc 100644 --- a/lib/views/new_private_chat.dart +++ b/lib/views/new_private_chat.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:share/share.dart'; diff --git a/lib/views/settings.dart b/lib/views/settings.dart index 2fec875..d7df0f4 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -4,11 +4,11 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/components/settings_themes.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/views/settings_devices.dart'; -import 'package:fluffychat/views/settings_ignore_list.dart'; +import 'package:furrychat/components/settings_themes.dart'; +import 'package:furrychat/config/app_config.dart'; +import 'package:furrychat/utils/platform_infos.dart'; +import 'package:furrychat/views/settings_devices.dart'; +import 'package:furrychat/views/settings_ignore_list.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/settings_devices.dart b/lib/views/settings_devices.dart index a1a5620..d050deb 100644 --- a/lib/views/settings_devices.dart +++ b/lib/views/settings_devices.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/settings_emotes.dart b/lib/views/settings_emotes.dart index 5046031..c2159ef 100644 --- a/lib/views/settings_emotes.dart +++ b/lib/views/settings_emotes.dart @@ -3,7 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/settings_ignore_list.dart b/lib/views/settings_ignore_list.dart index 1acf778..a5cd8fd 100644 --- a/lib/views/settings_ignore_list.dart +++ b/lib/views/settings_ignore_list.dart @@ -1,7 +1,7 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/adaptive_page_layout.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/adaptive_page_layout.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart index 2350ff8..89c5520 100644 --- a/lib/views/sign_up.dart +++ b/lib/views/sign_up.dart @@ -3,17 +3,16 @@ import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/login.dart'; -import 'package:fluffychat/views/sign_up_password.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/login.dart'; +import 'package:furrychat/views/sign_up_password.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; class SignUp extends StatefulWidget { - SignUp({Key key, WellKnownInformations this.wellknown: null}) - : super(key: key); + SignUp({Key key, this.wellknown}) : super(key: key); final WellKnownInformations wellknown; diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart index 59c8ed2..fd286f3 100644 --- a/lib/views/sign_up_password.dart +++ b/lib/views/sign_up_password.dart @@ -3,9 +3,9 @@ import 'dart:math'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/views/auth_web_view.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/views/auth_web_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -112,7 +112,7 @@ class _SignUpPasswordState extends State { widget.wellknown.jitsiHomeserver.baseUrl = 'https://${widget.wellknown.jitsiHomeserver.baseUrl}'; } - Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', + await Matrix.of(context).store.setItem('chat.fluffy.jitsi_instance', 'https://${Uri.parse(widget.wellknown.jitsiHomeserver.baseUrl).host}/'); Matrix.of(context).jitsiInstance = 'https://${Uri.parse(widget.wellknown.jitsiHomeserver.baseUrl).host}/'; diff --git a/lib/views/status_view.dart b/lib/views/status_view.dart index 0ea3ba2..88606a2 100644 --- a/lib/views/status_view.dart +++ b/lib/views/status_view.dart @@ -1,12 +1,12 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/components/avatar.dart'; -import 'package:fluffychat/components/dialogs/simple_dialogs.dart'; -import 'package:fluffychat/components/matrix.dart'; -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/utils/user_status.dart'; +import 'package:furrychat/components/avatar.dart'; +import 'package:furrychat/components/dialogs/simple_dialogs.dart'; +import 'package:furrychat/components/matrix.dart'; +import 'package:furrychat/utils/url_launcher.dart'; +import 'package:furrychat/utils/user_status.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/utils/app_route.dart'; -import 'package:fluffychat/utils/string_color.dart'; +import 'package:furrychat/utils/app_route.dart'; +import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/material.dart'; import 'package:matrix_link_text/link_text.dart'; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 5e82bb4..fccf73d 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) set(BINARY_NAME "fluffychat") -set(APPLICATION_ID "chat.fluffy.fluffychat") +set(APPLICATION_ID "dev.inex.furrychat") cmake_policy(SET CMP0063 NEW) diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 362569a..3ef2516 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = fluffychat // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.fluffychat +PRODUCT_BUNDLE_IDENTIFIER = dev.inex.furrychat // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2020 chat.fluffy. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index 6705045..b3c7332 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: fluffychat +name: furrychat description: Chat with your friends. # The following defines the version and build number for your application. diff --git a/test/matrix_identifier_string_extension_test.dart b/test/matrix_identifier_string_extension_test.dart index 06db66d..e07decb 100644 --- a/test/matrix_identifier_string_extension_test.dart +++ b/test/matrix_identifier_string_extension_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:fluffychat/utils/matrix_identifier_string_extension.dart'; +import 'package:furrychat/utils/matrix_identifier_string_extension.dart'; void main() { group('Matrix Identifier String Extension', () {