Merge pull request syphon-org#693 from syphon-org/dev

[release] Version 0.2.14

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.10.3",
+  "flutterSdkVersion": "3.0.5",
   "flavors": {}
 }

.github/pull_request_template.md

@@ -32,3 +32,4 @@
 - [ ] All associated issues have been linked to PR
 - [ ] All necessary changes made to the documentation
 - [ ] Parties interested in these changes have been notified
+- [ ] Linter has been run on all code in the PR

.gitignore

@@ -52,9 +52,6 @@ android/app/.cxx/*
 # Ignore generated files
 android/.*
 
-# ignore olm import for macos
-macos/olm
-
 # ignore flutter pod spec
 Flutter.podspec
 
@@ -69,3 +66,7 @@ Flutter.podspec
 
 # generated shared lib artifacts for iOS
 **/dgph
+
+# testing files
+
+testing*

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "windows/olm"]
 	path = windows/olm
 	url = https://gitlab.matrix.org/matrix-org/olm.git
+[submodule "android/olm"]
+	path = android/olm
+	url = https://gitlab.matrix.org/matrix-org/olm.git

.vscode/settings.json

@@ -1,6 +1,37 @@
 {
   "editor.tabSize": 2,
+  "dart.lineLength": 110,
   "[dart]": {
-    "editor.formatOnSave": true
-  }
+    "editor.formatOnSave": true,
+    "editor.rulers": [110],
+
+    // // Disables built-in highlighting of words that match your selection. Without
+    // // this, all instances of the selected text will be highlighted, interfering
+    // // with Dart's ability to highlight only exact references to the selected variable.
+    // "editor.selectionHighlight": false,
+
+    // // By default, VS Code prevents code completion from popping open when in
+    // // "snippet mode" (editing placeholders in inserted code). Setting this option
+    // // to `false` stops that and allows completion to open as normal, as if you
+    // // weren't in a snippet placeholder.
+    // "editor.suggest.snippetsPreventQuickSuggestions": false,
+
+    // // By default, VS Code will pre-select the most recently used item from code
+    // // completion. This is usually not the most relevant item.
+    // //
+    // // "first" will always select top item
+    // // "recentlyUsedByPrefix" will filter the recently used items based on the
+    // //     text immediately preceding where completion was invoked.
+    // "editor.suggestSelection": "first",
+
+    // // Allows pressing <TAB> to complete snippets such as `for` even when the
+    // // completion list is not visible.
+    // "editor.tabCompletion": "onlySnippets",
+
+    // // By default, VS Code will populate code completion with words found in the
+    // // current file when a language service does not provide its own completions.
+    // // This results in code completion suggesting words when editing comments and
+    // // strings. This setting will prevent that.
+    // "editor.wordBasedSuggestions": false,
+  }  
 }

analysis_options.yaml

@@ -4,6 +4,9 @@ include: package:lint/analysis_options.yaml
 analyzer:
   strong-mode:
     implicit-casts: true
+  exclude:
+    - lib/**/*.g.dart
+    - test/_data/**
 
 linter:
   rules:
@@ -14,6 +17,8 @@ linter:
     prefer_typing_uninitialized_variables: false
     empty_catches: false
     avoid_dynamic_calls: false
+    prefer_constructors_over_static_methods: false
+    curly_braces_in_flow_control_structures: true
     # sort_constructors_first: true
     # always_put_required_named_parameters_first: true
     # always_specify_types: true

android/app/build.gradle

@@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,7 +45,7 @@ android {
     defaultConfig {
         applicationId "org.tether.tether"
         minSdkVersion 18
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
@@ -77,7 +77,7 @@ android {
         // Encapsulates your CMake build configurations.
         cmake {
             // Provides a relative path to your CMake build script.
-            path "../../ios/olm/CMakeLists.txt"
+            path "../olm/CMakeLists.txt"
             version "3.10.2"
         }
     }

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -90,6 +90,11 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch(Exception e) {
       Log.e(TAG, "Error registering plugin permission_handler, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
     }
+    try {
+      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.share.SharePlusPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin share_plus, dev.fluttercommunity.plus.share.SharePlusPlugin", e);
+    }
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
     } catch(Exception e) {
@@ -120,5 +125,10 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch(Exception e) {
       Log.e(TAG, "Error registering plugin webview_flutter, io.flutter.plugins.webviewflutter.WebViewFlutterPlugin", e);
     }
+    try {
+      flutterEngine.getPlugins().add(new be.tramckrijte.workmanager.WorkmanagerPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin workmanager, be.tramckrijte.workmanager.WorkmanagerPlugin", e);
+    }
   }
 }

assets/translations/ar.json

@@ -131,9 +131,9 @@
     "title-view-search-groups": "استكشاف المجموعات",
     "title-view-delete-devices": "تأكيد إزالة الجهاز",
     "title-verification": "التحقق",
-    "header-login": "استرجع الدردشة",
+    "header-login": "سيطِر على محادثاتك",
     "label-send": "ارسل",
-    "button-leave-chat": "ترك الدردشة",
+    "button-leave-chat": "مغادرة الدردشة",
     "label-back": "الرجوع للخلف",
     "label-close": "اغلاق",
     "button-delete-chat": "حذف الدردشة",
@@ -333,7 +333,14 @@
     "content-remove-screen-lock": "هل أنت متأكد أنك تريد إزالة قفل الشاشة؟ هذا سيزيل أيضاً حماية المخبأ",
     "list-item-settings-dismiss-keyboard": "تجاهل لوحة المفاتيح",
     "list-item-settings-auto-download": "تنزيل تلقائي",
-    "alert-log-out-enable-multiaccount": "يجب عليك تسجيل الخروج من جلسة العمل الحالية لتمكين الحسابات المتعددة",
+    "alert-log-out-enable-multiaccount": "يجب عليك تسجيل الخروج من جلسة العمل/n الحالية لتمكين الحسابات المتعددة",
     "content-export-session-keys": "أدخل كلمة مرور للنسخ الاحتياطي لمفتاح الجلسة هذا.\n\nيرجى الانتباه إلى أن التصدير قد يستغرق بعض الوقت لإكماله.",
-    "content-logout-multiaccount-confirm": "\n\nنظرا لأن لديك حسابات أخرى ، فإن تسجيل الخروج سيحولك إلى جلسة حساب أخرى."
+    "content-logout-multiaccount-confirm": "\n\nنظرا لأن لديك حسابات أخرى ، فإن تسجيل الخروج سيحولك إلى جلسة حساب أخرى.",
+    "alert-copied-to-clipboard": "تم نسخها إلى الحافظة",
+    "label-fab-create-dm": "رسالة مباشرة",
+    "title-dialog-key-backup-warning": "تحذير النسخ الاحتياطي الرئيسي",
+    "content-key-backup-warning": "نظرا لمعالجة الخلفية على iOS ، قد يتم تشغيل النسخة الاحتياطية المجدولة أو لا يتم تشغيلها بناء على البطارية وقوة المعالجة وعوامل أخرى.\n\nتأكد دائما من حفظ النسخ الاحتياطية بشكل مناسب.",
+    "label-fab-search": "البحث في المحادثات",
+    "label-fab-create-group": "بدء الدردشة الجماعية",
+    "label-fab-create-public": "بدء الدردشة العامة"
 }