Skip to content

Fix statistics dialog alignment by using column-based key–value layout #539

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
sogalabhi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix statistics dialog alignment by using column-based key–value layout #539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 31 additions & 22 deletions lib/app/modules/manageTaskServer/views/manage_task_server_page_app_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// ignore_for_file: use_build_context_synchronously

import 'dart:math';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -29,7 +27,8 @@ class ManageTaskServerPageAppBar extends StatelessWidget

@override
Widget build(BuildContext context) {
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
TaskwarriorColorTheme tColors =
Theme.of(context).extension<TaskwarriorColorTheme>()!;
return AppBar(
backgroundColor: TaskWarriorColors.kprimaryBackgroundColor,
titleSpacing: 0,
Expand Down Expand Up @@ -129,11 +128,6 @@ class ManageTaskServerPageAppBar extends StatelessWidget
var header =
await controller.storage.home.statistics(await client());

// Determine the maximum key length for formatting purposes
var maxKeyLength = header.keys
.map<int>((key) => (key as String).length)
.reduce(max);

// Dismiss the loading dialog
// Navigator.of(context).pop();
Get.back();
Expand All @@ -151,22 +145,37 @@ class ManageTaskServerPageAppBar extends StatelessWidget
style: const TextStyle(),
),
content: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Display each key-value pair in the statistics header
for (var key in header.keys.toList())
Text(
'${'$key:'.padRight(maxKeyLength + 1)} ${header[key]}',
style: TextStyle(
color: tColors.primaryTextColor,
// Display each key-value pair with aligned columns
for (final entry in header.entries)
Padding(
padding: const EdgeInsets.symmetric(vertical: 2),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 180, // Fixed width for key column
child: Text(
'${entry.key}:',
style: TextStyle(
color: tColors.primaryTextColor,
fontWeight: FontWeight.w500,
),
),
),
),
],
),
Expanded(
child: Text(
entry.value.toString(),
style: TextStyle(
color: tColors.primaryTextColor,
),
),
),
],
),
),
],
),
),
Expand Down