fixed sliver app bar title opacity
This commit is contained in:
parent
25311c5fcb
commit
b5e4fecf2f
5 changed files with 45 additions and 10 deletions
|
@ -20,6 +20,7 @@ import 'package:aves/widgets/common/app_bar_subtitle.dart';
|
||||||
import 'package:aves/widgets/common/app_bar_title.dart';
|
import 'package:aves/widgets/common/app_bar_title.dart';
|
||||||
import 'package:aves/widgets/common/basic/menu.dart';
|
import 'package:aves/widgets/common/basic/menu.dart';
|
||||||
import 'package:aves/widgets/common/extensions/build_context.dart';
|
import 'package:aves/widgets/common/extensions/build_context.dart';
|
||||||
|
import 'package:aves/widgets/common/sliver_app_bar_title.dart';
|
||||||
import 'package:aves/widgets/dialogs/tile_view_dialog.dart';
|
import 'package:aves/widgets/dialogs/tile_view_dialog.dart';
|
||||||
import 'package:aves/widgets/search/search_delegate.dart';
|
import 'package:aves/widgets/search/search_delegate.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -116,7 +117,9 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
|
||||||
builder: (context, queryEnabled, child) {
|
builder: (context, queryEnabled, child) {
|
||||||
return SliverAppBar(
|
return SliverAppBar(
|
||||||
leading: appMode.hasDrawer ? _buildAppBarLeading(isSelecting) : null,
|
leading: appMode.hasDrawer ? _buildAppBarLeading(isSelecting) : null,
|
||||||
title: _buildAppBarTitle(isSelecting),
|
title: SliverAppBarTitleWrapper(
|
||||||
|
child: _buildAppBarTitle(isSelecting),
|
||||||
|
),
|
||||||
actions: _buildActions(
|
actions: _buildActions(
|
||||||
isSelecting: isSelecting,
|
isSelecting: isSelecting,
|
||||||
selectedItemCount: selectedItemCount,
|
selectedItemCount: selectedItemCount,
|
||||||
|
@ -177,7 +180,7 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget? _buildAppBarTitle(bool isSelecting) {
|
Widget _buildAppBarTitle(bool isSelecting) {
|
||||||
final l10n = context.l10n;
|
final l10n = context.l10n;
|
||||||
|
|
||||||
if (isSelecting) {
|
if (isSelecting) {
|
||||||
|
|
23
lib/widgets/common/sliver_app_bar_title.dart
Normal file
23
lib/widgets/common/sliver_app_bar_title.dart
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
// as of Flutter v2.8.1, fading opacity in `SliverAppBar`
|
||||||
|
// is not applied to title when `appBarTheme.titleTextStyle` is defined,
|
||||||
|
// so this wrapper manually applies opacity to the default text style
|
||||||
|
class SliverAppBarTitleWrapper extends StatelessWidget {
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
const SliverAppBarTitleWrapper({
|
||||||
|
Key? key,
|
||||||
|
required this.child,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final toolbarOpacity = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>()!.toolbarOpacity;
|
||||||
|
final baseColor = (DefaultTextStyle.of(context).style.color ?? Theme.of(context).primaryTextTheme.headline6!.color!);
|
||||||
|
return DefaultTextStyle.merge(
|
||||||
|
style: TextStyle(color: baseColor.withOpacity(toolbarOpacity)),
|
||||||
|
child: child,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -16,6 +16,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
|
||||||
import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
|
import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
|
||||||
import 'package:aves/widgets/common/identity/empty.dart';
|
import 'package:aves/widgets/common/identity/empty.dart';
|
||||||
import 'package:aves/widgets/common/providers/selection_provider.dart';
|
import 'package:aves/widgets/common/providers/selection_provider.dart';
|
||||||
|
import 'package:aves/widgets/common/sliver_app_bar_title.dart';
|
||||||
import 'package:aves/widgets/dialogs/filter_editors/create_album_dialog.dart';
|
import 'package:aves/widgets/dialogs/filter_editors/create_album_dialog.dart';
|
||||||
import 'package:aves/widgets/filter_grids/albums_page.dart';
|
import 'package:aves/widgets/filter_grids/albums_page.dart';
|
||||||
import 'package:aves/widgets/filter_grids/common/action_delegates/album_set.dart';
|
import 'package:aves/widgets/filter_grids/common/action_delegates/album_set.dart';
|
||||||
|
@ -141,9 +142,11 @@ class _AlbumPickAppBar extends StatelessWidget {
|
||||||
|
|
||||||
return SliverAppBar(
|
return SliverAppBar(
|
||||||
leading: const BackButton(),
|
leading: const BackButton(),
|
||||||
title: SourceStateAwareAppBarTitle(
|
title: SliverAppBarTitleWrapper(
|
||||||
title: Text(title()),
|
child: SourceStateAwareAppBarTitle(
|
||||||
source: source,
|
title: Text(title()),
|
||||||
|
source: source,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
bottom: _AlbumQueryBar(
|
bottom: _AlbumQueryBar(
|
||||||
queryNotifier: queryNotifier,
|
queryNotifier: queryNotifier,
|
||||||
|
|
|
@ -8,6 +8,7 @@ import 'package:aves/widgets/common/app_bar_subtitle.dart';
|
||||||
import 'package:aves/widgets/common/app_bar_title.dart';
|
import 'package:aves/widgets/common/app_bar_title.dart';
|
||||||
import 'package:aves/widgets/common/basic/menu.dart';
|
import 'package:aves/widgets/common/basic/menu.dart';
|
||||||
import 'package:aves/widgets/common/extensions/build_context.dart';
|
import 'package:aves/widgets/common/extensions/build_context.dart';
|
||||||
|
import 'package:aves/widgets/common/sliver_app_bar_title.dart';
|
||||||
import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
|
import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
|
||||||
import 'package:aves/widgets/search/search_delegate.dart';
|
import 'package:aves/widgets/search/search_delegate.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -74,7 +75,9 @@ class _FilterGridAppBarState<T extends CollectionFilter> extends State<FilterGri
|
||||||
_isSelectingNotifier.value = isSelecting;
|
_isSelectingNotifier.value = isSelecting;
|
||||||
return SliverAppBar(
|
return SliverAppBar(
|
||||||
leading: appMode.hasDrawer ? _buildAppBarLeading(isSelecting) : null,
|
leading: appMode.hasDrawer ? _buildAppBarLeading(isSelecting) : null,
|
||||||
title: _buildAppBarTitle(isSelecting),
|
title: SliverAppBarTitleWrapper(
|
||||||
|
child: _buildAppBarTitle(isSelecting),
|
||||||
|
),
|
||||||
actions: _buildActions(appMode, selection),
|
actions: _buildActions(appMode, selection),
|
||||||
titleSpacing: 0,
|
titleSpacing: 0,
|
||||||
floating: true,
|
floating: true,
|
||||||
|
@ -103,7 +106,7 @@ class _FilterGridAppBarState<T extends CollectionFilter> extends State<FilterGri
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget? _buildAppBarTitle(bool isSelecting) {
|
Widget _buildAppBarTitle(bool isSelecting) {
|
||||||
if (isSelecting) {
|
if (isSelecting) {
|
||||||
return Selector<Selection<FilterGridItem<T>>, int>(
|
return Selector<Selection<FilterGridItem<T>>, int>(
|
||||||
selector: (context, selection) => selection.selectedItems.length,
|
selector: (context, selection) => selection.selectedItems.length,
|
||||||
|
|
|
@ -5,6 +5,7 @@ import 'package:aves/theme/icons.dart';
|
||||||
import 'package:aves/widgets/common/app_bar_title.dart';
|
import 'package:aves/widgets/common/app_bar_title.dart';
|
||||||
import 'package:aves/widgets/common/basic/menu.dart';
|
import 'package:aves/widgets/common/basic/menu.dart';
|
||||||
import 'package:aves/widgets/common/extensions/build_context.dart';
|
import 'package:aves/widgets/common/extensions/build_context.dart';
|
||||||
|
import 'package:aves/widgets/common/sliver_app_bar_title.dart';
|
||||||
import 'package:aves/widgets/viewer/action/entry_info_action_delegate.dart';
|
import 'package:aves/widgets/viewer/action/entry_info_action_delegate.dart';
|
||||||
import 'package:aves/widgets/viewer/info/info_search.dart';
|
import 'package:aves/widgets/viewer/info/info_search.dart';
|
||||||
import 'package:aves/widgets/viewer/info/metadata/metadata_section.dart';
|
import 'package:aves/widgets/viewer/info/metadata/metadata_section.dart';
|
||||||
|
@ -37,9 +38,11 @@ class InfoAppBar extends StatelessWidget {
|
||||||
onPressed: onBackPressed,
|
onPressed: onBackPressed,
|
||||||
tooltip: context.l10n.viewerInfoBackToViewerTooltip,
|
tooltip: context.l10n.viewerInfoBackToViewerTooltip,
|
||||||
),
|
),
|
||||||
title: InteractiveAppBarTitle(
|
title: SliverAppBarTitleWrapper(
|
||||||
onTap: () => _goToSearch(context),
|
child: InteractiveAppBarTitle(
|
||||||
child: Text(context.l10n.viewerInfoPageTitle),
|
onTap: () => _goToSearch(context),
|
||||||
|
child: Text(context.l10n.viewerInfoPageTitle),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
actions: [
|
actions: [
|
||||||
IconButton(
|
IconButton(
|
||||||
|
|
Loading…
Reference in a new issue