fluffychat merge

assets/l10n/intl_en.arb

@@ -185,7 +185,9 @@
   },
   "sendTypingNotifications": "Send typing notifications",
   "@sendTypingNotifications": {},
-  "sendOnEnter": "Always send on enter",
+  "swipeRightToLeftToReply": "Swipe right to left to reply",
+  "@swipeRightToLeftToReply": {},
+  "sendOnEnter": "Send on enter",
   "@sendOnEnter": {},
   "badServerVersionsException": "The homeserver supports the Spec versions:\n{serverVersions}\nBut this app supports only {supportedVersions}",
   "@badServerVersionsException": {

lib/config/setting_keys.dart

@@ -26,6 +26,8 @@ abstract class SettingKeys {
   static const String sendPublicReadReceipts =
       'chat.fluffy.send_public_read_receipts';
   static const String sendOnEnter = 'chat.fluffy.send_on_enter';
+  static const String swipeRightToLeftToReply =
+      'chat.fluffy.swipeRightToLeftToReply';
   static const String experimentalVoip = 'chat.fluffy.experimental_voip';
   static const String showPresences = 'chat.fluffy.show_presences';
   static const String displayChatDetailsColumn =

lib/pages/settings_chat/settings_chat_view.dart

@@ -28,14 +28,14 @@ class SettingsChatView extends StatelessWidget {
               //   storeKey: SettingKeys.renderHtml,
               //   defaultValue: AppConfig.renderHtml,
               // ),
+              // SettingsSwitchListTile.adaptive(
+              //   title: L10n.of(context)!.hideMemberChangesInPublicChats,
+              //   subtitle: L10n.of(context)!.hideMemberChangesInPublicChatsBody,
+              //   onChanged: (b) => AppConfig.hideUnimportantStateEvents = b,
+              //   storeKey: SettingKeys.hideUnimportantStateEvents,
+              //   defaultValue: AppConfig.hideUnimportantStateEvents,
+              // ),
               // Pangea#
-              SettingsSwitchListTile.adaptive(
-                title: L10n.of(context)!.hideMemberChangesInPublicChats,
-                subtitle: L10n.of(context)!.hideMemberChangesInPublicChatsBody,
-                onChanged: (b) => AppConfig.hideUnimportantStateEvents = b,
-                storeKey: SettingKeys.hideUnimportantStateEvents,
-                defaultValue: AppConfig.hideUnimportantStateEvents,
-              ),
               SettingsSwitchListTile.adaptive(
                 title: L10n.of(context)!.hideRedactedMessages,
                 subtitle: L10n.of(context)!.hideRedactedMessagesBody,
@@ -49,7 +49,7 @@ class SettingsChatView extends StatelessWidget {
                 storeKey: SettingKeys.hideUnknownEvents,
                 defaultValue: AppConfig.hideUnknownEvents,
               ),
-              // Pangea#
+              // #Pangea
               // if (PlatformInfos.isMobile)
               //   SettingsSwitchListTile.adaptive(
               //     title: L10n.of(context)!.autoplayImages,
@@ -57,14 +57,20 @@ class SettingsChatView extends StatelessWidget {
               //     storeKey: SettingKeys.autoplayImages,
               //     defaultValue: AppConfig.autoplayImages,
               //   ),
-              // Pangea#
-              // #Pangea
               // SettingsSwitchListTile.adaptive(
               //   title: L10n.of(context)!.sendOnEnter,
               //   onChanged: (b) => AppConfig.sendOnEnter = b,
               //   storeKey: SettingKeys.sendOnEnter,
               //   defaultValue: AppConfig.sendOnEnter ?? !PlatformInfos.isMobile,
               // ),
+              // Pangea#
+              SettingsSwitchListTile.adaptive(
+                title: L10n.of(context)!.swipeRightToLeftToReply,
+                onChanged: (b) => AppConfig.swipeRightToLeftToReply = b,
+                storeKey: SettingKeys.swipeRightToLeftToReply,
+                defaultValue: AppConfig.swipeRightToLeftToReply,
+              ),
+              // #Pangea
               // Divider(
               //   height: 1,
               //   color: Theme.of(context).dividerColor,

lib/widgets/matrix.dart

@@ -466,6 +466,10 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
     AppConfig.renderHtml =
         store.getBool(SettingKeys.renderHtml) ?? AppConfig.renderHtml;
 
+    AppConfig.swipeRightToLeftToReply =
+        store.getBool(SettingKeys.swipeRightToLeftToReply) ??
+            AppConfig.swipeRightToLeftToReply;
+
     AppConfig.hideRedactedEvents =
         store.getBool(SettingKeys.hideRedactedEvents) ??
             AppConfig.hideRedactedEvents;

needed-translations.txt

@@ -4,6 +4,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -904,6 +905,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -2393,6 +2395,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -3886,6 +3889,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -5340,6 +5344,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -6234,6 +6239,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -7211,6 +7217,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -8072,6 +8079,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "changeDeviceName",
     "changedTheChatAvatar",
     "changedTheChatDescriptionTo",
@@ -9532,6 +9540,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "yourChatBackupHasBeenSetUp",
     "classes",
     "commandHint_markasdm",
@@ -10654,6 +10663,7 @@
 
   "es": [
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "globalChatId",
     "accessAndVisibility",
     "accessAndVisibilityDescription",
@@ -10694,6 +10704,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -11459,8 +11470,6 @@
     "clickToManageSubscription",
     "emptyInviteWarning",
     "errorGettingAudio",
-    "gallery",
-    "files",
     "signUp",
     "pleaseChooseAtLeastChars",
     "noEmailWarning",
@@ -11556,6 +11565,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -12425,6 +12435,7 @@
     "alreadyHaveAnAccount",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "createGroup",
     "createNewGroup",
@@ -13418,6 +13429,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -14380,6 +14392,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -15703,6 +15716,7 @@
     "alreadyHaveAnAccount",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -16713,6 +16727,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_markasdm",
     "commandHint_markasgroup",
@@ -17824,6 +17839,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -18676,9 +18692,7 @@
     "capacitySetTooLow",
     "roomCapacityExplanation",
     "enterNumber",
-    "buildTranslation",
+    "buildTranslation"
-    "restricted",
-    "knockRestricted"
   ],
 
   "he": [
@@ -18703,6 +18717,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_markasdm",
     "commandHint_markasgroup",
@@ -19965,6 +19980,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -21419,6 +21435,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -22357,6 +22374,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -23259,6 +23277,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -24712,6 +24731,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -25597,6 +25617,7 @@
     "areGuestsAllowedToJoin",
     "askSSSSSign",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "changedTheChatAvatar",
     "changedTheChatDescriptionTo",
     "changedTheChatNameTo",
@@ -26829,6 +26850,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -27758,6 +27780,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_kick",
     "commandHint_me",
@@ -28773,6 +28796,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "badServerVersionsException",
     "classes",
     "commandHint_markasdm",
@@ -30120,6 +30144,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -30996,6 +31021,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "createGroup",
     "createNewGroup",
@@ -32010,6 +32036,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -32893,6 +32920,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "yourChatBackupHasBeenSetUp",
     "chatHasBeenAddedToThisSpace",
     "chats",
@@ -34071,6 +34099,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -35027,6 +35056,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -36027,6 +36057,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -37462,6 +37493,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -38344,6 +38376,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_markasdm",
     "commandHint_markasgroup",
@@ -39529,6 +39562,7 @@
     "alreadyHaveAnAccount",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "createGroup",
     "createNewGroup",
@@ -40521,6 +40555,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -41403,6 +41438,7 @@
     "appLockDescription",
     "autoplayImages",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "blocked",
     "botMessages",
     "changeYourAvatar",
@@ -42663,6 +42699,7 @@
     "hugContent",
     "appLockDescription",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_markasdm",
     "commandHint_markasgroup",
@@ -44055,6 +44092,7 @@
     "appLockDescription",
     "autoplayImages",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "cantOpenUri",
     "yourChatBackupHasBeenSetUp",
@@ -45199,6 +45237,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -46132,6 +46171,7 @@
     "autoplayImages",
     "badServerLoginTypesException",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "badServerVersionsException",
     "banFromChat",
@@ -47586,6 +47626,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "badServerVersionsException",
     "banFromChat",
     "banned",
@@ -49029,6 +49070,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -49881,9 +49923,7 @@
     "capacitySetTooLow",
     "roomCapacityExplanation",
     "enterNumber",
-    "buildTranslation",
+    "buildTranslation"
-    "restricted",
-    "knockRestricted"
   ],
 
   "uk": [
@@ -49892,6 +49932,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -50784,22 +50825,9 @@
   ],
 
   "vi": [
-    "repeatPassword",
-    "notAnImage",
-    "remove",
-    "importNow",
-    "importEmojis",
-    "importFromZipFile",
-    "exportEmotePack",
-    "replace",
     "accountInformation",
-    "confirmMatrixId",
-    "supposedMxid",
     "addGroupDescription",
     "addNewFriend",
-    "addToSpace",
-    "all",
-    "allChats",
     "alreadyHaveAnAccount",
     "commandHint_googly",
     "commandHint_cuddle",
@@ -50807,11 +50835,10 @@
     "googlyEyesContent",
     "cuddleContent",
     "hugContent",
-    "appLock",
-    "appLockDescription",
     "askSSSSSign",
     "autoplayImages",
     "sendTypingNotifications",
+    "swipeRightToLeftToReply",
     "sendOnEnter",
     "botMessages",
     "cantOpenUri",
@@ -50993,7 +51020,6 @@
     "noPasswordRecoveryDescription",
     "noPermission",
     "noRoomsFound",
-    "notifications",
     "notificationsEnabledForThisAccount",
     "numUsersTyping",
     "obtainingLocation",
@@ -51027,7 +51053,6 @@
     "hideMemberChangesInPublicChats",
     "hideMemberChangesInPublicChatsBody",
     "overview",
-    "notifyMeFor",
     "passwordRecoverySettings",
     "passwordRecovery",
     "people",
@@ -51081,7 +51106,6 @@
     "sendImage",
     "sendMessages",
     "sendOriginal",
-    "sendSticker",
     "sendVideo",
     "sentAFile",
     "sentAnAudio",
@@ -51096,7 +51120,6 @@
     "setInvitationLink",
     "setPermissionsLevel",
     "setStatus",
-    "settings",
     "share",
     "sharedTheLocation",
     "shareLocation",
@@ -51235,52 +51258,14 @@
     "foregroundServiceRunning",
     "screenSharingTitle",
     "screenSharingDetail",
-    "callingPermissions",
-    "callingAccount",
     "callingAccountDetails",
     "appearOnTop",
     "appearOnTopDetails",
     "otherCallingPermissions",
     "whyIsThisMessageEncrypted",
     "noKeyForThisMessage",
-    "newGroup",
-    "newSpace",
-    "enterSpace",
-    "enterRoom",
-    "allSpaces",
-    "numChats",
-    "hideUnimportantStateEvents",
-    "hidePresences",
-    "doNotShowAgain",
-    "wasDirectChatDisplayName",
-    "newSpaceDescription",
-    "encryptThisChat",
-    "disableEncryptionWarning",
-    "sorryThatsNotPossible",
     "deviceKeys",
-    "reopenChat",
-    "noBackupWarning",
-    "noOtherDevicesFound",
-    "fileIsTooBigForServer",
-    "fileHasBeenSavedAt",
-    "jumpToLastReadMessage",
-    "readUpToHere",
-    "jump",
-    "openLinkInBrowser",
-    "reportErrorDescription",
-    "report",
-    "signInWithPassword",
-    "pleaseTryAgainLaterOrChooseDifferentServer",
-    "signInWith",
-    "profileNotFound",
-    "setTheme",
-    "setColorTheme",
-    "invite",
     "requests",
-    "inviteGroupChat",
-    "invitePrivateChat",
-    "invalidInput",
-    "wrongPinEntered",
     "allCorrect",
     "newWayAllGood",
     "othersAreBetter",
@@ -52023,18 +52008,7 @@
     "reportMessageTitle",
     "reportMessageBody",
     "noTeachersFound",
-    "pleaseEnterANumber",
-    "archiveRoomDescription",
-    "roomUpgradeDescription",
-    "removeDevicesDescription",
-    "banUserDescription",
-    "unbanUserDescription",
-    "kickUserDescription",
-    "makeAdminDescription",
-    "pushNotificationsNotAvailable",
-    "learnMore",
     "yourGlobalUserIdIs",
-    "noUsersFoundWithQuery",
     "knocking",
     "chatCanBeDiscoveredViaSearchOnServer",
     "searchChatsRooms",
@@ -52142,11 +52116,6 @@
     "autoPlayTitle",
     "autoPlayDesc",
     "transparent",
-    "incomingMessages",
-    "stickers",
-    "discover",
-    "commandHint_ignore",
-    "commandHint_unignore",
     "unreadChatsInApp",
     "messageAnalytics",
     "words",
@@ -52198,7 +52167,6 @@
     "buildTranslation",
     "noDatabaseEncryption",
     "thereAreCountUsersBlocked",
-    "restricted",
     "knockRestricted"
   ],
 
@@ -52207,6 +52175,7 @@
     "addGroupDescription",
     "addNewFriend",
     "alreadyHaveAnAccount",
+    "swipeRightToLeftToReply",
     "classes",
     "createNewGroup",
     "editChatPermissions",
@@ -53059,9 +53028,7 @@
     "capacitySetTooLow",
     "roomCapacityExplanation",
     "enterNumber",
-    "buildTranslation",
+    "buildTranslation"
-    "restricted",
-    "knockRestricted"
   ],
 
   "zh_Hant": [
@@ -53070,6 +53037,7 @@
     "addNewFriend",
     "alreadyHaveAnAccount",
     "appLockDescription",
+    "swipeRightToLeftToReply",
     "classes",
     "commandHint_markasdm",
     "commandHint_markasgroup",