Compare commits
11 Commits
cda23db609
...
v3
Author | SHA1 | Date | |
---|---|---|---|
001549b190 | |||
4595865ad3 | |||
|
1834643167 | ||
|
0e816eaa3e | ||
|
7c1f24b824 | ||
c6594ea2ce
|
|||
3bec6e683e
|
|||
83e92e2eed
|
|||
|
b7d44d96ba | ||
a83b929d42
|
|||
9423affa75
|
@@ -120,13 +120,24 @@ void main() async {
|
||||
windowButtonVisibility: true,
|
||||
);
|
||||
windowManager.waitUntilReadyToShow(windowOptions, () async {
|
||||
final env = Platform.environment;
|
||||
final isWayland = env.containsKey('WAYLAND_DISPLAY');
|
||||
|
||||
if (isWayland) {
|
||||
try {
|
||||
await windowManager.setAsFrameless();
|
||||
} catch (e) {
|
||||
debugPrint('[Wayland] setAsFrameless failed: $e');
|
||||
}
|
||||
}
|
||||
await windowManager.setMinimumSize(defaultSize);
|
||||
await windowManager.show();
|
||||
await windowManager.focus();
|
||||
final opacity = prefs.getDouble(kAppWindowOpacity) ?? 1.0;
|
||||
await windowManager.setOpacity(opacity);
|
||||
talker.info(
|
||||
"[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}",
|
||||
"[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}"
|
||||
"${isWayland ? " (Wayland frameless fix applied)" : ""}",
|
||||
);
|
||||
});
|
||||
}
|
||||
|
@@ -25,7 +25,6 @@ import 'package:island/screens/tabs.dart';
|
||||
import 'package:island/screens/explore.dart';
|
||||
import 'package:island/screens/discovery/article_detail.dart';
|
||||
import 'package:island/screens/account.dart';
|
||||
import 'package:island/screens/notification.dart';
|
||||
import 'package:island/screens/wallet.dart';
|
||||
import 'package:island/screens/account/relationship.dart';
|
||||
import 'package:island/screens/account/profile.dart';
|
||||
@@ -392,11 +391,6 @@ final routerProvider = Provider<GoRouter>((ref) {
|
||||
),
|
||||
],
|
||||
),
|
||||
GoRoute(
|
||||
name: 'notifications',
|
||||
path: '/account/notifications',
|
||||
builder: (context, state) => const NotificationScreen(),
|
||||
),
|
||||
GoRoute(
|
||||
name: 'wallet',
|
||||
path: '/account/wallet',
|
||||
|
@@ -282,7 +282,12 @@ class AccountScreen extends HookConsumerWidget {
|
||||
],
|
||||
),
|
||||
onTap: () {
|
||||
context.pushNamed('notifications');
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
useRootNavigator: true,
|
||||
builder: (context) => const NotificationSheet(),
|
||||
);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
|
@@ -20,6 +20,7 @@ class ArticleDetailScreen extends ConsumerWidget {
|
||||
final articleAsync = ref.watch(articleDetailProvider(articleId));
|
||||
|
||||
return AppScaffold(
|
||||
isNoBackground: false,
|
||||
body: articleAsync.when(
|
||||
data:
|
||||
(article) => AppScaffold(
|
||||
|
@@ -54,7 +54,12 @@ Widget notificationIndicatorWidget(
|
||||
trailing: const Icon(Symbols.chevron_right),
|
||||
contentPadding: EdgeInsets.only(left: 16, right: 15),
|
||||
onTap: () {
|
||||
GoRouter.of(context).pushNamed('notifications');
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
useRootNavigator: true,
|
||||
builder: (context) => const NotificationSheet(),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
@@ -3,7 +3,6 @@ import 'dart:math' as math;
|
||||
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:island/models/account.dart';
|
||||
@@ -11,8 +10,8 @@ import 'package:island/pods/network.dart';
|
||||
import 'package:island/pods/websocket.dart';
|
||||
import 'package:island/route.dart';
|
||||
import 'package:island/widgets/alert.dart';
|
||||
import 'package:island/widgets/app_scaffold.dart';
|
||||
import 'package:island/widgets/content/markdown.dart';
|
||||
import 'package:island/widgets/content/sheet.dart';
|
||||
import 'package:material_symbols_icons/material_symbols_icons.dart';
|
||||
import 'package:relative_time/relative_time.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
@@ -113,8 +112,8 @@ class NotificationListNotifier extends _$NotificationListNotifier
|
||||
}
|
||||
}
|
||||
|
||||
class NotificationScreen extends HookConsumerWidget {
|
||||
const NotificationScreen({super.key});
|
||||
class NotificationSheet extends HookConsumerWidget {
|
||||
const NotificationSheet({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
@@ -128,19 +127,15 @@ class NotificationScreen extends HookConsumerWidget {
|
||||
ref.watch(notificationUnreadCountNotifierProvider.notifier).clear();
|
||||
}
|
||||
|
||||
return AppScaffold(
|
||||
appBar: AppBar(
|
||||
leading: const PageBackButton(),
|
||||
title: const Text('notifications').tr(),
|
||||
actions: [
|
||||
IconButton(
|
||||
onPressed: markAllRead,
|
||||
icon: const Icon(Symbols.mark_as_unread),
|
||||
),
|
||||
const Gap(8),
|
||||
],
|
||||
),
|
||||
body: PagingHelperView(
|
||||
return SheetScaffold(
|
||||
titleText: 'notifications'.tr(),
|
||||
actions: [
|
||||
IconButton(
|
||||
onPressed: markAllRead,
|
||||
icon: const Icon(Symbols.mark_as_unread),
|
||||
),
|
||||
],
|
||||
child: PagingHelperView(
|
||||
provider: notificationListNotifierProvider,
|
||||
futureRefreshable: notificationListNotifierProvider.future,
|
||||
notifierRefreshable: notificationListNotifierProvider.notifier,
|
||||
|
@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:island/models/post.dart';
|
||||
import 'package:island/models/publisher.dart';
|
||||
import 'package:island/models/account.dart';
|
||||
import 'package:island/models/heatmap.dart';
|
||||
import 'package:island/pods/config.dart';
|
||||
import 'package:island/pods/network.dart';
|
||||
import 'package:island/services/color.dart';
|
||||
@@ -20,6 +21,7 @@ import 'package:island/widgets/app_scaffold.dart';
|
||||
import 'package:island/widgets/content/cloud_files.dart';
|
||||
import 'package:island/widgets/content/markdown.dart';
|
||||
import 'package:island/widgets/post/post_list.dart';
|
||||
import 'package:island/widgets/activity_heatmap.dart';
|
||||
import 'package:material_symbols_icons/symbols.dart';
|
||||
import 'package:island/services/color_extraction.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
@@ -222,6 +224,32 @@ class _PublisherBioWidget extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _PublisherHeatmapWidget extends StatelessWidget {
|
||||
final AsyncValue<SnHeatmap?> heatmap;
|
||||
final bool forceDense;
|
||||
|
||||
const _PublisherHeatmapWidget({
|
||||
required this.heatmap,
|
||||
this.forceDense = false,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return heatmap.when(
|
||||
data:
|
||||
(data) =>
|
||||
data != null
|
||||
? ActivityHeatmapWidget(
|
||||
heatmap: data,
|
||||
forceDense: forceDense,
|
||||
).padding(horizontal: 8)
|
||||
: const SizedBox.shrink(),
|
||||
loading: () => const SizedBox.shrink(),
|
||||
error: (_, _) => const SizedBox.shrink(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _PublisherCategoryTabWidget extends StatelessWidget {
|
||||
final TabController categoryTabController;
|
||||
|
||||
@@ -292,6 +320,13 @@ Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
|
||||
}
|
||||
}
|
||||
|
||||
@riverpod
|
||||
Future<SnHeatmap?> publisherHeatmap(Ref ref, String uname) async {
|
||||
final apiClient = ref.watch(apiClientProvider);
|
||||
final resp = await apiClient.get('/sphere/publishers/$uname/heatmap');
|
||||
return SnHeatmap.fromJson(resp.data);
|
||||
}
|
||||
|
||||
class PublisherProfileScreen extends HookConsumerWidget {
|
||||
final String name;
|
||||
const PublisherProfileScreen({super.key, required this.name});
|
||||
@@ -301,6 +336,7 @@ class PublisherProfileScreen extends HookConsumerWidget {
|
||||
final publisher = ref.watch(publisherProvider(name));
|
||||
final badges = ref.watch(publisherBadgesProvider(name));
|
||||
final subStatus = ref.watch(publisherSubscriptionStatusProvider(name));
|
||||
final heatmap = ref.watch(publisherHeatmapProvider(name));
|
||||
final appbarColor = ref.watch(
|
||||
publisherAppbarForcegroundColorProvider(name),
|
||||
);
|
||||
@@ -446,6 +482,10 @@ class PublisherProfileScreen extends HookConsumerWidget {
|
||||
),
|
||||
_PublisherVerificationWidget(data: data),
|
||||
_PublisherBioWidget(data: data),
|
||||
_PublisherHeatmapWidget(
|
||||
heatmap: heatmap,
|
||||
forceDense: true,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -517,6 +557,9 @@ class PublisherProfileScreen extends HookConsumerWidget {
|
||||
SliverToBoxAdapter(
|
||||
child: _PublisherBioWidget(data: data),
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: _PublisherHeatmapWidget(heatmap: heatmap),
|
||||
),
|
||||
SliverPostList(pubName: name, pinned: true),
|
||||
SliverToBoxAdapter(
|
||||
child: _PublisherCategoryTabWidget(
|
||||
|
@@ -530,5 +530,126 @@ class _PublisherAppbarForcegroundColorProviderElement
|
||||
(origin as PublisherAppbarForcegroundColorProvider).pubName;
|
||||
}
|
||||
|
||||
String _$publisherHeatmapHash() => r'86db275ce3861a2855b5ec35fbfef85fc47b23a6';
|
||||
|
||||
/// See also [publisherHeatmap].
|
||||
@ProviderFor(publisherHeatmap)
|
||||
const publisherHeatmapProvider = PublisherHeatmapFamily();
|
||||
|
||||
/// See also [publisherHeatmap].
|
||||
class PublisherHeatmapFamily extends Family<AsyncValue<SnHeatmap?>> {
|
||||
/// See also [publisherHeatmap].
|
||||
const PublisherHeatmapFamily();
|
||||
|
||||
/// See also [publisherHeatmap].
|
||||
PublisherHeatmapProvider call(String uname) {
|
||||
return PublisherHeatmapProvider(uname);
|
||||
}
|
||||
|
||||
@override
|
||||
PublisherHeatmapProvider getProviderOverride(
|
||||
covariant PublisherHeatmapProvider provider,
|
||||
) {
|
||||
return call(provider.uname);
|
||||
}
|
||||
|
||||
static const Iterable<ProviderOrFamily>? _dependencies = null;
|
||||
|
||||
@override
|
||||
Iterable<ProviderOrFamily>? get dependencies => _dependencies;
|
||||
|
||||
static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
|
||||
|
||||
@override
|
||||
Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
|
||||
_allTransitiveDependencies;
|
||||
|
||||
@override
|
||||
String? get name => r'publisherHeatmapProvider';
|
||||
}
|
||||
|
||||
/// See also [publisherHeatmap].
|
||||
class PublisherHeatmapProvider extends AutoDisposeFutureProvider<SnHeatmap?> {
|
||||
/// See also [publisherHeatmap].
|
||||
PublisherHeatmapProvider(String uname)
|
||||
: this._internal(
|
||||
(ref) => publisherHeatmap(ref as PublisherHeatmapRef, uname),
|
||||
from: publisherHeatmapProvider,
|
||||
name: r'publisherHeatmapProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$publisherHeatmapHash,
|
||||
dependencies: PublisherHeatmapFamily._dependencies,
|
||||
allTransitiveDependencies:
|
||||
PublisherHeatmapFamily._allTransitiveDependencies,
|
||||
uname: uname,
|
||||
);
|
||||
|
||||
PublisherHeatmapProvider._internal(
|
||||
super._createNotifier, {
|
||||
required super.name,
|
||||
required super.dependencies,
|
||||
required super.allTransitiveDependencies,
|
||||
required super.debugGetCreateSourceHash,
|
||||
required super.from,
|
||||
required this.uname,
|
||||
}) : super.internal();
|
||||
|
||||
final String uname;
|
||||
|
||||
@override
|
||||
Override overrideWith(
|
||||
FutureOr<SnHeatmap?> Function(PublisherHeatmapRef provider) create,
|
||||
) {
|
||||
return ProviderOverride(
|
||||
origin: this,
|
||||
override: PublisherHeatmapProvider._internal(
|
||||
(ref) => create(ref as PublisherHeatmapRef),
|
||||
from: from,
|
||||
name: null,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
debugGetCreateSourceHash: null,
|
||||
uname: uname,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
AutoDisposeFutureProviderElement<SnHeatmap?> createElement() {
|
||||
return _PublisherHeatmapProviderElement(this);
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return other is PublisherHeatmapProvider && other.uname == uname;
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode {
|
||||
var hash = _SystemHash.combine(0, runtimeType.hashCode);
|
||||
hash = _SystemHash.combine(hash, uname.hashCode);
|
||||
|
||||
return _SystemHash.finish(hash);
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
mixin PublisherHeatmapRef on AutoDisposeFutureProviderRef<SnHeatmap?> {
|
||||
/// The parameter `uname` of this provider.
|
||||
String get uname;
|
||||
}
|
||||
|
||||
class _PublisherHeatmapProviderElement
|
||||
extends AutoDisposeFutureProviderElement<SnHeatmap?>
|
||||
with PublisherHeatmapRef {
|
||||
_PublisherHeatmapProviderElement(super.provider);
|
||||
|
||||
@override
|
||||
String get uname => (origin as PublisherHeatmapProvider).uname;
|
||||
}
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
|
||||
|
@@ -66,12 +66,12 @@ class TabsScreen extends HookConsumerWidget {
|
||||
if (wideScreen)
|
||||
NavigationDestination(
|
||||
label: 'creatorHub'.tr(),
|
||||
icon: const Icon(Symbols.draw),
|
||||
icon: const Icon(Symbols.ink_pen),
|
||||
),
|
||||
if (wideScreen)
|
||||
NavigationDestination(
|
||||
label: 'developerHub'.tr(),
|
||||
icon: const Icon(Symbols.code),
|
||||
icon: const Icon(Symbols.data_object),
|
||||
),
|
||||
];
|
||||
|
||||
|
@@ -11,8 +11,13 @@ import '../services/responsive.dart';
|
||||
/// Shows exactly 365 days (wide screen) or 90 days (non-wide screen) of data ending at the current date.
|
||||
class ActivityHeatmapWidget extends HookConsumerWidget {
|
||||
final SnHeatmap heatmap;
|
||||
final bool forceDense;
|
||||
|
||||
const ActivityHeatmapWidget({super.key, required this.heatmap});
|
||||
const ActivityHeatmapWidget({
|
||||
super.key,
|
||||
required this.heatmap,
|
||||
this.forceDense = false,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
@@ -21,7 +26,7 @@ class ActivityHeatmapWidget extends HookConsumerWidget {
|
||||
final now = DateTime.now();
|
||||
|
||||
final isWide = isWideScreen(context);
|
||||
final days = isWide ? 365 : 90;
|
||||
final days = (isWide && !forceDense) ? 365 : 90;
|
||||
|
||||
// Start from exactly the selected days ago
|
||||
final startDate = now.subtract(Duration(days: days));
|
||||
|
@@ -374,10 +374,10 @@ class PageBackButton extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDesktop =
|
||||
!kIsWeb && (Platform.isMacOS || Platform.isLinux || Platform.isWindows);
|
||||
final hasPageAction =
|
||||
!kIsWeb && Platform.isMacOS;
|
||||
|
||||
if (isDesktop && isWideScreen(context)) return const SizedBox.shrink();
|
||||
if (hasPageAction && isWideScreen(context)) return const SizedBox.shrink();
|
||||
|
||||
return IconButton(
|
||||
onPressed: () {
|
||||
|
@@ -73,10 +73,8 @@ class ChatInput extends HookConsumerWidget {
|
||||
final chatSubscribe = ref.watch(chatSubscribeNotifierProvider(chatRoom.id));
|
||||
|
||||
void send() {
|
||||
inputFocusNode.requestFocus();
|
||||
onSend.call();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
inputFocusNode.requestFocus();
|
||||
});
|
||||
}
|
||||
|
||||
void insertNewLine() {
|
||||
@@ -539,6 +537,10 @@ class ChatInput extends HookConsumerWidget {
|
||||
onTapOutside:
|
||||
(_) =>
|
||||
FocusManager.instance.primaryFocus?.unfocus(),
|
||||
textInputAction:
|
||||
settings.enterToSend
|
||||
? TextInputAction.send
|
||||
: null,
|
||||
onSubmitted:
|
||||
settings.enterToSend ? (_) => send() : null,
|
||||
);
|
||||
|
@@ -14,7 +14,6 @@ import 'package:island/pods/chat/messages_notifier.dart';
|
||||
import 'package:island/pods/translate.dart';
|
||||
import 'package:island/pods/config.dart';
|
||||
import 'package:island/widgets/account/account_pfc.dart';
|
||||
import 'package:island/widgets/app_scaffold.dart';
|
||||
import 'package:island/widgets/chat/message_content.dart';
|
||||
import 'package:island/widgets/chat/message_indicators.dart';
|
||||
import 'package:island/widgets/chat/message_sender_info.dart';
|
||||
@@ -666,17 +665,11 @@ class MessageItemDisplayBubble extends HookConsumerWidget {
|
||||
? Theme.of(context).colorScheme.primaryContainer.withOpacity(0.5)
|
||||
: Theme.of(context).colorScheme.surfaceContainer;
|
||||
|
||||
final hasBackground =
|
||||
ref.watch(backgroundImageFileProvider).valueOrNull != null;
|
||||
|
||||
final remoteMessage = message.toRemoteMessage();
|
||||
final sender = remoteMessage.sender;
|
||||
|
||||
return Material(
|
||||
color:
|
||||
hasBackground
|
||||
? Colors.transparent
|
||||
: Theme.of(context).colorScheme.surface,
|
||||
color: Colors.transparent,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: Column(
|
||||
|
@@ -23,6 +23,7 @@ class PostListNotifier extends _$PostListNotifier
|
||||
List<String>? tags,
|
||||
bool? pinned,
|
||||
bool shuffle = false,
|
||||
bool? includeReplies,
|
||||
}) {
|
||||
return fetch(cursor: null);
|
||||
}
|
||||
@@ -42,6 +43,7 @@ class PostListNotifier extends _$PostListNotifier
|
||||
if (categories != null) 'categories': categories,
|
||||
if (shuffle) 'shuffle': true,
|
||||
if (pinned != null) 'pinned': pinned,
|
||||
if (includeReplies != null) 'includeReplies': includeReplies,
|
||||
};
|
||||
|
||||
final response = await client.get(
|
||||
|
@@ -6,7 +6,7 @@ part of 'post_list.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$postListNotifierHash() => r'3c0a8154ded4bcd8f5456f7a4ea2e542f57efa85';
|
||||
String _$postListNotifierHash() => r'fc139ad4df0deb67bcbb949560319f2f7fbfb503';
|
||||
|
||||
/// Copied from Dart SDK
|
||||
class _SystemHash {
|
||||
@@ -38,6 +38,7 @@ abstract class _$PostListNotifier
|
||||
late final List<String>? tags;
|
||||
late final bool? pinned;
|
||||
late final bool shuffle;
|
||||
late final bool? includeReplies;
|
||||
|
||||
FutureOr<CursorPagingData<SnPost>> build({
|
||||
String? pubName,
|
||||
@@ -47,6 +48,7 @@ abstract class _$PostListNotifier
|
||||
List<String>? tags,
|
||||
bool? pinned,
|
||||
bool shuffle = false,
|
||||
bool? includeReplies,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -69,6 +71,7 @@ class PostListNotifierFamily
|
||||
List<String>? tags,
|
||||
bool? pinned,
|
||||
bool shuffle = false,
|
||||
bool? includeReplies,
|
||||
}) {
|
||||
return PostListNotifierProvider(
|
||||
pubName: pubName,
|
||||
@@ -78,6 +81,7 @@ class PostListNotifierFamily
|
||||
tags: tags,
|
||||
pinned: pinned,
|
||||
shuffle: shuffle,
|
||||
includeReplies: includeReplies,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -93,6 +97,7 @@ class PostListNotifierFamily
|
||||
tags: provider.tags,
|
||||
pinned: provider.pinned,
|
||||
shuffle: provider.shuffle,
|
||||
includeReplies: provider.includeReplies,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -127,6 +132,7 @@ class PostListNotifierProvider
|
||||
List<String>? tags,
|
||||
bool? pinned,
|
||||
bool shuffle = false,
|
||||
bool? includeReplies,
|
||||
}) : this._internal(
|
||||
() =>
|
||||
PostListNotifier()
|
||||
@@ -136,7 +142,8 @@ class PostListNotifierProvider
|
||||
..categories = categories
|
||||
..tags = tags
|
||||
..pinned = pinned
|
||||
..shuffle = shuffle,
|
||||
..shuffle = shuffle
|
||||
..includeReplies = includeReplies,
|
||||
from: postListNotifierProvider,
|
||||
name: r'postListNotifierProvider',
|
||||
debugGetCreateSourceHash:
|
||||
@@ -153,6 +160,7 @@ class PostListNotifierProvider
|
||||
tags: tags,
|
||||
pinned: pinned,
|
||||
shuffle: shuffle,
|
||||
includeReplies: includeReplies,
|
||||
);
|
||||
|
||||
PostListNotifierProvider._internal(
|
||||
@@ -169,6 +177,7 @@ class PostListNotifierProvider
|
||||
required this.tags,
|
||||
required this.pinned,
|
||||
required this.shuffle,
|
||||
required this.includeReplies,
|
||||
}) : super.internal();
|
||||
|
||||
final String? pubName;
|
||||
@@ -178,6 +187,7 @@ class PostListNotifierProvider
|
||||
final List<String>? tags;
|
||||
final bool? pinned;
|
||||
final bool shuffle;
|
||||
final bool? includeReplies;
|
||||
|
||||
@override
|
||||
FutureOr<CursorPagingData<SnPost>> runNotifierBuild(
|
||||
@@ -191,6 +201,7 @@ class PostListNotifierProvider
|
||||
tags: tags,
|
||||
pinned: pinned,
|
||||
shuffle: shuffle,
|
||||
includeReplies: includeReplies,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -207,7 +218,8 @@ class PostListNotifierProvider
|
||||
..categories = categories
|
||||
..tags = tags
|
||||
..pinned = pinned
|
||||
..shuffle = shuffle,
|
||||
..shuffle = shuffle
|
||||
..includeReplies = includeReplies,
|
||||
from: from,
|
||||
name: null,
|
||||
dependencies: null,
|
||||
@@ -220,6 +232,7 @@ class PostListNotifierProvider
|
||||
tags: tags,
|
||||
pinned: pinned,
|
||||
shuffle: shuffle,
|
||||
includeReplies: includeReplies,
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -242,7 +255,8 @@ class PostListNotifierProvider
|
||||
other.categories == categories &&
|
||||
other.tags == tags &&
|
||||
other.pinned == pinned &&
|
||||
other.shuffle == shuffle;
|
||||
other.shuffle == shuffle &&
|
||||
other.includeReplies == includeReplies;
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -255,6 +269,7 @@ class PostListNotifierProvider
|
||||
hash = _SystemHash.combine(hash, tags.hashCode);
|
||||
hash = _SystemHash.combine(hash, pinned.hashCode);
|
||||
hash = _SystemHash.combine(hash, shuffle.hashCode);
|
||||
hash = _SystemHash.combine(hash, includeReplies.hashCode);
|
||||
|
||||
return _SystemHash.finish(hash);
|
||||
}
|
||||
@@ -284,6 +299,9 @@ mixin PostListNotifierRef
|
||||
|
||||
/// The parameter `shuffle` of this provider.
|
||||
bool get shuffle;
|
||||
|
||||
/// The parameter `includeReplies` of this provider.
|
||||
bool? get includeReplies;
|
||||
}
|
||||
|
||||
class _PostListNotifierProviderElement
|
||||
@@ -310,6 +328,9 @@ class _PostListNotifierProviderElement
|
||||
bool? get pinned => (origin as PostListNotifierProvider).pinned;
|
||||
@override
|
||||
bool get shuffle => (origin as PostListNotifierProvider).shuffle;
|
||||
@override
|
||||
bool? get includeReplies =>
|
||||
(origin as PostListNotifierProvider).includeReplies;
|
||||
}
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:island/models/post.dart';
|
||||
import 'package:island/pods/userinfo.dart';
|
||||
@@ -19,35 +20,37 @@ class PostRepliesSheet extends HookConsumerWidget {
|
||||
|
||||
return SheetScaffold(
|
||||
titleText: 'repliesCount'.plural(post.repliesCount),
|
||||
child: Column(
|
||||
child: Stack(
|
||||
children: [
|
||||
// Replies list
|
||||
Expanded(
|
||||
child: CustomScrollView(
|
||||
slivers: [
|
||||
PostRepliesList(
|
||||
postId: post.id.toString(),
|
||||
onOpen: () {
|
||||
Navigator.pop(context);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
CustomScrollView(
|
||||
slivers: [
|
||||
PostRepliesList(
|
||||
postId: post.id.toString(),
|
||||
onOpen: () {
|
||||
Navigator.pop(context);
|
||||
},
|
||||
),
|
||||
SliverGap(80),
|
||||
],
|
||||
),
|
||||
// Quick reply section
|
||||
if (user.value != null)
|
||||
PostQuickReply(
|
||||
parent: post,
|
||||
onPosted: () {
|
||||
ref.invalidate(postRepliesNotifierProvider(post.id));
|
||||
},
|
||||
onLaunch: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
).padding(
|
||||
bottom: MediaQuery.of(context).padding.bottom + 16,
|
||||
top: 8,
|
||||
horizontal: 16,
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: PostQuickReply(
|
||||
parent: post,
|
||||
onPosted: () {
|
||||
ref.invalidate(postRepliesNotifierProvider(post.id));
|
||||
},
|
||||
onLaunch: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
).padding(
|
||||
bottom: MediaQuery.of(context).padding.bottom + 16,
|
||||
top: 8,
|
||||
horizontal: 16,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
@@ -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: 3.3.0+135
|
||||
version: 3.3.0+136
|
||||
|
||||
environment:
|
||||
sdk: ^3.7.2
|
||||
|
Reference in New Issue
Block a user