diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 8ac32da4..3781004f 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -118,7 +118,7 @@ class _FavDetailPageState extends State with GridMixin { ], ) : null, - expandedHeight: kToolbarHeight + 130, + expandedHeight: kToolbarHeight + 127, pinned: true, title: enableMultiSelect ? null @@ -343,9 +343,9 @@ class _FavDetailPageState extends State with GridMixin { background: Padding( padding: EdgeInsets.only( top: kToolbarHeight + padding.top + 10, - left: 14 + padding.left, - right: 20, - bottom: 10, + left: 12 + padding.left, + right: 12, + bottom: 7, ), child: SizedBox( height: 110, diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index c11cf0fc..309fe091 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -47,10 +47,10 @@ class _MemberPageState extends State { @override Widget build(BuildContext context) { - final theme = Theme.of(context); + final theme = Theme.of(context).colorScheme; final padding = MediaQuery.viewPaddingOf(context); return Material( - color: theme.colorScheme.surface, + color: theme.surface, child: Obx( () { if (_userController.loadingState.value.isSuccess) { @@ -74,10 +74,16 @@ class _MemberPageState extends State { child: Column( children: [ if ((_userController.tab2?.length ?? 0) > 1) - TabBar( - controller: _userController.tabController, - tabs: _userController.tabs, - onTap: _userController.onTapTab, + SizedBox( + height: 40, + child: TabBar( + controller: _userController.tabController, + tabs: _userController.tabs, + onTap: _userController.onTapTab, + dividerColor: theme.outline.withValues( + alpha: 0.2, + ), + ), ), Expanded(child: _buildBody), ], @@ -94,7 +100,7 @@ class _MemberPageState extends State { ); } - List _actions(ThemeData theme) => [ + List _actions(ColorScheme theme) => [ IconButton( tooltip: '搜索', onPressed: () => Get.toNamed( @@ -260,12 +266,12 @@ class _MemberPageState extends State { Icon( Icons.error_outline, size: 19, - color: theme.colorScheme.error, + color: theme.error, ), const SizedBox(width: 10), Text( '举报', - style: TextStyle(color: theme.colorScheme.error), + style: TextStyle(color: theme.error), ), ], ), @@ -307,7 +313,7 @@ class _MemberPageState extends State { ); Widget _buildUserInfo( - ThemeData theme, + ColorScheme theme, LoadingState userState, ) { switch (userState) {