Merge pull request #213 from Foundation-Devices/envoy_ui

Envoy UI
Foundation-Devices · May 17, 2023 · 23f6ef4 · 23f6ef4
2 parents 23f4007 + a77c362
commit 23f6ef4
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 9 deletions.
diff --git a/lib/ui/amount.dart b/lib/ui/amount.dart
@@ -3,13 +3,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import 'dart:async';
+
 import 'package:envoy/business/exchange_rate.dart';
+import 'package:envoy/business/settings.dart';
 import 'package:envoy/util/haptics.dart';
 import 'package:flutter_neumorphic/flutter_neumorphic.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:wallet/wallet.dart';
-import 'package:envoy/business/settings.dart';
 
 import 'envoy_colors.dart';
 
@@ -85,6 +86,11 @@ class AmountEntryState extends State<AmountEntry> {
               } else {
                 _enteredAmount = _enteredAmount + event;
               }
+              //limit entered amount
+              if (amountSats >= 2.1e15) {
+                _enteredAmount =
+                    _enteredAmount.substring(0, _enteredAmount.length - 1);
+              }
             });
           }
       }
@@ -297,7 +303,11 @@ int convertSatsStringToSats(String amountSats) {
   if (amountSats.isEmpty) {
     return 0;
   }
-  return int.parse(amountSats);
+  try {
+    return int.parse(amountSats);
+  } catch (e) {
+    return 0;
+  }
 }
 
 int convertBtcStringToSats(String amountBtc) {

diff --git a/lib/ui/embedded_video.dart b/lib/ui/embedded_video.dart
@@ -22,6 +22,7 @@ class EmbeddedVideoState extends State<EmbeddedVideo> {
   Timer? _updatePositionTimer;
   int _position = 0;
   int _duration = 3;
+  bool _muted = false;
 
   @override
   void initState() {
@@ -58,12 +59,18 @@ class EmbeddedVideoState extends State<EmbeddedVideo> {
   Widget build(BuildContext context) {
     return Stack(
       children: [
-        ClipRRect(
-          borderRadius: BorderRadius.all(Radius.circular(8)),
-          child: VlcPlayer(
-            controller: _videoPlayerController!,
-            aspectRatio: 4 / 3,
-            placeholder: Center(child: CircularProgressIndicator()),
+        Card(
+          elevation: 12,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: ClipRRect(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+            child: VlcPlayer(
+              controller: _videoPlayerController!,
+              aspectRatio: 4 / 3,
+              placeholder: Center(child: CircularProgressIndicator()),
+            ),
           ),
         ),
         Positioned.fill(
@@ -84,6 +91,26 @@ class EmbeddedVideoState extends State<EmbeddedVideo> {
             ),
           ),
         ),
+        Align(
+          child: Material(
+            color: Colors.transparent,
+            child: IconButton(
+              color: Colors.white,
+              icon: Icon(_muted ? Icons.volume_off_sharp : Icons.volume_up),
+              onPressed: () async {
+                setState(() {
+                  _muted = !_muted;
+                  if (_muted) {
+                    _videoPlayerController?.setVolume(0);
+                  } else {
+                    _videoPlayerController?.setVolume(100);
+                  }
+                });
+              },
+            ),
+          ),
+          alignment: Alignment.topRight,
+        )
       ],
     );
   }

diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart
@@ -112,6 +112,8 @@ class _HomePageState extends ConsumerState<HomePage>
       if (onboarded != true) {
         Navigator.pushNamed(context, "/splash");
       }
+      //Sets default home card
+      _navigateToCard(1);
     });
     // Home is there for the lifetime of the app so no need to dispose stream
     ConnectivityManager().events.stream.listen((event) {
@@ -279,7 +281,10 @@ class _HomePageState extends ConsumerState<HomePage>
               _leftAction?.call();
               return false;
             } else {
-              if (_tabController.index != 1) {
+              if (_leftAction != null && _leftAction != _toggleSettings) {
+                _leftAction?.call();
+                return false;
+              } else if (_tabController.index != 1) {
                 _tabController.animateTo(1);
                 return false;
               }