Compare commits

...

3 Commits

Author SHA1 Message Date
312d68286e 🚀 Launch 2.0.0+9
⬆️ Upgrade deps
2024-11-26 22:06:05 +08:00
bedffbfad7 🐛 Fix notification screen error 2024-11-26 21:56:01 +08:00
6a3cd0a60d 🐛 Bug fixes on wrong push notification provider 2024-11-26 21:48:04 +08:00
8 changed files with 111 additions and 101 deletions

View File

@ -46,10 +46,10 @@ class NotificationProvider extends ChangeNotifier {
}
if (Platform.isIOS || Platform.isMacOS) {
provider = 'apple';
provider = 'apns';
token = await FirebaseMessaging.instance.getAPNSToken();
} else {
provider = 'firebase';
provider = 'fcm';
token = await FirebaseMessaging.instance.getToken();
}
log('Device Push Token is $token');

View File

@ -197,11 +197,24 @@ class _NotificationScreenState extends State<NotificationScreen> {
'interactive.subscription'
].contains(nty.topic) &&
nty.metadata['related_post'] != null)
PostItem(
data: SnPost.fromJson(
nty.metadata['related_post']!,
StyledWidget(Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(
Radius.circular(8)),
border: Border.all(
color: Theme.of(context).dividerColor,
width: 1,
),
),
),
child: PostItem(
data: SnPost.fromJson(
nty.metadata['related_post']!,
),
showComments: false,
showReactions: false,
showMenu: false,
),
)).padding(top: 8),
const Gap(8),
Row(
children: [

View File

@ -18,8 +18,8 @@ class SnPost with _$SnPost {
required String language,
required String? alias,
required String? aliasPrefix,
required List<dynamic> tags,
required List<dynamic> categories,
@Default([]) List<dynamic> tags,
@Default([]) List<dynamic> categories,
required List<SnPost>? replies,
required int? replyId,
required int? repostId,

View File

@ -583,8 +583,8 @@ class _$SnPostImpl extends _SnPost {
required this.language,
required this.alias,
required this.aliasPrefix,
required final List<dynamic> tags,
required final List<dynamic> categories,
final List<dynamic> tags = const [],
final List<dynamic> categories = const [],
required final List<SnPost>? replies,
required this.replyId,
required this.repostId,
@ -642,6 +642,7 @@ class _$SnPostImpl extends _SnPost {
final String? aliasPrefix;
final List<dynamic> _tags;
@override
@JsonKey()
List<dynamic> get tags {
if (_tags is EqualUnmodifiableListView) return _tags;
// ignore: implicit_dynamic_type
@ -650,6 +651,7 @@ class _$SnPostImpl extends _SnPost {
final List<dynamic> _categories;
@override
@JsonKey()
List<dynamic> get categories {
if (_categories is EqualUnmodifiableListView) return _categories;
// ignore: implicit_dynamic_type
@ -850,8 +852,8 @@ abstract class _SnPost extends SnPost {
required final String language,
required final String? alias,
required final String? aliasPrefix,
required final List<dynamic> tags,
required final List<dynamic> categories,
final List<dynamic> tags,
final List<dynamic> categories,
required final List<SnPost>? replies,
required final int? replyId,
required final int? repostId,

View File

@ -18,8 +18,8 @@ _$SnPostImpl _$$SnPostImplFromJson(Map<String, dynamic> json) => _$SnPostImpl(
language: json['language'] as String,
alias: json['alias'] as String?,
aliasPrefix: json['alias_prefix'] as String?,
tags: json['tags'] as List<dynamic>,
categories: json['categories'] as List<dynamic>,
tags: json['tags'] as List<dynamic>? ?? const [],
categories: json['categories'] as List<dynamic>? ?? const [],
replies: (json['replies'] as List<dynamic>?)
?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
.toList(),

View File

@ -18,6 +18,7 @@ class PostItem extends StatelessWidget {
final SnPost data;
final bool showReactions;
final bool showComments;
final bool showMenu;
final double? maxWidth;
final Function(SnPost data)? onChanged;
const PostItem({
@ -25,6 +26,7 @@ class PostItem extends StatelessWidget {
required this.data,
this.showReactions = true,
this.showComments = true,
this.showMenu = true,
this.maxWidth,
this.onChanged,
});
@ -43,7 +45,7 @@ class PostItem extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_PostContentHeader(data: data)
_PostContentHeader(data: data, showMenu: showMenu)
.padding(horizontal: 12, vertical: 8),
if (data.body['title'] != null ||
data.body['description'] != null)
@ -62,7 +64,7 @@ class PostItem extends StatelessWidget {
],
),
),
if (data.preload?.attachments?.isNotEmpty ?? true)
if (data.preload?.attachments?.isNotEmpty ?? false)
AttachmentList(
data: data.preload!.attachments!,
bordered: true,
@ -107,70 +109,71 @@ class _PostBottomAction extends StatelessWidget {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
if (showReactions)
InkWell(
child: Row(
children: [
Icon(Symbols.add_reaction, size: 20, color: iconColor),
const Gap(8),
if (data.totalUpvote > 0 &&
data.totalUpvote >= data.totalDownvote)
Text('postReactionUpvote').plural(
data.totalUpvote,
)
else if (data.totalDownvote > 0)
Text('postReactionDownvote').plural(
data.totalDownvote,
)
else
Text('postReact').tr(),
],
).padding(horizontal: 8, vertical: 8),
onTap: () {
showModalBottomSheet(
context: context,
builder: (context) => PostReactionPopup(
data: data,
onChanged: (value, attr, delta) {
onChanged(data.copyWith(
totalUpvote: attr == 1
? data.totalUpvote + delta
: data.totalUpvote,
totalDownvote: attr == 2
? data.totalDownvote + delta
: data.totalDownvote,
metric: data.metric.copyWith(reactionList: value),
));
},
),
);
},
),
if (showComments)
InkWell(
child: Row(
children: [
Icon(Symbols.comment, size: 20, color: iconColor),
const Gap(8),
Text('postComments').plural(data.metric.replyCount),
],
).padding(horizontal: 8, vertical: 8),
onTap: () {
showModalBottomSheet(
context: context,
useRootNavigator: true,
builder: (context) => PostCommentListPopup(
postId: data.id,
commentCount: data.metric.replyCount,
),
);
},
),
].expand((ele) => [ele, const Gap(8)]).toList()
..removeLast(),
),
if (showReactions || showComments)
Row(
children: [
if (showReactions)
InkWell(
child: Row(
children: [
Icon(Symbols.add_reaction, size: 20, color: iconColor),
const Gap(8),
if (data.totalUpvote > 0 &&
data.totalUpvote >= data.totalDownvote)
Text('postReactionUpvote').plural(
data.totalUpvote,
)
else if (data.totalDownvote > 0)
Text('postReactionDownvote').plural(
data.totalDownvote,
)
else
Text('postReact').tr(),
],
).padding(horizontal: 8, vertical: 8),
onTap: () {
showModalBottomSheet(
context: context,
builder: (context) => PostReactionPopup(
data: data,
onChanged: (value, attr, delta) {
onChanged(data.copyWith(
totalUpvote: attr == 1
? data.totalUpvote + delta
: data.totalUpvote,
totalDownvote: attr == 2
? data.totalDownvote + delta
: data.totalDownvote,
metric: data.metric.copyWith(reactionList: value),
));
},
),
);
},
),
if (showComments)
InkWell(
child: Row(
children: [
Icon(Symbols.comment, size: 20, color: iconColor),
const Gap(8),
Text('postComments').plural(data.metric.replyCount),
],
).padding(horizontal: 8, vertical: 8),
onTap: () {
showModalBottomSheet(
context: context,
useRootNavigator: true,
builder: (context) => PostCommentListPopup(
postId: data.id,
commentCount: data.metric.replyCount,
),
);
},
),
].expand((ele) => [ele, const Gap(8)]).toList()
..removeLast(),
),
InkWell(
child: Icon(
Symbols.share,
@ -211,11 +214,11 @@ class _PostHeadline extends StatelessWidget {
class _PostContentHeader extends StatelessWidget {
final SnPost data;
final bool isCompact;
final bool showActions;
final bool showMenu;
const _PostContentHeader({
required this.data,
this.isCompact = false,
this.showActions = true,
this.showMenu = true,
});
@override
@ -264,7 +267,7 @@ class _PostContentHeader extends StatelessWidget {
],
),
),
if (showActions)
if (showMenu)
PopupMenuButton(
icon: const Icon(Symbols.more_horiz),
style: const ButtonStyle(
@ -376,7 +379,7 @@ class _PostQuoteContent extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Column(
children: [
_PostContentHeader(data: child, isCompact: true, showActions: false)
_PostContentHeader(data: child, isCompact: true, showMenu: false)
.padding(bottom: 4),
_PostContentBody(data: child.body),
],

View File

@ -450,10 +450,10 @@ packages:
dependency: transitive
description:
name: file_selector_linux
sha256: b2b91daf8a68ecfa4a01b778a6f52edef9b14ecd506e771488ea0f2e0784198b
sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
url: "https://pub.dev"
source: hosted
version: "0.9.3+1"
version: "0.9.3+2"
file_selector_macos:
dependency: transitive
description:
@ -567,10 +567,10 @@ packages:
dependency: "direct main"
description:
name: flutter_animate
sha256: "5fc5bb5486624a9ed2d3d9a04a9f7a6a92511f36a030531e092ce819ab3091af"
sha256: "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5"
url: "https://pub.dev"
source: hosted
version: "4.5.1"
version: "4.5.2"
flutter_cache_manager:
dependency: transitive
description:
@ -662,10 +662,10 @@ packages:
dependency: transitive
description:
name: flutter_webrtc
sha256: "0b69ecab98211504c10d40c1c4cb48eb387e03ea8e732079bd0d2665d8c20d3f"
sha256: fcaee6f28cc1221e804fcba16fbee6f20b0848af20fe11174a0f97c3b9833381
url: "https://pub.dev"
source: hosted
version: "0.12.1+hotfix.1"
version: "0.12.2"
freezed:
dependency: "direct dev"
description:
@ -1190,10 +1190,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7"
url: "https://pub.dev"
source: hosted
version: "2.2.12"
version: "2.2.14"
path_provider_foundation:
dependency: transitive
description:
@ -1815,14 +1815,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.9.0"
visibility_detector:
dependency: transitive
description:
name: visibility_detector
sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
url: "https://pub.dev"
source: hosted
version: "0.4.0+2"
vm_service:
dependency: transitive
description:

View File

@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 2.0.0+8
version: 2.0.0+9
environment:
sdk: ^3.5.4