kolo/Casha
1
0
Fork 0
mirror of https://github.com/koloideal/Casha.git synced 2026-06-10 02:15:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kolo
2026-03-24 12:02:46 +03:00
parent c295649128
commit 6750b996fc
3 changed files with 288 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/dashboard/screen.dart
+37 -21
View File
@@ -33,11 +33,17 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
Color tempPrimary = CardColorService.defaultPrimary;
Color tempSecondary = CardColorService.defaultSecondary;
HSVColor tempPrimaryHSV = HSVColor.fromColor(CardColorService.defaultPrimary);
HSVColor tempSecondaryHSV = HSVColor.fromColor(CardColorService.defaultSecondary);
HSVColor tempSecondaryHSV = HSVColor.fromColor(
CardColorService.defaultSecondary,
);
Color savedPrimary = CardColorService.defaultPrimary;
Color savedSecondary = CardColorService.defaultSecondary;
HSVColor savedPrimaryHSV = HSVColor.fromColor(CardColorService.defaultPrimary);
HSVColor savedSecondaryHSV = HSVColor.fromColor(CardColorService.defaultSecondary);
HSVColor savedPrimaryHSV = HSVColor.fromColor(
CardColorService.defaultPrimary,
);
HSVColor savedSecondaryHSV = HSVColor.fromColor(
CardColorService.defaultSecondary,
);
GradientType tempGradientType = CardColorService.defaultGradient;
GradientType savedGradientType = CardColorService.defaultGradient;
OverlayEntry? overlayEntry;
@@ -69,10 +75,8 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
void _showOverlay() {
overlayEntry = OverlayEntry(
builder: (overlayContext) => FullScreenBlurOverlay(
dashboardState: this,
context: context,
),
builder: (overlayContext) =>
FullScreenBlurOverlay(dashboardState: this, context: context),
);
Overlay.of(context, rootOverlay: true).insert(overlayEntry!);
}
@@ -80,7 +84,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
void closeOverlay({required bool apply}) {
if (apply) {
HapticService.medium();
ref.read(cardColorsProvider.notifier).save(tempPrimary, tempSecondary, tempGradientType);
ref
.read(cardColorsProvider.notifier)
.save(tempPrimary, tempSecondary, tempGradientType);
} else {
setState(() {
tempPrimary = savedPrimary;
@@ -118,10 +124,8 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
void _showAccountOverlay() {
overlayEntry = OverlayEntry(
builder: (overlayContext) => AccountEditorOverlay(
dashboardState: this,
context: context,
),
builder: (overlayContext) =>
AccountEditorOverlay(dashboardState: this, context: context),
);
Overlay.of(context, rootOverlay: true).insert(overlayEntry!);
}
@@ -131,11 +135,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
HapticService.medium();
// Save colors
await ref.read(accountCardColorsProvider(editingAccount!.id).notifier).save(
tempPrimary,
tempSecondary,
tempGradientType,
);
await ref
.read(accountCardColorsProvider(editingAccount!.id).notifier)
.save(tempPrimary, tempSecondary, tempGradientType);
// Update account name and currency
final updatedAccount = Account(
@@ -149,10 +151,15 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
await ref.read(accountRepositoryProvider).update(updatedAccount);
} else {
// Restore original values on cancel
setState(() {
tempPrimary = savedPrimary;
tempSecondary = savedSecondary;
tempGradientType = savedGradientType;
if (editingAccount != null) {
tempAccountName = editingAccount!.name;
tempAccountCurrency = editingAccount!.currency;
}
});
}
@@ -224,12 +231,19 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
child: Center(
child: Builder(
builder: (context) {
final raw = DateFormat('LLLL, yyyy', s.dateLocale).format(DateTime.now());
final capitalized = raw.isNotEmpty ? '${raw[0].toUpperCase()}${raw.substring(1)}' : raw;
final raw = DateFormat(
'LLLL, yyyy',
s.dateLocale,
).format(DateTime.now());
final capitalized = raw.isNotEmpty
? '${raw[0].toUpperCase()}${raw.substring(1)}'
: raw;
return Text(
capitalized,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
color: Theme.of(
context,
).colorScheme.onSurface.withOpacity(0.5),
fontWeight: FontWeight.w500,
),
);
@@ -268,7 +282,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
onAccountLongPress: _onAccountCardLongPress,
previewPrimary: editingCard ? tempPrimary : null,
previewSecondary: editingCard ? tempSecondary : null,
previewGradientType: editingCard ? tempGradientType : null,
previewGradientType: editingCard
? tempGradientType
: null,
),
const SizedBox(height: 16),
SummaryRow(
lib/features/dashboard/widgets/account_editor_overlay.dart
+242 -200
View File
@@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/l10n/app_strings.dart';
import '../../../core/l10n/locale_provider.dart';
import '../../../core/services/card_color_service.dart';
import '../../../shared/models/transaction.dart';
import '../../settings/provider.dart';
import '../provider.dart';
import 'balance_card.dart';
@@ -32,15 +33,35 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
dynamic get dash => widget.dashboardState;
late TextEditingController _nameController;
late String _selectedCurrency;
late String _originalCurrency;
bool _showCurrencyDropdown = false;
bool _showLimitError = false;
@override
void initState() {
super.initState();
_nameController = TextEditingController(text: dash.tempAccountName);
_selectedCurrency = dash.tempAccountCurrency;
_originalCurrency = dash.tempAccountCurrency;
_nameController.addListener(() {
dash.tempAccountName = _nameController.text;
final text = _nameController.text;
if (text.length > 17) {
_nameController.text = text.substring(0, 17);
_nameController.selection = TextSelection.fromPosition(
const TextPosition(offset: 17),
);
setState(() => _showLimitError = true);
Future.delayed(const Duration(seconds: 2), () {
if (mounted) setState(() => _showLimitError = false);
});
return; // Skip updating dash to avoid out-of-bounds
}
// Real-time update on card
dash.setState(() {
dash.tempAccountName = _nameController.text;
});
dash.overlayEntry?.markNeedsBuild();
});
}
@@ -60,90 +81,107 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
final colorPanelTop = editorPanelTop + editorPanelHeight + 12;
const colorPanelHeight = 410.0;
return Material(
color: Colors.transparent,
child: Stack(
children: [
Positioned.fill(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
child: Container(color: Colors.black.withOpacity(0.6)),
),
),
Positioned.fill(
child: GestureDetector(
onTap: () {
if (_showCurrencyDropdown) {
setState(() {
_showCurrencyDropdown = false;
});
} else {
dash.closeAccountOverlay(apply: false);
}
},
behavior: HitTestBehavior.translucent,
child: const SizedBox.expand(),
),
),
// Preview Card
Positioned(
top: cardTop,
left: 20,
right: 20,
child: Consumer(
builder: (ctx, ref, _) => BalanceCard(
balance: ref.read(totalBalanceProvider),
currencyInfo: CurrencyInfo(
currencyMap[dash.tempAccountCurrency]?.symbol ?? '\$',
dash.tempAccountCurrency,
),
onLongPress: null,
accountName: dash.tempAccountName,
previewPrimary: dash.tempPrimary,
previewSecondary: dash.tempSecondary,
previewGradientType: dash.tempGradientType,
),
),
),
// Account Editor Panel
Positioned(
top: editorPanelTop,
left: 20,
right: 20,
child: GestureDetector(
onTap: () {},
behavior: HitTestBehavior.opaque,
child: _buildEditorPanel(editorPanelHeight),
),
),
// Color Picker Panel
Positioned(
top: colorPanelTop,
left: 20,
right: 20,
child: GestureDetector(
onTap: () {
if (_showCurrencyDropdown) {
setState(() {
_showCurrencyDropdown = false;
});
}
},
behavior: HitTestBehavior.opaque,
child: _buildColorPanel(colorPanelHeight),
),
),
// Currency Dropdown - Above everything
if (_showCurrencyDropdown)
Positioned(
top: editorPanelTop + 58, // Position below the currency button
left: 20 + 14 + (MediaQuery.of(context).size.width - 40 - 28) * 0.75 + 8, // Align with currency button
width: (MediaQuery.of(context).size.width - 40 - 28) * 0.25, // Same width as currency button
child: Consumer(
builder: (context, ref, _) {
final exchangeService = ref.read(exchangeRateServiceProvider);
return Consumer(
builder: (context, ref, _) {
final exchangeService = ref.watch(exchangeRateServiceProvider);
return Material(
// Get the original balance from the editing account
double originalBalance = ref.read(totalBalanceProvider);
if (dash.editingAccount != null) {
// Get the account's actual balance
final txs = ref.watch(accountFilteredTransactionsProvider);
final accountTxs = txs.where((t) => t.accountId == dash.editingAccount!.id);
originalBalance = accountTxs.fold<double>(
0.0,
(sum, t) => sum + (t.type == TransactionType.income ? t.amount : -t.amount),
);
}
// Convert to the preview currency
final previewBalance = exchangeService.convert(
originalBalance,
_originalCurrency,
dash.tempAccountCurrency,
);
return Material(
color: Colors.transparent,
child: Stack(
children: [
Positioned.fill(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
child: Container(color: Colors.black.withOpacity(0.6)),
),
),
Positioned.fill(
child: GestureDetector(
onTap: () {
if (_showCurrencyDropdown) {
setState(() {
_showCurrencyDropdown = false;
});
} else {
dash.closeAccountOverlay(apply: false);
}
},
behavior: HitTestBehavior.translucent,
child: const SizedBox.expand(),
),
),
// Preview Card
Positioned(
top: cardTop,
left: 20,
right: 20,
child: BalanceCard(
balance: previewBalance,
currencyInfo: CurrencyInfo(
currencyMap[dash.tempAccountCurrency]?.symbol ?? '\$',
dash.tempAccountCurrency,
),
onLongPress: null,
accountName: dash.tempAccountName,
previewPrimary: dash.tempPrimary,
previewSecondary: dash.tempSecondary,
previewGradientType: dash.tempGradientType,
),
),
// Account Editor Panel
Positioned(
top: editorPanelTop,
left: 20,
right: 20,
child: GestureDetector(
onTap: () {},
behavior: HitTestBehavior.opaque,
child: _buildEditorPanel(editorPanelHeight),
),
),
// Color Picker Panel
Positioned(
top: colorPanelTop,
left: 20,
right: 20,
child: GestureDetector(
onTap: () {
if (_showCurrencyDropdown) {
setState(() {
_showCurrencyDropdown = false;
});
}
},
behavior: HitTestBehavior.opaque,
child: _buildColorPanel(colorPanelHeight),
),
),
// Currency Dropdown - Above everything
if (_showCurrencyDropdown)
Positioned(
top: editorPanelTop + 62,
right: 34, // 20 (panel padding) + 14 (inner padding)
width: (MediaQuery.of(context).size.width - 68) * 0.25, // 25% of the inner row width
child: Material(
elevation: 12,
borderRadius: BorderRadius.circular(12),
child: Container(
@@ -166,18 +204,15 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
final isSelected = entry.$1 == _selectedCurrency;
return InkWell(
onTap: () {
final oldCurrency = _selectedCurrency;
final newCurrency = entry.$1;
setState(() {
_selectedCurrency = newCurrency;
dash.tempAccountCurrency = newCurrency;
_selectedCurrency = entry.$1;
// Update temp currency for preview
dash.setState(() {
dash.tempAccountCurrency = entry.$1;
});
dash.overlayEntry?.markNeedsBuild();
_showCurrencyDropdown = false;
});
// Note: Currency conversion will happen automatically
// when the account is saved, as the exchangeRateServiceProvider
// will handle the conversion in the balance calculations
},
borderRadius: BorderRadius.circular(12),
child: Padding(
@@ -217,42 +252,42 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
}).toList(),
),
),
);
},
),
),
// Close Button - Top Right
Positioned(
top: mq.padding.top + 8,
right: 20,
child: SafeArea(
child: GestureDetector(
onTap: () => dash.closeAccountOverlay(apply: false),
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.surface,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(
Icons.close_rounded,
size: 24,
color: Theme.of(widget.context).colorScheme.onSurface,
),
// Close Button - Top Right
Positioned(
top: mq.padding.top + 8,
right: 20,
child: SafeArea(
child: GestureDetector(
onTap: () => dash.closeAccountOverlay(apply: false),
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.surface,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(
Icons.close_rounded,
size: 24,
color: Theme.of(widget.context).colorScheme.onSurface,
),
),
),
),
),
),
],
),
],
),
);
},
);
}
@@ -289,87 +324,94 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
),
),
const SizedBox(height: 8),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 3,
child: TextField(
controller: _nameController,
maxLength: 17,
buildCounter: (context, {required currentLength, required isFocused, maxLength}) => null,
style: const TextStyle(fontSize: 13),
decoration: InputDecoration(
hintText: 'Account name',
hintStyle: TextStyle(fontSize: 13, color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.4)),
filled: true,
fillColor: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.05),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: const BorderSide(
color: Color(0xFF7C6DED),
width: 1.5,
),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
),
),
),
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: () {
setState(() {
_showCurrencyDropdown = !_showCurrencyDropdown;
});
},
child: Container(
height: 44, // Increased to match TextField height
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.05),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: _showCurrencyDropdown
? const Color(0xFF7C6DED)
: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
[('USD', '\$'), ('EUR', '€'), ('BYN', 'Br'), ('RUB', '₽')]
.firstWhere((c) => c.$1 == _selectedCurrency).$2,
style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w600),
IntrinsicHeight(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 3,
child: TextField(
controller: _nameController,
buildCounter: (context, {required currentLength, required isFocused, maxLength}) => null,
style: const TextStyle(fontSize: 13),
decoration: InputDecoration(
hintText: 'Account name',
hintStyle: TextStyle(fontSize: 13, color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.4)),
filled: true,
fillColor: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.05),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: _showLimitError
? Colors.red
: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
const SizedBox(width: 4),
Icon(
_showCurrencyDropdown ? Icons.arrow_drop_up : Icons.arrow_drop_down,
size: 20,
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.6),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: _showLimitError
? Colors.red
: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
],
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: _showLimitError
? Colors.red
: const Color(0xFF7C6DED),
width: 1.5,
),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 12),
),
),
),
),
],
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: () {
setState(() {
_showCurrencyDropdown = !_showCurrencyDropdown;
});
},
child: Container(
height: double.infinity,
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.05),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: _showCurrencyDropdown
? const Color(0xFF7C6DED)
: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.15),
width: 1.5,
),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
[('USD', '\$'), ('EUR', '€'), ('BYN', 'Br'), ('RUB', '₽')]
.firstWhere((c) => c.$1 == _selectedCurrency).$2,
style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w600),
),
const SizedBox(width: 4),
Icon(
_showCurrencyDropdown ? Icons.arrow_drop_up : Icons.arrow_drop_down,
size: 20,
color: Theme.of(widget.context).colorScheme.onSurface.withOpacity(0.6),
),
],
),
),
),
),
],
),
),
],
),
pubspec.lock
+4 -4
View File
@@ -213,18 +213,18 @@ packages:
dependency: "direct main"
description:
name: drift
sha256: "61f876c0291b194980bafd203f48e85d5fb04e4a7334367d1a89f44004dbcb83"
sha256: "055c249d1f91be5a47fe447f88afc24c4ca6f4cd6c5ed66767b4797d48acc2e5"
url: "https://pub.dev"
source: hosted
version: "2.32.0"
version: "2.32.1"
drift_dev:
dependency: "direct dev"
description:
name: drift_dev
sha256: d687e955cc4b1706ad49b3860fcc1045c09bbf1d84c3c7383615f7f9c3320aa2
sha256: "88a9de3af8571518148a6d8a513b57779fd1e60a026d3ab8a481a878fba01d91"
url: "https://pub.dev"
source: hosted
version: "2.32.0"
version: "2.32.1"
equatable:
dependency: transitive
description: