From d9d9079df46e1ffe4100853dceab38e9a3128d1d Mon Sep 17 00:00:00 2001 From: Juan Gilsanz Polo Date: Fri, 23 Feb 2024 18:12:51 +0100 Subject: [PATCH] Improvements --- lib/screens/links/ui/links.dart | 26 +++++++++++++++++--------- lib/screens/webview/ui/webview.dart | 4 +--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/screens/links/ui/links.dart b/lib/screens/links/ui/links.dart index ee36c90..6f06924 100644 --- a/lib/screens/links/ui/links.dart +++ b/lib/screens/links/ui/links.dart @@ -27,15 +27,19 @@ class Links extends ConsumerWidget { } String dateString(DateTime date) { + String addZeros(int value) { + return value.toString().padLeft(2, '0'); + } + final today = DateTime.now(); final yesterday = DateTime.now().subtract(const Duration(days: 1)); if (date.day == today.day && date.month == today.month && date.year == today.year) { - return t.links.dates.todayAt(time: "${date.hour}:${date.minute}"); + return t.links.dates.todayAt(time: "${addZeros(date.hour)}:${addZeros(date.minute)}"); } else if (date.day == yesterday.day && date.month == yesterday.month && date.year == yesterday.year) { - return t.links.dates.yesterdayAt(time: "${date.hour}:${date.minute}"); + return t.links.dates.yesterdayAt(time: "${addZeros(date.hour)}:${addZeros(date.minute)}"); } else { - return "${date.day}/${date.month}/${date.year} - ${date.hour}:${date.minute}"; + return "${date.day}/${date.month}/${date.year} - ${addZeros(date.hour)}:${addZeros(date.minute)}"; } } @@ -111,6 +115,7 @@ class Links extends ConsumerWidget { validateStrings(link?.title, link?.websiteTitle), maxLines: 2, overflow: TextOverflow.ellipsis, + textAlign: TextAlign.left, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, @@ -119,11 +124,13 @@ class Links extends ConsumerWidget { ), ), subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( validateStrings(link?.description, link?.websiteDescription), maxLines: 3, overflow: TextOverflow.ellipsis, + textAlign: TextAlign.left, style: TextStyle( fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, @@ -143,12 +150,13 @@ class Links extends ConsumerWidget { ), ), if (link?.dateModified != null) ...[ - Container( - width: 1, - height: 12, - margin: const EdgeInsets.symmetric(horizontal: 8), - color: Theme.of(context).colorScheme.tertiary.withOpacity(0.3), - ), + if (link?.tagNames?.isNotEmpty == true) + Container( + width: 1, + height: 12, + margin: const EdgeInsets.symmetric(horizontal: 8), + color: Theme.of(context).colorScheme.tertiary.withOpacity(0.3), + ), Text( dateString(link!.dateModified!), style: TextStyle( diff --git a/lib/screens/webview/ui/webview.dart b/lib/screens/webview/ui/webview.dart index bac58b1..770777b 100644 --- a/lib/screens/webview/ui/webview.dart +++ b/lib/screens/webview/ui/webview.dart @@ -24,6 +24,7 @@ class WebView extends ConsumerWidget { appBar: AppBar( elevation: 3, title: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!, @@ -69,9 +70,6 @@ class WebView extends ConsumerWidget { ref.read(webViewProvider.notifier).setLoadProgress(progress); }, initialSettings: InAppWebViewSettings( - allowContentAccess: false, - allowFileAccess: false, - applePayAPIEnabled: false, cacheEnabled: false, isInspectable: false, ),