+136 -74

lib/api.dart

··· 5 5 import 'models/gallery.dart'; 6 6 import 'models/notification.dart' as grain; 7 7 import './auth.dart'; 8 8 - import 'package:xrpc/xrpc.dart' as xrpc; 9 8 import 'package:http/http.dart' as http; 10 9 import 'dart:convert'; 11 10 import 'package:grain/dpop_client.dart'; ··· 58 57 59 58 Future<Profile?> fetchProfile({required String did}) async { 60 59 appLogger.i('Fetching profile for did: $did'); 61 61 - final response = await xrpc.query( 62 62 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 63 63 - xrpc.NSID.create('actor.grain.social', 'getProfile'), 64 64 - parameters: {'actor': did}, 65 65 - to: Profile.fromJson, 60 60 + final response = await http.get( 61 61 + Uri.parse('$_apiUrl/xrpc/social.grain.actor.getProfile?actor=$did'), 62 62 + headers: {'Content-Type': 'application/json'}, 66 63 ); 67 67 - return response.data; 64 64 + if (response.statusCode != 200) { 65 65 + appLogger.w( 66 66 + 'Failed to fetch profile: ${response.statusCode} ${response.body}', 67 67 + ); 68 68 + return null; 69 69 + } 70 70 + return Profile.fromJson(jsonDecode(response.body)); 68 71 } 69 72 70 73 Future<List<Gallery>> fetchActorGalleries({required String did}) async { 71 74 appLogger.i('Fetching galleries for actor did: $did'); 72 72 - final record = await xrpc.query( 73 73 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 74 74 - xrpc.NSID.create('gallery.grain.social', 'getActorGalleries'), 75 75 - parameters: {'actor': did}, 76 76 - to: (json) => 77 77 - (json['items'] as List<dynamic>?) 78 78 - ?.map((item) => Gallery.fromJson(item)) 79 79 - .toList() ?? 80 80 - [], 75 75 + final response = await http.get( 76 76 + Uri.parse( 77 77 + '$_apiUrl/xrpc/social.grain.gallery.getActorGalleries?actor=$did', 78 78 + ), 79 79 + headers: {'Content-Type': 'application/json'}, 81 80 ); 82 82 - galleries = record.data; 81 81 + if (response.statusCode != 200) { 82 82 + appLogger.w( 83 83 + 'Failed to fetch galleries: ${response.statusCode} ${response.body}', 84 84 + ); 85 85 + return []; 86 86 + } 87 87 + final json = jsonDecode(response.body); 88 88 + galleries = 89 89 + (json['items'] as List<dynamic>?) 90 90 + ?.map((item) => Gallery.fromJson(item)) 91 91 + .toList() ?? 92 92 + []; 83 93 return galleries; 84 94 } 85 95 ··· 87 97 if (_accessToken == null) { 88 98 return []; 89 99 } 90 90 - appLogger.i('Fetching timeline with algorithm: ${algorithm ?? 'default'}'); 91 91 - final record = await xrpc.query( 92 92 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 93 93 - xrpc.NSID.create('feed.grain.social', 'getTimeline'), 94 94 - parameters: algorithm != null ? {'algorithm': algorithm} : null, 95 95 - headers: {'Authorization': "Bearer $_accessToken"}, 96 96 - to: (json) => 97 97 - (json['feed'] as List<dynamic>?) 98 98 - ?.map((item) => Gallery.fromJson(item as Map<String, dynamic>)) 99 99 - .toList() ?? 100 100 - [], 100 100 + appLogger.i( 101 101 + 'Fetching timeline with algorithm: \\${algorithm ?? 'default'}', 102 102 + ); 103 103 + final uri = algorithm != null 104 104 + ? Uri.parse( 105 105 + '$_apiUrl/xrpc/social.grain.feed.getTimeline?algorithm=$algorithm', 106 106 + ) 107 107 + : Uri.parse('$_apiUrl/xrpc/social.grain.feed.getTimeline'); 108 108 + final response = await http.get( 109 109 + uri, 110 110 + headers: { 111 111 + 'Authorization': "Bearer $_accessToken", 112 112 + 'Content-Type': 'application/json', 113 113 + }, 101 114 ); 102 102 - return record.data; 115 115 + if (response.statusCode != 200) { 116 116 + appLogger.w( 117 117 + 'Failed to fetch timeline: ${response.statusCode} ${response.body}', 118 118 + ); 119 119 + return []; 120 120 + } 121 121 + final json = jsonDecode(response.body); 122 122 + return (json['feed'] as List<dynamic>?) 123 123 + ?.map((item) => Gallery.fromJson(item as Map<String, dynamic>)) 124 124 + .toList() ?? 125 125 + []; 103 126 } 104 127 105 128 Future<Gallery?> getGallery({required String uri}) async { 106 129 appLogger.i('Fetching gallery for uri: $uri'); 107 107 - final record = await xrpc.query( 108 108 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 109 109 - xrpc.NSID.create('gallery.grain.social', 'getGallery'), 110 110 - parameters: {'uri': uri}, 111 111 - to: Gallery.fromJson, 130 130 + final response = await http.get( 131 131 + Uri.parse('$_apiUrl/xrpc/social.grain.gallery.getGallery?uri=$uri'), 132 132 + headers: {'Content-Type': 'application/json'}, 112 133 ); 113 113 - return record.data; 134 134 + if (response.statusCode != 200) { 135 135 + appLogger.w( 136 136 + 'Failed to fetch gallery: ${response.statusCode} ${response.body}', 137 137 + ); 138 138 + return null; 139 139 + } 140 140 + try { 141 141 + final json = jsonDecode(response.body); 142 142 + if (json is Map<String, dynamic>) { 143 143 + return Gallery.fromJson(json); 144 144 + } else { 145 145 + appLogger.w( 146 146 + 'Unexpected response type for getGallery: ${response.body}', 147 147 + ); 148 148 + return null; 149 149 + } 150 150 + } catch (e, st) { 151 151 + appLogger.e('Error parsing getGallery response: $e', stackTrace: st); 152 152 + return null; 153 153 + } 114 154 } 115 155 116 156 Future<Map<String, dynamic>> getGalleryThread({required String uri}) async { 117 157 appLogger.i('Fetching gallery thread for uri: $uri'); 118 118 - final record = await xrpc.query( 119 119 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 120 120 - xrpc.NSID.create('gallery.grain.social', 'getGalleryThread'), 121 121 - parameters: {'uri': uri}, 122 122 - to: (json) => json as Map<String, dynamic>, 158 158 + final response = await http.get( 159 159 + Uri.parse('$_apiUrl/xrpc/social.grain.gallery.getGalleryThread?uri=$uri'), 160 160 + headers: {'Content-Type': 'application/json'}, 123 161 ); 124 124 - return record.data; 162 162 + if (response.statusCode != 200) { 163 163 + appLogger.w( 164 164 + 'Failed to fetch gallery thread: ${response.statusCode} ${response.body}', 165 165 + ); 166 166 + return {}; 167 167 + } 168 168 + return jsonDecode(response.body) as Map<String, dynamic>; 125 169 } 126 170 127 171 Future<List<grain.Notification>> getNotifications() async { ··· 130 174 return []; 131 175 } 132 176 appLogger.i('Fetching notifications'); 133 133 - final record = await xrpc.query( 134 134 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 135 135 - xrpc.NSID.create('notification.grain.social', 'getNotifications'), 136 136 - headers: {'Authorization': "Bearer $_accessToken"}, 137 137 - to: (json) => 138 138 - (json['notifications'] as List<dynamic>?) 139 139 - ?.map( 140 140 - (item) => 141 141 - grain.Notification.fromJson(item as Map<String, dynamic>), 142 142 - ) 143 143 - .toList() ?? 144 144 - [], 177 177 + final response = await http.get( 178 178 + Uri.parse('$_apiUrl/xrpc/social.grain.notification.getNotifications'), 179 179 + headers: { 180 180 + 'Authorization': "Bearer $_accessToken", 181 181 + 'Content-Type': 'application/json', 182 182 + }, 145 183 ); 146 146 - return record.data; 184 184 + if (response.statusCode != 200) { 185 185 + appLogger.w( 186 186 + 'Failed to fetch notifications: ${response.statusCode} ${response.body}', 187 187 + ); 188 188 + return []; 189 189 + } 190 190 + final json = jsonDecode(response.body); 191 191 + return (json['notifications'] as List<dynamic>?) 192 192 + ?.map( 193 193 + (item) => 194 194 + grain.Notification.fromJson(item as Map<String, dynamic>), 195 195 + ) 196 196 + .toList() ?? 197 197 + []; 147 198 } 148 199 149 200 Future<List<Profile>> searchActors(String query) async { ··· 152 203 return []; 153 204 } 154 205 appLogger.i('Searching actors with query: $query'); 155 155 - final record = await xrpc.query( 156 156 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 157 157 - xrpc.NSID.create('actor.grain.social', 'searchActors'), 158 158 - parameters: {'q': query}, 159 159 - to: (json) => 160 160 - (json['actors'] as List<dynamic>?) 161 161 - ?.map((item) => Profile.fromJson(item)) 162 162 - .toList() ?? 163 163 - [], 206 206 + final response = await http.get( 207 207 + Uri.parse('$_apiUrl/xrpc/social.grain.actor.searchActors?q=$query'), 208 208 + headers: { 209 209 + 'Authorization': "Bearer $_accessToken", 210 210 + 'Content-Type': 'application/json', 211 211 + }, 164 212 ); 165 165 - return record.data; 213 213 + if (response.statusCode != 200) { 214 214 + appLogger.w( 215 215 + 'Failed to search actors: ${response.statusCode} ${response.body}', 216 216 + ); 217 217 + return []; 218 218 + } 219 219 + final json = jsonDecode(response.body); 220 220 + return (json['actors'] as List<dynamic>?) 221 221 + ?.map((item) => Profile.fromJson(item)) 222 222 + .toList() ?? 223 223 + []; 166 224 } 167 225 168 226 Future<List<Gallery>> getActorFavs({required String did}) async { 169 227 appLogger.i('Fetching actor favs for did: $did'); 170 170 - final record = await xrpc.query( 171 171 - service: _apiUrl.replaceFirst(RegExp(r'^https?://'), ''), 172 172 - xrpc.NSID.create('actor.grain.social', 'getActorFavs'), 173 173 - parameters: {'actor': did}, 174 174 - to: (json) => 175 175 - (json['items'] as List<dynamic>?) 176 176 - ?.map((item) => Gallery.fromJson(item)) 177 177 - .toList() ?? 178 178 - [], 228 228 + final response = await http.get( 229 229 + Uri.parse('$_apiUrl/xrpc/social.grain.actor.getActorFavs?actor=$did'), 230 230 + headers: {'Content-Type': 'application/json'}, 179 231 ); 180 180 - return record.data; 232 232 + if (response.statusCode != 200) { 233 233 + appLogger.w( 234 234 + 'Failed to fetch actor favs: ${response.statusCode} ${response.body}', 235 235 + ); 236 236 + return []; 237 237 + } 238 238 + final json = jsonDecode(response.body); 239 239 + return (json['items'] as List<dynamic>?) 240 240 + ?.map((item) => Gallery.fromJson(item)) 241 241 + .toList() ?? 242 242 + []; 181 243 } 182 244 183 245 Future<String?> createGallery({

+139 -46

lib/screens/create_gallery_page.dart

··· 9 9 import 'gallery_page.dart'; 10 10 import 'package:grain/photo_manip.dart'; 11 11 import 'package:flutter/foundation.dart'; 12 12 + import 'package:grain/models/gallery.dart'; 13 13 + import 'package:path_provider/path_provider.dart'; 14 14 + 15 15 + // Wrapper class for differentiating images 16 16 + class GalleryImage { 17 17 + final XFile file; 18 18 + final bool isExisting; 19 19 + final String? remoteUri; 20 20 + GalleryImage({required this.file, this.isExisting = false, this.remoteUri}); 21 21 + } 12 22 13 23 class CreateGalleryPage extends StatefulWidget { 14 14 - const CreateGalleryPage({super.key}); 24 24 + final Gallery? gallery; 25 25 + const CreateGalleryPage({super.key, this.gallery}); 15 26 16 27 @override 17 28 State<CreateGalleryPage> createState() => _CreateGalleryPageState(); ··· 20 31 class _CreateGalleryPageState extends State<CreateGalleryPage> { 21 32 final _titleController = TextEditingController(); 22 33 final _descController = TextEditingController(); 23 23 - final List<XFile> _images = []; 34 34 + final List<GalleryImage> _images = []; 24 35 bool _submitting = false; 25 36 37 37 + @override 38 38 + void initState() { 39 39 + super.initState(); 40 40 + if (widget.gallery != null) { 41 41 + _titleController.text = widget.gallery!.title; 42 42 + _descController.text = widget.gallery!.description; 43 43 + // Load existing images 44 44 + Future.microtask(() async { 45 45 + final List<GalleryImage> loadedImages = []; 46 46 + for (final item in widget.gallery!.items) { 47 47 + try { 48 48 + final response = await HttpClient().getUrl(Uri.parse(item.thumb)); 49 49 + final file = await response.close().then((res) async { 50 50 + final bytes = await consolidateHttpClientResponseBytes(res); 51 51 + final tempDir = await getTemporaryDirectory(); 52 52 + final tempFile = File('${tempDir.path}/${item.uri.hashCode}.jpg'); 53 53 + await tempFile.writeAsBytes(bytes); 54 54 + return tempFile; 55 55 + }); 56 56 + loadedImages.add( 57 57 + GalleryImage( 58 58 + file: XFile(file.path), 59 59 + isExisting: true, 60 60 + remoteUri: item.uri, 61 61 + ), 62 62 + ); 63 63 + } catch (_) {} 64 64 + } 65 65 + if (mounted) { 66 66 + setState(() { 67 67 + _images.addAll(loadedImages); 68 68 + }); 69 69 + } 70 70 + }); 71 71 + } 72 72 + } 73 73 + 26 74 Future<void> _pickImages() async { 27 75 final picker = ImagePicker(); 28 76 final picked = await picker.pickMultiImage(imageQuality: 85); 29 77 if (picked.isNotEmpty) { 30 78 setState(() { 31 31 - _images.addAll(picked); 79 79 + _images.addAll( 80 80 + picked.map((xfile) => GalleryImage(file: xfile, isExisting: false)), 81 81 + ); 32 82 }); 33 83 } 34 84 } ··· 51 101 Future<void> _submit() async { 52 102 setState(() => _submitting = true); 53 103 final List<String> photoUris = []; 54 54 - for (final xfile in _images) { 55 55 - final file = File(xfile.path); 56 56 - // Use compute to run resizeImage in a background isolate 57 57 - final resizedResult = await compute<File, ResizeResult>( 58 58 - (f) => resizeImage(file: f), 59 59 - file, 60 60 - ); 61 61 - final blobResult = await apiService.uploadBlob(resizedResult.file); 62 62 - if (blobResult != null) { 63 63 - final dims = await _getImageDimensions(xfile); 64 64 - final photoUri = await apiService.createPhoto( 65 65 - blob: blobResult, 66 66 - width: dims['width']!, 67 67 - height: dims['height']!, 104 104 + for (final galleryImage in _images) { 105 105 + if (galleryImage.isExisting && galleryImage.remoteUri != null) { 106 106 + photoUris.add(galleryImage.remoteUri!); 107 107 + continue; 108 108 + } 109 109 + // Only upload, create photo, and create gallery item if not existing 110 110 + if (!galleryImage.isExisting) { 111 111 + final file = File(galleryImage.file.path); 112 112 + final resizedResult = await compute<File, ResizeResult>( 113 113 + (f) => resizeImage(file: f), 114 114 + file, 68 115 ); 69 69 - if (photoUri != null) { 70 70 - photoUris.add(photoUri); 116 116 + final blobResult = await apiService.uploadBlob(resizedResult.file); 117 117 + if (blobResult != null) { 118 118 + final dims = await _getImageDimensions(galleryImage.file); 119 119 + final photoUri = await apiService.createPhoto( 120 120 + blob: blobResult, 121 121 + width: dims['width']!, 122 122 + height: dims['height']!, 123 123 + ); 124 124 + if (photoUri != null) { 125 125 + photoUris.add(photoUri); 126 126 + } 71 127 } 72 128 } 73 129 } 74 74 - final galleryUri = await apiService.createGallery( 75 75 - title: _titleController.text.trim(), 76 76 - description: _descController.text.trim(), 77 77 - ); 78 78 - // Link photos to gallery as gallery items 79 79 - if (galleryUri != null) { 80 80 - for (int i = 0; i < photoUris.length; i++) { 81 81 - await apiService.createGalleryItem( 82 82 - galleryUri: galleryUri, 83 83 - photoUri: photoUris[i], 84 84 - position: i, 85 85 - ); 86 86 - } 130 130 + String? galleryUri; 131 131 + if (widget.gallery != null && widget.gallery!.uri.isNotEmpty) { 132 132 + galleryUri = widget.gallery!.uri; 133 133 + } else { 134 134 + galleryUri = await apiService.createGallery( 135 135 + title: _titleController.text.trim(), 136 136 + description: _descController.text.trim(), 137 137 + ); 87 138 } 139 139 + // Link only new photos to gallery as gallery items 88 140 if (galleryUri != null) { 141 141 + int position = 0; 142 142 + for (final galleryImage in _images) { 143 143 + if (!galleryImage.isExisting) { 144 144 + // Only create gallery item for new photos 145 145 + if (position < photoUris.length) { 146 146 + await apiService.createGalleryItem( 147 147 + galleryUri: galleryUri, 148 148 + photoUri: photoUris[position], 149 149 + position: position, 150 150 + ); 151 151 + position++; 152 152 + } 153 153 + } else { 154 154 + position++; 155 155 + } 156 156 + } 89 157 await apiService.pollGalleryItems( 90 158 galleryUri: galleryUri, 91 91 - expectedCount: photoUris.length, 159 159 + expectedCount: _images.length, 92 160 ); 93 161 } 94 162 setState(() => _submitting = false); 95 163 if (mounted && galleryUri != null) { 164 164 + // Mark all images as existing after successful save 165 165 + for (var i = 0; i < _images.length; i++) { 166 166 + if (!_images[i].isExisting && i < photoUris.length) { 167 167 + _images[i] = GalleryImage( 168 168 + file: _images[i].file, 169 169 + isExisting: true, 170 170 + remoteUri: photoUris[i], 171 171 + ); 172 172 + } 173 173 + } 96 174 Navigator.of(context).pop(); 97 97 - Navigator.of(context).push( 98 98 - MaterialPageRoute( 99 99 - builder: (context) => GalleryPage( 100 100 - uri: galleryUri, 101 101 - currentUserDid: apiService.currentUser?.did, 175 175 + if (widget.gallery == null) { 176 176 + Navigator.of(context).push( 177 177 + MaterialPageRoute( 178 178 + builder: (context) => GalleryPage( 179 179 + uri: galleryUri!, 180 180 + currentUserDid: apiService.currentUser?.did, 181 181 + ), 102 182 ), 103 103 - ), 104 104 - ); 183 183 + ); 184 184 + } 105 185 } else if (mounted) { 106 186 Navigator.of(context).pop(true); 107 187 } ··· 129 209 ? null 130 210 : () => Navigator.of(context).pop(), 131 211 style: TextButton.styleFrom( 132 132 - foregroundColor: const Color( 133 133 - 0xFF0EA5E9, 134 134 - ), // Tailwind sky-500 212 212 + foregroundColor: const Color(0xFF0EA5E9), 135 213 ), 136 214 child: const Text( 137 215 'Cancel', ··· 139 217 ), 140 218 ), 141 219 Text( 142 142 - 'New Gallery', 220 220 + widget.gallery == null ? 'New Gallery' : 'Edit Gallery', 143 221 style: const TextStyle( 144 222 fontWeight: FontWeight.bold, 145 223 fontSize: 18, 146 224 ), 147 225 ), 148 226 AppButton( 149 149 - label: 'Create', 227 227 + label: widget.gallery == null ? 'Create' : 'Save', 150 228 onPressed: _submitting ? null : _submit, 151 229 loading: _submitting, 152 230 variant: AppButtonVariant.primary, ··· 206 284 ), 207 285 itemCount: _images.length, 208 286 itemBuilder: (context, index) { 287 287 + final galleryImage = _images[index]; 209 288 return Stack( 210 289 children: [ 211 290 Positioned.fill( 212 291 child: Image.file( 213 213 - File(_images[index].path), 292 292 + File(galleryImage.file.path), 214 293 fit: BoxFit.cover, 215 294 ), 216 295 ), 296 296 + if (galleryImage.isExisting) 297 297 + Positioned( 298 298 + left: 2, 299 299 + top: 2, 300 300 + child: Container( 301 301 + padding: const EdgeInsets.all(2), 302 302 + color: Colors.green.withOpacity(0.7), 303 303 + child: const Icon( 304 304 + Icons.check_circle, 305 305 + color: Colors.white, 306 306 + size: 16, 307 307 + ), 308 308 + ), 309 309 + ), 217 310 Positioned( 218 311 top: 2, 219 312 right: 2,

+20

lib/screens/gallery_page.dart

··· 9 9 import 'package:share_plus/share_plus.dart'; 10 10 import 'package:grain/widgets/app_image.dart'; 11 11 import 'package:cached_network_image/cached_network_image.dart'; 12 12 + import 'package:grain/screens/create_gallery_page.dart'; 12 13 13 14 class GalleryPage extends StatefulWidget { 14 15 final String uri; ··· 111 112 fontSize: 18, 112 113 fontWeight: FontWeight.w600, 113 114 ), 115 115 + actions: [ 116 116 + if (gallery.creator?.did == widget.currentUserDid) 117 117 + IconButton( 118 118 + icon: const Icon(Icons.edit), 119 119 + tooltip: 'Edit Gallery', 120 120 + onPressed: () async { 121 121 + await showModalBottomSheet( 122 122 + context: context, 123 123 + isScrollControlled: true, 124 124 + builder: (context) => CreateGalleryPage( 125 125 + // Optionally pass initial data for editing 126 126 + gallery: gallery, 127 127 + ), 128 128 + ); 129 129 + // Optionally refresh after editing 130 130 + _fetchGallery(); 131 131 + }, 132 132 + ), 133 133 + ], 114 134 ), 115 135 body: ListView( 116 136 children: [