Skip to content

feat: support decorations below avatar #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

feat: support decorations below avatar #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions lib/view/widget/cat_avatar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:misskey_dart/misskey_dart.dart';

import '../../model/account.dart';
import '../../provider/general_settings_notifier_provider.dart';
import 'avatar_decorations.dart';
import 'cat_ear.dart';
import 'image_widget.dart';
Expand All @@ -26,17 +24,18 @@ final _catEarWiggleTween = TweenSequence([
TweenSequenceItem(tween: Tween(begin: 0.0, end: 0.65624379), weight: 25),
]);

class CatAvatar extends HookConsumerWidget {
class CatAvatar extends HookWidget {
const CatAvatar({
super.key,
required this.account,
required this.url,
required this.blurHash,
required this.catEarColor,
required this.showAvatarDecorations,
required this.decorations,
required this.decorationsBelowAvatar,
required this.showOnlineStatus,
required this.onlineStatus,
required this.enableHapticFeedback,
required this.size,
required this.borderRadius,
required this.onTap,
Expand All @@ -46,21 +45,17 @@ class CatAvatar extends HookConsumerWidget {
final Uri? url;
final String? blurHash;
final Color catEarColor;
final bool showAvatarDecorations;
final List<UserAvatarDecoration> decorations;
final List<UserAvatarDecoration>? decorations;
final List<UserAvatarDecoration>? decorationsBelowAvatar;
final bool showOnlineStatus;
final OnlineStatus? onlineStatus;
final bool enableHapticFeedback;
final double size;
final BorderRadius borderRadius;
final void Function()? onTap;

@override
Widget build(BuildContext context, WidgetRef ref) {
final enableHapticFeedback = ref.watch(
generalSettingsNotifierProvider.select(
(settings) => settings.enableHapticFeedback,
),
);
Widget build(BuildContext context) {
final controller = useAnimationController(
duration: const Duration(seconds: 1),
);
Expand Down Expand Up @@ -111,6 +106,12 @@ class CatAvatar extends HookConsumerWidget {
child: Stack(
alignment: Alignment.center,
children: [
if (decorationsBelowAvatar case final decorations?)
AvatarDecorations(
account: account,
decorations: decorations,
size: size,
),
Transform.translate(
offset: Offset(-size * 0.25, 0.0),
child: CatEar(
Expand Down Expand Up @@ -138,7 +139,7 @@ class CatAvatar extends HookConsumerWidget {
fit: BoxFit.cover,
),
),
if (showAvatarDecorations)
if (decorations case final decorations?)
AvatarDecorations(
account: account,
decorations: decorations,
Expand Down
22 changes: 19 additions & 3 deletions lib/view/widget/user_avatar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:misskey_dart/misskey_dart.dart';
Expand Down Expand Up @@ -41,13 +42,15 @@ class UserAvatar extends ConsumerWidget {
squareAvatars,
disableShowingAnimatedImages,
showOnlineStatus,
enableHapticFeedback,
) = ref.watch(
generalSettingsNotifierProvider.select(
(settings) => (
settings.showAvatarDecorations,
settings.squareAvatars,
settings.disableShowingAnimatedImages,
settings.showOnlineStatus,
settings.enableHapticFeedback,
),
),
);
Expand All @@ -60,7 +63,13 @@ class UserAvatar extends ConsumerWidget {
)
: user.avatarUrl;
final blurHash = user.avatarBlurhash;
final decorations = this.decorations ?? user.avatarDecorations;
final decorationsGrouped = forceShowDecoration || showAvatarDecorations
? (this.decorations ?? user.avatarDecorations).groupListsBy(
(decoration) => decoration.showBelow ?? false,
)
: null;
final decorations = decorationsGrouped?[false];
final decorationsBelowAvatar = decorationsGrouped?[true];
final borderRadius = BorderRadius.circular(
squareAvatars ? size * 0.2 : size,
);
Expand All @@ -75,10 +84,11 @@ class UserAvatar extends ConsumerWidget {
url: url,
blurHash: blurHash,
catEarColor: catEarColor,
showAvatarDecorations: forceShowDecoration || showAvatarDecorations,
decorations: decorations,
decorationsBelowAvatar: decorationsBelowAvatar,
showOnlineStatus: showOnlineIndicator && showOnlineStatus,
onlineStatus: user.onlineStatus,
enableHapticFeedback: enableHapticFeedback,
size: size,
borderRadius: borderRadius,
onTap: onTap,
Expand All @@ -90,6 +100,12 @@ class UserAvatar extends ConsumerWidget {
borderRadius: borderRadius,
child: Stack(
children: [
if (decorationsBelowAvatar case final decorations?)
AvatarDecorations(
account: account,
decorations: decorations,
size: size,
),
ClipRRect(
borderRadius: borderRadius,
child: ImageWidget(
Expand All @@ -100,7 +116,7 @@ class UserAvatar extends ConsumerWidget {
fit: BoxFit.cover,
),
),
if (forceShowDecoration || showAvatarDecorations)
if (decorations case final decorations?)
AvatarDecorations(
account: account,
decorations: decorations,
Expand Down
Loading