Rename again after rebase

More fixes

More fixes

Fix for builds?

More fixes post rebase
pull/2269/head
Steven Lageveen 3 weeks ago
parent 9fe3aa4e89
commit d65611862d

@ -1,3 +1,3 @@
* @krille-chan
* @allomanta
pubspec.* @dependabot
lib/l10n/*.arb @weblate
lib/l10n/*.arb @weblate

@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 👬 FluffyChat Community
- name: 👬 Hermes Community
url: https://matrix.to/#/#hermes:matrix.org
about: Please ask and answer questions here.

@ -22,6 +22,6 @@ jobs:
days-before-pr-stale: 365
days-before-pr-close: 14
exempt-milestones: true
exempt-assignees: krille-chan
exempt-assignees: allomanta
operations-per-run: 500
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}

@ -25,7 +25,7 @@ labels: test
- [ ] iOS
- [ ] Web
- [ ] Linux
7. Sharing texts/files/images from other apps to FluffyChat works:
7. Sharing texts/files/images from other apps to Hermes works:
- [ ] Android
- [ ] iOS
8. Login with single sign on works:

@ -10,7 +10,7 @@ updates:
prefix: "build: "
include: "scope"
assignees:
- "krille-chan"
- "allomanta"
open-pull-requests-limit: 5
- package-ecosystem: "github-actions"
directory: "/"

@ -1,6 +1,6 @@
*Thank you so much for your contribution to FluffyChat ❤️❤️❤️*
*Thank you so much for your contribution to Hermes ❤️❤️❤️*
- [ ] I have read and understood the [contributing guidelines](https://github.com/krille-chan/fluffychat/blob/main/CONTRIBUTING.md).
- [ ] I have read and understood the [contributing guidelines](https://github.com/allomanta/hermes/blob/main/CONTRIBUTING.md).
### Pull Request has been tested on:
@ -11,4 +11,4 @@
- [ ] Browser (WebKit based)
- [ ] Desktop Linux
- [ ] Desktop Windows
- [ ] Desktop macOS
- [ ] Desktop macOS

1
.gitignore vendored

@ -1,4 +1,5 @@
# Miscellaneous
AGENTS.md
*.ignore
*.class
*.log

@ -19,7 +19,7 @@ Bugfix release to trigger flatpak arm64 release again.
- refactor: Remove broken push error reporter (Christian Kußowski)
## v2.1.0
FluffyChat 2.1.0 brings support for room version 12 and a lot of bugfixes, updated translations and performance improvements. Also chat state events are now collapsed by default.
Hermes 2.1.0 brings support for room version 12 and a lot of bugfixes, updated translations and performance improvements. Also chat state events are now collapsed by default.
- feat: Collapse all state events by default (Christian Kußowski)
- feat(linux/notify): support avatar icon (ShootingStarDragons)

@ -1,4 +1,4 @@
# Contributing to FluffyChat
# Contributing to Hermes
Contributions are always welcome. Yet we might lack manpower to review all of them in time.
To improve the process please make sure that you read the following guidelines carefully:
@ -13,4 +13,4 @@ To improve the process please make sure that you read the following guidelines c
6. Format the commit message as [Conventional Commits](https://www.conventionalcommits.org).
7. Format (`flutter format lib`) and sort impots (`dart run import_sorter:main --no-comments`) in all code files.
8. For bigger or complex changes (more than a couple of code lines) write an issue or refer to an existing issue and ask for approval from the maintainers (@krille-chan) **before** starting to implement it. This way you reduce the risk that your Pull Request get's declined.
9. Prefer simple and easy to maintain solutions over complexity and fancy ones.
9. Prefer simple and easy to maintain solutions over complexity and fancy ones.

@ -34,7 +34,7 @@ configurations.all {
android {
namespace = "chat.fluffy.fluffychat"
namespace = "chat.pantheon.hermes"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
@ -64,7 +64,7 @@ android {
}
defaultConfig {
applicationId = "chat.fluffy.fluffychat"
applicationId = "chat.pantheon.hermes"
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode

@ -46,15 +46,15 @@
class="text-lg hover:text-purple-800 dark:text-white dark:hover:text-purple-400"
>News</a
> <a
href="https://github.com/krille-chan/hermes/blob/main/CHANGELOG.md"
href="https://github.com/allomanta/hermes/blob/main/CHANGELOG.md"
class="text-lg hover:text-purple-800 dark:text-white dark:hover:text-purple-400"
>Changelog</a
> <a
href="https://github.com/krille-chan/hermes/wiki"
href="https://github.com/allomanta/hermes/wiki"
class="text-lg hover:text-purple-800 dark:text-white dark:hover:text-purple-400"
>Wiki</a
> <a
href="https://github.com/krille-chan/hermes"
href="https://github.com/allomanta/hermes"
class="text-lg hover:text-purple-800 dark:text-white dark:hover:text-purple-400"
>Code</a
>
@ -240,15 +240,15 @@
>Liberapay</a
> - <a
class="text-sm text-slate-700 no-underline hover:text-purple-800 dark:text-slate-200"
href="https://github.com/krille-chan/hermes"
href="https://github.com/allomanta/hermes"
>Source code</a
> - <a
class="text-sm text-slate-700 no-underline hover:text-purple-800 dark:text-slate-200"
href="https://github.com/krille-chan/hermes/blob/main/PRIVACY.md"
href="https://github.com/allomanta/hermes/blob/main/PRIVACY.md"
>Privacy</a
> - <a
class="text-sm text-slate-700 no-underline hover:text-purple-800 dark:text-slate-200"
href="https://github.com/krille-chan/hermes/blob/main/CHANGELOG.md"
href="https://github.com/allomanta/hermes/blob/main/CHANGELOG.md"
>Changelog</a
> - <a
class="text-sm text-slate-700 no-underline hover:text-purple-800 dark:text-slate-200"

@ -30,7 +30,7 @@ class User {
const User(this.name, this.password);
}
const homeserver = 'http://${const String.fromEnvironment(
const homeserver = 'http://${String.fromEnvironment(
'HOMESERVER',
defaultValue: 'localhost',
)}';

@ -0,0 +1,32 @@
#
# Generated file, do not edit.
#
import lldb
def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
"""Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
base = frame.register["x0"].GetValueAsAddress()
page_len = frame.register["x1"].GetValueAsUnsigned()
# Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
# first page to see if handled it correctly. This makes diagnosing
# misconfiguration (e.g. missing breakpoint) easier.
data = bytearray(page_len)
data[0:8] = b'IHELPED!'
error = lldb.SBError()
frame.GetThread().GetProcess().WriteMemory(base, data, error)
if not error.Success():
print(f'Failed to write into {base}[+{page_len}]', error)
return
def __lldb_init_module(debugger: lldb.SBDebugger, _):
target = debugger.GetDummyTarget()
# Caveat: must use BreakpointCreateByRegEx here and not
# BreakpointCreateByName. For some reasons callback function does not
# get carried over from dummy target for the later.
bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
bp.SetAutoContinue(True)
print("-- LLDB integration loaded --")

@ -0,0 +1,5 @@
#
# Generated file, do not edit.
#
command script import --relative-to-command-file flutter_lldb_helper.py

@ -4,7 +4,7 @@
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.im.fluffychat.app</string>
<string>group.im.hermes.app</string>
</array>
</dict>
</plist>

@ -19,12 +19,12 @@ class NotificationService: UNNotificationServiceExtension {
if let bestAttemptContent = bestAttemptContent {
// Uncomment to read the push message payload:
// os_log("[FluffyChatPushHelper] New message received: %{public}@", log: .default, type: .error, bestAttemptContent.userInfo)
os_log("[FluffyChatPushHelper] New message received")
// os_log("[HermesPushHelper] New message received: %{public}@", log: .default, type: .error, bestAttemptContent.userInfo)
os_log("[HermesPushHelper] New message received")
guard let roomId = bestAttemptContent.userInfo["room_id"] as? String,
let eventId = bestAttemptContent.userInfo["event_id"] as? String else {
os_log("[FluffyChatPushHelper] Room ID or Event ID is missing!")
os_log("[HermesPushHelper] Room ID or Event ID is missing!")
let emptyContent = UNMutableNotificationContent()
contentHandler(emptyContent)
return

@ -285,9 +285,9 @@
);
dependencies = (
);
name = "FluffyChat Share";
productName = "FluffyChat Share";
productReference = C1005C42261071B5002F4F32 /* FluffyChat Share.appex */;
name = "Hermes Share";
productName = "Hermes Share";
productReference = C1005C42261071B5002F4F32 /* Hermes Share.appex */;
productType = "com.apple.product-type.app-extension";
};
C14695512E642D400075F2F7 /* Notification Service Extension */ = {
@ -974,7 +974,7 @@
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.Notification-Service-Extension";
PRODUCT_BUNDLE_IDENTIFIER = "im.hermes.app.Notification-Service-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@ -1015,7 +1015,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.Notification-Service-Extension";
PRODUCT_BUNDLE_IDENTIFIER = "im.hermes.app.Notification-Service-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@ -1054,7 +1054,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.Notification-Service-Extension";
PRODUCT_BUNDLE_IDENTIFIER = "im.hermes.app.Notification-Service-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;

@ -22,19 +22,18 @@ abstract class AppConfig {
static const String website = 'https://hermes.im';
static const String enablePushTutorial =
'https://github.com/krille-chan/hermes/wiki/Push-Notifications-without-Google-Services';
'https://github.com/allomanta/hermes/wiki/Push-Notifications-without-Google-Services';
static const String encryptionTutorial =
'https://github.com/krille-chan/hermes/wiki/How-to-use-end-to-end-encryption-in-Hermes';
'https://github.com/allomanta/hermes/wiki/How-to-use-end-to-end-encryption-in-Hermes';
static const String startChatTutorial =
'https://github.com/krille-chan/hermes/wiki/How-to-Find-Users-in-Hermes';
'https://github.com/allomanta/hermes/wiki/How-to-Find-Users-in-Hermes';
static const String appId = 'im.hermes.Hermes';
static const String appOpenUrlScheme = 'im.hermes';
static const String sourceCodeUrl = 'https://github.com/krille-chan/hermes';
static const String supportUrl =
'https://github.com/krille-chan/hermes/issues';
static const String sourceCodeUrl = 'https://github.com/allomanta/hermes';
static const String supportUrl = 'https://github.com/allomanta/hermes/issues';
static const String changelogUrl =
'https://github.com/krille-chan/hermes/blob/main/CHANGELOG.md';
'https://github.com/allomanta/hermes/blob/main/CHANGELOG.md';
static const String donationUrl = 'https://ko-fi.com/krille';
static const Set<String> defaultReactions = {'👍', '❤️', '😂', '😮', '😢'};
@ -42,7 +41,7 @@ abstract class AppConfig {
static final Uri newIssueUrl = Uri(
scheme: 'https',
host: 'github.com',
path: '/krille-chan/hermes/issues/new',
path: '/allomanta/hermes/issues/new',
);
static final Uri homeserverList = Uri(

@ -143,8 +143,8 @@
"type": "String",
"placeholders": {}
},
"fluffychat": "FluffyChat",
"@fluffychat": {
"hermes": "Hermes",
"@hermes": {
"type": "String",
"placeholders": {}
},
@ -1294,8 +1294,8 @@
"type": "String",
"placeholders": {}
},
"newMessageInFluffyChat": "💬 FluffyChat에서 새로운 메시지",
"@newMessageInFluffyChat": {
"newMessageInHermes": "💬 Hermes에서 새로운 메시지",
"@newMessageInHermes": {
"type": "String",
"placeholders": {}
},
@ -1441,7 +1441,7 @@
"type": "String",
"placeholders": {}
},
"title": "FluffyChat",
"title": "Hermes",
"@title": {
"description": "Title for the application",
"type": "String",
@ -1603,7 +1603,7 @@
"type": "String",
"placeholders": {}
},
"noGoogleServicesWarning": "이 휴대폰에 Firebase Cloud Messaging 서비스가 없는 것 같습니다. FluffyChat에서 푸시 알림을 받으려면 ntfy 사용을 추천합니다. ntfy 혹은 다른 푸시 알림 제공자를 사용하면 알림을 보안적인 방법으로 받을 수 있습니다. ntfy는 PlayStore와 F-Droid에서 설치 가능합니다.",
"noGoogleServicesWarning": "이 휴대폰에 Firebase Cloud Messaging 서비스가 없는 것 같습니다. Hermes에서 푸시 알림을 받으려면 ntfy 사용을 추천합니다. ntfy 혹은 다른 푸시 알림 제공자를 사용하면 알림을 보안적인 방법으로 받을 수 있습니다. ntfy는 PlayStore와 F-Droid에서 설치 가능합니다.",
"@noGoogleServicesWarning": {
"type": "String",
"placeholders": {}
@ -1867,7 +1867,7 @@
"type": "String",
"placeholders": {}
},
"inviteText": "{username}님이 당신을 FluffyChat에 초대했습니다.\n1. FluffyChat 설치: https://fluffychat.im \n2. 가입하거나 로그인 \n3. 초대 링크 열기: \n {link}",
"inviteText": "{username}님이 당신을 Hermes에 초대했습니다.\n1. Hermes 설치: https://hermes.im \n2. 가입하거나 로그인 \n3. 초대 링크 열기: \n {link}",
"@inviteText": {
"type": "String",
"placeholders": {
@ -2250,7 +2250,7 @@
"@reportErrorDescription": {},
"widgetJitsi": "Jitsi Meet",
"@widgetJitsi": {},
"indexedDbErrorLong": "메시지 저장은 기본적으로 사생활 보호 모드에서 사용할 수 없습니다.\n- about:config 로 이동\n- dom.indexedDB.privateBrowsing.enabled 를 true로 설정\n그렇지 않으면 FluffyChat을 실행할 수 없습니다.",
"indexedDbErrorLong": "메시지 저장은 기본적으로 사생활 보호 모드에서 사용할 수 없습니다.\n- about:config 로 이동\n- dom.indexedDB.privateBrowsing.enabled 를 true로 설정\n그렇지 않으면 Hermes을 실행할 수 없습니다.",
"@indexedDbErrorLong": {},
"startFirstChat": "첫 번째 채팅을 시작하기",
"@startFirstChat": {},
@ -2308,7 +2308,7 @@
"@unbanUserDescription": {},
"youRejectedTheInvitation": "초대를 거부했습니다",
"@youRejectedTheInvitation": {},
"otherCallingPermissions": "마이크, 카메라 그리고 다름 FluffyChat 권한",
"otherCallingPermissions": "마이크, 카메라 그리고 다름 Hermes 권한",
"@otherCallingPermissions": {},
"messagesStyle": "메세지:",
"@messagesStyle": {},
@ -2318,7 +2318,7 @@
"@newSpaceDescription": {},
"chatDescription": "채팅 설명",
"@chatDescription": {},
"callingAccountDetails": "FluffyChat이 android 전화앱을 사용 할 수 있도록 허가.",
"callingAccountDetails": "Hermes이 android 전화앱을 사용 할 수 있도록 허가.",
"@callingAccountDetails": {},
"enterSpace": "스페이스에 입장",
"@enterSpace": {},
@ -2446,7 +2446,7 @@
}
}
},
"appearOnTopDetails": "앱이 상단에 표시되도록 허용 (이미 FluffyChat을 통화 계정으로 설정한 경우에는 필요하지 않음)",
"appearOnTopDetails": "앱이 상단에 표시되도록 허용 (이미 Hermes을 통화 계정으로 설정한 경우에는 필요하지 않음)",
"@appearOnTopDetails": {},
"enterRoom": "방에 입장",
"@enterRoom": {},
@ -2637,7 +2637,7 @@
"@indexedDbErrorTitle": {},
"storeSecurlyOnThisDevice": "이 기기에 안전하게 저장",
"@storeSecurlyOnThisDevice": {},
"screenSharingDetail": "FluffyChat에 당신의 화면을 공유하는중",
"screenSharingDetail": "Hermes에 당신의 화면을 공유하는중",
"@screenSharingDetail": {},
"blockUsername": "유저 이름 무시",
"@blockUsername": {},
@ -3072,7 +3072,7 @@
},
"noContactInformationProvided": "서버가 유효한 연락처 정보를 제공하지 않음",
"@noContactInformationProvided": {},
"welcomeText": "안녕하세요 👋 FluffyChat이에요. 당신은 htpps://matrix.org와 호환되는 모든 홈서버를 사용할 수 있어요. 그리고 모두와 대화해보세요. 거대한 분산 대화망이니까요!",
"welcomeText": "안녕하세요 👋 Hermes이에요. 당신은 htpps://matrix.org와 호환되는 모든 홈서버를 사용할 수 있어요. 그리고 모두와 대화해보세요. 거대한 분산 대화망이니까요!",
"@welcomeText": {},
"changeGeneralChatSettings": "일반 채팅 설정 번경하기",
"@changeGeneralChatSettings": {},
@ -3196,7 +3196,7 @@
"@previous": {},
"newChatRequest": "📩 새 채팅 요청",
"@newChatRequest": {},
"appIntroduction": "FluffyChat는 다른 메신저들을 사용하는 친구들과도 채팅할 수 있습니다. https://matrix.org에 방문하거나 *계속*을 눌러 자세한 정보를 확인하세요.",
"appIntroduction": "Hermes는 다른 메신저들을 사용하는 친구들과도 채팅할 수 있습니다. https://matrix.org에 방문하거나 *계속*을 눌러 자세한 정보를 확인하세요.",
"@appIntroduction": {},
"synchronizingPleaseWaitCounter": " 동기화중… ({percentage}%)",
"@synchronizingPleaseWaitCounter": {

@ -109,7 +109,8 @@ class BootstrapDialogState extends State<BootstrapDialog> {
body: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: PantheonThemes.columnWidth * 1.5),
maxWidth: PantheonThemes.columnWidth * 1.5,
),
child: ListView(
padding: const EdgeInsets.all(16.0),
children: [

@ -20,7 +20,6 @@ import 'package:hermes/config/setting_keys.dart';
import 'package:hermes/config/themes.dart';
import 'package:hermes/pages/chat/chat_view.dart';
import 'package:hermes/pages/chat/event_info_dialog.dart';
import 'package:hermes/pages/chat/recording_dialog.dart';
import 'package:hermes/pages/chat_details/chat_details.dart';
import 'package:hermes/utils/error_reporter.dart';
import 'package:hermes/utils/file_selector.dart';

@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/chat/recording_input_row.dart';
import 'package:fluffychat/pages/chat/recording_view_model.dart';
import 'package:hermes/config/setting_keys.dart';
import 'package:hermes/pages/chat/recording_input_row.dart';
import 'package:hermes/pages/chat/recording_view_model.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/config/app_config.dart';
import 'package:hermes/utils/other_party_can_receive.dart';

@ -86,7 +86,7 @@ class HtmlMessage extends StatelessWidget {
'rt',
'html',
'body',
// Workaround for https://github.com/krille-chan/hermes/issues/507
// Workaround for https://github.com/allomanta/hermes/issues/507
'tg-forward',
};

@ -1,11 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:emojis/emoji.dart';
import 'package:matrix/matrix.dart';
import 'package:slugify/slugify.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:hermes/config/app_config.dart';
import 'package:hermes/config/setting_keys.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/utils/markdown_context_builder.dart';

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat/recording_view_model.dart';
import 'package:hermes/config/themes.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/pages/chat/recording_view_model.dart';
class RecordingInputRow extends StatelessWidget {
final RecordingViewModelState state;

@ -11,10 +11,11 @@ import 'package:path_provider/path_provider.dart';
import 'package:record/record.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
import 'package:hermes/config/setting_keys.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/utils/platform_infos.dart';
import 'package:hermes/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
import 'package:hermes/widgets/matrix.dart';
import 'events/audio_player.dart';
class RecordingViewModel extends StatefulWidget {

@ -12,7 +12,6 @@ import 'package:matrix/matrix.dart' as sdk;
import 'package:matrix/matrix.dart';
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
import 'package:hermes/config/app_config.dart';
import 'package:hermes/pages/chat_list/chat_list_view.dart';
import 'package:hermes/utils/localized_exception_extension.dart';

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:hermes/l10n/l10n.dart';
import 'package:hermes/widgets/avatar.dart';
import 'package:hermes/widgets/future_loading_dialog.dart';
import 'package:hermes/widgets/layouts/max_width_body.dart';
import '../../widgets/matrix.dart';

@ -4,7 +4,7 @@ import 'dart:io';
import 'package:http/http.dart' as http;
import 'package:http/io_client.dart';
import 'package:http/retry.dart' as retry;
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:hermes/utils/platform_infos.dart';
import 'package:hermes/config/isrg_x1.dart';
/// Custom Client to add an additional certificate. This is for the isrg X1

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:hermes/utils/platform_infos.dart';
import 'package:hermes/l10n/l10n.dart';
/// Provides extra functionality for formatting the time.

@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart';
import 'package:file_picker/file_picker.dart';
import 'package:file_selector/file_selector.dart';
import 'package:hermes/utils/platform_infos.dart';
import 'package:hermes/widgets/app_lock.dart';
import 'package:hermes/widgets/future_loading_dialog.dart';

@ -8,7 +8,6 @@ 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:hermes/l10n/l10n.dart';
import 'package:hermes/config/app_config.dart';
import 'package:hermes/utils/client_manager.dart';
import 'package:hermes/utils/platform_infos.dart';
import 'cipher.dart';

@ -1,7 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:hermes/config/app_config.dart';
class AdaptiveDialogAction extends StatelessWidget {
final VoidCallback? onPressed;

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:hermes/config/themes.dart';
class AvatarPageHeader extends StatelessWidget {
final Widget avatar;
@ -23,7 +23,7 @@ class AvatarPageHeader extends StatelessWidget {
final onAvatarEdit = this.onAvatarEdit;
return Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: FluffyThemes.columnWidth),
constraints: const BoxConstraints(maxWidth: PantheonThemes.columnWidth),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,

@ -143,7 +143,7 @@ class _MxcImageState extends State<MxcImage> {
final hasData = data != null && data.isNotEmpty;
return AnimatedSwitcher(
duration: FluffyThemes.animationDuration,
duration: PantheonThemes.animationDuration,
child: hasData
? ClipRRect(
borderRadius: widget.borderRadius,

@ -13,7 +13,6 @@ import dynamic_color
import emoji_picker_flutter
import file_picker
import file_selector_macos
import firebase_core
import flutter_local_notifications
import flutter_new_badger
import flutter_secure_storage_macos
@ -45,7 +44,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
FlutterNewBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterNewBadgerPlugin"))
FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))

@ -15,17 +15,6 @@ PODS:
- FlutterMacOS
- file_selector_macos (0.0.1):
- FlutterMacOS
- Firebase/CoreOnly (10.25.0):
- FirebaseCore (= 10.25.0)
- firebase_core (2.32.0):
- Firebase/CoreOnly (~> 10.25.0)
- FlutterMacOS
- FirebaseCore (10.25.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- FirebaseCoreInternal (10.29.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- flutter_local_notifications (0.0.1):
- FlutterMacOS
- flutter_new_badger (0.0.1):
@ -43,15 +32,6 @@ PODS:
- geolocator_apple (1.2.0):
- Flutter
- FlutterMacOS
- GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- "GoogleUtilities/NSData+zlib (7.13.3)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (7.13.3)
- just_audio (0.0.1):
- Flutter
- FlutterMacOS
@ -104,7 +84,6 @@ DEPENDENCIES:
- emoji_picker_flutter (from `Flutter/ephemeral/.symlinks/plugins/emoji_picker_flutter/macos`)
- file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
- file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
- firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
- flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
- flutter_new_badger (from `Flutter/ephemeral/.symlinks/plugins/flutter_new_badger/macos`)
- flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
@ -131,11 +110,6 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- Firebase
- FirebaseCore
- FirebaseCoreInternal
- GoogleUtilities
- PromisesObjC
- SQLCipher
- WebRTC-SDK
@ -156,8 +130,6 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
file_selector_macos:
:path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
firebase_core:
:path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
flutter_local_notifications:
:path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
flutter_new_badger:
@ -222,7 +194,6 @@ SPEC CHECKSUMS:
flutter_webrtc: 718eae22a371cd94e5d56aa4f301443ebc5bb737
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
package_info_plus: f0052d280d17aa382b932f399edf32507174e870
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564

@ -377,14 +377,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.3"
fcm_shared_isolate:
dependency: "direct main"
description:
name: fcm_shared_isolate
sha256: "18dc57d9ce7fa6b250f857ef8c823b3f7f1d1b428584557c1e9f2064e9227f6b"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
ffi:
dependency: transitive
description:
@ -473,30 +465,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.9.3+4"
firebase_core:
dependency: transitive
description:
name: firebase_core
sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c"
url: "https://pub.dev"
source: hosted
version: "2.32.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
url: "https://pub.dev"
source: hosted
version: "5.4.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: ddd72baa6f727e5b23f32d9af23d7d453d67946f380bd9c21daf474ee0f7326e
url: "https://pub.dev"
source: hosted
version: "2.23.0"
fixnum:
dependency: transitive
description:

@ -5,8 +5,8 @@ flutter pub get
if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' 's,//<GOOGLE_SERVICES>,,g' lib/utils/background_push.dart
sed -i '' -e 's,^/\*,,' -e 's,\*/$,,' android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt
sed -i '' -e 's,^/\*,,' -e 's,\*/$,,' android/app/src/main/kotlin/chat/pantheon/hermes/FcmPushService.kt
else
sed -i 's,//<GOOGLE_SERVICES>,,g' lib/utils/background_push.dart
sed -i -e 's,^/\*,,' -e 's,\*/$,,' android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt
sed -i -e 's,^/\*,,' -e 's,\*/$,,' android/app/src/main/kotlin/chat/pantheon/hermes/FcmPushService.kt
fi

@ -102,7 +102,7 @@ slots:
dbus-svc:
interface: dbus
bus: session
name: chat.fluffy.hermes
name: chat.pantheon.hermes
apps:
hermes:
@ -128,4 +128,4 @@ apps:
XDG_DATA_HOME: $SNAP_USER_DATA
XDG_DATA_DIRS: $SNAP/usr/share
GDK_GL: gles
LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET"
LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET"

@ -11,7 +11,6 @@
#include <dynamic_color/dynamic_color_plugin_c_api.h>
#include <emoji_picker_flutter/emoji_picker_flutter_plugin_c_api.h>
#include <file_selector_windows/file_selector_windows.h>
#include <firebase_core/firebase_core_plugin_c_api.h>
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
#include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
#include <geolocator_windows/geolocator_windows.h>
@ -36,8 +35,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("EmojiPickerFlutterPluginCApi"));
FileSelectorWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FileSelectorWindows"));
FirebaseCorePluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
FlutterWebRTCPluginRegisterWithRegistrar(

@ -8,7 +8,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
dynamic_color
emoji_picker_flutter
file_selector_windows
firebase_core
flutter_secure_storage_windows
flutter_webrtc
geolocator_windows

Loading…
Cancel
Save