Merge branch 'trunk' into erinn45

fetch-tor-win.ps1

@@ -1,6 +1,6 @@
 
-Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip -OutFile tor.zip
+Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip
 
-if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '72764eb07ad8ab511603aba0734951ca003989f5f4686af91ba220217b4a8a4bcc5f571b59f52c847932f6efedf847b111621983050fcddbb8099d43ca66fb07' ) { Write-Error 'tor.zip sha512sum mismatch' }
+if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }
 
 Expand-Archive -Path tor.zip -DestinationPath Tor

lib/widgets/messagerow.dart

@@ -5,6 +5,7 @@ import 'package:cwtch/models/message.dart';
 import 'package:cwtch/views/contactsview.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/widgets/profileimage.dart';
+import 'package:flutter/physics.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -20,9 +21,31 @@ class MessageRow extends StatefulWidget {
   MessageRowState createState() => MessageRowState();
 }
 
-class MessageRowState extends State<MessageRow> {
+class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMixin {
   bool showMenu = false;
   bool showBlockedMessage = false;
+  late AnimationController _controller;
+  late Animation<Alignment> _animation;
+  late Alignment _dragAlignment = Alignment.center;
+  Alignment _dragAffinity = Alignment.center;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(vsync: this);
+    _controller.addListener(() {
+      setState(() {
+        _dragAlignment = _animation.value;
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
@@ -30,6 +53,12 @@ class MessageRowState extends State<MessageRow> {
     var isBlocked = isContact ? Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle)!.isBlocked : false;
     var actualMessage = Flexible(flex: 3, fit: FlexFit.loose, child: widget.child);
 
+    _dragAffinity = fromMe ? Alignment.centerRight : Alignment.centerLeft;
+
+    if (_dragAlignment == Alignment.center) {
+      _dragAlignment = fromMe ? Alignment.centerRight : Alignment.centerLeft;
+    }
+
     var senderDisplayStr = "";
     if (!fromMe) {
       ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
@@ -52,7 +81,7 @@ class MessageRowState extends State<MessageRow> {
               Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
             },
             icon: Icon(Icons.reply, color: Provider.of<Settings>(context).theme.dropShadowColor())));
-    Widget wdgSpacer = Expanded(child: SizedBox(width: 60, height: 10));
+    Widget wdgSpacer = Flexible(child: SizedBox(width: 60, height: 10));
     var widgetRow = <Widget>[];
 
     if (fromMe) {
@@ -131,10 +160,9 @@ class MessageRowState extends State<MessageRow> {
         wdgSpacer,
       ];
     }
-
+    var size = MediaQuery.of(context).size;
     return MouseRegion(
         // For desktop...
-
         onHover: (event) {
           setState(() {
             this.showMenu = true;
@@ -146,14 +174,55 @@ class MessageRowState extends State<MessageRow> {
           });
         },
         child: GestureDetector(
+            onPanUpdate: (details) {
+              setState(() {
+                _dragAlignment += Alignment(
+                  details.delta.dx / (size.width * 0.5),
+                  0,
+                );
+              });
+            },
+            onPanDown: (details) {
+              _controller.stop();
+            },
+            onPanEnd: (details) {
+              _runAnimation(details.velocity.pixelsPerSecond, size);
+              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
+            },
+            child: Padding(
+                padding: EdgeInsets.all(2),
+                child: Align(
+                    widthFactor: 1,
+                    alignment: _dragAlignment,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: widgetRow,
+                    )))));
+  }
+
+  void _runAnimation(Offset pixelsPerSecond, Size size) {
+    _animation = _controller.drive(
+      AlignmentTween(
+        begin: _dragAlignment,
+        end: _dragAffinity,
+      ),
+    );
+    // Calculate the velocity relative to the unit interval, [0,1],
+    // used by the animation controller.
+    final unitsPerSecondX = pixelsPerSecond.dx / size.width;
+    final unitsPerSecondY = pixelsPerSecond.dy / size.height;
+    final unitsPerSecond = Offset(unitsPerSecondX, unitsPerSecondY);
+    final unitVelocity = unitsPerSecond.distance;
+
+    const spring = SpringDescription(
+      mass: 30,
+      stiffness: 1,
+      damping: 1,
+    );
 
-            // Swipe to quote on Android
-            onHorizontalDragEnd: Platform.isAndroid
-                ? (details) {
-                    Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
-                  }
-                : null,
-            child: Padding(padding: EdgeInsets.all(2), child: Row(mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start, children: widgetRow))));
+    final simulation = SpringSimulation(spring, 0, 1, -unitVelocity);
+    _controller.animateWith(simulation);
   }
 
   void _btnGoto() {