Merge branch 'dev' of https://github.com/anusii/solidui into tony/257_notification

# Conflicts:
#	lib/src/widgets/solid_scaffold_appbar_actions.dart
#	lib/src/widgets/solid_scaffold_appbar_builder.dart
#	lib/src/widgets/solid_scaffold_appbar_ordered_actions.dart
#	lib/src/widgets/solid_scaffold_helpers.dart
#	lib/src/widgets/solid_scaffold_widget_builder.dart

Author: tonypioneer

CHANGELOG.md

@@ -15,6 +15,16 @@ au](https://solidcommunity.au/docs/solidui)
 
 ## 0.4.0 Refine and Tune
 
++ Add a Wrap() to avoid overflow on SolidLogin [0.3.18 20260410 gjw]
++ Place ABOUT button to right most by default [0.3.17 20260410 gjw]
++ Add mising wordWrap function [0.3.16 20260410 gjw]
++ Add showLogin to support no login button [0.3.15 20260410 gjw]
++ Support invisible LOGIN/CONTINUE buttons [0.3.14 20260409 gjw]
++ Support invisible REGISTER/INFO buttons for SolidLogin [0.3.13 20260409 gjw]
++ Retain app theme across restart [0.3.12 20260409 gjw]
++ Add get key if required to login [0.3.11 20260406 tonypioneer]
++ Fine tune UX for SolidScaffold elements [0.3.10 20260406 gjw]
++ List files/folder count in FileBrowser, not just file count [0.3.9 20260402 gjw]
 + Add keep login and other webid to SolidLogin() [0.3.8 20260326 tonypioneer]
 + Adds additional layout width checks [0.3.7 20260326 tonypioneer]
 + Add Security Key and Logged In to Nav menu [0.3.6 20260326 tonypioneer]

Makefile

@@ -2,7 +2,7 @@
 #
 # Generic Makefile
 #
-# Time-stamp: <Saturday 2026-01-03 16:58:59 +1100 Graham Williams>
+# Time-stamp: <Wednesday 2026-03-18 12:22:03 +1100 Graham Williams>
 #
 # Copyright (c) Graham.Williams@togaware.com
 #
@@ -188,3 +188,12 @@ ginfo:
 	else \
 		echo "No bump ID found."; \
 	fi
+
+.PHONY: zip
+zip:
+	rm -f ignore/my_lib.zip
+	zip -r ignore/my_lib.zip lib
+
+.PHONY: claude
+claude:
+	bash support/meld_zip_from_claude.sh

example/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   markdown_tooltip: ^0.0.10
   rdflib: ^0.2.12
   solidpod: ^0.11.0
-  solidui: # ^0.2.0
+  solidui:
     path: ..
   universal_io: ^2.3.1
   window_manager: ^0.5.1

lib/src/constants/navigation.dart

@@ -51,27 +51,27 @@ class NavigationConstants {
 
   /// Minimum width for the navigation rail.
 
-  static const double navRailMinWidth = 80.0;
+  static const double navRailMinWidth = 84.0;
 
   /// Vertical alignment for navigation rail items.
 
   static const double navRailGroupAlignment = -1.0;
 
   /// Icon size for navigation items.
 
-  static const double navIconSize = 26.0;
+  static const double navIconSize = 24.0;
 
   /// Font size for navigation labels.
 
-  static const double navLabelFontSize = 10.5;
+  static const double navLabelFontSize = 11.0;
 
   /// Letter spacing for navigation labels.
 
-  static const double navLabelLetterSpacing = 0.2;
+  static const double navLabelLetterSpacing = 0.3;
 
   /// Vertical padding for navigation rail destinations.
 
-  static const double navDestinationVerticalPadding = 6.0;
+  static const double navDestinationVerticalPadding = 8.0;
 
   /// Maximum lines for navigation labels.
 

lib/src/utils/file_operations.dart

@@ -168,7 +168,7 @@ class FileOperations {
     String currentPath,
     List<String> directories,
   ) async {
-    // Count files in each subdirectory.
+    // Count items (files + folders) in each subdirectory.
 
     final counts = <String, int>{};
     for (var dir in directories) {
@@ -179,24 +179,26 @@ class FileOperations {
     return counts;
   }
 
-  /// Counts the number of files in a directory.
+  /// Counts the total number of items (files and folders) in a directory.
   ///
   /// Parameters:
-  /// - [dirPath]: The directory path to count files in.
+  /// - [dirPath]: The directory path to count items in.
   ///
-  /// Returns the number of files in the directory, or 0 if an error occurs.
+  /// Returns the number of files and subdirectories, or 0 if an error occurs.
 
   static Future<int> getDirectoryFileCount(String dirPath) async {
     try {
-      // Get directory contents and count files.
+      // Get directory contents and count both files and subdirectories.
 
       final dirUrl = await getDirUrl(dirPath);
       final resources = await getResourcesInContainer(dirUrl);
-      return resources.files
+      final fileCount = resources.files
           .where((f) => f.endsWith('.enc.ttl') || f.endsWith('.ttl'))
           .length;
+
+      return fileCount + resources.subDirs.length;
     } catch (e) {
-      debugPrint('Error counting files in directory: $e');
+      debugPrint('Error counting items in directory: $e');
       return 0;
     }
   }

lib/src/widgets/app_bar.dart

@@ -47,7 +47,13 @@ PreferredSizeWidget defaultAppBar(
 }) {
   return AppBar(
     leading: IconButton(
-      icon: const Icon(Icons.arrow_back, color: Colors.black),
+      icon: Icon(
+        Icons.arrow_back,
+        color: ThemeData.estimateBrightnessForColor(backgroundColor) ==
+                Brightness.dark
+            ? Colors.white
+            : Colors.black87,
+      ),
       onPressed: () {
         // Call the callback if provided.
 
@@ -61,15 +67,19 @@ PreferredSizeWidget defaultAppBar(
           // Use the original pushReplacement behaviour.
 
           pushReplacement(context, child);
-
-          // Navigator.pushReplacement(
-          //   context,
-          //   MaterialPageRoute(builder: (context) => child),
-          // );
         }
       },
     ),
     backgroundColor: backgroundColor,
-    title: Text(title),
+    elevation: 0,
+    scrolledUnderElevation: 0.5,
+    title: Text(
+      title,
+      style: const TextStyle(
+        fontWeight: FontWeight.w700,
+        letterSpacing: -0.3,
+        fontSize: 18,
+      ),
+    ),
   );
 }

lib/src/widgets/solid_about_button.dart

@@ -1,6 +1,6 @@
 /// Solid About Button.
 ///
-// Time-stamp: <Monday 2025-08-25 09:43:05 +1000 Graham Williams>
+// Time-stamp: <Thursday 2026-04-09 11:51:44 +1000 Graham Williams>
 ///
 /// Copyright (C) 2025, Software Innovation Institute, ANU.
 ///
@@ -42,6 +42,44 @@ import 'package:solidui/src/constants/about.dart';
 import 'package:solidui/src/widgets/solid_about_models.dart';
 import 'package:solidui/src/widgets/solid_preferences_dialog.dart';
 
+/// Collapses single newlines (source-code soft wraps) into spaces so the
+/// Markdown renderer can reflow text to fit the dialog width.
+///
+/// Double newlines (paragraph breaks) and Markdown syntax lines (headings,
+/// links, bold, etc.) are preserved verbatim.
+
+String wordWrap(String text) {
+  // Normalise Windows line endings.
+  final s = text.replaceAll('\r\n', '\n');
+  final lines = s.split('\n');
+  final out = StringBuffer();
+
+  for (int i = 0; i < lines.length; i++) {
+    final line = lines[i];
+    final next = i + 1 < lines.length ? lines[i + 1] : null;
+
+    // Empty line = paragraph break — preserve as-is.
+    if (line.trim().isEmpty) {
+      out.writeln();
+      continue;
+    }
+
+    // Markdown structural lines (headings, list items, links, bold starts)
+    // must stay on their own line.
+    final isMdLine =
+        RegExp(r'^(#{1,6} |\*\*|\* |- |\[|\!)').hasMatch(line.trim());
+
+    if (isMdLine || next == null || next.trim().isEmpty) {
+      out.writeln(line);
+    } else {
+      // Soft wrap: join to next line with a space instead of a newline.
+      out.write('$line ');
+    }
+  }
+
+  return out.toString().trimRight();
+}
+
 /// A button that shows an About dialogue when pressed.
 
 class SolidAboutButton extends StatefulWidget {
@@ -316,7 +354,7 @@ class SolidAbout {
             alignment: Alignment.centerLeft,
             child: TextButton.icon(
               icon: const Icon(Icons.tune),
-              label: const Text('AppBar Layout Preferences'),
+              label: const Text('AppBar Preferences'),
               onPressed: () {
                 Navigator.of(dialogContext).pop();
                 SolidPreferencesDialog.show(context);

lib/src/widgets/solid_dynamic_auth_button.dart

@@ -43,10 +43,15 @@ import 'package:solidui/src/handlers/solid_auth_handler.dart';
 
 class SolidDynamicAuthButton extends StatefulWidget {
   /// Whether to show the logout button when user is logged in.
-  /// When false, only the login button is shown when logged out.
 
   final bool showLogout;
 
+  /// Whether to show the login button when user is logged out.
+  /// Set to false to hide the login button entirely (e.g. when the app
+  /// uses a dedicated login screen via SolidLogin).
+
+  final bool showLogin;
+
   /// Callback function triggered when user taps logout (when logged in).
   /// If null, uses SolidAuthHandler.instance.handleLogout().
 
@@ -68,6 +73,7 @@ class SolidDynamicAuthButton extends StatefulWidget {
   const SolidDynamicAuthButton({
     super.key,
     this.showLogout = true,
+    this.showLogin = true,
     this.onLogout,
     this.onLogin,
     this.loginTooltip = 'Log in to your Solid POD',
@@ -173,11 +179,16 @@ class _SolidDynamicAuthButtonState extends State<SolidDynamicAuthButton> {
       );
     }
 
-    // When showLogout is false and user is logged in, hide the button.
+    // Hide logout button when logged in and showLogout is false.
     if (!widget.showLogout && _isLoggedIn) {
       return const SizedBox.shrink();
     }
 
+    // Hide login button when logged out and showLogin is false.
+    if (!widget.showLogin && !_isLoggedIn) {
+      return const SizedBox.shrink();
+    }
+
     final icon = _isLoggedIn ? Icons.logout : Icons.login;
     final tooltip = _isLoggedIn ? widget.logoutTooltip : widget.loginTooltip;
 

lib/src/widgets/solid_file_directory_list.dart

@@ -30,14 +30,14 @@ library;
 
 import 'package:flutter/material.dart';
 
-/// A widget that displays a list of directories with their file counts.
+/// A widget that displays a list of directories with their item counts.
 
 class DirectoryList extends StatelessWidget {
   /// List of directory names to display.
 
   final List<String> directories;
 
-  /// Map of directory names to their file counts.
+  /// Map of directory names to their item counts (files + folders).
 
   final Map<String, int> directoryCounts;
 
@@ -172,7 +172,7 @@ class DirectoryList extends StatelessWidget {
                   ),
                 ),
 
-                // File count badge. Shows a compact loading indicator while
+                // Item count badge. Shows a compact loading indicator while
                 // counts are being fetched in the background.
 
                 if (directoryCounts.containsKey(dir))
@@ -188,7 +188,8 @@ class DirectoryList extends StatelessWidget {
                       borderRadius: BorderRadius.circular(12),
                     ),
                     child: Text(
-                      '${directoryCounts[dir]} files',
+                      '${directoryCounts[dir]}'
+                      ' item${directoryCounts[dir] == 1 ? '' : 's'}',
                       style: TextStyle(
                         fontSize: 12,
                         color: Theme.of(context).textTheme.bodySmall?.color,

lib/src/widgets/solid_file_path_bar.dart

@@ -328,24 +328,22 @@ class PathBar extends StatelessWidget {
                     ),
                   )
                 else
-                  Row(
-                    children: [
-                      Text(
-                        'Directories: $currentDirDirectoryCount',
+                  Builder(
+                    builder: (context) {
+                      final total =
+                          currentDirDirectoryCount + currentDirFileCount;
+                      final dirs = currentDirDirectoryCount;
+                      final files = currentDirFileCount;
+                      return Text(
+                        '$total item${total == 1 ? '' : 's'}'
+                        ' ($dirs director${dirs == 1 ? 'y' : 'ies'}'
+                        ' and $files file${files == 1 ? '' : 's'})',
                         style: TextStyle(
                           color: Theme.of(context).textTheme.bodySmall?.color,
                           fontSize: 12,
                         ),
-                      ),
-                      const SizedBox(width: 8),
-                      Text(
-                        'Files: $currentDirFileCount',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodySmall?.color,
-                          fontSize: 12,
-                        ),
-                      ),
-                    ],
+                      );
+                    },
                   ),
 
                 const SizedBox(width: 12),