Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions lib/features/connections/connections_panel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import 'package:querya_desktop/core/database/redis_info.dart';
import 'package:querya_desktop/core/storage/folders_storage.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/features/connections/connection_creation_flow.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';

Expand Down
3 changes: 2 additions & 1 deletion lib/features/connections/connections_panel_mongo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ class _MongoConnectionTileState extends State<_MongoConnectionTile> {
padding: const material.EdgeInsets.all(2),
child: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
Expand Down
6 changes: 4 additions & 2 deletions lib/features/connections/connections_panel_mysql.dart
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ class _MysqlConnectionTileState extends State<_MysqlConnectionTile> {
padding: const material.EdgeInsets.all(2),
child: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
Expand Down Expand Up @@ -387,7 +388,8 @@ class _MysqlDatabaseNodeState extends State<_MysqlDatabaseNode> {
label: widget.databaseName,
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 14,
Expand Down
15 changes: 10 additions & 5 deletions lib/features/connections/connections_panel_pg_tree.dart
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ class _PgDatabasesNodeState extends State<_PgDatabasesNode> {
label: 'Databases (${widget.databases.length})',
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 14,
Expand Down Expand Up @@ -328,7 +329,8 @@ class _PgDatabaseNodeState extends State<_PgDatabaseNode> {
label: widget.databaseName,
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 14,
Expand Down Expand Up @@ -509,7 +511,8 @@ class _PgSchemasNodeState extends State<_PgSchemasNode> {
label: 'Schemas (${widget.schemas.length})',
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 14,
Expand Down Expand Up @@ -649,7 +652,8 @@ class _PgSchemaNodeState extends State<_PgSchemaNode> {
label: widget.schemaName,
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 14,
Expand Down Expand Up @@ -939,7 +943,8 @@ class _PgObjectGroupState extends State<_PgObjectGroup> {
label: '${widget.label} (${widget.items.length})',
leading: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 13,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ class _PostgresConnectionTileState extends State<_PostgresConnectionTile> {
padding: const material.EdgeInsets.all(2),
child: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
Expand Down
3 changes: 2 additions & 1 deletion lib/features/connections/connections_panel_redis.dart
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
padding: const material.EdgeInsets.all(2),
child: material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
Expand Down
3 changes: 2 additions & 1 deletion lib/features/connections/connections_panel_sidebar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ class _FolderTileState extends State<_FolderTile> {
children: [
material.AnimatedRotation(
turns: _expanded ? 0.25 : 0,
duration: const Duration(milliseconds: 100),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.standardCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 18,
Expand Down
6 changes: 4 additions & 2 deletions lib/features/connections/new_connection_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'dart:math' as math;

import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/layout/window_layout.dart';
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';

/// Database type for new connection.
Expand Down Expand Up @@ -383,8 +385,8 @@ class _DbTypeCardState extends material.State<_DbTypeCard> {
child: material.GestureDetector(
onTap: widget.onTap,
child: material.AnimatedContainer(
duration: const Duration(milliseconds: 120),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
padding: const material.EdgeInsets.symmetric(vertical: 10, horizontal: 8),
decoration: material.BoxDecoration(
color: highlighted ? t.muted.withValues(alpha: 0.4) : t.muted.withValues(alpha: 0.12),
Expand Down
12 changes: 7 additions & 5 deletions lib/features/main_screen/workspace_panel.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart' as material show Alignment, Axis, Container, EdgeInsets, BoxDecoration, GestureDetector, Padding, BorderRadius, Center, Icon, Icons, MouseRegion, AnimatedContainer, AnimatedScale, Curves, SystemMouseCursors, SizedBox, SingleChildScrollView, Row, MainAxisSize;
import 'package:flutter/material.dart' as material show Alignment, Axis, Container, EdgeInsets, BoxDecoration, GestureDetector, Padding, BorderRadius, Center, Icon, Icons, MouseRegion, AnimatedContainer, AnimatedScale, SystemMouseCursors, SizedBox, SingleChildScrollView, Row, MainAxisSize;
import 'package:querya_desktop/core/layout/vertical_split_pane.dart';
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';

Expand Down Expand Up @@ -341,8 +343,8 @@ class _TabButtonState extends State<_TabButton> {
child: material.GestureDetector(
onTap: widget.onTap,
child: material.AnimatedContainer(
duration: const Duration(milliseconds: 120),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
padding: const material.EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: material.BoxDecoration(
color: bgColor,
Expand Down Expand Up @@ -376,8 +378,8 @@ class _RunButtonState extends State<_RunButton> {
cursor: material.SystemMouseCursors.click,
child: material.AnimatedScale(
scale: _hovered ? 1.03 : 1.0,
duration: const Duration(milliseconds: 100),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
child: OutlineButton(
onPressed: () {},
leading: const material.Icon(material.Icons.play_arrow, size: 18),
Expand Down
5 changes: 4 additions & 1 deletion lib/features/mysql/mysql_workspace_home.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'dart:async' show unawaited;

import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/features/mysql/mysql_sql_workspace.dart';
import 'package:querya_desktop/features/mysql/mysql_stats_view.dart';
Expand Down Expand Up @@ -82,7 +84,8 @@ class _MysqlWorkspaceHomeState extends material.State<MysqlWorkspaceHome> {
child: material.GestureDetector(
onTap: () => unawaited(_selectTab(i)),
child: material.AnimatedContainer(
duration: const Duration(milliseconds: 120),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
padding: const material.EdgeInsets.symmetric(
horizontal: 12,
vertical: 8,
Expand Down
5 changes: 4 additions & 1 deletion lib/features/postgresql/postgres_workspace_home.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'dart:async' show unawaited;

import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/features/postgresql/postgres_object_kind.dart';
import 'package:querya_desktop/features/postgresql/postgres_sql_workspace.dart';
Expand Down Expand Up @@ -123,7 +125,8 @@ class _PostgresWorkspaceHomeState extends material.State<PostgresWorkspaceHome>
child: material.GestureDetector(
onTap: () => _selectTab(i),
child: material.AnimatedContainer(
duration: const Duration(milliseconds: 120),
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
padding: const material.EdgeInsets.symmetric(
horizontal: 12,
vertical: 8,
Expand Down
14 changes: 6 additions & 8 deletions lib/features/settings/theme_picker_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'dart:async';

import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/layout/ui_scale.dart';
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/core/theme/querya_theme.dart';
import 'package:querya_desktop/core/theme/theme_definition.dart';
import 'package:querya_desktop/features/settings/theme_preview_card.dart';
Expand Down Expand Up @@ -379,10 +381,8 @@ class _ThemePickerButtonState extends material.State<ThemePickerButton> {
onEnter: _enabled ? (_) => setState(() => _triggerHovered = true) : null,
onExit: _enabled ? (_) => setState(() => _triggerHovered = false) : null,
child: material.AnimatedContainer(
duration: const Duration(
milliseconds: QueryaDropdownTokens.hoverAnimationMs,
),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
height: triggerHeight,
padding: QueryaDropdownTokens.scaledTriggerPadding(context),
decoration: material.BoxDecoration(
Expand Down Expand Up @@ -490,10 +490,8 @@ class _ThemePickerRowState extends material.State<_ThemePickerRow> {
onTap: widget.onSelected,
borderRadius: material.BorderRadius.circular(radius),
child: material.AnimatedContainer(
duration: const Duration(
milliseconds: QueryaDropdownTokens.hoverAnimationMs,
),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
constraints: material.BoxConstraints(minHeight: itemHeight),
padding: material.EdgeInsets.symmetric(
horizontal:
Expand Down
12 changes: 7 additions & 5 deletions lib/shared/widgets/app_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import 'dart:ui';

import 'package:flutter/material.dart';

import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';

/// Shows a modal dialog with a frosted, dimmed backdrop over the app.
///
/// Use instead of [showDialog] so every overlay has consistent blur.
Expand All @@ -15,7 +18,7 @@ Future<T?> showAppDialog<T>({
barrierDismissible: false,
barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
barrierColor: Colors.transparent,
transitionDuration: const Duration(milliseconds: 200),
transitionDuration: context.motionDuration(QueryaMotion.standard),
pageBuilder: (ctx, animation, secondaryAnimation) {
return _BlurredDialogScaffold(
barrierDismissible: barrierDismissible,
Expand Down Expand Up @@ -44,12 +47,11 @@ class _BlurredDialogScaffold extends StatelessWidget {
final Animation<double> animation;
final Widget child;

// Eased curve for dialog card fade-in / scale-up.
static final _curve = CurveTween(curve: Curves.easeOutCubic);

@override
Widget build(BuildContext context) {
final curved = animation.drive(_curve);
final curved = animation.drive(
CurveTween(curve: context.motionCurve(QueryaMotion.enter)),
);
return Material(
type: MaterialType.transparency,
child: Stack(
Expand Down
14 changes: 6 additions & 8 deletions lib/shared/widgets/querya_dropdown.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/layout/ui_scale.dart';
import 'package:querya_desktop/core/motion/querya_motion.dart';
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
import 'package:querya_desktop/shared/widgets/querya_dropdown_tokens.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';

Expand Down Expand Up @@ -154,10 +156,8 @@ class _QueryaDropdownState<T> extends material.State<QueryaDropdown<T>> {
onEnter: widget.enabled ? (_) => setState(() => _triggerHovered = true) : null,
onExit: widget.enabled ? (_) => setState(() => _triggerHovered = false) : null,
child: material.AnimatedContainer(
duration: const Duration(
milliseconds: QueryaDropdownTokens.hoverAnimationMs,
),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
height: triggerHeight,
padding: QueryaDropdownTokens.scaledTriggerPadding(context),
decoration: material.BoxDecoration(
Expand Down Expand Up @@ -350,10 +350,8 @@ class _QueryaDropdownMenuItemState<T> extends material.State<_QueryaDropdownMenu
),
onPressed: widget.enabled ? widget.onPick : null,
child: material.AnimatedContainer(
duration: const Duration(
milliseconds: QueryaDropdownTokens.hoverAnimationMs,
),
curve: material.Curves.easeOut,
duration: context.motionDuration(QueryaMotion.fast),
curve: context.motionCurve(QueryaMotion.enter),
constraints: material.BoxConstraints(minHeight: itemHeight),
padding: material.EdgeInsets.symmetric(
horizontal: context.scaled(QueryaDropdownTokens.menuItemPadding.horizontal),
Expand Down
2 changes: 0 additions & 2 deletions lib/shared/widgets/querya_dropdown_tokens.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ abstract final class QueryaDropdownTokens {

static const double selectedCheckSlotWidth = 18.0;

static const int hoverAnimationMs = 120;

static double scaledTriggerHeight(material.BuildContext context) =>
context.scaled(triggerHeight);

Expand Down
Loading