Skip to content

[520] 보내기 플로우 QR 스캔, QR 뷰 UI 최적화 필요 #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pio-noncelab wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[520] 보내기 플로우 QR 스캔, QR 뷰 UI 최적화 필요 #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f44aef
fix(faucet-ui): 지갑 상세 화면의 FaucetTooltip, Faucet 요청 바텀 시트 화면 큰폰트 대응
pio-noncelab Dec 1, 2025
a6d7c1c
fix(wallet-detail-screen-ui): 지갑 상세 화면에 SafeArea 추가
pio-noncelab Dec 1, 2025
c679a2c
fix(unsigned-transaction-qr-screen): 보내기 플로우의 UnsignedTransactionQr화면…
pio-noncelab Dec 1, 2025
a852e5a
fix(address-qr-scanner-ui): 폴드 펼친 화면에서 주소 스캔 화면의 상단 텍스트 위치 조정, overla…
pio-noncelab Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/screens/send/unsigned_transaction_qr_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ class _UnsignedTransactionQrScreenState extends State<UnsignedTransactionQrScree
Padding(padding: const EdgeInsets.only(top: 8), child: _buildToolTip()),
Container(
margin: const EdgeInsets.only(top: 40),
constraints: const BoxConstraints(maxWidth: 500),
// width: qrSize, // 테스트용(갤폴드에서 보이는 QR사이즈)
// height: qrSize, // 테스트용(갤폴드에서 보이는 QR사이즈)
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16),
Expand Down
219 changes: 115 additions & 104 deletions lib/screens/wallet_detail/wallet_detail_faucet_request_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,121 +116,132 @@ class _FaucetRequestBottomSheetState extends State<FaucetRequestBottomSheet> {

@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
icon: const Icon(Icons.close, color: CoconutColors.white),
onPressed: () {
Navigator.pop(context);
},
),
Text(t.faucet_request_bottom_sheet.title, style: CoconutTypography.body1_16),
Visibility(
visible: false,
maintainSize: true,
maintainAnimation: true,
maintainState: true,
maintainSemantics: false,
maintainInteractivity: false,
child: IconButton(
return SafeArea(
child: GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
icon: const Icon(Icons.close, color: CoconutColors.white),
onPressed: () {
Navigator.pop(context);
},
),
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 30),
Text(t.faucet_request_bottom_sheet.recipient, style: CoconutTypography.body1_16_Bold),
const SizedBox(height: 10),
CustomTextField(
controller: textController,
placeholder: t.faucet_request_bottom_sheet.placeholder,
onChanged: (text) {
_validateAddress(text.toLowerCase());
},
maxLines: 2,
style: CoconutTypography.body1_16_Number,
),
const SizedBox(height: 2),
const SizedBox(height: 2),
Visibility(
visible: !_isErrorInAddress,
maintainSize: true,
maintainAnimation: true,
maintainState: true,
maintainSemantics: false,
maintainInteractivity: false,
child: Align(
alignment: Alignment.centerRight,
child: Text(
t.faucet_request_bottom_sheet.my_address(name: _walletName, index: _walletIndex),
style: CoconutTypography.body2_14_Number,
Text(t.faucet_request_bottom_sheet.title, style: CoconutTypography.body1_16),
Visibility(
visible: false,
maintainSize: true,
maintainAnimation: true,
maintainState: true,
maintainSemantics: false,
maintainInteractivity: false,
child: IconButton(
icon: const Icon(Icons.close, color: CoconutColors.white),
onPressed: () {
Navigator.pop(context);
},
),
),
),
],
],
),
),
),
const SizedBox(height: 24),
IgnorePointer(
ignoring: !canRequestFaucet(),
child: CupertinoButton(
onPressed: () {
widget.onRequest.call(_walletAddress, _requestAmount);
FocusScope.of(context).unfocus();
},
borderRadius: BorderRadius.circular(8.0),
padding: EdgeInsets.zero,
color: canRequestFaucet() ? CoconutColors.white : CoconutColors.white.withOpacity(0.3),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 12),
child:
_state == _AvailabilityState.checking
? const SizedBox(
height: 28,
width: 28,
child: CircularProgressIndicator(color: CoconutColors.white),
)
: Text(
_isRequesting
? t.faucet_request_bottom_sheet.requesting
: t.faucet_request_bottom_sheet.request_amount(
bitcoin: _requestAmount.toTrimmedString(),
),
style: CoconutTypography.body2_14
.setColor(
(canRequestFaucet()) ? CoconutColors.black : CoconutColors.black.withOpacity(0.5),
)
.merge(const TextStyle(letterSpacing: -0.1, fontWeight: FontWeight.w600)),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 30),
MediaQuery(
data: MediaQuery.of(context).copyWith(textScaler: const TextScaler.linear(1.0)),
child: Text(t.faucet_request_bottom_sheet.recipient, style: CoconutTypography.body1_16_Bold),
),
const SizedBox(height: 10),
MediaQuery(
data: MediaQuery.of(context).copyWith(textScaler: const TextScaler.linear(1.0)),
child: CustomTextField(
controller: textController,
placeholder: t.faucet_request_bottom_sheet.placeholder,
onChanged: (text) {
_validateAddress(text.toLowerCase());
},
maxLines: 2,
style: CoconutTypography.body1_16_Number,
),
),
const SizedBox(height: 2),
const SizedBox(height: 2),
MediaQuery(
data: MediaQuery.of(context).copyWith(textScaler: const TextScaler.linear(1.0)),
child: Visibility(
visible: !_isErrorInAddress,
maintainSize: true,
maintainAnimation: true,
maintainState: true,
maintainSemantics: false,
maintainInteractivity: false,
child: Align(
alignment: Alignment.centerRight,
child: Text(
t.faucet_request_bottom_sheet.my_address(name: _walletName, index: _walletIndex),
style: CoconutTypography.body2_14_Number,
),
),
),
),
],
),
),
const SizedBox(height: 24),
IgnorePointer(
ignoring: !canRequestFaucet(),
child: CupertinoButton(
onPressed: () {
widget.onRequest.call(_walletAddress, _requestAmount);
FocusScope.of(context).unfocus();
},
borderRadius: BorderRadius.circular(8.0),
padding: EdgeInsets.zero,
color: canRequestFaucet() ? CoconutColors.white : CoconutColors.white.withOpacity(0.3),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 12),
child:
_state == _AvailabilityState.checking
? const SizedBox(
height: 28,
width: 28,
child: CircularProgressIndicator(color: CoconutColors.white),
)
: Text(
_isRequesting
? t.faucet_request_bottom_sheet.requesting
: t.faucet_request_bottom_sheet.request_amount(
bitcoin: _requestAmount.toTrimmedString(),
),
style: CoconutTypography.body2_14
.setColor(
(canRequestFaucet()) ? CoconutColors.black : CoconutColors.black.withOpacity(0.5),
)
.merge(const TextStyle(letterSpacing: -0.1, fontWeight: FontWeight.w600)),
),
),
),
),
),
const SizedBox(height: 4),
if (_state == _AvailabilityState.bad) ...{
_buildWarningMessage(t.alert.faucet.no_test_bitcoin),
} else if (_state == _AvailabilityState.dailyLimitReached) ...{
_buildWarningMessage(t.alert.faucet.try_again(count: _remainingTimeString)),
} else if (_isErrorInAddress) ...{
_buildWarningMessage(t.alert.faucet.check_address),
},
],
const SizedBox(height: 4),
if (_state == _AvailabilityState.bad) ...{
_buildWarningMessage(t.alert.faucet.no_test_bitcoin),
} else if (_state == _AvailabilityState.dailyLimitReached) ...{
_buildWarningMessage(t.alert.faucet.try_again(count: _remainingTimeString)),
} else if (_isErrorInAddress) ...{
_buildWarningMessage(t.alert.faucet.check_address),
},
],
),
),
),
);
Expand Down
66 changes: 34 additions & 32 deletions lib/screens/wallet_detail/wallet_detail_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,39 +66,41 @@ class _WalletDetailScreenState extends State<WalletDetailScreen> {
Scaffold(
backgroundColor: CoconutColors.black,
appBar: _buildAppBar(context),
body: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
controller: _scrollController,
slivers: [
CupertinoSliverRefreshControl(onRefresh: () async => _onRefresh()),
SliverToBoxAdapter(
child: Selector<WalletDetailViewModel, Tuple4<AnimatedBalanceData, String, int, int>>(
selector:
(_, viewModel) => Tuple4(
AnimatedBalanceData(viewModel.balance, viewModel.prevBalance),
viewModel.bitcoinPriceKrwInString,
viewModel.sendingAmount,
viewModel.receivingAmount,
),
builder: (_, data, __) {
return WalletDetailHeader(
key: _headerWidgetKey,
animatedBalanceData: data.item1,
currentUnit: _currentUnit,
btcPriceInKrw: data.item2,
sendingAmount: data.item3,
receivingAmount: data.item4,
onPressedUnitToggle: _toggleUnit,
onTapReceive: _onTapReceive,
onTapSend: _onTapSend,
);
},
body: SafeArea(
child: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
controller: _scrollController,
slivers: [
CupertinoSliverRefreshControl(onRefresh: () async => _onRefresh()),
SliverToBoxAdapter(
child: Selector<WalletDetailViewModel, Tuple4<AnimatedBalanceData, String, int, int>>(
selector:
(_, viewModel) => Tuple4(
AnimatedBalanceData(viewModel.balance, viewModel.prevBalance),
viewModel.bitcoinPriceKrwInString,
viewModel.sendingAmount,
viewModel.receivingAmount,
),
builder: (_, data, __) {
return WalletDetailHeader(
key: _headerWidgetKey,
animatedBalanceData: data.item1,
currentUnit: _currentUnit,
btcPriceInKrw: data.item2,
sendingAmount: data.item3,
receivingAmount: data.item4,
onPressedUnitToggle: _toggleUnit,
onTapReceive: _onTapReceive,
onTapSend: _onTapSend,
);
},
),
),
),
_buildLoadingWidget(),
_buildTxListLabel(),
TransactionList(currentUnit: _currentUnit, walldtId: widget.id),
],
_buildLoadingWidget(),
_buildTxListLabel(),
TransactionList(currentUnit: _currentUnit, walldtId: widget.id),
],
),
),
),
_buildStickyHeader(),
Expand Down
53 changes: 33 additions & 20 deletions lib/widgets/body/address_qr_scanner_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:coconut_design_system/coconut_design_system.dart';
import 'package:coconut_wallet/localization/strings.g.dart';
import 'package:coconut_wallet/styles.dart';
import 'package:coconut_wallet/utils/address_util.dart';
import 'package:coconut_wallet/widgets/overlays/scanner_overlay.dart';
import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart';
Expand All @@ -16,26 +14,41 @@ class AddressQrScannerBody extends StatelessWidget {
Widget _buildQrView(BuildContext context) {
// 스캔 영역을 상단으로 이동 (상단 여백 120px 추가)
final statusBarHeight = MediaQuery.of(context).padding.top;
final topMargin = statusBarHeight + 120.0;
final isFoldScreen = MediaQuery.of(context).size.width > 600;
final topMargin = statusBarHeight + (isFoldScreen ? 0 : 120.0);
return LayoutBuilder(
builder: (context, constraints) {
final Size layoutSize = constraints.biggest;

return Stack(
children: [
MobileScanner(key: qrKey, onDetect: onDetect),
const ScannerOverlay(),
Positioned(
top: topMargin,
left: 0,
right: 0,
child: Container(
padding: const EdgeInsets.only(top: 32),
child: Text(
t.send_address_screen.text2,
textAlign: TextAlign.center,
style: CoconutTypography.body1_16.setColor(CoconutColors.white),
// ScannerOverlay와 동일한 크기의 정사각형 스캔 영역 계산
final scanAreaSize = (layoutSize.width < 400 || layoutSize.height < 400) ? 320.0 : layoutSize.width * 0.85;

final Rect scanWindow = Rect.fromCenter(
center: layoutSize.center(Offset.zero),
width: scanAreaSize,
height: scanAreaSize,
);

return Stack(
children: [
MobileScanner(key: qrKey, onDetect: onDetect, scanWindow: scanWindow),
const ScannerOverlay(),
Positioned(
top: topMargin,
left: 0,
right: 0,
child: Container(
padding: const EdgeInsets.only(top: 32),
child: Text(
t.send_address_screen.text2,
textAlign: TextAlign.center,
style: CoconutTypography.body1_16.setColor(CoconutColors.white),
),
),
),
),
),
],
],
);
},
);
}

Expand Down
Loading