🐛 Bug fixes
This commit is contained in:
parent
d6c829c26a
commit
6c7d42c31a
@ -29,13 +29,13 @@ import 'package:island/screens/creators/publishers.dart';
|
|||||||
import 'package:island/screens/creators/webfeed/webfeed_list.dart';
|
import 'package:island/screens/creators/webfeed/webfeed_list.dart';
|
||||||
import 'package:island/screens/creators/webfeed/webfeed_edit.dart';
|
import 'package:island/screens/creators/webfeed/webfeed_edit.dart';
|
||||||
import 'package:island/screens/posts/compose.dart';
|
import 'package:island/screens/posts/compose.dart';
|
||||||
import 'package:island/screens/posts/detail.dart';
|
import 'package:island/screens/posts/post_detail.dart';
|
||||||
import 'package:island/screens/posts/pub_profile.dart';
|
import 'package:island/screens/posts/pub_profile.dart';
|
||||||
import 'package:island/screens/auth/login.dart';
|
import 'package:island/screens/auth/login.dart';
|
||||||
import 'package:island/screens/auth/create_account.dart';
|
import 'package:island/screens/auth/create_account.dart';
|
||||||
import 'package:island/screens/settings.dart';
|
import 'package:island/screens/settings.dart';
|
||||||
import 'package:island/screens/realm/realms.dart';
|
import 'package:island/screens/realm/realms.dart';
|
||||||
import 'package:island/screens/realm/detail.dart';
|
import 'package:island/screens/realm/realm_detail.dart';
|
||||||
import 'package:island/screens/account/event_calendar.dart';
|
import 'package:island/screens/account/event_calendar.dart';
|
||||||
import 'package:island/screens/discovery/realms.dart';
|
import 'package:island/screens/discovery/realms.dart';
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ import 'package:island/widgets/content/cloud_files.dart';
|
|||||||
import 'package:island/widgets/post/compose_shared.dart';
|
import 'package:island/widgets/post/compose_shared.dart';
|
||||||
import 'package:island/widgets/post/post_item.dart';
|
import 'package:island/widgets/post/post_item.dart';
|
||||||
import 'package:island/widgets/post/publishers_modal.dart';
|
import 'package:island/widgets/post/publishers_modal.dart';
|
||||||
import 'package:island/screens/posts/detail.dart';
|
import 'package:island/screens/posts/post_detail.dart';
|
||||||
import 'package:island/widgets/post/compose_settings_sheet.dart';
|
import 'package:island/widgets/post/compose_settings_sheet.dart';
|
||||||
import 'package:island/services/compose_storage_db.dart';
|
import 'package:island/services/compose_storage_db.dart';
|
||||||
import 'package:island/widgets/post/draft_manager.dart';
|
import 'package:island/widgets/post/draft_manager.dart';
|
||||||
|
@ -12,7 +12,7 @@ import 'package:island/models/post.dart';
|
|||||||
import 'package:island/screens/creators/publishers.dart';
|
import 'package:island/screens/creators/publishers.dart';
|
||||||
import 'package:island/services/responsive.dart';
|
import 'package:island/services/responsive.dart';
|
||||||
import 'package:island/widgets/app_scaffold.dart';
|
import 'package:island/widgets/app_scaffold.dart';
|
||||||
import 'package:island/screens/posts/detail.dart';
|
import 'package:island/screens/posts/post_detail.dart';
|
||||||
import 'package:island/widgets/content/attachment_preview.dart';
|
import 'package:island/widgets/content/attachment_preview.dart';
|
||||||
import 'package:island/widgets/content/cloud_files.dart';
|
import 'package:island/widgets/content/cloud_files.dart';
|
||||||
import 'package:island/widgets/content/markdown.dart';
|
import 'package:island/widgets/content/markdown.dart';
|
||||||
|
@ -9,10 +9,11 @@ import 'package:island/widgets/app_scaffold.dart';
|
|||||||
import 'package:island/widgets/post/post_item.dart';
|
import 'package:island/widgets/post/post_item.dart';
|
||||||
import 'package:island/widgets/post/post_quick_reply.dart';
|
import 'package:island/widgets/post/post_quick_reply.dart';
|
||||||
import 'package:island/widgets/post/post_replies.dart';
|
import 'package:island/widgets/post/post_replies.dart';
|
||||||
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
import 'package:styled_widget/styled_widget.dart';
|
import 'package:styled_widget/styled_widget.dart';
|
||||||
|
|
||||||
part 'detail.g.dart';
|
part 'post_detail.g.dart';
|
||||||
|
|
||||||
@riverpod
|
@riverpod
|
||||||
Future<SnPost?> post(Ref ref, String id) async {
|
Future<SnPost?> post(Ref ref, String id) async {
|
||||||
@ -21,20 +22,43 @@ Future<SnPost?> post(Ref ref, String id) async {
|
|||||||
return SnPost.fromJson(resp.data);
|
return SnPost.fromJson(resp.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final postStateProvider = StateNotifierProvider.family<PostState, AsyncValue<SnPost?>, String>(
|
||||||
|
(ref, id) => PostState(ref, id),
|
||||||
|
);
|
||||||
|
|
||||||
|
class PostState extends StateNotifier<AsyncValue<SnPost?>> {
|
||||||
|
final Ref _ref;
|
||||||
|
final String _id;
|
||||||
|
|
||||||
|
PostState(this._ref, this._id) : super(const AsyncValue.loading()) {
|
||||||
|
// Initialize with the initial post data
|
||||||
|
_ref.listen<AsyncValue<SnPost?>>(
|
||||||
|
postProvider(_id),
|
||||||
|
(_, next) => state = next,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void updatePost(SnPost? newPost) {
|
||||||
|
if (newPost != null) {
|
||||||
|
state = AsyncData(newPost);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class PostDetailScreen extends HookConsumerWidget {
|
class PostDetailScreen extends HookConsumerWidget {
|
||||||
final String id;
|
final String id;
|
||||||
const PostDetailScreen({super.key, required this.id});
|
const PostDetailScreen({super.key, required this.id});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final post = ref.watch(postProvider(id));
|
final postState = ref.watch(postStateProvider(id));
|
||||||
final user = ref.watch(userInfoProvider);
|
final user = ref.watch(userInfoProvider);
|
||||||
|
|
||||||
final isWide = isWideScreen(context);
|
final isWide = isWideScreen(context);
|
||||||
|
|
||||||
return AppScaffold(
|
return AppScaffold(
|
||||||
appBar: AppBar(title: const Text('Post')),
|
appBar: AppBar(title: const Text('Post')),
|
||||||
body: post.when(
|
body: postState.when(
|
||||||
data: (post) {
|
data: (post) {
|
||||||
return Stack(
|
return Stack(
|
||||||
fit: StackFit.expand,
|
fit: StackFit.expand,
|
||||||
@ -49,6 +73,10 @@ class PostDetailScreen extends HookConsumerWidget {
|
|||||||
isOpenable: false,
|
isOpenable: false,
|
||||||
isFullPost: true,
|
isFullPost: true,
|
||||||
backgroundColor: isWide ? Colors.transparent : null,
|
backgroundColor: isWide ? Colors.transparent : null,
|
||||||
|
onUpdate: (newItem) {
|
||||||
|
// Update the local state with the new post data
|
||||||
|
ref.read(postStateProvider(id).notifier).updatePost(newItem);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
const Divider(height: 1),
|
const Divider(height: 1),
|
||||||
],
|
],
|
||||||
@ -65,11 +93,15 @@ class PostDetailScreen extends HookConsumerWidget {
|
|||||||
right: 0,
|
right: 0,
|
||||||
child: Material(
|
child: Material(
|
||||||
elevation: 2,
|
elevation: 2,
|
||||||
child: PostQuickReply(
|
child: postState.when(
|
||||||
parent: post,
|
data: (post) => PostQuickReply(
|
||||||
|
parent: post!,
|
||||||
onPosted: () {
|
onPosted: () {
|
||||||
ref.invalidate(postRepliesNotifierProvider(id));
|
ref.invalidate(postRepliesNotifierProvider(id));
|
||||||
},
|
},
|
||||||
|
),
|
||||||
|
loading: () => const SizedBox.shrink(),
|
||||||
|
error: (_, __) => const SizedBox.shrink(),
|
||||||
).padding(
|
).padding(
|
||||||
bottom: MediaQuery.of(context).padding.bottom + 16,
|
bottom: MediaQuery.of(context).padding.bottom + 16,
|
||||||
top: 16,
|
top: 16,
|
@ -1,6 +1,6 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
part of 'detail.dart';
|
part of 'post_detail.dart';
|
||||||
|
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
// RiverpodGenerator
|
// RiverpodGenerator
|
@ -22,7 +22,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
|
|||||||
import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
|
import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
|
||||||
import 'package:styled_widget/styled_widget.dart';
|
import 'package:styled_widget/styled_widget.dart';
|
||||||
|
|
||||||
part 'detail.g.dart';
|
part 'realm_detail.g.dart';
|
||||||
|
|
||||||
@riverpod
|
@riverpod
|
||||||
Future<Color?> realmAppbarForegroundColor(Ref ref, String realmSlug) async {
|
Future<Color?> realmAppbarForegroundColor(Ref ref, String realmSlug) async {
|
@ -1,6 +1,6 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
part of 'detail.dart';
|
part of 'realm_detail.dart';
|
||||||
|
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
// RiverpodGenerator
|
// RiverpodGenerator
|
@ -1,3 +1,4 @@
|
|||||||
|
import 'dart:convert';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
import 'dart:ui';
|
import 'dart:ui';
|
||||||
|
|
||||||
@ -13,6 +14,7 @@ import 'package:island/pods/config.dart';
|
|||||||
import 'package:island/pods/network.dart';
|
import 'package:island/pods/network.dart';
|
||||||
import 'package:island/widgets/alert.dart';
|
import 'package:island/widgets/alert.dart';
|
||||||
import 'package:island/widgets/content/cloud_files.dart';
|
import 'package:island/widgets/content/cloud_files.dart';
|
||||||
|
import 'package:island/widgets/content/sheet.dart';
|
||||||
import 'package:path/path.dart' show extension;
|
import 'package:path/path.dart' show extension;
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:photo_view/photo_view.dart';
|
import 'package:photo_view/photo_view.dart';
|
||||||
@ -210,6 +212,35 @@ class CloudFileZoomIn extends HookConsumerWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void showInfoSheet() {
|
||||||
|
final exifData = item.fileMeta?['exif'] ?? {};
|
||||||
|
showModalBottomSheet(
|
||||||
|
useRootNavigator: true,
|
||||||
|
context: context,
|
||||||
|
builder:
|
||||||
|
(context) => SheetScaffold(
|
||||||
|
titleText: 'File Info',
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text('Name: ${item.name}'),
|
||||||
|
Text('Size: ${item.size} bytes'),
|
||||||
|
Text('Type: ${item.mimeType ?? 'Unknown'}'),
|
||||||
|
if (exifData.isNotEmpty) ...[
|
||||||
|
const Gap(16),
|
||||||
|
Text('EXIF Data:'),
|
||||||
|
const Gap(8),
|
||||||
|
for (var entry in exifData.entries)
|
||||||
|
Text('${entry.key}: ${entry.value}'),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return DismissiblePage(
|
return DismissiblePage(
|
||||||
isFullScreen: true,
|
isFullScreen: true,
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.transparent,
|
||||||
@ -288,8 +319,22 @@ class CloudFileZoomIn extends HookConsumerWidget {
|
|||||||
left: 16,
|
left: 16,
|
||||||
right: 16,
|
right: 16,
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
|
||||||
children: [
|
children: [
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(
|
||||||
|
Icons.info_outline,
|
||||||
|
color: Colors.white,
|
||||||
|
shadows: [
|
||||||
|
Shadow(
|
||||||
|
color: Colors.black54,
|
||||||
|
blurRadius: 5.0,
|
||||||
|
offset: Offset(1.0, 1.0),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
onPressed: showInfoSheet,
|
||||||
|
),
|
||||||
|
Spacer(),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: Icon(Icons.remove, color: Colors.white),
|
icon: Icon(Icons.remove, color: Colors.white),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user