Merge branch 'design'
This commit is contained in:
@ -36,8 +36,7 @@ class _UpPanelState extends State<UpPanel> {
|
|||||||
}
|
}
|
||||||
upList.insert(
|
upList.insert(
|
||||||
0,
|
0,
|
||||||
UpItem(
|
UpItem(face: '', uname: '全部动态', mid: -1),
|
||||||
face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
|
|
||||||
);
|
);
|
||||||
userInfo = userInfoCache.get('userInfoCache');
|
userInfo = userInfoCache.get('userInfoCache');
|
||||||
upList.insert(
|
upList.insert(
|
||||||
@ -56,7 +55,7 @@ class _UpPanelState extends State<UpPanel> {
|
|||||||
floating: true,
|
floating: true,
|
||||||
pinned: false,
|
pinned: false,
|
||||||
delegate: _SliverHeaderDelegate(
|
delegate: _SliverHeaderDelegate(
|
||||||
height: 124,
|
height: 126,
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
@ -178,6 +177,9 @@ class _UpPanelState extends State<UpPanel> {
|
|||||||
},
|
},
|
||||||
onLongPress: () {
|
onLongPress: () {
|
||||||
feedBack();
|
feedBack();
|
||||||
|
if (data.mid == -1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
String heroTag = Utils.makeHeroTag(data.mid);
|
String heroTag = Utils.makeHeroTag(data.mid);
|
||||||
Get.toNamed('/member?mid=${data.mid}',
|
Get.toNamed('/member?mid=${data.mid}',
|
||||||
arguments: {'face': data.face, 'heroTag': heroTag});
|
arguments: {'face': data.face, 'heroTag': heroTag});
|
||||||
@ -205,11 +207,18 @@ class _UpPanelState extends State<UpPanel> {
|
|||||||
backgroundColor: data.type == 'live'
|
backgroundColor: data.type == 'live'
|
||||||
? Theme.of(context).colorScheme.secondaryContainer
|
? Theme.of(context).colorScheme.secondaryContainer
|
||||||
: Theme.of(context).colorScheme.primary,
|
: Theme.of(context).colorScheme.primary,
|
||||||
child: NetworkImgLayer(
|
child: data.face != ''
|
||||||
width: 49,
|
? NetworkImgLayer(
|
||||||
height: 49,
|
width: 50,
|
||||||
|
height: 50,
|
||||||
src: data.face,
|
src: data.face,
|
||||||
type: 'avatar',
|
type: 'avatar',
|
||||||
|
)
|
||||||
|
: const CircleAvatar(
|
||||||
|
radius: 25,
|
||||||
|
backgroundImage: AssetImage(
|
||||||
|
'assets/images/noface.jpeg',
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Padding(
|
Padding(
|
||||||
@ -278,13 +287,11 @@ class UpPanelSkeleton extends StatelessWidget {
|
|||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
Container(
|
Container(
|
||||||
width: 49,
|
width: 50,
|
||||||
height: 49,
|
height: 50,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Theme.of(context).colorScheme.onInverseSurface,
|
color: Theme.of(context).colorScheme.onInverseSurface,
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: BorderRadius.circular(50),
|
||||||
Radius.circular(24),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
|
|||||||
Reference in New Issue
Block a user