Browse Source

Forking out

yiffed
Inex Code 6 months ago
parent
commit
55d60853b3
59 changed files with 173 additions and 190 deletions
  1. +1
    -1
      PRIVACY.md
  2. +3
    -2
      README.md
  3. +1
    -1
      android/app/build.gradle
  4. +1
    -1
      android/app/src/debug/AndroidManifest.xml
  5. +2
    -2
      android/app/src/main/AndroidManifest.xml
  6. +1
    -1
      android/app/src/main/kotlin/chat/fluffy/fluffychat/Application.kt
  7. +1
    -1
      android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
  8. +1
    -1
      android/app/src/profile/AndroidManifest.xml
  9. +1
    -0
      android/settings_aar.gradle
  10. +3
    -3
      ios/Runner.xcodeproj/project.pbxproj
  11. +1
    -1
      lib/components/audio_player.dart
  12. +2
    -2
      lib/components/avatar.dart
  13. +3
    -3
      lib/components/chat_settings_popup_menu.dart
  14. +1
    -1
      lib/components/content_banner.dart
  15. +2
    -2
      lib/components/encryption_button.dart
  16. +3
    -3
      lib/components/image_bubble.dart
  17. +1
    -1
      lib/components/input_bar.dart
  18. +2
    -2
      lib/components/list_items/chat_list_item.dart
  19. +6
    -6
      lib/components/list_items/message.dart
  20. +3
    -3
      lib/components/list_items/participant_list_item.dart
  21. +1
    -1
      lib/components/list_items/public_room_list_item.dart
  22. +1
    -1
      lib/components/list_items/state_message.dart
  23. +2
    -2
      lib/components/list_items/status_list_item.dart
  24. +5
    -6
      lib/components/matrix.dart
  25. +4
    -4
      lib/components/message_content.dart
  26. +1
    -1
      lib/components/message_download_content.dart
  27. +1
    -1
      lib/components/message_reactions.dart
  28. +1
    -1
      lib/components/reply_content.dart
  29. +2
    -1
      lib/components/theme_switcher.dart
  30. +3
    -3
      lib/main.dart
  31. +1
    -1
      lib/utils/app_route.dart
  32. +1
    -1
      lib/utils/event_extension.dart
  33. +1
    -1
      lib/utils/famedlysdk_store.dart
  34. +4
    -4
      lib/utils/firebase_controller.dart
  35. +4
    -4
      lib/utils/url_launcher.dart
  36. +4
    -4
      lib/views/app_info.dart
  37. +3
    -3
      lib/views/archive.dart
  38. +1
    -1
      lib/views/auth_web_view.dart
  39. +15
    -15
      lib/views/chat.dart
  40. +10
    -10
      lib/views/chat_details.dart
  41. +5
    -5
      lib/views/chat_encryption_settings.dart
  42. +7
    -7
      lib/views/chat_list.dart
  43. +5
    -19
      lib/views/homeserver_picker.dart
  44. +2
    -2
      lib/views/image_view.dart
  45. +4
    -4
      lib/views/invitation_selection.dart
  46. +7
    -11
      lib/views/login.dart
  47. +4
    -4
      lib/views/new_group.dart
  48. +5
    -5
      lib/views/new_private_chat.dart
  49. +5
    -5
      lib/views/settings.dart
  50. +1
    -1
      lib/views/settings_devices.dart
  51. +1
    -1
      lib/views/settings_emotes.dart
  52. +3
    -3
      lib/views/settings_ignore_list.dart
  53. +5
    -6
      lib/views/sign_up.dart
  54. +4
    -4
      lib/views/sign_up_password.dart
  55. +7
    -7
      lib/views/status_view.dart
  56. +1
    -1
      linux/CMakeLists.txt
  57. +1
    -1
      macos/Runner/Configs/AppInfo.xcconfig
  58. +1
    -1
      pubspec.yaml
  59. +1
    -1
      test/matrix_identifier_string_extension_test.dart

+ 1
- 1
PRIVACY.md View File

@ -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": {},


+ 3
- 2
README.md View File

@ -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


+ 1
- 1
android/app/build.gradle View File

@ -43,7 +43,7 @@ android {
}
defaultConfig {
applicationId "chat.fluffy.fluffychat"
applicationId "dev.inex.furrychat"
minSdkVersion 18
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()


+ 1
- 1
android/app/src/debug/AndroidManifest.xml View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="chat.fluffy.fluffychat">
package="dev.inex.furrychat">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->


+ 2
- 2
android/app/src/main/AndroidManifest.xml View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="chat.fluffy.fluffychat">
package="dev.inex.furrychat">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
@ -12,7 +12,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:name=".Application"
android:label="FluffyChat"
android:label="FurryChat"
android:icon="@mipmap/launcher_icon">
<activity
android:name=".MainActivity"


+ 1
- 1
android/app/src/main/kotlin/chat/fluffy/fluffychat/Application.kt View File

@ -1,4 +1,4 @@
package chat.fluffy.fluffychat
package dev.inex.furrychat
import io.flutter.app.FlutterApplication
import io.flutter.plugin.common.PluginRegistry


+ 1
- 1
android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt View File

@ -1,4 +1,4 @@
package chat.fluffy.fluffychat
package dev.inex.furrychat
import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity


+ 1
- 1
android/app/src/profile/AndroidManifest.xml View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="chat.fluffy.fluffychat">
package="dev.inex.furrychat">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->


+ 1
- 0
android/settings_aar.gradle View File

@ -0,0 +1 @@
include ':app'

+ 3
- 3
ios/Runner.xcodeproj/project.pbxproj View File

@ -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;


+ 1
- 1
lib/components/audio_player.dart View File

@ -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';


+ 2
- 2
lib/components/avatar.dart View File

@ -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';


+ 3
- 3
lib/components/chat_settings_popup_menu.dart View File

@ -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';


+ 1
- 1
lib/components/content_banner.dart View File

@ -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';


+ 2
- 2
lib/components/encryption_button.dart View File

@ -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';


+ 3
- 3
lib/components/image_bubble.dart View File

@ -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';


+ 1
- 1
lib/components/input_bar.dart View File

@ -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';


+ 2
- 2
lib/components/list_items/chat_list_item.dart View File

@ -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';


+ 6
- 6
lib/components/list_items/message.dart View File

@ -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';


+ 3
- 3
lib/components/list_items/participant_list_item.dart View File

@ -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';


+ 1
- 1
lib/components/list_items/public_room_list_item.dart View File

@ -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';


+ 1
- 1
lib/components/list_items/state_message.dart View File

@ -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';


+ 2
- 2
lib/components/list_items/status_list_item.dart View File

@ -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';


+ 5
- 6
lib/components/matrix.dart View File

@ -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';


+ 4
- 4
lib/components/message_content.dart View File

@ -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';


+ 1
- 1
lib/components/message_download_content.dart View File

@ -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;


+ 1
- 1
lib/components/message_reactions.dart View File

@ -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';


+ 1
- 1
lib/components/reply_content.dart View File

@ -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';


+ 2
- 1
lib/components/theme_switcher.dart View File

@ -219,7 +219,8 @@ class ThemeSwitcherWidgetState extends State<ThemeSwitcherWidget> {
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);


+ 3
- 3
lib/main.dart View File

@ -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,


+ 1
- 1
lib/utils/app_route.dart View File

@ -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';


+ 1
- 1
lib/utils/event_extension.dart View File

@ -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';


+ 1
- 1
lib/utils/famedlysdk_store.dart View File

@ -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';


+ 4
- 4
lib/utils/firebase_controller.dart View File

@ -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';


+ 4
- 4
lib/utils/url_launcher.dart View File

@ -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';


+ 4
- 4
lib/views/app_info.dart View File

@ -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;


+ 3
- 3
lib/views/archive.dart View File

@ -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';


+ 1
- 1
lib/views/auth_web_view.dart View File

@ -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';


+ 15
- 15
lib/views/chat.dart View File

@ -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';


+ 10
- 10
lib/views/chat_details.dart View File

@ -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';


+ 5
- 5
lib/views/chat_encryption_settings.dart View File

@ -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';


+ 7
- 7
lib/views/chat_list.dart View File

@ -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';


+ 5
- 19
lib/views/homeserver_picker.dart View File

@ -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<HomeserverPicker> {
Future<void> _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<HomeserverPicker> {
)));
}
} else {
homeserver = homeserver.trim();
if (homeserver.endsWith('/')) {
homeserver = homeserver.substring(0, homeserver.length - 1);
}
wellknown = await SimpleDialogs(context).tryRequestWithLoadingDialog(
Matrix.of(context)


+ 2
- 2
lib/views/image_view.dart View File

@ -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';


+ 4
- 4
lib/views/invitation_selection.dart View File

@ -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';


+ 7
- 11
lib/views/login.dart View File

@ -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<Login> {
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<Login> {
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}/';


+ 4
- 4
lib/views/new_group.dart View File

@ -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';


+ 5
- 5
lib/views/new_private_chat.dart View File

@ -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';


+ 5
- 5
lib/views/settings.dart View File

@ -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';


+ 1
- 1
lib/views/settings_devices.dart View File

@ -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';


+ 1
- 1
lib/views/settings_emotes.dart View File

@ -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';


+ 3
- 3
lib/views/settings_ignore_list.dart View File

@ -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';


+ 5
- 6
lib/views/sign_up.dart View File

@ -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;


+ 4
- 4
lib/views/sign_up_password.dart View File

@ -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<SignUpPassword> {
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}/';


+ 7
- 7
lib/views/status_view.dart View File

@ -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';


+ 1
- 1
linux/CMakeLists.txt View File

@ -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)


+ 1
- 1
macos/Runner/Configs/AppInfo.xcconfig View File

@ -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.

+ 1
- 1
pubspec.yaml View File

@ -1,4 +1,4 @@
name: fluffychat
name: furrychat
description: Chat with your friends.
# The following defines the version and build number for your application.


+ 1
- 1
test/matrix_identifier_string_extension_test.dart View File

@ -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', () {


Loading…
Cancel
Save