Merge branch 'main' of https://github.com/sorydima/REChain-

.drone.yml

@@ -0,0 +1,120 @@
+kind: pipeline
+type: docker
+name: flutter-multi-platform
+
+steps:
+  # Clone repository
+  - name: clone
+    image: plugins/git
+    settings:
+      depth: 50
+
+  # Setup environment and install dependencies
+  - name: install-dependencies
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter pub get
+
+  # Build APK for Android
+  - name: build-android
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build apk --release
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Build iOS App
+  - name: build-ios
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build ios --release --no-codesign
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Build for Web (PWA)
+  - name: build-web
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build web --release
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Build for Linux Desktop
+  - name: build-linux
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build linux --release
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Build for macOS Desktop
+  - name: build-macos
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build macos --release
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Build for Windows Desktop
+  - name: build-windows
+    image: cirrusci/flutter:stable
+    commands:
+      - flutter build windows --release
+    when:
+      event:
+        - push
+        - pull_request
+      branch:
+        - main
+
+  # Deploy using SSH (Docker)
+  - name: deploy
+    image: plugins/ssh
+    environment:
+      SSH_KEY:
+        from_secret: ssh_key
+      DOCKER_HOST: tcp://your-docker-host:2376
+      DOCKER_TLS_VERIFY: "1"
+      DOCKER_CERT_PATH: "/path/to/docker/certs"
+    settings:
+      host: your-server.com
+      username: your-username
+      port: 22
+      script:
+        - echo "Deploying Flutter app via SSH"
+        - docker pull your-docker-image:latest
+        - docker stop your-container || true
+        - docker rm your-container || true
+        - docker run -d --name your-container your-docker-image:latest
+    when:
+      event:
+        - push
+      branch:
+        - main
+
+trigger:
+  branch:
+    - main
+  event:
+    - push
+    - pull_request

CODE_OF_CONDUCT.md

@@ -0,0 +1,43 @@
+# Code of Conduct for the REChain Project
+
+## Introduction
+
+As contributors and maintainers of the REChain project, we are committed to fostering a welcoming and inclusive environment for everyone. We pledge to treat all individuals with respect and dignity, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+We strive to create a positive and constructive community. Examples of behavior that contribute to a welcoming environment include:
+
+- Using inclusive and supportive language.
+- Being respectful of differing opinions and perspectives.
+- Accepting constructive feedback gracefully.
+- Prioritizing the needs of the community over personal interests.
+- Demonstrating empathy towards fellow community members.
+
+Examples of unacceptable behavior by participants include:
+
+- Engaging in sexualized language or imagery and unwelcome sexual advances.
+- Trolling, insulting, or derogatory comments, and personal attacks.
+- Public or private harassment.
+- Disclosing others' private information, such as addresses or contact information, without consent.
+- Any conduct that could be considered inappropriate in a professional environment.
+
+## Enforcement Responsibilities
+
+Project maintainers are tasked with clarifying and enforcing the standards of acceptable behavior. They have the authority to take appropriate and fair action in response to any instances of unacceptable behavior.
+
+Project maintainers reserve the right to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that do not align with this Code of Conduct. They may also temporarily or permanently ban any contributor for behavior deemed inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within project spaces and public spaces when individuals represent the project or its community. Representation includes using official project communication channels, posting through official social media accounts, or acting as a designated representative at any event. Specific representation definitions may be outlined by project maintainers.
+
+## Enforcement
+
+If you experience or witness any behavior that violates this Code of Conduct, please report it to the project maintainers at support@adminmarina.ru. All reports will be reviewed and investigated, and appropriate actions will be taken based on the circumstances. Maintainers are committed to maintaining confidentiality regarding the reporter of an incident.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, which can be found at https://www.contributor-covenant.org/version/1/4/code_of_conduct.md.
+
+For more information and answers to frequently asked questions about this code of conduct, please refer to the [Contributor Covenant FAQ](https://www.contributor-covenant.org/faq).

lib/config/app_config.dart

@@ -61,7 +61,6 @@ abstract class AppConfig {
   static const String schemePrefix = 'matrix:';
   static const String pushNotificationsChannelId = 'rechainonline_push';
   static const String pushNotificationsAppId = 'com.rechain.online';
-  \\\ We're collabarating with the External Push GateWay with the Matrix SDK, Matrix API and Unified Push for the REChain ..
   static const String pushNotificationsGatewayUrl =
       'https://push.fluffychat.im/_matrix/push/v1/notify';
   static const String pushNotificationsPusherFormat = 'event_id_only';

lib/pages/chat_list/chat_list.dart

@@ -491,8 +491,8 @@ class ChatListController extends State<ChatList>
 
     // For receiving shared Uris
     _intentUriStreamSubscription = linkStream.listen(_processIncomingUris);
-    if (rechainonlineApp.gotInitialLink == false) {
-      rechainonlineApp.gotInitialLink = true;
+    if (rechainonlineChatApp.gotInitialLink == false) {
+      rechainonlineChatApp.gotInitialLink = true;
       getInitialLink().then(_processIncomingUris);
     }
 

lib/pages/login/login.dart

@@ -129,7 +129,7 @@ class LoginController extends State<Login> {
             context: context,
             useRootNavigator: false,
             message:
-                L10n.of(context)!.noMatrixServer(newDomain, oldHomeserver!),
+                L10n.of(context)!.norechainonlineServer(newDomain, oldHomeserver!),
             okLabel: L10n.of(context)!.ok,
             cancelLabel: L10n.of(context)!.cancel,
           );

lib/utils/matrix_sdk_extensions/matrix_locals.dart

@@ -19,7 +19,7 @@ class MatrixLocals extends MatrixLocalizations {
 
   @override
   String answeredTheCall(String senderName) {
-    return l10n.answeredTheCall(senderName);
+    return l10n.answeredTheCall(senderName, senderName);
   }
 
   @override