feat: Integrate sync status indicators in app title bar and home screen
This commit is contained in:
+3
-4
@@ -705,6 +705,8 @@ class _NotesAppState extends State<NotesApp>
|
|||||||
repository: repository,
|
repository: repository,
|
||||||
onOpenSettings: _openSettings,
|
onOpenSettings: _openSettings,
|
||||||
onVaultInvalid: _resetLocalVaultData,
|
onVaultInvalid: _resetLocalVaultData,
|
||||||
|
syncStatus: _syncStatus,
|
||||||
|
syncErrorMessage: _syncErrorMessage,
|
||||||
)
|
)
|
||||||
: SettingsScreen(
|
: SettingsScreen(
|
||||||
key: const ValueKey<String>('settings-screen'),
|
key: const ValueKey<String>('settings-screen'),
|
||||||
@@ -749,10 +751,7 @@ class _NotesAppState extends State<NotesApp>
|
|||||||
child: SafeArea(
|
child: SafeArea(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
AppTitleBar(
|
const AppTitleBar(),
|
||||||
syncStatus: _syncStatus,
|
|
||||||
syncErrorMessage: _syncErrorMessage,
|
|
||||||
),
|
|
||||||
Expanded(
|
Expanded(
|
||||||
child: AnimatedSwitcher(
|
child: AnimatedSwitcher(
|
||||||
duration: _screenTransitionDuration,
|
duration: _screenTransitionDuration,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import 'package:notas/screens/note_editor_screen.dart';
|
|||||||
import 'package:notas/widgets/menu_drawer.dart';
|
import 'package:notas/widgets/menu_drawer.dart';
|
||||||
import 'package:notas/widgets/note_card.dart';
|
import 'package:notas/widgets/note_card.dart';
|
||||||
import 'package:notas/widgets/search_app_bar.dart';
|
import 'package:notas/widgets/search_app_bar.dart';
|
||||||
|
import 'package:notas/widgets/sync_status_indicator.dart';
|
||||||
|
|
||||||
class HomeScreen extends StatefulWidget {
|
class HomeScreen extends StatefulWidget {
|
||||||
const HomeScreen({
|
const HomeScreen({
|
||||||
@@ -17,11 +18,15 @@ class HomeScreen extends StatefulWidget {
|
|||||||
required this.repository,
|
required this.repository,
|
||||||
required this.onOpenSettings,
|
required this.onOpenSettings,
|
||||||
this.onVaultInvalid,
|
this.onVaultInvalid,
|
||||||
|
this.syncStatus = SyncStatus.idle,
|
||||||
|
this.syncErrorMessage,
|
||||||
});
|
});
|
||||||
|
|
||||||
final NoteRepository repository;
|
final NoteRepository repository;
|
||||||
final VoidCallback onOpenSettings;
|
final VoidCallback onOpenSettings;
|
||||||
final Future<void> Function()? onVaultInvalid;
|
final Future<void> Function()? onVaultInvalid;
|
||||||
|
final SyncStatus syncStatus;
|
||||||
|
final String? syncErrorMessage;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<HomeScreen> createState() => _HomeScreenState();
|
State<HomeScreen> createState() => _HomeScreenState();
|
||||||
@@ -512,6 +517,10 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
_isMenuOpen = !_isMenuOpen;
|
_isMenuOpen = !_isMenuOpen;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
trailingWidget: SyncStatusIndicator(
|
||||||
|
status: widget.syncStatus,
|
||||||
|
errorMessage: widget.syncErrorMessage,
|
||||||
|
),
|
||||||
onSearchChanged: (String query) {
|
onSearchChanged: (String query) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_searchQuery = query;
|
_searchQuery = query;
|
||||||
|
|||||||
@@ -1,18 +1,12 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:notas/platform/app_platform.dart';
|
import 'package:notas/platform/app_platform.dart';
|
||||||
import 'package:notas/widgets/sync_status_indicator.dart';
|
|
||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
class AppTitleBar extends StatelessWidget {
|
class AppTitleBar extends StatelessWidget {
|
||||||
const AppTitleBar({
|
const AppTitleBar({
|
||||||
this.syncStatus = SyncStatus.idle,
|
|
||||||
this.syncErrorMessage,
|
|
||||||
super.key,
|
super.key,
|
||||||
});
|
});
|
||||||
|
|
||||||
final SyncStatus syncStatus;
|
|
||||||
final String? syncErrorMessage;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
if (isAndroid || isIOS) {
|
if (isAndroid || isIOS) {
|
||||||
@@ -30,11 +24,6 @@ class AppTitleBar extends StatelessWidget {
|
|||||||
'Mis Notas',
|
'Mis Notas',
|
||||||
style: TextStyle(color: Colors.white70, fontSize: 13),
|
style: TextStyle(color: Colors.white70, fontSize: 13),
|
||||||
),
|
),
|
||||||
const SizedBox(width: 8),
|
|
||||||
SyncStatusIndicator(
|
|
||||||
status: syncStatus,
|
|
||||||
errorMessage: syncErrorMessage,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -42,10 +31,7 @@ class AppTitleBar extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isLinux) {
|
if (isLinux) {
|
||||||
return _KdeTitleBar(
|
return const _KdeTitleBar();
|
||||||
syncStatus: syncStatus,
|
|
||||||
syncErrorMessage: syncErrorMessage,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
@@ -56,11 +42,6 @@ class AppTitleBar extends StatelessWidget {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
const Text('Mis Notas', style: TextStyle(color: Colors.white)),
|
const Text('Mis Notas', style: TextStyle(color: Colors.white)),
|
||||||
const SizedBox(width: 8),
|
|
||||||
SyncStatusIndicator(
|
|
||||||
status: syncStatus,
|
|
||||||
errorMessage: syncErrorMessage,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -69,13 +50,7 @@ class AppTitleBar extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _KdeTitleBar extends StatefulWidget {
|
class _KdeTitleBar extends StatefulWidget {
|
||||||
const _KdeTitleBar({
|
const _KdeTitleBar();
|
||||||
this.syncStatus = SyncStatus.idle,
|
|
||||||
this.syncErrorMessage,
|
|
||||||
});
|
|
||||||
|
|
||||||
final SyncStatus syncStatus;
|
|
||||||
final String? syncErrorMessage;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<_KdeTitleBar> createState() => _KdeTitleBarState();
|
State<_KdeTitleBar> createState() => _KdeTitleBarState();
|
||||||
@@ -182,22 +157,6 @@ class _KdeTitleBarState extends State<_KdeTitleBar> with WindowListener {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Positioned(
|
|
||||||
left: 0,
|
|
||||||
top: 0,
|
|
||||||
bottom: 0,
|
|
||||||
child: IgnorePointer(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
|
||||||
child: Center(
|
|
||||||
child: SyncStatusIndicator(
|
|
||||||
status: widget.syncStatus,
|
|
||||||
errorMessage: widget.syncErrorMessage,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Positioned(
|
Positioned(
|
||||||
right: 0,
|
right: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ class SearchAppBar extends StatefulWidget {
|
|||||||
this.onLeadingPressed,
|
this.onLeadingPressed,
|
||||||
this.leadingIcon = Icons.menu,
|
this.leadingIcon = Icons.menu,
|
||||||
this.leadingTooltip = 'Menú',
|
this.leadingTooltip = 'Menú',
|
||||||
|
this.leadingWidget,
|
||||||
|
this.trailingWidget,
|
||||||
this.onSearchChanged,
|
this.onSearchChanged,
|
||||||
this.searchHint = 'Buscar notas...',
|
this.searchHint = 'Buscar notas...',
|
||||||
this.showSearch = true,
|
this.showSearch = true,
|
||||||
@@ -17,6 +19,8 @@ class SearchAppBar extends StatefulWidget {
|
|||||||
final VoidCallback? onLeadingPressed;
|
final VoidCallback? onLeadingPressed;
|
||||||
final IconData leadingIcon;
|
final IconData leadingIcon;
|
||||||
final String leadingTooltip;
|
final String leadingTooltip;
|
||||||
|
final Widget? leadingWidget;
|
||||||
|
final Widget? trailingWidget;
|
||||||
final ValueChanged<String>? onSearchChanged;
|
final ValueChanged<String>? onSearchChanged;
|
||||||
final String searchHint;
|
final String searchHint;
|
||||||
final bool showSearch;
|
final bool showSearch;
|
||||||
@@ -67,6 +71,10 @@ class _SearchAppBarState extends State<SearchAppBar> {
|
|||||||
splashRadius: 18,
|
splashRadius: 18,
|
||||||
constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
|
constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
|
||||||
),
|
),
|
||||||
|
if (widget.leadingWidget != null) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Center(child: widget.leadingWidget!),
|
||||||
|
],
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: widget.showSearch
|
child: widget.showSearch
|
||||||
@@ -151,6 +159,10 @@ class _SearchAppBarState extends State<SearchAppBar> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (widget.trailingWidget != null) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Center(child: widget.trailingWidget!),
|
||||||
|
],
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -21,7 +21,14 @@ class SyncStatusIndicator extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case SyncStatus.idle:
|
case SyncStatus.idle:
|
||||||
return const SizedBox.shrink();
|
return const Tooltip(
|
||||||
|
message: 'Sincronización en espera',
|
||||||
|
child: Icon(
|
||||||
|
Icons.cloud_outlined,
|
||||||
|
size: 16,
|
||||||
|
color: Colors.white38,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
case SyncStatus.syncing:
|
case SyncStatus.syncing:
|
||||||
return const Tooltip(
|
return const Tooltip(
|
||||||
|
|||||||
Reference in New Issue
Block a user