From 9c8ed3dfa83c3b8319e5a70070af73382cf0a505 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sun, 20 Aug 2023 21:33:27 +0800 Subject: [PATCH] opt.: `TagBtn` --- lib/view/widget/tag/btn.dart | 31 ++++++++++++++++--------------- lib/view/widget/tag/switcher.dart | 14 +++++--------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/lib/view/widget/tag/btn.dart b/lib/view/widget/tag/btn.dart index 2ac9ed3d..c26692fe 100644 --- a/lib/view/widget/tag/btn.dart +++ b/lib/view/widget/tag/btn.dart @@ -18,23 +18,24 @@ class TagBtn extends StatelessWidget { Widget build(BuildContext context) { return Padding( padding: const EdgeInsets.only(left: 4, right: 5, bottom: 9), - child: GestureDetector( - onTap: onTap, - child: Container( - decoration: BoxDecoration( - borderRadius: const BorderRadius.all(Radius.circular(20.0)), - color: primaryColor.withAlpha(20), - ), + child: ClipRRect( + borderRadius: const BorderRadius.all(Radius.circular(20.0)), + child: Material( + color: primaryColor.withAlpha(20), + child: InkWell( + onTap: onTap, + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 11, vertical: 2.7), - child: Center( - child: Text( - content, - style: TextStyle( - color: isEnable ? null : Colors.grey, - fontSize: 13, - ), + child: Text( + content, + style: TextStyle( + color: isEnable ? null : Colors.grey, + fontSize: 13, ), - )), + ), + ), + ), + ), ), ); } diff --git a/lib/view/widget/tag/switcher.dart b/lib/view/widget/tag/switcher.dart index 2a56d06e..551d0dc7 100644 --- a/lib/view/widget/tag/switcher.dart +++ b/lib/view/widget/tag/switcher.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:toolbox/data/res/ui.dart'; -import 'package:toolbox/view/widget/fade_in.dart'; import 'package:toolbox/view/widget/tag/view.dart'; class TagSwitcher extends StatelessWidget { @@ -32,14 +31,11 @@ class TagSwitcher extends StatelessWidget { scrollDirection: Axis.horizontal, itemBuilder: (context, index) { final item = items[index]; - return FadeIn( - key: ValueKey(initTag), - child: TagView( - tag: item, - initTag: initTag, - all: all, - onTap: onTagChanged, - ), + return TagView( + tag: item, + initTag: initTag, + all: all, + onTap: onTagChanged, ); }, itemCount: items.length,