diff --git a/mobile/lib/ui/collections/album/list_item.dart b/mobile/lib/ui/collections/album/list_item.dart index 97a31f0938..4d8ffd41ae 100644 --- a/mobile/lib/ui/collections/album/list_item.dart +++ b/mobile/lib/ui/collections/album/list_item.dart @@ -160,10 +160,11 @@ class AlbumListItemWidget extends StatelessWidget { iconButtonType: IconButtonType.secondary, iconColor: colorScheme.blurStrokeBase, ) - : const IconButtonWidget( - key: ValueKey("unselected"), + : IconButtonWidget( + key: const ValueKey("unselected"), icon: Icons.chevron_right_outlined, iconButtonType: IconButtonType.secondary, + iconColor: colorScheme.blurStrokePressed, ), ); }, diff --git a/mobile/lib/ui/collections/album/new_row_item.dart b/mobile/lib/ui/collections/album/new_row_item.dart index 3a7d92b879..0adcb0c6a3 100644 --- a/mobile/lib/ui/collections/album/new_row_item.dart +++ b/mobile/lib/ui/collections/album/new_row_item.dart @@ -73,13 +73,13 @@ class NewAlbumRowItemWidget extends StatelessWidget { dashPattern: const [3.75, 3.75], radius: const Radius.circular(2.35), padding: EdgeInsets.zero, - color: enteColorScheme.strokeFaint, + color: enteColorScheme.blurStrokePressed, child: SizedBox( height: height, width: width, child: Icon( Icons.add, - color: enteColorScheme.strokeFaint, + color: enteColorScheme.blurStrokePressed, ), ), ), diff --git a/mobile/lib/ui/collections/collection_list_page.dart b/mobile/lib/ui/collections/collection_list_page.dart index da78a28bb9..2780fef116 100644 --- a/mobile/lib/ui/collections/collection_list_page.dart +++ b/mobile/lib/ui/collections/collection_list_page.dart @@ -10,6 +10,7 @@ import 'package:photos/models/collection/collection_items.dart'; import "package:photos/models/selected_albums.dart"; import "package:photos/service_locator.dart"; import "package:photos/services/collections_service.dart"; +import "package:photos/theme/ente_theme.dart"; import "package:photos/ui/collections/flex_grid_view.dart"; import "package:photos/ui/components/buttons/icon_button_widget.dart"; import "package:photos/ui/components/searchable_appbar.dart"; @@ -104,7 +105,6 @@ class _CollectionListPageState extends State { refreshCollections(); }, actions: [ - const SizedBox(width: 8), _sortMenu(collections!), ], ), @@ -130,6 +130,8 @@ class _CollectionListPageState extends State { } Widget _sortMenu(List collections) { + final colorTheme = getEnteColorScheme(context); + Text sortOptionText(AlbumSortKey key) { String text = key.toString(); switch (key) { @@ -163,6 +165,7 @@ class _CollectionListPageState extends State { ? Icons.view_list_outlined : Icons.grid_view_outlined, iconButtonType: IconButtonType.secondary, + iconColor: colorTheme.blurStrokePressed, onTap: () async { setState(() { albumViewType = albumViewType == AlbumViewType.grid @@ -172,7 +175,6 @@ class _CollectionListPageState extends State { await localSettings.setAlbumViewType(albumViewType!); }, ), - const SizedBox(width: 8), GestureDetector( onTapDown: (TapDownDetails details) async { final int? selectedValue = await showMenu( @@ -198,9 +200,10 @@ class _CollectionListPageState extends State { Bus.instance.fire(AlbumSortOrderChangeEvent()); } }, - child: const IconButtonWidget( + child: IconButtonWidget( icon: Icons.sort_outlined, iconButtonType: IconButtonType.secondary, + iconColor: colorTheme.blurStrokePressed, ), ), ], diff --git a/mobile/lib/ui/components/searchable_appbar.dart b/mobile/lib/ui/components/searchable_appbar.dart index 3ce8e3b5ae..4290713552 100644 --- a/mobile/lib/ui/components/searchable_appbar.dart +++ b/mobile/lib/ui/components/searchable_appbar.dart @@ -85,6 +85,7 @@ class _SearchableAppBarState extends State { icon: Icons.search, iconButtonType: IconButtonType.secondary, onTap: _activateSearch, + iconColor: getEnteColorScheme(context).blurStrokePressed, ), ...?widget.actions, ], diff --git a/mobile/lib/ui/tabs/shared/quick_link_album_item.dart b/mobile/lib/ui/tabs/shared/quick_link_album_item.dart index db84df9083..f5bf9fd6da 100644 --- a/mobile/lib/ui/tabs/shared/quick_link_album_item.dart +++ b/mobile/lib/ui/tabs/shared/quick_link_album_item.dart @@ -150,10 +150,11 @@ class QuickLinkAlbumItem extends StatelessWidget { iconButtonType: IconButtonType.secondary, iconColor: colorScheme.blurStrokeBase, ) - : const IconButtonWidget( - key: ValueKey("unselected"), + : IconButtonWidget( + key: const ValueKey("unselected"), icon: Icons.chevron_right_outlined, iconButtonType: IconButtonType.secondary, + iconColor: colorScheme.blurStrokePressed, ), ), ), diff --git a/mobile/lib/ui/tabs/shared_collections_tab.dart b/mobile/lib/ui/tabs/shared_collections_tab.dart index 42b8850185..54df06a517 100644 --- a/mobile/lib/ui/tabs/shared_collections_tab.dart +++ b/mobile/lib/ui/tabs/shared_collections_tab.dart @@ -10,6 +10,7 @@ import 'package:photos/events/user_logged_out_event.dart'; import "package:photos/generated/l10n.dart"; import 'package:photos/models/collection/collection_items.dart'; import 'package:photos/services/collections_service.dart'; +import "package:photos/theme/ente_theme.dart"; import "package:photos/ui/collections/album/row_item.dart"; import "package:photos/ui/collections/collection_list_page.dart"; import 'package:photos/ui/common/loading_widget.dart'; @@ -106,6 +107,7 @@ class _SharedCollectionsTabState extends State SectionTitle(title: S.of(context).sharedWithYou); final SectionTitle sharedByYou = SectionTitle(title: S.of(context).sharedByYou); + final colorTheme = getEnteColorScheme(context); return SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Container( @@ -136,9 +138,10 @@ class _SharedCollectionsTabState extends State : null, Hero(tag: "incoming", child: sharedWithYou), trailingWidget: collections.incoming.isNotEmpty - ? const IconButtonWidget( + ? IconButtonWidget( icon: Icons.chevron_right, iconButtonType: IconButtonType.secondary, + iconColor: colorTheme.blurStrokePressed, ) : null, ), @@ -158,6 +161,7 @@ class _SharedCollectionsTabState extends State collections.incoming[index], maxThumbnailWidth, tag: "incoming", + showFileCount: false, ), ); }, @@ -192,9 +196,10 @@ class _SharedCollectionsTabState extends State : null, Hero(tag: "outgoing", child: sharedByYou), trailingWidget: collections.outgoing.isNotEmpty - ? const IconButtonWidget( + ? IconButtonWidget( icon: Icons.chevron_right, iconButtonType: IconButtonType.secondary, + iconColor: colorTheme.blurStrokePressed, ) : null, ), @@ -214,6 +219,7 @@ class _SharedCollectionsTabState extends State collections.outgoing[index], maxThumbnailWidth, tag: "outgoing", + showFileCount: false, ), ); }, @@ -252,9 +258,10 @@ class _SharedCollectionsTabState extends State ), ), trailingWidget: numberOfQuickLinks > maxQuickLinks - ? const IconButtonWidget( + ? IconButtonWidget( icon: Icons.chevron_right, iconButtonType: IconButtonType.secondary, + iconColor: colorTheme.blurStrokePressed, ) : null, ), diff --git a/mobile/lib/ui/tabs/user_collections_tab.dart b/mobile/lib/ui/tabs/user_collections_tab.dart index ebf4d19c72..b03b3912fa 100644 --- a/mobile/lib/ui/tabs/user_collections_tab.dart +++ b/mobile/lib/ui/tabs/user_collections_tab.dart @@ -146,9 +146,10 @@ class _UserCollectionsTabState extends State tag: "OnDeviceAppTitle", child: SectionTitle(title: S.of(context).onDevice), ), - trailingWidget: const IconButtonWidget( + trailingWidget: IconButtonWidget( icon: Icons.chevron_right, iconButtonType: IconButtonType.secondary, + iconColor: getEnteColorScheme(context).blurStrokePressed, ), ), ), @@ -171,9 +172,10 @@ class _UserCollectionsTabState extends State ); }, SectionTitle(titleWithBrand: getOnEnteSection(context)), - trailingWidget: const IconButtonWidget( + trailingWidget: IconButtonWidget( icon: Icons.chevron_right, iconButtonType: IconButtonType.secondary, + iconColor: getEnteColorScheme(context).blurStrokePressed, ), padding: const EdgeInsets.only(left: 12, right: 6), ), diff --git a/mobile/lib/ui/viewer/search/result/searchable_item.dart b/mobile/lib/ui/viewer/search/result/searchable_item.dart index 90c457f77c..a78d1292f1 100644 --- a/mobile/lib/ui/viewer/search/result/searchable_item.dart +++ b/mobile/lib/ui/viewer/search/result/searchable_item.dart @@ -133,11 +133,12 @@ class SearchableItemWidget extends StatelessWidget { ], ), ), - const Flexible( + Flexible( flex: 1, child: IconButtonWidget( icon: Icons.chevron_right_outlined, iconButtonType: IconButtonType.secondary, + iconColor: colorScheme.blurStrokePressed, ), ), ], diff --git a/mobile/lib/ui/viewer/search_tab/section_header.dart b/mobile/lib/ui/viewer/search_tab/section_header.dart index bd97c7215f..31f1f4a4d2 100644 --- a/mobile/lib/ui/viewer/search_tab/section_header.dart +++ b/mobile/lib/ui/viewer/search_tab/section_header.dart @@ -39,7 +39,7 @@ class SectionHeader extends StatelessWidget { padding: const EdgeInsets.fromLTRB(24, 12, 12, 12), child: Icon( Icons.chevron_right_outlined, - color: getEnteColorScheme(context).strokeMuted, + color: getEnteColorScheme(context).blurStrokePressed, ), ), )