From bb5fe9c380327529fb3cf7a76ac98b18b099debd Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Thu, 12 Dec 2024 22:33:10 +0800 Subject: [PATCH] :lipstick: Optimize font color on app bar in some pages --- ios/Podfile.lock | 17 ----------------- lib/screens/account.dart | 1 - lib/screens/account/pfp.dart | 4 ++-- lib/screens/post/post_detail.dart | 8 ++++++-- lib/screens/post/post_editor.dart | 8 ++++++-- lib/screens/post/publisher_page.dart | 3 +-- lib/widgets/post/post_item.dart | 11 ++++++++--- 7 files changed, 23 insertions(+), 29 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 835a638..f99928a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,8 +4,6 @@ PODS: - FlutterMacOS - croppy (0.0.1): - Flutter - - cupertino_http (0.0.1): - - Flutter - device_info_plus (0.0.1): - Flutter - DKImagePickerController/Core (4.3.9): @@ -196,11 +194,6 @@ PODS: - SDWebImage (5.20.0): - SDWebImage/Core (= 5.20.0) - SDWebImage/Core (5.20.0) - - Sentry/HybridSDK (8.41.0) - - sentry_flutter (8.11.0): - - Flutter - - FlutterMacOS - - Sentry/HybridSDK (= 8.41.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -221,7 +214,6 @@ PODS: DEPENDENCIES: - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`) - croppy (from `.symlinks/plugins/croppy/ios`) - - cupertino_http (from `.symlinks/plugins/cupertino_http/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) @@ -242,7 +234,6 @@ DEPENDENCIES: - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) @@ -267,7 +258,6 @@ SPEC REPOS: - PromisesObjC - SAMKeychain - SDWebImage - - Sentry - SwiftyGif - WebRTC-SDK @@ -276,8 +266,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/connectivity_plus/darwin" croppy: :path: ".symlinks/plugins/croppy/ios" - cupertino_http: - :path: ".symlinks/plugins/cupertino_http/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" file_picker: @@ -318,8 +306,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler_apple/ios" screen_brightness_ios: :path: ".symlinks/plugins/screen_brightness_ios/ios" - sentry_flutter: - :path: ".symlinks/plugins/sentry_flutter/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: @@ -336,7 +322,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: connectivity_plus: 4c41c08fc6d7c91f63bc7aec70ffe3730b04f563 croppy: b6199bc8d56bd2e03cc11609d1c47ad9875c1321 - cupertino_http: 1a3a0f163c1b26e7f1a293b33d476e0fde7a64ec device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 @@ -372,8 +357,6 @@ SPEC CHECKSUMS: SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 - Sentry: 54d0fe6c0df448497c8ed4cce66ccf7027e1823e - sentry_flutter: 83a84efb7f978522c9127fbc0c07dab09663eecc share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d diff --git a/lib/screens/account.dart b/lib/screens/account.dart index 11a2d27..44ff592 100644 --- a/lib/screens/account.dart +++ b/lib/screens/account.dart @@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:go_router/go_router.dart'; -import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/account/pfp.dart b/lib/screens/account/pfp.dart index 4b36c89..d957921 100644 --- a/lib/screens/account/pfp.dart +++ b/lib/screens/account/pfp.dart @@ -238,7 +238,7 @@ class _UserScreenState extends State with SingleTickerProviderStateM TextSpan( text: _account!.nick, style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: Colors.white, + color: Theme.of(context).appBarTheme.foregroundColor!, shadows: labelShadows, ), ), @@ -246,7 +246,7 @@ class _UserScreenState extends State with SingleTickerProviderStateM TextSpan( text: '@${_account!.name}', style: Theme.of(context).textTheme.bodySmall!.copyWith( - color: Colors.white, + color: Theme.of(context).appBarTheme.foregroundColor!, shadows: labelShadows, ), ), diff --git a/lib/screens/post/post_detail.dart b/lib/screens/post/post_detail.dart index 4b68ae9..845fe31 100644 --- a/lib/screens/post/post_detail.dart +++ b/lib/screens/post/post_detail.dart @@ -84,12 +84,16 @@ class _PostDetailScreenState extends State { text: TextSpan(children: [ TextSpan( text: _data?.body['title'] ?? 'postNoun'.tr(), - style: Theme.of(context).textTheme.titleLarge!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.titleLarge!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor!, + ), ), const TextSpan(text: '\n'), TextSpan( text: 'postDetail'.tr(), - style: Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.bodySmall!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor!, + ), ), ]), ) diff --git a/lib/screens/post/post_editor.dart b/lib/screens/post/post_editor.dart index 5e5f23f..60c0a33 100644 --- a/lib/screens/post/post_editor.dart +++ b/lib/screens/post/post_editor.dart @@ -149,12 +149,16 @@ class _PostEditorScreenState extends State { text: TextSpan(children: [ TextSpan( text: _writeController.title.isNotEmpty ? _writeController.title : 'untitled'.tr(), - style: Theme.of(context).textTheme.titleLarge!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.titleLarge!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor!, + ), ), const TextSpan(text: '\n'), TextSpan( text: PostWriteController.kTitleMap[widget.mode]!.tr(), - style: Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.bodySmall!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor!, + ), ), ]), ), diff --git a/lib/screens/post/publisher_page.dart b/lib/screens/post/publisher_page.dart index ce8600e..70d30b9 100644 --- a/lib/screens/post/publisher_page.dart +++ b/lib/screens/post/publisher_page.dart @@ -201,7 +201,6 @@ class _PostPublisherScreenState extends State with SingleTi setState(() => _isWorking = true); try { - final sn = context.read(); final rel = context.read(); await rel.updateRelationship(_account!.id, 1, _accountRelationship?.permNodes ?? {}); if (!mounted) return; @@ -288,7 +287,7 @@ class _PostPublisherScreenState extends State with SingleTi TextSpan( text: _publisher!.nick, style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: Colors.white, + color: Theme.of(context).appBarTheme.foregroundColor!, shadows: labelShadows, ), ), diff --git a/lib/widgets/post/post_item.dart b/lib/widgets/post/post_item.dart index 889d70d..86ea46f 100644 --- a/lib/widgets/post/post_item.dart +++ b/lib/widgets/post/post_item.dart @@ -213,6 +213,10 @@ class _PostBottomAction extends StatelessWidget { } } + void _doShareViaPicture() { + + } + @override Widget build(BuildContext context) { final iconColor = Theme.of(context).colorScheme.onSurface.withAlpha( @@ -298,6 +302,7 @@ class _PostBottomAction extends StatelessWidget { ), InkWell( onTap: _doShare, + onLongPress: _doShareViaPicture, child: Icon( Symbols.share, size: 20, @@ -369,10 +374,10 @@ class _PostHeadline extends StatelessWidget { style: TextStyle(fontSize: 13), ), const Gap(8), - if (data.updatedAt != data.createdAt) + if (data.editedAt != null) Text( 'articleEditedAt'.tr( - args: [DateFormat('y/M/d HH:mm').format(data.updatedAt)], + args: [DateFormat('y/M/d HH:mm').format(data.editedAt!)], ), style: TextStyle(fontSize: 13), ), @@ -652,7 +657,7 @@ class _PostQuoteContent extends StatelessWidget { if (child.visibility > 0) _PostVisibilityHint(data: child).padding(top: 4), ], ).padding(horizontal: 16), - if (child.preload?.attachments?.isNotEmpty ?? false) + if (child.type != 'article' && (child.preload?.attachments?.isNotEmpty ?? false)) ClipRRect( borderRadius: const BorderRadius.only( bottomLeft: Radius.circular(8),