Skip to content

Commit

Permalink
Only use clipboard item for 'Paste Invoice or ID' button
Browse files Browse the repository at this point in the history 
Handle input on clicking "Paste Invoice or ID"

Pass clipboard item to input bloc if it's a supported input type

Revert inputHandler changes

Display a loader when clipboard data is being retrieved, parsed & handled

Close bottom sheet upon clicking 'Paste Invoice or ID' button
  • Loading branch information
@erdemyerebasmaz
erdemyerebasmaz committed Jul 13, 2023
1 parent 746bbc6 commit 88105d4
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 50 deletions.
22 changes: 13 additions & 9 deletions lib/handlers/input_handler.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,7 @@ class InputHandler extends Handler {
_handlingRequest = true;
handleInputData(inputState.inputData)
.then((result) {
_log.v("Input state handled: $result");
if (result is LNURLPageResult && result.protocol != null) {
final context = contextProvider?.getBuildContext();
if (context != null) {
handleLNURLPageResult(context, result);
} else {
_log.v("Skipping handling of result: $result because context is null");
}
}
handleResult(result);
})
.whenComplete(() => _handlingRequest = false)
.onError((error, _) {
Expand All @@ -92,6 +84,18 @@ class InputHandler extends Handler {
});
}

void handleResult(result) {
_log.v("Input state handled: $result");
if (result is LNURLPageResult && result.protocol != null) {
final context = contextProvider?.getBuildContext();
if (context != null) {
handleLNURLPageResult(context, result);
} else {
_log.v("Skipping handling of result: $result because context is null");
}
}
}

Future handleInputData(dynamic parsedInput) async {
_log.v("handle input $parsedInput");
final context = contextProvider?.getBuildContext();
Expand Down
137 changes: 96 additions & 41 deletions lib/routes/home/widgets/bottom_actions_bar/send_options_bottom_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,32 @@ import 'package:breez_translations/breez_translations_locales.dart';
import 'package:c_breez/bloc/account/account_bloc.dart';
import 'package:c_breez/bloc/account/account_state.dart';
import 'package:c_breez/bloc/input/input_bloc.dart';
import 'package:c_breez/bloc/input/input_state.dart';
import 'package:c_breez/routes/home/widgets/bottom_actions_bar/bottom_action_item_image.dart';
import 'package:c_breez/routes/home/widgets/bottom_actions_bar/enter_payment_info_dialog.dart';
import 'package:c_breez/routes/spontaneous_payment/spontaneous_payment_page.dart';
import 'package:c_breez/routes/withdraw_funds/withdraw_funds_address_page.dart';
import 'package:c_breez/theme/theme_provider.dart' as theme;
import 'package:c_breez/widgets/route.dart';
import 'package:c_breez/widgets/loader.dart';
import 'package:fimber/fimber.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

final _log = FimberLog("SendOptionsBottomSheet");

class SendOptionsBottomSheet extends StatelessWidget {
class SendOptionsBottomSheet extends StatefulWidget {
final GlobalKey firstPaymentItemKey;

const SendOptionsBottomSheet({super.key, required this.firstPaymentItemKey});
const SendOptionsBottomSheet({
super.key,
required this.firstPaymentItemKey,
});

@override
State<SendOptionsBottomSheet> createState() => _SendOptionsBottomSheetState();
}

class _SendOptionsBottomSheetState extends State<SendOptionsBottomSheet> {
ModalRoute? _loaderRoute;

@override
Widget build(BuildContext context) {
Expand All @@ -29,20 +38,15 @@ class SendOptionsBottomSheet extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(height: 8.0),
BlocBuilder<InputBloc, InputState>(
builder: (context, snapshot) {
_log.v("Building paste item with snapshot: $snapshot");
return ListTile(
leading: const BottomActionItemImage(
iconAssetPath: "src/icon/paste.png",
),
title: Text(
texts.bottom_action_bar_paste_invoice,
style: theme.bottomSheetTextStyle,
),
onTap: () => _pasteTapped(context, snapshot.inputData, firstPaymentItemKey),
);
},
ListTile(
leading: const BottomActionItemImage(
iconAssetPath: "src/icon/paste.png",
),
title: Text(
texts.bottom_action_bar_paste_invoice,
style: theme.bottomSheetTextStyle,
),
onTap: () => _pasteFromClipboard(context),
),
Divider(
height: 0.0,
Expand All @@ -69,33 +73,71 @@ class SendOptionsBottomSheet extends StatelessWidget {
);
}

void _pasteTapped(
BuildContext context,
dynamic inputData,
GlobalKey firstPaymentItemKey,
) async {
Navigator.of(context).pop();
if (inputData is InputType_NodeId) {
_log.v("Input data is of type InputType_NodeId, pushing SpontaneousPaymentPage");
Navigator.of(context).push(
FadeInRoute(
builder: (_) => SpontaneousPaymentPage(
inputData.nodeId,
firstPaymentItemKey,
),
),
// TODO: Improve error handling flow to reduce open Enter Payment Info Dialog calls
Future<void> _pasteFromClipboard(BuildContext context) async {
try {
final inputBloc = context.read<InputBloc>();
// Close bottom sheet
Navigator.of(context).pop();
_setLoading(true);
// Get clipboard data
await Clipboard.getData("text/plain").then(
(clipboardData) async {
final clipboardText = clipboardData?.text;
_log.v("Clipboard text: $clipboardText");
if (clipboardText != null) {
// Parse clipboard text
await inputBloc.parseInput(input: clipboardText).then(
(inputType) {
// Handle parsed input
if (!(inputType is InputType_Bolt11 ||
inputType is InputType_LnUrlPay ||
inputType is InputType_LnUrlWithdraw ||
inputType is InputType_LnUrlAuth ||
inputType is InputType_LnUrlError ||
inputType is InputType_NodeId)) {
_showEnterPaymentInfoDialog(context, widget.firstPaymentItemKey);
} else {
inputBloc.addIncomingInput(clipboardText);
}
},
);
} else {
_setLoading(false);
// If clipboard data is empty, display EnterPaymentInfoDialog
_showEnterPaymentInfoDialog(
context,
widget.firstPaymentItemKey,
);
}
},
);
} else {
_log.v("Input data is $inputData, showing EnterPaymentInfoDialog");
await showDialog(
useRootNavigator: false,
context: context,
barrierDismissible: false,
builder: (_) => EnterPaymentInfoDialog(paymentItemKey: firstPaymentItemKey),
} catch (e) {
_setLoading(false);
// If there's an error getting the clipboard data, display EnterPaymentInfoDialog
_showEnterPaymentInfoDialog(
context,
widget.firstPaymentItemKey,
);
} finally {
_setLoading(false);
}
}

Future<void> _showEnterPaymentInfoDialog(
BuildContext context,
GlobalKey<State<StatefulWidget>> firstPaymentItemKey,
) async {
await showDialog(
useRootNavigator: false,
context: context,
barrierDismissible: false,
builder: (_) => EnterPaymentInfoDialog(
paymentItemKey: firstPaymentItemKey,
),
);
}

void _sendToBTCAddress(BuildContext context, int maxValue) {
final navigator = Navigator.of(context);
// Close bottom sheet
Expand All @@ -110,4 +152,17 @@ class SendOptionsBottomSheet extends StatelessWidget {
),
);
}

void _setLoading(bool visible) {
if (visible && _loaderRoute == null) {
_loaderRoute = createLoaderRoute(context);
Navigator.of(context).push(_loaderRoute!);
return;
}

if (!visible && (_loaderRoute != null && _loaderRoute!.isActive)) {
_loaderRoute!.navigator?.removeRoute(_loaderRoute!);
_loaderRoute = null;
}
}
}

0 comments on commit 88105d4

Please sign in to comment.