Merge pull request #66 from LtbLightning/refactor/example

Refactor PayjoinManager and FeesRangeOptions components;

Author: BitcoinZavior

example/lib/managers/payjoin_manager.dart

@@ -1,11 +1,10 @@
 import 'dart:convert';
-import 'dart:typed_data';
 
 import 'package:bdk_flutter/bdk_flutter.dart' as bdk;
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
-import 'package:payjoin_flutter/uri.dart' as pj_uri;
 import 'package:payjoin_flutter/send.dart';
+import 'package:payjoin_flutter/uri.dart' as pj_uri;
 
 class PayjoinManager {
   static const pjUrl = "https://localhost:8088";
@@ -302,11 +301,6 @@ class PayjoinManager {
   //   }
   // }
 
-  Future<bool> _isOwned(Uint8List bytes, bdk.Wallet wallet) async {
-    final script = bdk.ScriptBuf(bytes: bytes);
-    return wallet.isMine(script: script);
-  }
-
   Future<String> processPsbt(String preProcessed, bdk.Wallet wallet) async {
     final psbt = await bdk.PartiallySignedTransaction.fromString(preProcessed);
     debugPrint('PSBT before: ${psbt.toString()}');

example/lib/screens/home.dart

@@ -12,6 +12,7 @@ import 'package:payjoin_flutter/receive.dart';
 import 'package:payjoin_flutter/send.dart';
 import 'package:payjoin_flutter/uri.dart' as pjuri;
 import 'package:url_launcher/url_launcher.dart';
+
 import '../widgets/widgets.dart';
 
 const payjoinDirectory = "https://payjo.in";
@@ -680,7 +681,7 @@ class _HomeState extends State<Home> {
     // Create receiver session with new bindings
     debugPrint('INITIALIZING PERSISTER');
 
-    final newReceiver = await NewReceiver.create(
+    final newReceiver = NewReceiver.create(
       address: recipientAddress.text,
       network: Network.signet,
       directory: payjoinDirectory,
@@ -798,11 +799,9 @@ class InMemoryReceiverPersister {
     return receiver;
   }
 
-  @override
   void dispose() {
     _store.clear();
   }
 
-  @override
   bool get isDisposed => _store.isEmpty;
 }

example/lib/styles/theme.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 ThemeData theme() {
   Color secondaryColor = Colors.orange;
-  Color primaryColor = Colors.blue.withOpacity(.8);
+  Color primaryColor = Colors.blue.withValues(alpha: 0.8);
   return ThemeData(
       primaryColor: primaryColor,
       secondaryHeaderColor: secondaryColor,
@@ -17,7 +17,7 @@ ThemeData theme() {
           displayMedium: const TextStyle(
               color: Colors.black, fontWeight: FontWeight.w900, fontSize: 14.5),
           bodyLarge: TextStyle(
-              color: Colors.black.withOpacity(.8),
+              color: Colors.black.withValues(alpha: 0.8),
               fontWeight: FontWeight.w500,
               fontSize: 12),
           labelLarge: const TextStyle(
@@ -26,7 +26,7 @@ ThemeData theme() {
         border: InputBorder.none,
         contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
         hintStyle: TextStyle(
-            color: Colors.black.withOpacity(.4),
+            color: Colors.black.withValues(alpha: 0.4),
             fontWeight: FontWeight.w500,
             fontSize: 10),
       ));

example/lib/widgets/widgets.dart

@@ -174,13 +174,21 @@ enum FeeRangeEnum {
 }
 
 class FeesRangeOptions extends StatefulWidget {
-  FeesRangeOptions({super.key, this.feeRange = FeeRangeEnum.high});
-  FeeRangeEnum? feeRange;
+  const FeesRangeOptions({super.key, this.feeRange = FeeRangeEnum.high});
+  final FeeRangeEnum? feeRange;
   @override
   State<FeesRangeOptions> createState() => _FeesRangeOptionsState();
 }
 
 class _FeesRangeOptionsState extends State<FeesRangeOptions> {
+  late FeeRangeEnum? currentFeeRange;
+
+  @override
+  void initState() {
+    super.initState();
+    currentFeeRange = widget.feeRange;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -192,7 +200,7 @@ class _FeesRangeOptionsState extends State<FeesRangeOptions> {
             trailing: Text(FeeRangeEnum.high.toString()),
           ),
           value: FeeRangeEnum.high,
-          groupValue: widget.feeRange,
+          groupValue: currentFeeRange,
           onChanged: onChangeFeeRange,
         ),
         RadioListTile<FeeRangeEnum>(
@@ -202,7 +210,7 @@ class _FeesRangeOptionsState extends State<FeesRangeOptions> {
             trailing: Text(FeeRangeEnum.medium.toString()),
           ),
           value: FeeRangeEnum.medium,
-          groupValue: widget.feeRange,
+          groupValue: currentFeeRange,
           onChanged: onChangeFeeRange,
         ),
         RadioListTile<FeeRangeEnum>(
@@ -212,7 +220,7 @@ class _FeesRangeOptionsState extends State<FeesRangeOptions> {
             trailing: Text(FeeRangeEnum.low.toString()),
           ),
           value: FeeRangeEnum.low,
-          groupValue: widget.feeRange,
+          groupValue: currentFeeRange,
           onChanged: onChangeFeeRange,
         ),
       ],
@@ -221,8 +229,8 @@ class _FeesRangeOptionsState extends State<FeesRangeOptions> {
 
   onChangeFeeRange(FeeRangeEnum? value) {
     setState(() {
-      widget.feeRange = value;
-      Navigator.pop(context, widget.feeRange);
+      currentFeeRange = value;
+      Navigator.pop(context, currentFeeRange);
     });
   }
 }