diff --git a/lib/core/network/app_view_fallback_service.dart b/lib/core/network/app_view_fallback_service.dart index bbd31e1..8ba8c04 100644 --- a/lib/core/network/app_view_fallback_service.dart +++ b/lib/core/network/app_view_fallback_service.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:atproto_core/atproto_core.dart' as atp_core show XRPCException; +import 'package:poptart_core/poptart_core.dart' as atp_core show XRPCException; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_provider.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/core/network/atproto_host_resolver.dart b/lib/core/network/atproto_host_resolver.dart index e6e6414..740af81 100644 --- a/lib/core/network/atproto_host_resolver.dart +++ b/lib/core/network/atproto_host_resolver.dart @@ -1,4 +1,4 @@ -import 'package:atproto_core/atproto_core.dart' as atp_core; +import 'package:poptart_core/poptart_core.dart' as atp_core; import 'package:lazurite/features/auth/data/models/auth_models.dart'; String resolvePdsHost(AuthTokens tokens) { diff --git a/lib/core/network/poptart_client_adapter.dart b/lib/core/network/poptart_client_adapter.dart new file mode 100644 index 0000000..907a11c --- /dev/null +++ b/lib/core/network/poptart_client_adapter.dart @@ -0,0 +1,626 @@ +import 'dart:typed_data'; + +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor.dart' as actor_methods; +import 'package:poptart_lex/app/bsky/bookmark.dart' as bookmark_methods; +import 'package:poptart_lex/app/bsky/feed.dart' as feed_methods; +import 'package:poptart_lex/app/bsky/graph.dart' as graph_methods; +import 'package:poptart_lex/app/bsky/labeler.dart' as labeler_methods; +import 'package:poptart_lex/app/bsky/notification.dart' as notification_methods; +import 'package:poptart_lex/app/bsky/unspecced.dart' as unspecced_methods; +import 'package:poptart_lex/app/bsky/video.dart' as video_methods; +import 'package:poptart_lex/chat/bsky/convo.dart' as convo_methods; +import 'package:poptart_lex/com/atproto/identity.dart' as identity_methods; +import 'package:poptart_lex/com/atproto/moderation.dart' as moderation_methods; +import 'package:poptart_lex/com/atproto/repo.dart' as repo_methods; +import 'package:poptart_lex/com/atproto/server.dart' as server_methods; +import 'package:poptart_lex/com/atproto/server/create_session/input.dart'; +import 'package:poptart_lex/com/atproto/server/create_session/output.dart'; +import 'package:poptart_lex/com/atproto/server/refresh_session/output.dart'; +import 'package:poptart_oauth/poptart_oauth.dart' show OAuthSession; + +export 'package:poptart_core/poptart_core.dart'; +export 'package:poptart_oauth/poptart_oauth.dart'; +export 'package:poptart_xrpc/poptart_xrpc.dart'; + +class Bluesky { + Bluesky._(this._client); + + factory Bluesky.fromSession( + Session session, { + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return Bluesky._( + PoptartClient.fromSession( + session, + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + factory Bluesky.fromOAuthSession( + OAuthSession session, { + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return Bluesky._( + PoptartClient.fromOAuthSession( + session, + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + factory Bluesky.anonymous({ + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return Bluesky._( + PoptartClient.anonymous( + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + final PoptartClient _client; + + Session? get session => _client.session; + OAuthSession? get oAuthSession => _client.oAuthSession; + String get service => _client.service; + Map get headers => _client.headers; + + BlueskyAtProto get atproto => BlueskyAtProto._(_client); + dynamic get actor => _XrpcNamespace(_client, 'app.bsky.actor'); + dynamic get bookmark => _XrpcNamespace(_client, 'app.bsky.bookmark'); + dynamic get feed => _FeedNamespace(_client); + dynamic get graph => _GraphNamespace(_client); + dynamic get labeler => _XrpcNamespace(_client, 'app.bsky.labeler'); + dynamic get notification => _XrpcNamespace(_client, 'app.bsky.notification'); + dynamic get unspecced => _XrpcNamespace(_client, 'app.bsky.unspecced'); + dynamic get video => _XrpcNamespace(_client, 'app.bsky.video'); + + Future> call( + XRPCMethod method, { + String? service, + Map? headers, + P? parameters, + I? input, + }) { + return _client.call(method, service: service, headers: headers, parameters: parameters, input: input); + } + + Future> get( + NSID methodId, { + String? service, + Map? headers, + Map? parameters, + ResponseDataBuilder? to, + ResponseDataAdaptor? adaptor, + }) { + return _client.get(methodId, service: service, headers: headers, parameters: parameters, to: to, adaptor: adaptor); + } + + Future> post( + NSID methodId, { + String? service, + Map? headers, + Map? parameters, + dynamic body, + ResponseDataBuilder? to, + }) { + return _client.post(methodId, service: service, headers: headers, parameters: parameters, body: body, to: to); + } +} + +class BlueskyChat extends Bluesky { + BlueskyChat._(super.client) : super._(); + + factory BlueskyChat.fromSession( + Session session, { + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return BlueskyChat._( + PoptartClient.fromSession( + session, + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + factory BlueskyChat.fromOAuthSession( + OAuthSession session, { + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return BlueskyChat._( + PoptartClient.fromOAuthSession( + session, + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + dynamic get convo => _XrpcNamespace(_client, 'chat.bsky.convo'); +} + +typedef ATProto = BlueskyAtProto; + +class BlueskyAtProto { + BlueskyAtProto._(this._client); + + factory BlueskyAtProto.anonymous({ + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return BlueskyAtProto._( + PoptartClient.anonymous( + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + factory BlueskyAtProto.fromOAuthSession( + OAuthSession session, { + Map? headers, + Protocol? protocol, + String? service, + String? relayService, + Duration? timeout, + RetryConfig? retryConfig, + GetClient? getClient, + PostClient? postClient, + }) { + return BlueskyAtProto._( + PoptartClient.fromOAuthSession( + session, + headers: headers, + protocol: protocol, + service: service, + relayService: relayService, + timeout: timeout, + retryConfig: retryConfig, + getClient: getClient, + postClient: postClient, + ), + ); + } + + final PoptartClient _client; + + Session? get session => _client.session; + OAuthSession? get oAuthSession => _client.oAuthSession; + String get service => _client.service; + + dynamic get identity => _XrpcNamespace(_client, 'com.atproto.identity'); + dynamic get moderation => _XrpcNamespace(_client, 'com.atproto.moderation'); + dynamic get repo => _RepoNamespace(_client); + dynamic get server => _XrpcNamespace(_client, 'com.atproto.server'); + + Future> get( + NSID methodId, { + String? service, + Map? headers, + Map? parameters, + ResponseDataBuilder? to, + ResponseDataAdaptor? adaptor, + }) { + return _client.get(methodId, service: service, headers: headers, parameters: parameters, to: to, adaptor: adaptor); + } +} + +Future> createSession({ + required String identifier, + required String password, + String? service, +}) async { + final response = await PoptartClient.anonymous().call( + server_methods.comAtprotoServerCreateSession, + service: service, + input: ServerCreateSessionInput(identifier: identifier, password: password), + ); + + return _sessionResponse(response, _sessionFromCreateSessionOutput(response.data)); +} + +Future> refreshSession({required String refreshJwt, String? service}) async { + final response = await PoptartClient.anonymous( + headers: {'Authorization': 'Bearer $refreshJwt'}, + ).call(server_methods.comAtprotoServerRefreshSession, service: service); + + return _sessionResponse(response, _sessionFromRefreshSessionOutput(response.data)); +} + +XRPCResponse _sessionResponse(final XRPCResponse response, final Session session) { + return XRPCResponse( + headers: response.headers, + status: response.status, + request: response.request, + rateLimit: response.rateLimit, + data: session, + ); +} + +Session _sessionFromCreateSessionOutput(final ServerCreateSessionOutput output) { + return Session.fromJson(output.toJson()); +} + +Session _sessionFromRefreshSessionOutput(final ServerRefreshSessionOutput output) { + return Session.fromJson(output.toJson()); +} + +class _FeedNamespace extends _XrpcNamespace { + _FeedNamespace(PoptartClient client) : super(client, 'app.bsky.feed'); + + dynamic get like => _RecordNamespace(_client, 'app.bsky.feed.like'); + dynamic get post => _RecordNamespace(_client, 'app.bsky.feed.post'); + dynamic get repost => _RecordNamespace(_client, 'app.bsky.feed.repost'); +} + +class _GraphNamespace extends _XrpcNamespace { + _GraphNamespace(PoptartClient client) : super(client, 'app.bsky.graph'); + + dynamic get block => _RecordNamespace(_client, 'app.bsky.graph.block'); + dynamic get follow => _RecordNamespace(_client, 'app.bsky.graph.follow'); + dynamic get listblock => _RecordNamespace(_client, 'app.bsky.graph.listblock'); + dynamic get listitem => _RecordNamespace(_client, 'app.bsky.graph.listitem'); + dynamic get starterpack => _RecordNamespace(_client, 'app.bsky.graph.starterpack'); +} + +class _RepoNamespace extends _XrpcNamespace { + _RepoNamespace(PoptartClient client) : super(client, 'com.atproto.repo'); + + Future> uploadBlob({ + required Uint8List bytes, + Map? $headers, + String? $service, + }) { + return _invokeDescriptor( + _client, + repo_methods.comAtprotoRepoUploadBlob, + headers: $headers, + service: $service, + input: bytes, + ); + } +} + +class _RecordNamespace { + _RecordNamespace(this._client, this._collection); + + final PoptartClient _client; + final String _collection; + + Future> create({ + String? rkey, + Map? $headers, + String? $service, + bool? validate, + String? swapCommit, + Map? record, + dynamic subject, + dynamic cid, + DateTime? createdAt, + dynamic list, + dynamic item, + String? name, + String? description, + dynamic avatar, + dynamic labels, + dynamic purpose, + }) { + final body = record ?? {}; + body.putIfAbsent(r'$type', () => _collection); + _putIfPresent(body, 'subject', subject); + _putIfPresent(body, 'cid', cid); + _putIfPresent(body, 'createdAt', createdAt); + _putIfPresent(body, 'list', list); + _putIfPresent(body, 'item', item); + _putIfPresent(body, 'name', name); + _putIfPresent(body, 'description', description); + _putIfPresent(body, 'avatar', avatar); + _putIfPresent(body, 'labels', labels); + _putIfPresent(body, 'purpose', purpose); + return _invokeDescriptor( + _client, + repo_methods.comAtprotoRepoCreateRecord, + headers: $headers, + service: $service, + input: { + 'repo': _repoDid(_client), + 'collection': _collection, + 'rkey': ?rkey, + 'validate': ?validate, + 'swapCommit': ?swapCommit, + 'record': _normalizeJson(body), + }, + ); + } + + Future> put({ + required String rkey, + Map? $headers, + String? $service, + bool? validate, + String? swapRecord, + String? swapCommit, + Map? record, + String? name, + String? description, + dynamic avatar, + dynamic labels, + dynamic purpose, + dynamic list, + }) { + final body = record ?? {}; + body.putIfAbsent(r'$type', () => _collection); + _putIfPresent(body, 'name', name); + _putIfPresent(body, 'description', description); + _putIfPresent(body, 'avatar', avatar); + _putIfPresent(body, 'labels', labels); + _putIfPresent(body, 'purpose', purpose); + _putIfPresent(body, 'list', list); + return _invokeDescriptor( + _client, + repo_methods.comAtprotoRepoPutRecord, + headers: $headers, + service: $service, + input: { + 'repo': _repoDid(_client), + 'collection': _collection, + 'rkey': rkey, + 'validate': ?validate, + 'swapRecord': ?swapRecord, + 'swapCommit': ?swapCommit, + 'record': _normalizeJson(body), + }, + ); + } + + Future> delete({ + required String rkey, + Map? $headers, + String? $service, + String? swapRecord, + String? swapCommit, + }) { + return _invokeDescriptor( + _client, + repo_methods.comAtprotoRepoDeleteRecord, + headers: $headers, + service: $service, + input: { + 'repo': _repoDid(_client), + 'collection': _collection, + 'rkey': rkey, + 'swapRecord': ?swapRecord, + 'swapCommit': ?swapCommit, + }, + ); + } +} + +class _XrpcNamespace { + _XrpcNamespace(this._client, this._prefix); + + final PoptartClient _client; + final String _prefix; + + @override + dynamic noSuchMethod(Invocation invocation) { + if (!invocation.isMethod) return super.noSuchMethod(invocation); + final method = _symbolName(invocation.memberName); + final named = {}; + invocation.namedArguments.forEach((key, value) => named[_symbolName(key)] = value); + final headers = named.remove(r'$headers') as Map?; + final service = named.remove(r'$service') as String?; + final descriptor = _descriptorFor('$_prefix.$method'); + if (descriptor == null) return super.noSuchMethod(invocation); + return _invokeDescriptor(_client, descriptor, headers: headers, service: service, values: named); + } +} + +Future> _invokeDescriptor( + PoptartClient client, + XRPCMethodDescriptor descriptor, { + Map? headers, + String? service, + Map? values, + dynamic input, +}) { + final normalized = _normalizeJson(values ?? const {}) as Map; + final dynamic parameters = descriptor.isQuery ? descriptor.parametersFromJson?.call(normalized) ?? normalized : null; + final dynamic body = + input ?? + (descriptor.isProcedure + ? descriptor.inputFromJson?.call(normalized) ?? (normalized.isEmpty ? null : normalized) + : null); + return client.call(descriptor, service: service, headers: headers, parameters: parameters, input: body); +} + +XRPCMethodDescriptor? _descriptorFor(String nsid) { + return switch (nsid) { + 'app.bsky.actor.getPreferences' => actor_methods.appBskyActorGetPreferences, + 'app.bsky.actor.getProfile' => actor_methods.appBskyActorGetProfile, + 'app.bsky.actor.getProfiles' => actor_methods.appBskyActorGetProfiles, + 'app.bsky.actor.putPreferences' => actor_methods.appBskyActorPutPreferences, + 'app.bsky.actor.searchActors' => actor_methods.appBskyActorSearchActors, + 'app.bsky.actor.searchActorsTypeahead' => actor_methods.appBskyActorSearchActorsTypeahead, + 'app.bsky.bookmark.createBookmark' => bookmark_methods.appBskyBookmarkCreateBookmark, + 'app.bsky.bookmark.deleteBookmark' => bookmark_methods.appBskyBookmarkDeleteBookmark, + 'app.bsky.bookmark.getBookmarks' => bookmark_methods.appBskyBookmarkGetBookmarks, + 'app.bsky.feed.getActorLikes' => feed_methods.appBskyFeedGetActorLikes, + 'app.bsky.feed.getAuthorFeed' => feed_methods.appBskyFeedGetAuthorFeed, + 'app.bsky.feed.getFeed' => feed_methods.appBskyFeedGetFeed, + 'app.bsky.feed.getFeedGenerator' => feed_methods.appBskyFeedGetFeedGenerator, + 'app.bsky.feed.getFeedGenerators' => feed_methods.appBskyFeedGetFeedGenerators, + 'app.bsky.feed.getLikes' => feed_methods.appBskyFeedGetLikes, + 'app.bsky.feed.getListFeed' => feed_methods.appBskyFeedGetListFeed, + 'app.bsky.feed.getPostThread' => feed_methods.appBskyFeedGetPostThread, + 'app.bsky.feed.getPosts' => feed_methods.appBskyFeedGetPosts, + 'app.bsky.feed.getQuotes' => feed_methods.appBskyFeedGetQuotes, + 'app.bsky.feed.getRepostedBy' => feed_methods.appBskyFeedGetRepostedBy, + 'app.bsky.feed.getSuggestedFeeds' => feed_methods.appBskyFeedGetSuggestedFeeds, + 'app.bsky.feed.getTimeline' => feed_methods.appBskyFeedGetTimeline, + 'app.bsky.feed.searchPosts' => feed_methods.appBskyFeedSearchPosts, + 'app.bsky.graph.getActorStarterPacks' => graph_methods.appBskyGraphGetActorStarterPacks, + 'app.bsky.graph.getFollowers' => graph_methods.appBskyGraphGetFollowers, + 'app.bsky.graph.getFollows' => graph_methods.appBskyGraphGetFollows, + 'app.bsky.graph.getList' => graph_methods.appBskyGraphGetList, + 'app.bsky.graph.getListFeed' => null, + 'app.bsky.graph.getLists' => graph_methods.appBskyGraphGetLists, + 'app.bsky.graph.getListsWithMembership' => graph_methods.appBskyGraphGetListsWithMembership, + 'app.bsky.graph.getStarterPack' => graph_methods.appBskyGraphGetStarterPack, + 'app.bsky.graph.getSuggestedFollowsByActor' => graph_methods.appBskyGraphGetSuggestedFollowsByActor, + 'app.bsky.graph.muteActor' => graph_methods.appBskyGraphMuteActor, + 'app.bsky.graph.muteActorList' => graph_methods.appBskyGraphMuteActorList, + 'app.bsky.graph.searchStarterPacks' => graph_methods.appBskyGraphSearchStarterPacks, + 'app.bsky.graph.unmuteActor' => graph_methods.appBskyGraphUnmuteActor, + 'app.bsky.graph.unmuteActorList' => graph_methods.appBskyGraphUnmuteActorList, + 'app.bsky.labeler.getServices' => labeler_methods.appBskyLabelerGetServices, + 'app.bsky.notification.getUnreadCount' => notification_methods.appBskyNotificationGetUnreadCount, + 'app.bsky.notification.listNotifications' => notification_methods.appBskyNotificationListNotifications, + 'app.bsky.notification.registerPush' => notification_methods.appBskyNotificationRegisterPush, + 'app.bsky.notification.unregisterPush' => notification_methods.appBskyNotificationUnregisterPush, + 'app.bsky.notification.updateSeen' => notification_methods.appBskyNotificationUpdateSeen, + 'app.bsky.unspecced.getPopularFeedGenerators' => unspecced_methods.appBskyUnspeccedGetPopularFeedGenerators, + 'app.bsky.unspecced.getTopicFeed' => unspecced_methods.appBskyUnspeccedGetTaggedSuggestions, + 'app.bsky.unspecced.getTrendingTopics' => unspecced_methods.appBskyUnspeccedGetTrendingTopics, + 'app.bsky.unspecced.getTrends' => unspecced_methods.appBskyUnspeccedGetTrends, + 'app.bsky.video.getJobStatus' => video_methods.appBskyVideoGetJobStatus, + 'app.bsky.video.getUploadLimits' => video_methods.appBskyVideoGetUploadLimits, + 'app.bsky.video.uploadVideo' => video_methods.appBskyVideoUploadVideo, + 'chat.bsky.convo.deleteMessageForSelf' => convo_methods.chatBskyConvoDeleteMessageForSelf, + 'chat.bsky.convo.getConvoForMembers' => convo_methods.chatBskyConvoGetConvoForMembers, + 'chat.bsky.convo.getMessages' => convo_methods.chatBskyConvoGetMessages, + 'chat.bsky.convo.listConvos' => convo_methods.chatBskyConvoListConvos, + 'chat.bsky.convo.muteConvo' => convo_methods.chatBskyConvoMuteConvo, + 'chat.bsky.convo.sendMessage' => convo_methods.chatBskyConvoSendMessage, + 'chat.bsky.convo.unmuteConvo' => convo_methods.chatBskyConvoUnmuteConvo, + 'chat.bsky.convo.updateRead' => convo_methods.chatBskyConvoUpdateRead, + 'com.atproto.identity.resolveHandle' => identity_methods.comAtprotoIdentityResolveHandle, + 'com.atproto.moderation.createReport' => moderation_methods.comAtprotoModerationCreateReport, + 'com.atproto.repo.applyWrites' => repo_methods.comAtprotoRepoApplyWrites, + 'com.atproto.repo.createRecord' => repo_methods.comAtprotoRepoCreateRecord, + 'com.atproto.repo.deleteRecord' => repo_methods.comAtprotoRepoDeleteRecord, + 'com.atproto.repo.describeRepo' => repo_methods.comAtprotoRepoDescribeRepo, + 'com.atproto.repo.getRecord' => repo_methods.comAtprotoRepoGetRecord, + 'com.atproto.repo.listRecords' => repo_methods.comAtprotoRepoListRecords, + 'com.atproto.repo.putRecord' => repo_methods.comAtprotoRepoPutRecord, + 'com.atproto.repo.uploadBlob' => repo_methods.comAtprotoRepoUploadBlob, + 'com.atproto.server.getSession' => server_methods.comAtprotoServerGetSession, + _ => null, + } + as XRPCMethodDescriptor?; +} + +dynamic _normalizeJson(dynamic value) { + if (value == null || value is String || value is num || value is bool) return value; + if (value is DateTime) return value.toUtc().toIso8601String(); + if (value is AtUri || value is NSID) return value.toString(); + if (value is Blob || value is BlobRef) return value.toJson(); + if (value is List) return value.map(_normalizeJson).toList(growable: false); + if (value is Map) { + return value.map((key, val) => MapEntry(key.toString(), _normalizeJson(val))); + } + final dynamic dynamicValue = value; + try { + return dynamicValue.toJson(); + } catch (_) { + return value.toString(); + } +} + +void _putIfPresent(Map target, String key, dynamic value) { + if (value != null) target[key] = _normalizeJson(value); +} + +String _repoDid(PoptartClient client) { + return client.session?.did ?? + client.oAuthSession?.sub ?? + (throw StateError('Authenticated repo DID is unavailable.')); +} + +String _symbolName(Symbol symbol) { + final text = symbol.toString(); + return text.substring(8, text.length - 2); +} diff --git a/lib/core/network/unauthorized_recovery_runner.dart b/lib/core/network/unauthorized_recovery_runner.dart index 9760856..2782818 100644 --- a/lib/core/network/unauthorized_recovery_runner.dart +++ b/lib/core/network/unauthorized_recovery_runner.dart @@ -1,4 +1,4 @@ -import 'package:atproto_core/atproto_core.dart' as atcore show UnauthorizedException; +import 'package:poptart_core/poptart_core.dart' as atcore show UnauthorizedException; import 'package:lazurite/features/auth/data/models/auth_models.dart'; typedef UnauthorizedRecoveryCallback = Future Function(); diff --git a/lib/core/network/xrpc_client_factory.dart b/lib/core/network/xrpc_client_factory.dart index 94947ac..d23b624 100644 --- a/lib/core/network/xrpc_client_factory.dart +++ b/lib/core/network/xrpc_client_factory.dart @@ -1,10 +1,9 @@ -import 'package:atproto/atproto.dart' as atp; -import 'package:atproto_core/atproto_core.dart' as atp_core; -import 'package:atproto_oauth/atproto_oauth.dart' as atp_oauth; -import 'package:bluesky/bluesky.dart'; -import 'package:bluesky/bluesky_chat.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart' as atp; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/network/xrpc_network_interceptor.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; +import 'package:poptart_core/poptart_core.dart' as atp_core; +import 'package:poptart_oauth/poptart_oauth.dart' as atp_oauth; /// Creates a Bluesky client from authentication tokens. /// diff --git a/lib/core/network/xrpc_network_interceptor.dart b/lib/core/network/xrpc_network_interceptor.dart index 5763349..5760d55 100644 --- a/lib/core/network/xrpc_network_interceptor.dart +++ b/lib/core/network/xrpc_network_interceptor.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atp_core; +import 'package:poptart_core/poptart_core.dart' as atp_core; import 'package:flutter/foundation.dart'; import 'package:http/http.dart' as http; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart index 46a45c6..375c5a2 100644 --- a/lib/core/router/app_router.dart +++ b/lib/core/router/app_router.dart @@ -1,8 +1,5 @@ import 'dart:async'; -import 'package:atproto/atproto.dart' as atp; -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/bluesky.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; @@ -10,6 +7,8 @@ import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_provider.dart'; import 'package:lazurite/core/network/constellation_client.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart' as atp; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/network/xrpc_network_interceptor.dart'; import 'package:lazurite/core/router/app_route_page.dart'; import 'package:lazurite/core/router/app_shell.dart'; diff --git a/lib/core/scheduler/post_scheduler.dart b/lib/core/scheduler/post_scheduler.dart index 813fe4d..01a3c1a 100644 --- a/lib/core/scheduler/post_scheduler.dart +++ b/lib/core/scheduler/post_scheduler.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' show Blob; -import 'package:bluesky/app_bsky_video_defs.dart' show KnownJobStatusState; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_core/poptart_core.dart' show Blob; +import 'package:poptart_lex/app/bsky/video/defs.dart' show KnownJobStatusState; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:flutter/widgets.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/alerts/presentation/alerts_screen.dart b/lib/features/alerts/presentation/alerts_screen.dart index 0dd4bcf..49c3866 100644 --- a/lib/features/alerts/presentation/alerts_screen.dart +++ b/lib/features/alerts/presentation/alerts_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/auth/data/auth_repository.dart b/lib/features/auth/data/auth_repository.dart index 62500e2..2f18c3a 100644 --- a/lib/features/auth/data/auth_repository.dart +++ b/lib/features/auth/data/auth_repository.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:atproto/atproto.dart' as atp; -import 'package:atproto_core/atproto_core.dart' as atcore; -import 'package:atproto_oauth/atproto_oauth.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart' as atp; +import 'package:poptart_core/poptart_core.dart' as atcore; +import 'package:poptart_oauth/poptart_oauth.dart'; import 'package:drift/drift.dart'; import 'package:flutter/foundation.dart'; import 'package:http/http.dart' as http; diff --git a/lib/features/compose/bloc/compose_bloc.dart b/lib/features/compose/bloc/compose_bloc.dart index ddcf138..2626f7f 100644 --- a/lib/features/compose/bloc/compose_bloc.dart +++ b/lib/features/compose/bloc/compose_bloc.dart @@ -3,9 +3,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:ui' as ui; -import 'package:atproto_core/atproto_core.dart' show AtUri, Blob, BlobRef, XRPCException; -import 'package:bluesky/app_bsky_video_defs.dart' show KnownJobStatusState; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, Blob, BlobRef, XRPCException; +import 'package:poptart_lex/app/bsky/video/defs.dart' show KnownJobStatusState; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:characters/characters.dart'; import 'package:drift/drift.dart'; import 'package:equatable/equatable.dart'; diff --git a/lib/features/compose/data/link_preview_service.dart b/lib/features/compose/data/link_preview_service.dart index 5fb6974..18ebe35 100644 --- a/lib/features/compose/data/link_preview_service.dart +++ b/lib/features/compose/data/link_preview_service.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:http/http.dart' as http; class LinkPreviewData { diff --git a/lib/features/compose/presentation/compose_screen.dart b/lib/features/compose/presentation/compose_screen.dart index f617c5c..3310f72 100644 --- a/lib/features/compose/presentation/compose_screen.dart +++ b/lib/features/compose/presentation/compose_screen.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:ui' as ui; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/devtools/cubit/dev_tools_cubit.dart b/lib/features/devtools/cubit/dev_tools_cubit.dart index c10c4ff..2e4d080 100644 --- a/lib/features/devtools/cubit/dev_tools_cubit.dart +++ b/lib/features/devtools/cubit/dev_tools_cubit.dart @@ -1,18 +1,17 @@ import 'dart:async'; -import 'package:atproto/atproto.dart'; -import 'package:atproto/com_atproto_identity_resolvehandle.dart'; -import 'package:atproto/com_atproto_repo_describerepo.dart'; -import 'package:atproto/com_atproto_repo_getrecord.dart'; -import 'package:atproto/com_atproto_repo_listrecords.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_actor_searchactorstypeahead.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/actor_repository_service_resolver.dart'; import 'package:lazurite/core/network/atproto_host_resolver.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/actor/search_actors_typeahead.dart'; +import 'package:poptart_lex/com/atproto/identity/resolve_handle.dart'; +import 'package:poptart_lex/com/atproto/repo/describe_repo.dart'; +import 'package:poptart_lex/com/atproto/repo/get_record.dart'; +import 'package:poptart_lex/com/atproto/repo/list_records.dart'; part 'dev_tools_state.dart'; diff --git a/lib/features/devtools/presentation/dev_tools_screen.dart b/lib/features/devtools/presentation/dev_tools_screen.dart index 4c44897..7e457ac 100644 --- a/lib/features/devtools/presentation/dev_tools_screen.dart +++ b/lib/features/devtools/presentation/dev_tools_screen.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:atproto/com_atproto_repo_listrecords.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/repo/list_records.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/feed/bloc/feed_bloc.dart b/lib/features/feed/bloc/feed_bloc.dart index 0c89f55..6697cae 100644 --- a/lib/features/feed/bloc/feed_bloc.dart +++ b/lib/features/feed/bloc/feed_bloc.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/feed/data/feed_repository.dart'; diff --git a/lib/features/feed/cubit/feed_preferences_cubit.dart b/lib/features/feed/cubit/feed_preferences_cubit.dart index d5497da..a64e80a 100644 --- a/lib/features/feed/cubit/feed_preferences_cubit.dart +++ b/lib/features/feed/cubit/feed_preferences_cubit.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:drift/drift.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/feed/cubit/post_action_cubit.dart b/lib/features/feed/cubit/post_action_cubit.dart index 2545a02..1a7e054 100644 --- a/lib/features/feed/cubit/post_action_cubit.dart +++ b/lib/features/feed/cubit/post_action_cubit.dart @@ -1,4 +1,4 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/feed/cubit/post_thread_cubit.dart b/lib/features/feed/cubit/post_thread_cubit.dart index 2095a42..4dc1b9e 100644 --- a/lib/features/feed/cubit/post_thread_cubit.dart +++ b/lib/features/feed/cubit/post_thread_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/feed/cubit/saved_posts_cubit.dart b/lib/features/feed/cubit/saved_posts_cubit.dart index 38d56be..b9c5108 100644 --- a/lib/features/feed/cubit/saved_posts_cubit.dart +++ b/lib/features/feed/cubit/saved_posts_cubit.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_bookmark_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/bookmark/defs.dart'; import 'package:drift/drift.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/feed/data/feed_repository.dart b/lib/features/feed/data/feed_repository.dart index ead53e4..2c76bc6 100644 --- a/lib/features/feed/data/feed_repository.dart +++ b/lib/features/feed/data/feed_repository.dart @@ -1,10 +1,10 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atcore show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getauthorfeed.dart'; -import 'package:bluesky/app_bsky_unspecced_defs.dart'; +import 'package:poptart_core/poptart_core.dart' as atcore show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_author_feed.dart'; +import 'package:poptart_lex/app/bsky/unspecced/defs.dart'; import 'package:flutter/foundation.dart'; import 'package:lazurite/core/cache/offline_cache_policy.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/lib/features/feed/data/liked_posts_repository.dart b/lib/features/feed/data/liked_posts_repository.dart index 616fb7e..505cf91 100644 --- a/lib/features/feed/data/liked_posts_repository.dart +++ b/lib/features/feed/data/liked_posts_repository.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:drift/drift.dart' show Value; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/features/feed/data/post_action_repository.dart b/lib/features/feed/data/post_action_repository.dart index ad6a038..3314f16 100644 --- a/lib/features/feed/data/post_action_repository.dart +++ b/lib/features/feed/data/post_action_repository.dart @@ -1,10 +1,9 @@ -import 'package:atproto/com_atproto_repo_strongref.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; -import 'package:bluesky/app_bsky_feed_getlikes.dart'; -import 'package:bluesky/app_bsky_feed_getquotes.dart'; -import 'package:bluesky/app_bsky_feed_getrepostedby.dart'; -import 'package:bluesky/bluesky.dart'; +import 'package:poptart_lex/com/atproto/repo/strong_ref.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; +import 'package:poptart_lex/app/bsky/feed/get_likes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_quotes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; class PostActionRepository { diff --git a/lib/features/feed/data/post_thread_repository.dart b/lib/features/feed/data/post_thread_repository.dart index 1312e47..cbd7ff9 100644 --- a/lib/features/feed/data/post_thread_repository.dart +++ b/lib/features/feed/data/post_thread_repository.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atcore; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getpostthread.dart'; +import 'package:poptart_core/poptart_core.dart' as atcore; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart'; import 'package:lazurite/core/cache/offline_cache_policy.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/feed/data/trending_join.dart b/lib/features/feed/data/trending_join.dart index a7b9fc1..9b0a1fa 100644 --- a/lib/features/feed/data/trending_join.dart +++ b/lib/features/feed/data/trending_join.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_unspecced_defs.dart'; +import 'package:poptart_lex/app/bsky/unspecced/defs.dart'; class EnrichedTrendingTopic { const EnrichedTrendingTopic({required this.topic, this.trend}); diff --git a/lib/features/feed/presentation/feed_detail_screen.dart b/lib/features/feed/presentation/feed_detail_screen.dart index d649334..71c6679 100644 --- a/lib/features/feed/presentation/feed_detail_screen.dart +++ b/lib/features/feed/presentation/feed_detail_screen.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/auth/bloc/auth_bloc.dart'; diff --git a/lib/features/feed/presentation/feed_management_screen.dart b/lib/features/feed/presentation/feed_management_screen.dart index f5e9f09..8045e34 100644 --- a/lib/features/feed/presentation/feed_management_screen.dart +++ b/lib/features/feed/presentation/feed_management_screen.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/feed/presentation/home_feed_screen.dart b/lib/features/feed/presentation/home_feed_screen.dart index 2685aeb..700f48a 100644 --- a/lib/features/feed/presentation/home_feed_screen.dart +++ b/lib/features/feed/presentation/home_feed_screen.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/feed/presentation/post_thread_screen.dart b/lib/features/feed/presentation/post_thread_screen.dart index 018ee9c..8535a0b 100644 --- a/lib/features/feed/presentation/post_thread_screen.dart +++ b/lib/features/feed/presentation/post_thread_screen.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:convert'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/feed/presentation/saved_posts_screen.dart b/lib/features/feed/presentation/saved_posts_screen.dart index 36f4c3a..ef1eda9 100644 --- a/lib/features/feed/presentation/saved_posts_screen.dart +++ b/lib/features/feed/presentation/saved_posts_screen.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/feed/presentation/widgets/compact_post_card.dart b/lib/features/feed/presentation/widgets/compact_post_card.dart index 3e72e75..b55e5c6 100644 --- a/lib/features/feed/presentation/widgets/compact_post_card.dart +++ b/lib/features/feed/presentation/widgets/compact_post_card.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/feed/presentation/widgets/facet_text.dart b/lib/features/feed/presentation/widgets/facet_text.dart index 27e4aa9..63a43a6 100644 --- a/lib/features/feed/presentation/widgets/facet_text.dart +++ b/lib/features/feed/presentation/widgets/facet_text.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:lazurite/core/theme/theme_extensions.dart'; -import 'package:bluesky/app_bsky_richtext_facet.dart'; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_lex/app/bsky/richtext/facet.dart'; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/feed/presentation/widgets/grid_post_card.dart b/lib/features/feed/presentation/widgets/grid_post_card.dart index a22fa2b..dba11f7 100644 --- a/lib/features/feed/presentation/widgets/grid_post_card.dart +++ b/lib/features/feed/presentation/widgets/grid_post_card.dart @@ -1,7 +1,7 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_embed_recordwithmedia.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/embed/record_with_media.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/cache/lazurite_image_cache.dart'; diff --git a/lib/features/feed/presentation/widgets/post_card.dart b/lib/features/feed/presentation/widgets/post_card.dart index 555c94a..a66012a 100644 --- a/lib/features/feed/presentation/widgets/post_card.dart +++ b/lib/features/feed/presentation/widgets/post_card.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/feed/presentation/widgets/post_card_with_actions.dart b/lib/features/feed/presentation/widgets/post_card_with_actions.dart index 52737db..f8e9901 100644 --- a/lib/features/feed/presentation/widgets/post_card_with_actions.dart +++ b/lib/features/feed/presentation/widgets/post_card_with_actions.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:convert'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/feed/presentation/widgets/post_embed_view.dart b/lib/features/feed/presentation/widgets/post_embed_view.dart index 45627b7..fb701b1 100644 --- a/lib/features/feed/presentation/widgets/post_embed_view.dart +++ b/lib/features/feed/presentation/widgets/post_embed_view.dart @@ -1,10 +1,10 @@ -import 'package:bluesky/app_bsky_embed_external.dart'; -import 'package:bluesky/app_bsky_embed_images.dart'; -import 'package:bluesky/app_bsky_embed_record.dart'; -import 'package:bluesky/app_bsky_embed_recordwithmedia.dart'; -import 'package:bluesky/app_bsky_embed_video.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/embed/external.dart'; +import 'package:poptart_lex/app/bsky/embed/images.dart'; +import 'package:poptart_lex/app/bsky/embed/record.dart'; +import 'package:poptart_lex/app/bsky/embed/record_with_media.dart'; +import 'package:poptart_lex/app/bsky/embed/video.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/feed/presentation/widgets/post_interactions_sheet.dart b/lib/features/feed/presentation/widgets/post_interactions_sheet.dart index e517a59..d08f292 100644 --- a/lib/features/feed/presentation/widgets/post_interactions_sheet.dart +++ b/lib/features/feed/presentation/widgets/post_interactions_sheet.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/cache/lazurite_image_cache.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/feed/presentation/widgets/post_menu_actions.dart b/lib/features/feed/presentation/widgets/post_menu_actions.dart index cfe3028..706d415 100644 --- a/lib/features/feed/presentation/widgets/post_menu_actions.dart +++ b/lib/features/feed/presentation/widgets/post_menu_actions.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter/services.dart'; diff --git a/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart b/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart index b3d2921..c62bd67 100644 --- a/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart +++ b/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:lazurite/core/cache/lazurite_image_cache.dart'; diff --git a/lib/features/lists/bloc/list_bloc.dart b/lib/features/lists/bloc/list_bloc.dart index 469cad0..baa541e 100644 --- a/lib/features/lists/bloc/list_bloc.dart +++ b/lib/features/lists/bloc/list_bloc.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri, BlobRef; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, BlobRef; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/lib/features/lists/bloc/list_feed_bloc.dart b/lib/features/lists/bloc/list_feed_bloc.dart index 4f7a11a..9b9bf7f 100644 --- a/lib/features/lists/bloc/list_feed_bloc.dart +++ b/lib/features/lists/bloc/list_feed_bloc.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/lib/features/lists/cubit/add_to_list_cubit.dart b/lib/features/lists/cubit/add_to_list_cubit.dart index 0023c7c..c02da99 100644 --- a/lib/features/lists/cubit/add_to_list_cubit.dart +++ b/lib/features/lists/cubit/add_to_list_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_graph_getlistswithmembership.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/lib/features/lists/cubit/my_lists_cubit.dart b/lib/features/lists/cubit/my_lists_cubit.dart index 0b950d2..2330d0d 100644 --- a/lib/features/lists/cubit/my_lists_cubit.dart +++ b/lib/features/lists/cubit/my_lists_cubit.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri, BlobRef; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, BlobRef; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/lib/features/lists/data/list_repository.dart b/lib/features/lists/data/list_repository.dart index 5afcd6c..dc8ee87 100644 --- a/lib/features/lists/data/list_repository.dart +++ b/lib/features/lists/data/list_repository.dart @@ -1,11 +1,11 @@ import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' show AtUri, BlobRef; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; -import 'package:bluesky/app_bsky_graph_getlists.dart'; -import 'package:bluesky/app_bsky_graph_getlistswithmembership.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, BlobRef; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; import 'package:lazurite/features/moderation/data/moderation_service.dart'; diff --git a/lib/features/lists/presentation/list_detail_screen.dart b/lib/features/lists/presentation/list_detail_screen.dart index 10539ff..2a97886 100644 --- a/lib/features/lists/presentation/list_detail_screen.dart +++ b/lib/features/lists/presentation/list_detail_screen.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/lists/presentation/list_members_screen.dart b/lib/features/lists/presentation/list_members_screen.dart index bc65d45..eb40af7 100644 --- a/lib/features/lists/presentation/list_members_screen.dart +++ b/lib/features/lists/presentation/list_members_screen.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/lists/presentation/my_lists_screen.dart b/lib/features/lists/presentation/my_lists_screen.dart index cf294ad..a9800eb 100644 --- a/lib/features/lists/presentation/my_lists_screen.dart +++ b/lib/features/lists/presentation/my_lists_screen.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart b/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart index 7174178..d217add 100644 --- a/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart +++ b/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' show KnownListPurpose; +import 'package:poptart_lex/app/bsky/graph/defs.dart' show KnownListPurpose; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; diff --git a/lib/features/lists/presentation/widgets/list_row_tile.dart b/lib/features/lists/presentation/widgets/list_row_tile.dart index 6adabc4..a5ad587 100644 --- a/lib/features/lists/presentation/widgets/list_row_tile.dart +++ b/lib/features/lists/presentation/widgets/list_row_tile.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/messages/bloc/convo_list_bloc.dart b/lib/features/messages/bloc/convo_list_bloc.dart index fbb11b8..cbc770c 100644 --- a/lib/features/messages/bloc/convo_list_bloc.dart +++ b/lib/features/messages/bloc/convo_list_bloc.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/messages/bloc/message_bloc.dart b/lib/features/messages/bloc/message_bloc.dart index bda2fba..61a8606 100644 --- a/lib/features/messages/bloc/message_bloc.dart +++ b/lib/features/messages/bloc/message_bloc.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_getmessages.dart'; +import 'package:poptart_lex/chat/bsky/convo/get_messages.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/messages/data/convo_repository.dart b/lib/features/messages/data/convo_repository.dart index 7b888db..d1b6f7a 100644 --- a/lib/features/messages/data/convo_repository.dart +++ b/lib/features/messages/data/convo_repository.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/bluesky_chat.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; -import 'package:bluesky/chat_bsky_convo_getmessages.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/get_messages.dart'; import 'package:lazurite/core/network/unauthorized_recovery_runner.dart'; import 'package:lazurite/core/network/xrpc_client_factory.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; diff --git a/lib/features/messages/presentation/message_thread_screen.dart b/lib/features/messages/presentation/message_thread_screen.dart index 9c79ce9..40ca147 100644 --- a/lib/features/messages/presentation/message_thread_screen.dart +++ b/lib/features/messages/presentation/message_thread_screen.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_getmessages.dart'; +import 'package:poptart_lex/chat/bsky/convo/get_messages.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/messages/presentation/widgets/convo_list_item.dart b/lib/features/messages/presentation/widgets/convo_list_item.dart index 4d74ec3..a218e0a 100644 --- a/lib/features/messages/presentation/widgets/convo_list_item.dart +++ b/lib/features/messages/presentation/widgets/convo_list_item.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/messages/presentation/widgets/convo_list_pane.dart b/lib/features/messages/presentation/widgets/convo_list_pane.dart index 4856f7e..1bfb87c 100644 --- a/lib/features/messages/presentation/widgets/convo_list_pane.dart +++ b/lib/features/messages/presentation/widgets/convo_list_pane.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/messages/presentation/widgets/message_bubble.dart b/lib/features/messages/presentation/widgets/message_bubble.dart index 7871b09..bfd0267 100644 --- a/lib/features/messages/presentation/widgets/message_bubble.dart +++ b/lib/features/messages/presentation/widgets/message_bubble.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/moderation/data/moderation_service.dart b/lib/features/moderation/data/moderation_service.dart index 3006c06..53837f8 100644 --- a/lib/features/moderation/data/moderation_service.dart +++ b/lib/features/moderation/data/moderation_service.dart @@ -1,15 +1,15 @@ import 'dart:async'; import 'dart:convert'; -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_actor_getpreferences.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_labeler_defs.dart'; -import 'package:bluesky/app_bsky_labeler_getservices.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as notifications; -import 'package:bluesky/bluesky.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/actor/get_preferences.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/get_services.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as notifications; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/features/moderation/presentation/moderation_ui_helpers.dart b/lib/features/moderation/presentation/moderation_ui_helpers.dart index a7017c4..6b98cc7 100644 --- a/lib/features/moderation/presentation/moderation_ui_helpers.dart +++ b/lib/features/moderation/presentation/moderation_ui_helpers.dart @@ -1,6 +1,6 @@ -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/app_localizations.dart'; diff --git a/lib/features/moderation/presentation/screens/labeler_detail_screen.dart b/lib/features/moderation/presentation/screens/labeler_detail_screen.dart index b11937f..2142118 100644 --- a/lib/features/moderation/presentation/screens/labeler_detail_screen.dart +++ b/lib/features/moderation/presentation/screens/labeler_detail_screen.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_labeler_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/moderation/presentation/screens/moderation_settings_screen.dart b/lib/features/moderation/presentation/screens/moderation_settings_screen.dart index 66b5567..f0561f3 100644 --- a/lib/features/moderation/presentation/screens/moderation_settings_screen.dart +++ b/lib/features/moderation/presentation/screens/moderation_settings_screen.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_labeler_defs.dart'; -import 'package:bluesky/app_bsky_labeler_getservices.dart'; +import 'package:poptart_lex/app/bsky/labeler/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/get_services.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/moderation/presentation/widgets/moderated_avatar.dart b/lib/features/moderation/presentation/widgets/moderated_avatar.dart index ee02e89..386dce5 100644 --- a/lib/features/moderation/presentation/widgets/moderated_avatar.dart +++ b/lib/features/moderation/presentation/widgets/moderated_avatar.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/cache/lazurite_image_cache.dart'; diff --git a/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart b/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart index 02c105c..5362644 100644 --- a/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart +++ b/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/moderation/presentation/widgets/moderation_badge_row.dart b/lib/features/moderation/presentation/widgets/moderation_badge_row.dart index 9480b42..afd65dc 100644 --- a/lib/features/moderation/presentation/widgets/moderation_badge_row.dart +++ b/lib/features/moderation/presentation/widgets/moderation_badge_row.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/notifications/bloc/notification_bloc.dart b/lib/features/notifications/bloc/notification_bloc.dart index a29073c..c5c3eb2 100644 --- a/lib/features/notifications/bloc/notification_bloc.dart +++ b/lib/features/notifications/bloc/notification_bloc.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/notifications/data/notification_repository.dart b/lib/features/notifications/data/notification_repository.dart index 75eabe1..689586d 100644 --- a/lib/features/notifications/data/notification_repository.dart +++ b/lib/features/notifications/data/notification_repository.dart @@ -1,7 +1,7 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart'; -import 'package:bluesky/app_bsky_notification_registerpush.dart'; -import 'package:bluesky/app_bsky_notification_unregisterpush.dart'; -import 'package:bluesky/bluesky.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart'; +import 'package:poptart_lex/app/bsky/notification/register_push.dart'; +import 'package:poptart_lex/app/bsky/notification/unregister_push.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; import 'package:lazurite/core/network/unauthorized_recovery_runner.dart'; diff --git a/lib/features/notifications/domain/notification_domain_service.dart b/lib/features/notifications/domain/notification_domain_service.dart index 99268c3..0e12582 100644 --- a/lib/features/notifications/domain/notification_domain_service.dart +++ b/lib/features/notifications/domain/notification_domain_service.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/features/notifications/data/notification_repository.dart'; diff --git a/lib/features/notifications/domain/notification_local_mappers.dart b/lib/features/notifications/domain/notification_local_mappers.dart index 84f544c..53d9020 100644 --- a/lib/features/notifications/domain/notification_local_mappers.dart +++ b/lib/features/notifications/domain/notification_local_mappers.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:ui'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart'; import 'package:crypto/crypto.dart'; import 'package:lazurite/core/l10n/app_localizations.dart'; import 'package:lazurite/features/notifications/domain/notification_local_models.dart'; diff --git a/lib/features/notifications/domain/notification_reason_utils.dart b/lib/features/notifications/domain/notification_reason_utils.dart index ec9b17d..b758b46 100644 --- a/lib/features/notifications/domain/notification_reason_utils.dart +++ b/lib/features/notifications/domain/notification_reason_utils.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'dart:ui'; import 'package:lazurite/core/l10n/app_localizations.dart'; diff --git a/lib/features/notifications/domain/push_registration_service.dart b/lib/features/notifications/domain/push_registration_service.dart index bde4c7b..4acfd6d 100644 --- a/lib/features/notifications/domain/push_registration_service.dart +++ b/lib/features/notifications/domain/push_registration_service.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:atproto_core/atproto_core.dart' as atcore show UnauthorizedException; +import 'package:poptart_core/poptart_core.dart' as atcore show UnauthorizedException; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; import 'package:lazurite/features/notifications/data/notification_repository.dart'; diff --git a/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart b/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart index 065034e..b6c8250 100644 --- a/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart +++ b/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/app_bsky_actor_defs.dart' as actor; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart' as actor; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart' hide Notification; import 'package:go_router/go_router.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/notifications/presentation/widgets/notification_list_item.dart b/lib/features/notifications/presentation/widgets/notification_list_item.dart index 0fa5584..50093d4 100644 --- a/lib/features/notifications/presentation/widgets/notification_list_item.dart +++ b/lib/features/notifications/presentation/widgets/notification_list_item.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart' hide Notification; import 'package:go_router/go_router.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/notifications/presentation/widgets/notifications_pane.dart b/lib/features/notifications/presentation/widgets/notifications_pane.dart index a7f461a..4177fdc 100644 --- a/lib/features/notifications/presentation/widgets/notifications_pane.dart +++ b/lib/features/notifications/presentation/widgets/notifications_pane.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/features/profile/bloc/profile_bloc.dart b/lib/features/profile/bloc/profile_bloc.dart index 9921ff3..1cdaa79 100644 --- a/lib/features/profile/bloc/profile_bloc.dart +++ b/lib/features/profile/bloc/profile_bloc.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/profile/data/profile_repository.dart'; diff --git a/lib/features/profile/cubit/profile_action_cubit.dart b/lib/features/profile/cubit/profile_action_cubit.dart index 9ea21df..81c091a 100644 --- a/lib/features/profile/cubit/profile_action_cubit.dart +++ b/lib/features/profile/cubit/profile_action_cubit.dart @@ -1,5 +1,5 @@ -import 'package:atproto/com_atproto_moderation_defs.dart'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_lex/com/atproto/moderation/defs.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/profile/cubit/profile_connections_cubit.dart b/lib/features/profile/cubit/profile_connections_cubit.dart index 3cfc420..cf2e37b 100644 --- a/lib/features/profile/cubit/profile_connections_cubit.dart +++ b/lib/features/profile/cubit/profile_connections_cubit.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:fuzzywuzzy/fuzzywuzzy.dart' as fuzzywuzzy; diff --git a/lib/features/profile/cubit/profile_context_cubit.dart b/lib/features/profile/cubit/profile_context_cubit.dart index c78c762..d5aaea6 100644 --- a/lib/features/profile/cubit/profile_context_cubit.dart +++ b/lib/features/profile/cubit/profile_context_cubit.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/profile/cubit/suggested_follows_cubit.dart b/lib/features/profile/cubit/suggested_follows_cubit.dart index 88e212c..8c2e3bc 100644 --- a/lib/features/profile/cubit/suggested_follows_cubit.dart +++ b/lib/features/profile/cubit/suggested_follows_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/profile/data/profile_repository.dart'; diff --git a/lib/features/profile/data/follow_audit_repository.dart b/lib/features/profile/data/follow_audit_repository.dart index c112d85..abd2ab3 100644 --- a/lib/features/profile/data/follow_audit_repository.dart +++ b/lib/features/profile/data/follow_audit_repository.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:atproto/com_atproto_repo_applywrites.dart'; -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/repo/apply_writes.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/features/profile/data/profile_action_repository.dart b/lib/features/profile/data/profile_action_repository.dart index 1a5b5b7..5e95481 100644 --- a/lib/features/profile/data/profile_action_repository.dart +++ b/lib/features/profile/data/profile_action_repository.dart @@ -1,10 +1,9 @@ -import 'package:atproto/com_atproto_admin_defs.dart'; -import 'package:atproto/com_atproto_moderation_createreport.dart'; -import 'package:atproto/com_atproto_moderation_defs.dart'; -import 'package:atproto/com_atproto_repo_strongref.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/bluesky.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:poptart_lex/com/atproto/admin/defs.dart'; +import 'package:poptart_lex/com/atproto/moderation/create_report.dart'; +import 'package:poptart_lex/com/atproto/moderation/defs.dart'; +import 'package:poptart_lex/com/atproto/repo/strong_ref.dart'; class ProfileActionRepository { ProfileActionRepository({ diff --git a/lib/features/profile/data/profile_context_repository.dart b/lib/features/profile/data/profile_context_repository.dart index 16bfbc2..34b6615 100644 --- a/lib/features/profile/data/profile_context_repository.dart +++ b/lib/features/profile/data/profile_context_repository.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/constellation_client.dart'; diff --git a/lib/features/profile/data/profile_repository.dart b/lib/features/profile/data/profile_repository.dart index ebf0c98..778ae8e 100644 --- a/lib/features/profile/data/profile_repository.dart +++ b/lib/features/profile/data/profile_repository.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' as atp_core; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart' as atp_core; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:characters/characters.dart'; -import 'package:bluesky/bluesky.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/actor_repository_service_resolver.dart'; diff --git a/lib/features/profile/presentation/profile_connections_screen.dart b/lib/features/profile/presentation/profile_connections_screen.dart index a20721e..3303919 100644 --- a/lib/features/profile/presentation/profile_connections_screen.dart +++ b/lib/features/profile/presentation/profile_connections_screen.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/profile/presentation/profile_context_screen.dart b/lib/features/profile/presentation/profile_context_screen.dart index 7cbc7b8..691eb27 100644 --- a/lib/features/profile/presentation/profile_context_screen.dart +++ b/lib/features/profile/presentation/profile_context_screen.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/profile/presentation/profile_edit_screen.dart b/lib/features/profile/presentation/profile_edit_screen.dart index d7478f9..0d98025 100644 --- a/lib/features/profile/presentation/profile_edit_screen.dart +++ b/lib/features/profile/presentation/profile_edit_screen.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/features/profile/presentation/profile_screen.dart b/lib/features/profile/presentation/profile_screen.dart index 1025e06..1931105 100644 --- a/lib/features/profile/presentation/profile_screen.dart +++ b/lib/features/profile/presentation/profile_screen.dart @@ -1,7 +1,7 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart b/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart index b7ab53c..71e82fe 100644 --- a/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart +++ b/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/profile/presentation/widgets/report_dialog.dart b/lib/features/profile/presentation/widgets/report_dialog.dart index 2ea4684..213bc93 100644 --- a/lib/features/profile/presentation/widgets/report_dialog.dart +++ b/lib/features/profile/presentation/widgets/report_dialog.dart @@ -1,5 +1,5 @@ -import 'package:atproto/com_atproto_moderation_defs.dart'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_lex/com/atproto/moderation/defs.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/profile/presentation/widgets/suggested_follows_list.dart b/lib/features/profile/presentation/widgets/suggested_follows_list.dart index 56408b9..dbfee2a 100644 --- a/lib/features/profile/presentation/widgets/suggested_follows_list.dart +++ b/lib/features/profile/presentation/widgets/suggested_follows_list.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/l10n/l10n.dart'; diff --git a/lib/features/search/bloc/search_bloc.dart b/lib/features/search/bloc/search_bloc.dart index 1a1508d..ee749e9 100644 --- a/lib/features/search/bloc/search_bloc.dart +++ b/lib/features/search/bloc/search_bloc.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/lib/features/search/cubit/hashtag_cubit.dart b/lib/features/search/cubit/hashtag_cubit.dart index 6d5bb39..4970142 100644 --- a/lib/features/search/cubit/hashtag_cubit.dart +++ b/lib/features/search/cubit/hashtag_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; diff --git a/lib/features/search/cubit/topic_cubit.dart b/lib/features/search/cubit/topic_cubit.dart index 07d10ab..805f078 100644 --- a/lib/features/search/cubit/topic_cubit.dart +++ b/lib/features/search/cubit/topic_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; diff --git a/lib/features/search/data/hashtag_utils.dart b/lib/features/search/data/hashtag_utils.dart index b09a58e..762a231 100644 --- a/lib/features/search/data/hashtag_utils.dart +++ b/lib/features/search/data/hashtag_utils.dart @@ -1,7 +1,7 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; -import 'package:bluesky/app_bsky_richtext_facet.dart'; -import 'package:bluesky_text/bluesky_text.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; +import 'package:poptart_lex/app/bsky/richtext/facet.dart'; +import 'package:poptart_bluesky_text/poptart_bluesky_text.dart'; import 'package:lazurite/shared/utils/parse_utils.dart'; String normalizeHashtag(String input) { diff --git a/lib/features/search/data/post_text_extractor.dart b/lib/features/search/data/post_text_extractor.dart index 019b6eb..26866e2 100644 --- a/lib/features/search/data/post_text_extractor.dart +++ b/lib/features/search/data/post_text_extractor.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/app_bsky_embed_recordwithmedia.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; +import 'package:poptart_lex/app/bsky/embed/record_with_media.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; /// Extracts a single searchable string from a [PostView] for embedding. /// diff --git a/lib/features/search/data/search_repository.dart b/lib/features/search/data/search_repository.dart index 7131ca9..e454038 100644 --- a/lib/features/search/data/search_repository.dart +++ b/lib/features/search/data/search_repository.dart @@ -1,10 +1,10 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_searchposts.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/search_posts.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter/foundation.dart'; import 'package:lazurite/core/network/app_view_fallback_service.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/features/search/data/semantic_indexer.dart b/lib/features/search/data/semantic_indexer.dart index f9e44dd..780f1db 100644 --- a/lib/features/search/data/semantic_indexer.dart +++ b/lib/features/search/data/semantic_indexer.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:math' show min; import 'dart:typed_data'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/core/embedding/embedding_service.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/search/presentation/hashtag_screen.dart b/lib/features/search/presentation/hashtag_screen.dart index 44275db..4199a75 100644 --- a/lib/features/search/presentation/hashtag_screen.dart +++ b/lib/features/search/presentation/hashtag_screen.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/search/presentation/search_screen.dart b/lib/features/search/presentation/search_screen.dart index 256f956..2d26777 100644 --- a/lib/features/search/presentation/search_screen.dart +++ b/lib/features/search/presentation/search_screen.dart @@ -1,6 +1,6 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/search/presentation/semantic_search_tab.dart b/lib/features/search/presentation/semantic_search_tab.dart index b7fc68e..e92181c 100644 --- a/lib/features/search/presentation/semantic_search_tab.dart +++ b/lib/features/search/presentation/semantic_search_tab.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/core/logging/app_logger.dart'; diff --git a/lib/features/search/presentation/topic_screen.dart b/lib/features/search/presentation/topic_screen.dart index 37e287d..6ac9e37 100644 --- a/lib/features/search/presentation/topic_screen.dart +++ b/lib/features/search/presentation/topic_screen.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/auth/bloc/auth_bloc.dart'; diff --git a/lib/features/search/presentation/widgets/follow_button.dart b/lib/features/search/presentation/widgets/follow_button.dart index 9f126e0..72e7eec 100644 --- a/lib/features/search/presentation/widgets/follow_button.dart +++ b/lib/features/search/presentation/widgets/follow_button.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/connectivity/connectivity_helpers.dart'; diff --git a/lib/features/settings/data/video_repository.dart b/lib/features/settings/data/video_repository.dart index dd3c000..e3372ee 100644 --- a/lib/features/settings/data/video_repository.dart +++ b/lib/features/settings/data/video_repository.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_video_getuploadlimits.dart'; -import 'package:bluesky/bluesky.dart'; +import 'package:poptart_lex/app/bsky/video/get_upload_limits.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; abstract interface class VideoUploadLimitsApi { Future getUploadLimits(); diff --git a/lib/features/starter_packs/bloc/starter_pack_bloc.dart b/lib/features/starter_packs/bloc/starter_pack_bloc.dart index 5966d7f..80a110f 100644 --- a/lib/features/starter_packs/bloc/starter_pack_bloc.dart +++ b/lib/features/starter_packs/bloc/starter_pack_bloc.dart @@ -1,5 +1,5 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart'; diff --git a/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart b/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart index fcdd191..a5b65bb 100644 --- a/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart +++ b/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart'; diff --git a/lib/features/starter_packs/data/starter_pack_repository.dart b/lib/features/starter_packs/data/starter_pack_repository.dart index 4fe6a99..93b8f27 100644 --- a/lib/features/starter_packs/data/starter_pack_repository.dart +++ b/lib/features/starter_packs/data/starter_pack_repository.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_feed_defs.dart' show GeneratorView; -import 'package:bluesky/app_bsky_graph_defs.dart'; -import 'package:bluesky/app_bsky_graph_starterpack.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/feed/defs.dart' show GeneratorView; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/starterpack.dart'; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; import 'package:lazurite/features/moderation/data/moderation_service.dart'; diff --git a/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart b/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart index a2b1c5a..fd1cd43 100644 --- a/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart +++ b/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart b/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart index 0b48e13..f96fd4e 100644 --- a/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart +++ b/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_feed_defs.dart' show GeneratorView; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/feed/defs.dart' show GeneratorView; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart' hide ListView; import 'package:flutter/material.dart' as material show ListView; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart b/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart index 6057d3e..890c634 100644 --- a/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart +++ b/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/l10n/l10n.dart'; import 'package:lazurite/core/theme/theme_extensions.dart'; diff --git a/lib/features/typeahead/data/typeahead_repository.dart b/lib/features/typeahead/data/typeahead_repository.dart index f8bdc90..8e8f052 100644 --- a/lib/features/typeahead/data/typeahead_repository.dart +++ b/lib/features/typeahead/data/typeahead_repository.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:http/http.dart' as http; import 'package:lazurite/core/logging/app_logger.dart'; import 'package:lazurite/core/network/app_view_request_context.dart'; diff --git a/lib/features/typeahead/data/typeahead_result.dart b/lib/features/typeahead/data/typeahead_result.dart index a6dc51a..16de1f5 100644 --- a/lib/features/typeahead/data/typeahead_result.dart +++ b/lib/features/typeahead/data/typeahead_result.dart @@ -1,5 +1,5 @@ -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:equatable/equatable.dart'; class TypeaheadResult extends Equatable { diff --git a/lib/main.dart b/lib/main.dart index 79a0ecb..17e4ef4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,6 @@ import 'dart:async'; import 'dart:ui'; -import 'package:bluesky/bluesky.dart'; -import 'package:bluesky/bluesky_chat.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; @@ -22,6 +20,7 @@ import 'package:lazurite/core/logging/logging_navigator_observer.dart'; import 'package:lazurite/core/network/app_view_fallback_service.dart'; import 'package:lazurite/core/network/app_view_provider.dart'; import 'package:lazurite/core/network/app_view_router.dart'; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; import 'package:lazurite/core/network/xrpc_client_factory.dart'; import 'package:lazurite/core/objectbox/objectbox_store.dart'; import 'package:lazurite/core/router/app_router.dart'; diff --git a/lib/shared/presentation/helpers/notification_icon_mapper.dart b/lib/shared/presentation/helpers/notification_icon_mapper.dart index 9d3aae2..e54649a 100644 --- a/lib/shared/presentation/helpers/notification_icon_mapper.dart +++ b/lib/shared/presentation/helpers/notification_icon_mapper.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter/material.dart'; class NotificationIconStyle { diff --git a/lib/shared/presentation/widgets/profile_avatar.dart b/lib/shared/presentation/widgets/profile_avatar.dart index b3b6e7b..6398cbe 100644 --- a/lib/shared/presentation/widgets/profile_avatar.dart +++ b/lib/shared/presentation/widgets/profile_avatar.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:lazurite/core/cache/lazurite_image_cache.dart'; diff --git a/lib/shared/utils/format_utils.dart b/lib/shared/utils/format_utils.dart index 024d34c..c3d87e0 100644 --- a/lib/shared/utils/format_utils.dart +++ b/lib/shared/utils/format_utils.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:intl/intl.dart'; /// Returns up to two initials from a display value. diff --git a/lib/shared/utils/parse_utils.dart b/lib/shared/utils/parse_utils.dart index 8272723..930b397 100644 --- a/lib/shared/utils/parse_utils.dart +++ b/lib/shared/utils/parse_utils.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_feed_post.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; FeedPostRecord? tryParseRecord(Map record) { try { diff --git a/pubspec.lock b/pubspec.lock index 03296ad..aa0d972 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -41,41 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.13.1" - at_primitives: - dependency: transitive - description: - name: at_primitives - sha256: "016ffaa419b01befe6f5c6869c84d570060a5388655354a25668dbb1ad8ade3f" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - atproto: - dependency: "direct main" - description: - path: "packages/atproto" - ref: oauth-client-id - resolved-ref: aafa5dfb0c67c4e7cbe2ea286500bf5891a9bfe6 - url: "https://github.com/sprksocial/poptart.git" - source: git - version: "1.4.1" - atproto_core: - dependency: "direct main" - description: - path: "packages/atproto_core" - ref: oauth-client-id - resolved-ref: aafa5dfb0c67c4e7cbe2ea286500bf5891a9bfe6 - url: "https://github.com/sprksocial/poptart.git" - source: git - version: "1.2.0" - atproto_oauth: - dependency: "direct main" - description: - path: "packages/atproto_oauth" - ref: oauth-client-id - resolved-ref: aafa5dfb0c67c4e7cbe2ea286500bf5891a9bfe6 - url: "https://github.com/sprksocial/poptart.git" - source: git - version: "0.2.0" base_codecs: dependency: transitive description: @@ -100,24 +65,6 @@ packages: url: "https://pub.dev" source: hosted version: "10.0.0" - bluesky: - dependency: "direct main" - description: - path: "packages/bluesky" - ref: oauth-client-id - resolved-ref: aafa5dfb0c67c4e7cbe2ea286500bf5891a9bfe6 - url: "https://github.com/sprksocial/poptart.git" - source: git - version: "1.4.1" - bluesky_text: - dependency: "direct main" - description: - path: "packages/bluesky_text" - ref: oauth-client-id - resolved-ref: aafa5dfb0c67c4e7cbe2ea286500bf5891a9bfe6 - url: "https://github.com/sprksocial/poptart.git" - source: git - version: "1.1.1" boolean_selector: dependency: transitive description: @@ -994,14 +941,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - multiformats: - dependency: transitive - description: - name: multiformats - sha256: a6e85f37aa228e82b5644fc68d28f76622fe894d9191ebd1f994296325a89482 - url: "https://pub.dev" - source: hosted - version: "1.0.2" nanoid: dependency: transitive description: @@ -1266,6 +1205,78 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.2" + poptart: + dependency: "direct main" + description: + name: poptart + sha256: "5631a6e4a1ffa25101db2aa76b82e2410941fa5fec4d4c18ea2c2c7d95b70f0b" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_bluesky_moderation: + dependency: "direct main" + description: + name: poptart_bluesky_moderation + sha256: d9d4cdcd04e5874edc8eadf0cd39f5e6e0e23a7d362a67876430ddb39c8ccf79 + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_bluesky_text: + dependency: "direct main" + description: + name: poptart_bluesky_text + sha256: "77449712a9f0c9270025d42693e7a70426e24f193376c3a86d9df211f09bc334" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_core: + dependency: "direct main" + description: + name: poptart_core + sha256: "4401f47c4e7f6d1f5142a207aa7e543408f83c43b5aaabdf6d4f60ef8f00ad84" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_lex: + dependency: "direct main" + description: + name: poptart_lex + sha256: d26ad7869e03cb70a724cac0b7f1b07eddc3cd7f36151b59e0fad3678017976f + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_multiformats: + dependency: transitive + description: + name: poptart_multiformats + sha256: "37931daf50f600656942ee4bbe72727980de92d4d2b902a641486b00c75cd1ae" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_oauth: + dependency: "direct main" + description: + name: poptart_oauth + sha256: e268a6947833aab9368dfd67069888962fdea91a0158609b1680faee95e4f8f0 + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_primitives: + dependency: transitive + description: + name: poptart_primitives + sha256: "3bb32c3269964a7c40b2e7b185b9dcbb2f7e297b78cfbe27fae141474476dd27" + url: "https://pub.dev" + source: hosted + version: "0.1.0" + poptart_xrpc: + dependency: "direct main" + description: + name: poptart_xrpc + sha256: b54f94fab23d21666ce88a442f22c146f7ec6b4ba54ccd8857063e60cfb62d0a + url: "https://pub.dev" + source: hosted + version: "0.1.0" provider: dependency: "direct main" description: @@ -1839,14 +1850,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" - xrpc: - dependency: transitive - description: - name: xrpc - sha256: ccaaf5224d1037a196bdfd03059027961bed3980718c9ce956be39d6bce152df - url: "https://pub.dev" - source: hosted - version: "1.0.3" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5786661..cb3c72c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,11 +12,13 @@ dependencies: flutter_localizations: sdk: flutter cupertino_icons: ^1.0.8 - atproto: ^1.4.1 - atproto_core: ^1.2.0 - bluesky: ^1.4.1 - bluesky_text: ^1.1.1 - atproto_oauth: ^0.2.0 + poptart: ^0.1.0 + poptart_core: ^0.1.0 + poptart_oauth: ^0.1.0 + poptart_lex: ^0.1.0 + poptart_xrpc: ^0.1.0 + poptart_bluesky_text: ^0.1.0 + poptart_bluesky_moderation: ^0.1.0 flutter_bloc: ^9.1.1 drift: ^2.24.0 drift_flutter: ^0.2.8 @@ -74,33 +76,6 @@ dev_dependencies: objectbox_generator: ^5.3.1 # flutter_native_splash: ^2.4.7 -dependency_overrides: - atproto: - git: - url: https://github.com/sprksocial/poptart.git - ref: oauth-client-id - path: packages/atproto - atproto_core: - git: - url: https://github.com/sprksocial/poptart.git - ref: oauth-client-id - path: packages/atproto_core - bluesky: - git: - url: https://github.com/sprksocial/poptart.git - ref: oauth-client-id - path: packages/bluesky - bluesky_text: - git: - url: https://github.com/sprksocial/poptart.git - ref: oauth-client-id - path: packages/bluesky_text - atproto_oauth: - git: - url: https://github.com/sprksocial/poptart.git - ref: oauth-client-id - path: packages/atproto_oauth - flutter: uses-material-design: true generate: true diff --git a/test/core/network/xrpc_client_factory_test.dart b/test/core/network/xrpc_client_factory_test.dart index ece6540..1dffc28 100644 --- a/test/core/network/xrpc_client_factory_test.dart +++ b/test/core/network/xrpc_client_factory_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atp_core; +import 'package:poptart_core/poptart_core.dart' as atp_core; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/network/xrpc_client_factory.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; diff --git a/test/core/router/app_router_test.dart b/test/core/router/app_router_test.dart index f656459..1ec7815 100644 --- a/test/core/router/app_router_test.dart +++ b/test/core/router/app_router_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/alerts/presentation/alerts_screen_test.dart b/test/features/alerts/presentation/alerts_screen_test.dart index 34369b3..a8a929f 100644 --- a/test/features/alerts/presentation/alerts_screen_test.dart +++ b/test/features/alerts/presentation/alerts_screen_test.dart @@ -1,8 +1,8 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart' as app_actor; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; -import 'package:bluesky/chat_bsky_actor_defs.dart' as chat_actor; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart' as app_actor; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; +import 'package:poptart_lex/chat/bsky/actor/defs.dart' as chat_actor; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/auth/data/auth_repository_test.dart b/test/features/auth/data/auth_repository_test.dart index 1652441..48ca421 100644 --- a/test/features/auth/data/auth_repository_test.dart +++ b/test/features/auth/data/auth_repository_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atcore; -import 'package:atproto_oauth/atproto_oauth.dart'; +import 'package:poptart_core/poptart_core.dart' as atcore; +import 'package:poptart_oauth/poptart_oauth.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/compose/bloc/compose_bloc_test.dart b/test/features/compose/bloc/compose_bloc_test.dart index 983775a..2c25691 100644 --- a/test/features/compose/bloc/compose_bloc_test.dart +++ b/test/features/compose/bloc/compose_bloc_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:atproto_core/atproto_core.dart' show Blob, BlobRef; +import 'package:poptart_core/poptart_core.dart' show Blob, BlobRef; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/compose/data/compose_repository_auth_recovery_test.dart b/test/features/compose/data/compose_repository_auth_recovery_test.dart index 3cd45ae..ceeda2f 100644 --- a/test/features/compose/data/compose_repository_auth_recovery_test.dart +++ b/test/features/compose/data/compose_repository_auth_recovery_test.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' +import 'package:poptart_core/poptart_core.dart' show Blob, BlobRef, HttpMethod, HttpStatus, RateLimit, UnauthorizedException, XRPCError, XRPCRequest, XRPCResponse; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; diff --git a/test/features/compose/presentation/compose_screen_test.dart b/test/features/compose/presentation/compose_screen_test.dart index b7f0d09..5a96329 100644 --- a/test/features/compose/presentation/compose_screen_test.dart +++ b/test/features/compose/presentation/compose_screen_test.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/devtools/cubit/dev_tools_cubit_test.dart b/test/features/devtools/cubit/dev_tools_cubit_test.dart index 7533b9b..6ee53bc 100644 --- a/test/features/devtools/cubit/dev_tools_cubit_test.dart +++ b/test/features/devtools/cubit/dev_tools_cubit_test.dart @@ -1,9 +1,9 @@ -import 'package:atproto/com_atproto_identity_resolvehandle.dart'; -import 'package:atproto/com_atproto_repo_describerepo.dart'; -import 'package:atproto/com_atproto_repo_getrecord.dart'; -import 'package:atproto/com_atproto_repo_listrecords.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/identity/resolve_handle.dart'; +import 'package:poptart_lex/com/atproto/repo/describe_repo.dart'; +import 'package:poptart_lex/com/atproto/repo/get_record.dart'; +import 'package:poptart_lex/com/atproto/repo/list_records.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/devtools/cubit/dev_tools_cubit.dart'; diff --git a/test/features/devtools/cubit/dev_tools_state_test.dart b/test/features/devtools/cubit/dev_tools_state_test.dart index 06e94aa..89cd01a 100644 --- a/test/features/devtools/cubit/dev_tools_state_test.dart +++ b/test/features/devtools/cubit/dev_tools_state_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto/com_atproto_repo_listrecords.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/repo/list_records.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/devtools/cubit/dev_tools_cubit.dart'; diff --git a/test/features/devtools/presentation/dev_tools_screen_test.dart b/test/features/devtools/presentation/dev_tools_screen_test.dart index d2d973a..6f49e22 100644 --- a/test/features/devtools/presentation/dev_tools_screen_test.dart +++ b/test/features/devtools/presentation/dev_tools_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto/com_atproto_repo_listrecords.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/repo/list_records.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/feed/bloc/feed_bloc_test.dart b/test/features/feed/bloc/feed_bloc_test.dart index 3e271ad..b3768f8 100644 --- a/test/features/feed/bloc/feed_bloc_test.dart +++ b/test/features/feed/bloc/feed_bloc_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/bloc/feed_bloc.dart'; import 'package:lazurite/features/feed/data/feed_repository.dart'; diff --git a/test/features/feed/cubit/feed_preferences_cubit_test.dart b/test/features/feed/cubit/feed_preferences_cubit_test.dart index e38da53..d6cf79f 100644 --- a/test/features/feed/cubit/feed_preferences_cubit_test.dart +++ b/test/features/feed/cubit/feed_preferences_cubit_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:drift/drift.dart' hide isNotNull; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/cubit/post_action_cubit_test.dart b/test/features/feed/cubit/post_action_cubit_test.dart index 557d719..41f8b41 100644 --- a/test/features/feed/cubit/post_action_cubit_test.dart +++ b/test/features/feed/cubit/post_action_cubit_test.dart @@ -1,4 +1,4 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/cubit/post_action_cache.dart'; diff --git a/test/features/feed/cubit/post_thread_cubit_test.dart b/test/features/feed/cubit/post_thread_cubit_test.dart index 165a03f..4537a5c 100644 --- a/test/features/feed/cubit/post_thread_cubit_test.dart +++ b/test/features/feed/cubit/post_thread_cubit_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/cubit/post_thread_cubit.dart'; diff --git a/test/features/feed/cubit/saved_posts_cubit_test.dart b/test/features/feed/cubit/saved_posts_cubit_test.dart index 4af9d6c..75001d5 100644 --- a/test/features/feed/cubit/saved_posts_cubit_test.dart +++ b/test/features/feed/cubit/saved_posts_cubit_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto/com_atproto_repo_strongref.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_bookmark_defs.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; +import 'package:poptart_lex/com/atproto/repo/strong_ref.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/bookmark/defs.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; import 'package:drift/drift.dart' hide isNull, isNotNull; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/data/feed_repository_cache_test.dart b/test/features/feed/data/feed_repository_cache_test.dart index 71e03dc..50de1fe 100644 --- a/test/features/feed/data/feed_repository_cache_test.dart +++ b/test/features/feed/data/feed_repository_cache_test.dart @@ -1,9 +1,9 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/cache/offline_cache_policy.dart'; diff --git a/test/features/feed/data/feed_repository_test.dart b/test/features/feed/data/feed_repository_test.dart index de83fce..2f44b45 100644 --- a/test/features/feed/data/feed_repository_test.dart +++ b/test/features/feed/data/feed_repository_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/data/feed_repository.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/features/feed/data/liked_posts_repository_test.dart b/test/features/feed/data/liked_posts_repository_test.dart index 8548486..0124822 100644 --- a/test/features/feed/data/liked_posts_repository_test.dart +++ b/test/features/feed/data/liked_posts_repository_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getactorlikes.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_actor_likes.dart'; import 'package:drift/drift.dart' show Value; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/data/post_action_repository_test.dart b/test/features/feed/data/post_action_repository_test.dart index 1f99f2c..7ae7f54 100644 --- a/test/features/feed/data/post_action_repository_test.dart +++ b/test/features/feed/data/post_action_repository_test.dart @@ -1,8 +1,8 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; -import 'package:bluesky/app_bsky_feed_getlikes.dart'; -import 'package:bluesky/app_bsky_feed_getquotes.dart'; -import 'package:bluesky/app_bsky_feed_getrepostedby.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; +import 'package:poptart_lex/app/bsky/feed/get_likes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_quotes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/data/post_action_repository.dart'; diff --git a/test/features/feed/data/post_thread_repository_cache_test.dart b/test/features/feed/data/post_thread_repository_cache_test.dart index cb2e38c..3d8f8cd 100644 --- a/test/features/feed/data/post_thread_repository_cache_test.dart +++ b/test/features/feed/data/post_thread_repository_cache_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getpostthread.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/cache/offline_cache_policy.dart'; diff --git a/test/features/feed/data/post_thread_repository_test.dart b/test/features/feed/data/post_thread_repository_test.dart index c4f31c6..4d555ca 100644 --- a/test/features/feed/data/post_thread_repository_test.dart +++ b/test/features/feed/data/post_thread_repository_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/data/post_thread_repository.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/features/feed/data/trending_join_test.dart b/test/features/feed/data/trending_join_test.dart index 2f7d580..f688363 100644 --- a/test/features/feed/data/trending_join_test.dart +++ b/test/features/feed/data/trending_join_test.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_unspecced_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/unspecced/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/feed/data/trending_join.dart'; diff --git a/test/features/feed/presentation/feed_detail_screen_test.dart b/test/features/feed/presentation/feed_detail_screen_test.dart index ba2564c..1813390 100644 --- a/test/features/feed/presentation/feed_detail_screen_test.dart +++ b/test/features/feed/presentation/feed_detail_screen_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/presentation/grid_post_card_test.dart b/test/features/feed/presentation/grid_post_card_test.dart index d2e0bde..1abc895 100644 --- a/test/features/feed/presentation/grid_post_card_test.dart +++ b/test/features/feed/presentation/grid_post_card_test.dart @@ -1,9 +1,9 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_embed_external.dart'; -import 'package:bluesky/app_bsky_embed_images.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/embed/external.dart'; +import 'package:poptart_lex/app/bsky/embed/images.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/features/feed/presentation/home_feed_screen_test.dart b/test/features/feed/presentation/home_feed_screen_test.dart index f36c32c..7cfb2f1 100644 --- a/test/features/feed/presentation/home_feed_screen_test.dart +++ b/test/features/feed/presentation/home_feed_screen_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/presentation/post_card_test.dart b/test/features/feed/presentation/post_card_test.dart index fddca5b..7d8aab7 100644 --- a/test/features/feed/presentation/post_card_test.dart +++ b/test/features/feed/presentation/post_card_test.dart @@ -1,14 +1,14 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_embed_external.dart'; -import 'package:bluesky/app_bsky_embed_images.dart'; -import 'package:bluesky/app_bsky_embed_record.dart'; -import 'package:bluesky/app_bsky_embed_recordwithmedia.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; -import 'package:bluesky/app_bsky_richtext_facet.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/embed/external.dart'; +import 'package:poptart_lex/app/bsky/embed/images.dart'; +import 'package:poptart_lex/app/bsky/embed/record.dart'; +import 'package:poptart_lex/app/bsky/embed/record_with_media.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; +import 'package:poptart_lex/app/bsky/richtext/facet.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/features/feed/presentation/post_card_with_actions_test.dart b/test/features/feed/presentation/post_card_with_actions_test.dart index 1a32ee5..04837b6 100644 --- a/test/features/feed/presentation/post_card_with_actions_test.dart +++ b/test/features/feed/presentation/post_card_with_actions_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/feed/presentation/post_interactions_sheet_test.dart b/test/features/feed/presentation/post_interactions_sheet_test.dart index ccfd5c6..3f8d6bf 100644 --- a/test/features/feed/presentation/post_interactions_sheet_test.dart +++ b/test/features/feed/presentation/post_interactions_sheet_test.dart @@ -1,9 +1,9 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; -import 'package:bluesky/app_bsky_feed_getlikes.dart'; -import 'package:bluesky/app_bsky_feed_getquotes.dart'; -import 'package:bluesky/app_bsky_feed_getrepostedby.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; +import 'package:poptart_lex/app/bsky/feed/get_likes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_quotes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/theme/app_theme.dart'; diff --git a/test/features/feed/presentation/post_quote_repost_sheet_test.dart b/test/features/feed/presentation/post_quote_repost_sheet_test.dart index c582385..da251da 100644 --- a/test/features/feed/presentation/post_quote_repost_sheet_test.dart +++ b/test/features/feed/presentation/post_quote_repost_sheet_test.dart @@ -1,10 +1,10 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getlikes.dart'; -import 'package:bluesky/app_bsky_feed_getquotes.dart'; -import 'package:bluesky/app_bsky_feed_getrepostedby.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_likes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_quotes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/theme/app_theme.dart'; diff --git a/test/features/feed/presentation/post_thread_edit_flow_test.dart b/test/features/feed/presentation/post_thread_edit_flow_test.dart index ad1833d..2c177a1 100644 --- a/test/features/feed/presentation/post_thread_edit_flow_test.dart +++ b/test/features/feed/presentation/post_thread_edit_flow_test.dart @@ -1,11 +1,11 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_getlikes.dart'; -import 'package:bluesky/app_bsky_feed_getquotes.dart'; -import 'package:bluesky/app_bsky_feed_getrepostedby.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/get_likes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_quotes.dart'; +import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/presentation/post_thread_screen_test.dart b/test/features/feed/presentation/post_thread_screen_test.dart index 6bdb2f9..b7d9cb1 100644 --- a/test/features/feed/presentation/post_thread_screen_test.dart +++ b/test/features/feed/presentation/post_thread_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/feed/presentation/saved_posts_screen_test.dart b/test/features/feed/presentation/saved_posts_screen_test.dart index ece4aa1..d04fdf4 100644 --- a/test/features/feed/presentation/saved_posts_screen_test.dart +++ b/test/features/feed/presentation/saved_posts_screen_test.dart @@ -1,14 +1,14 @@ import 'dart:async'; import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:bluesky/app_bsky_bookmark_getbookmarks.dart'; +import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/features/connectivity/cubit/connectivity_cubit.dart'; import 'package:lazurite/features/feed/cubit/post_action_cache.dart'; diff --git a/test/features/feed/presentation/trending_screen_test.dart b/test/features/feed/presentation/trending_screen_test.dart index cfdb467..e6c816d 100644 --- a/test/features/feed/presentation/trending_screen_test.dart +++ b/test/features/feed/presentation/trending_screen_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_unspecced_defs.dart'; +import 'package:poptart_lex/app/bsky/unspecced/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/feed/presentation/widgets/facet_text_test.dart b/test/features/feed/presentation/widgets/facet_text_test.dart index a32b8b4..adef6a2 100644 --- a/test/features/feed/presentation/widgets/facet_text_test.dart +++ b/test/features/feed/presentation/widgets/facet_text_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:bluesky/app_bsky_richtext_facet.dart'; +import 'package:poptart_lex/app/bsky/richtext/facet.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/features/lists/bloc/list_bloc_test.dart b/test/features/lists/bloc/list_bloc_test.dart index 92a1fde..d998ab5 100644 --- a/test/features/lists/bloc/list_bloc_test.dart +++ b/test/features/lists/bloc/list_bloc_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri, BlobRef; +import 'package:poptart_core/poptart_core.dart' show AtUri, BlobRef; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/lists/bloc/list_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/test/features/lists/bloc/list_feed_bloc_test.dart b/test/features/lists/bloc/list_feed_bloc_test.dart index 1ca8712..9122409 100644 --- a/test/features/lists/bloc/list_feed_bloc_test.dart +++ b/test/features/lists/bloc/list_feed_bloc_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/lists/bloc/list_feed_bloc.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/test/features/lists/cubit/add_to_list_cubit_test.dart b/test/features/lists/cubit/add_to_list_cubit_test.dart index 27230ac..eef4058 100644 --- a/test/features/lists/cubit/add_to_list_cubit_test.dart +++ b/test/features/lists/cubit/add_to_list_cubit_test.dart @@ -1,8 +1,8 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; -import 'package:bluesky/app_bsky_graph_getlistswithmembership.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/lists/cubit/add_to_list_cubit.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/test/features/lists/cubit/my_lists_cubit_test.dart b/test/features/lists/cubit/my_lists_cubit_test.dart index b1de744..3764c02 100644 --- a/test/features/lists/cubit/my_lists_cubit_test.dart +++ b/test/features/lists/cubit/my_lists_cubit_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:bloc_test/bloc_test.dart'; -import 'package:atproto_core/atproto_core.dart' show AtUri, BlobRef; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, BlobRef; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/lists/cubit/my_lists_cubit.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/test/features/lists/data/list_repository_test.dart b/test/features/lists/data/list_repository_test.dart index 3169f41..e4540e9 100644 --- a/test/features/lists/data/list_repository_test.dart +++ b/test/features/lists/data/list_repository_test.dart @@ -1,11 +1,11 @@ import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' show AtUri, Blob, BlobRef; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; -import 'package:bluesky/app_bsky_graph_getlists.dart'; -import 'package:bluesky/app_bsky_graph_getlistswithmembership.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri, Blob, BlobRef; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists.dart'; +import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/lists/data/list_repository.dart'; diff --git a/test/features/lists/presentation/list_detail_screen_test.dart b/test/features/lists/presentation/list_detail_screen_test.dart index 145f566..bf2228b 100644 --- a/test/features/lists/presentation/list_detail_screen_test.dart +++ b/test/features/lists/presentation/list_detail_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/lists/presentation/list_members_screen_test.dart b/test/features/lists/presentation/list_members_screen_test.dart index a7dbc82..9c8a8e2 100644 --- a/test/features/lists/presentation/list_members_screen_test.dart +++ b/test/features/lists/presentation/list_members_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/lists/presentation/my_lists_screen_test.dart b/test/features/lists/presentation/my_lists_screen_test.dart index 4ee4aab..4a5c651 100644 --- a/test/features/lists/presentation/my_lists_screen_test.dart +++ b/test/features/lists/presentation/my_lists_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/messages/bloc/convo_list_bloc_test.dart b/test/features/messages/bloc/convo_list_bloc_test.dart index 7351a36..4a9372d 100644 --- a/test/features/messages/bloc/convo_list_bloc_test.dart +++ b/test/features/messages/bloc/convo_list_bloc_test.dart @@ -1,5 +1,5 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/messages/bloc/convo_list_bloc.dart'; import 'package:lazurite/features/messages/data/convo_repository.dart'; diff --git a/test/features/messages/bloc/message_bloc_test.dart b/test/features/messages/bloc/message_bloc_test.dart index 0e116f3..16f0e8b 100644 --- a/test/features/messages/bloc/message_bloc_test.dart +++ b/test/features/messages/bloc/message_bloc_test.dart @@ -1,6 +1,6 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; -import 'package:bluesky/chat_bsky_convo_getmessages.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/get_messages.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/messages/bloc/message_bloc.dart'; import 'package:lazurite/features/messages/data/convo_repository.dart'; diff --git a/test/features/messages/data/convo_repository_test.dart b/test/features/messages/data/convo_repository_test.dart index 7a4326e..37ee765 100644 --- a/test/features/messages/data/convo_repository_test.dart +++ b/test/features/messages/data/convo_repository_test.dart @@ -1,9 +1,9 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' as atcore; -import 'package:bluesky/bluesky_chat.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_core/poptart_core.dart' as atcore; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:lazurite/features/auth/data/models/auth_models.dart'; diff --git a/test/features/messages/presentation/convo_list_screen_test.dart b/test/features/messages/presentation/convo_list_screen_test.dart index 3c2c857..759472e 100644 --- a/test/features/messages/presentation/convo_list_screen_test.dart +++ b/test/features/messages/presentation/convo_list_screen_test.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/chat_bsky_actor_defs.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/actor/defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/messages/presentation/message_thread_screen_test.dart b/test/features/messages/presentation/message_thread_screen_test.dart index cf5c400..9d6a78c 100644 --- a/test/features/messages/presentation/message_thread_screen_test.dart +++ b/test/features/messages/presentation/message_thread_screen_test.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; -import 'package:bluesky/chat_bsky_convo_getmessages.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/get_messages.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/messages/presentation/widgets/convo_list_item_test.dart b/test/features/messages/presentation/widgets/convo_list_item_test.dart index d53be3b..ace4dcd 100644 --- a/test/features/messages/presentation/widgets/convo_list_item_test.dart +++ b/test/features/messages/presentation/widgets/convo_list_item_test.dart @@ -1,5 +1,5 @@ -import 'package:bluesky/chat_bsky_actor_defs.dart'; -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/actor/defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/messages/presentation/widgets/convo_list_item.dart'; diff --git a/test/features/messages/presentation/widgets/message_bubble_test.dart b/test/features/messages/presentation/widgets/message_bubble_test.dart index cc12bd6..a410913 100644 --- a/test/features/messages/presentation/widgets/message_bubble_test.dart +++ b/test/features/messages/presentation/widgets/message_bubble_test.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/chat_bsky_convo_defs.dart'; +import 'package:poptart_lex/chat/bsky/convo/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/messages/presentation/widgets/message_bubble.dart'; diff --git a/test/features/moderation/data/moderation_service_test.dart b/test/features/moderation/data/moderation_service_test.dart index 437d5de..8ad18b6 100644 --- a/test/features/moderation/data/moderation_service_test.dart +++ b/test/features/moderation/data/moderation_service_test.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_labeler_defs.dart'; -import 'package:bluesky/app_bsky_labeler_getservices.dart'; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/get_services.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/moderation/presentation/moderation_screens_test.dart b/test/features/moderation/presentation/moderation_screens_test.dart index 5e98b69..9fe1338 100644 --- a/test/features/moderation/presentation/moderation_screens_test.dart +++ b/test/features/moderation/presentation/moderation_screens_test.dart @@ -1,9 +1,9 @@ -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_labeler_defs.dart'; -import 'package:bluesky/app_bsky_labeler_getservices.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/defs.dart'; +import 'package:poptart_lex/app/bsky/labeler/get_services.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart b/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart index cef8b35..e109681 100644 --- a/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart +++ b/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart @@ -1,5 +1,5 @@ -import 'package:atproto/com_atproto_label_defs.dart'; -import 'package:bluesky/moderation.dart' as bsky_moderation; +import 'package:poptart_lex/com/atproto/label/defs.dart'; +import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/moderation/presentation/widgets/moderation_badge_row.dart'; diff --git a/test/features/notifications/bloc/notification_bloc_test.dart b/test/features/notifications/bloc/notification_bloc_test.dart index f1fa1d3..18300dd 100644 --- a/test/features/notifications/bloc/notification_bloc_test.dart +++ b/test/features/notifications/bloc/notification_bloc_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/notifications/bloc/notification_bloc.dart'; import 'package:lazurite/features/notifications/data/notification_repository.dart'; diff --git a/test/features/notifications/data/notification_repository_test.dart b/test/features/notifications/data/notification_repository_test.dart index 83d9d20..b44e595 100644 --- a/test/features/notifications/data/notification_repository_test.dart +++ b/test/features/notifications/data/notification_repository_test.dart @@ -1,12 +1,11 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; -import 'package:bluesky/bluesky.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:lazurite/features/notifications/data/notification_repository.dart'; -import 'package:lazurite/features/auth/data/models/auth_models.dart'; import 'package:http/http.dart' as http; +import 'package:lazurite/core/network/poptart_client_adapter.dart'; +import 'package:lazurite/features/auth/data/models/auth_models.dart'; +import 'package:lazurite/features/notifications/data/notification_repository.dart'; import 'package:mocktail/mocktail.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; class MockNotificationRepository extends Mock implements NotificationRepository {} diff --git a/test/features/notifications/domain/notification_domain_service_test.dart b/test/features/notifications/domain/notification_domain_service_test.dart index 579bca7..be9871f 100644 --- a/test/features/notifications/domain/notification_domain_service_test.dart +++ b/test/features/notifications/domain/notification_domain_service_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/notifications/domain/notification_local_mappers_test.dart b/test/features/notifications/domain/notification_local_mappers_test.dart index 57df74c..9cd3fa3 100644 --- a/test/features/notifications/domain/notification_local_mappers_test.dart +++ b/test/features/notifications/domain/notification_local_mappers_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/notifications/domain/notification_local_mappers.dart'; import 'package:lazurite/features/notifications/domain/notification_local_models.dart'; diff --git a/test/features/notifications/domain/notification_push_payload_processing_test.dart b/test/features/notifications/domain/notification_push_payload_processing_test.dart index fe3852e..6a71c2d 100644 --- a/test/features/notifications/domain/notification_push_payload_processing_test.dart +++ b/test/features/notifications/domain/notification_push_payload_processing_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/notifications/domain/notification_reason_utils_test.dart b/test/features/notifications/domain/notification_reason_utils_test.dart index 5c6a779..36066cc 100644 --- a/test/features/notifications/domain/notification_reason_utils_test.dart +++ b/test/features/notifications/domain/notification_reason_utils_test.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/notifications/domain/notification_reason_utils.dart'; diff --git a/test/features/notifications/domain/push_registration_service_test.dart b/test/features/notifications/domain/push_registration_service_test.dart index 60b1b3e..94a0769 100644 --- a/test/features/notifications/domain/push_registration_service_test.dart +++ b/test/features/notifications/domain/push_registration_service_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart' +import 'package:poptart_core/poptart_core.dart' show HttpMethod, HttpStatus, RateLimit, UnauthorizedException, XRPCError, XRPCRequest, XRPCResponse; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/auth/data/models/auth_models.dart'; diff --git a/test/features/notifications/presentation/notifications_screen_test.dart b/test/features/notifications/presentation/notifications_screen_test.dart index f17ac39..bbd004a 100644 --- a/test/features/notifications/presentation/notifications_screen_test.dart +++ b/test/features/notifications/presentation/notifications_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/test/features/notifications/presentation/widgets/notification_list_item_test.dart b/test/features/notifications/presentation/widgets/notification_list_item_test.dart index a62ae02..66b804f 100644 --- a/test/features/notifications/presentation/widgets/notification_list_item_test.dart +++ b/test/features/notifications/presentation/widgets/notification_list_item_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/features/profile/bloc/profile_bloc_test.dart b/test/features/profile/bloc/profile_bloc_test.dart index 13dfeff..1cb757b 100644 --- a/test/features/profile/bloc/profile_bloc_test.dart +++ b/test/features/profile/bloc/profile_bloc_test.dart @@ -1,5 +1,5 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/bloc/profile_bloc.dart'; import 'package:lazurite/features/profile/data/profile_repository.dart'; diff --git a/test/features/profile/cubit/profile_action_cubit_test.dart b/test/features/profile/cubit/profile_action_cubit_test.dart index 8c87fe8..46638db 100644 --- a/test/features/profile/cubit/profile_action_cubit_test.dart +++ b/test/features/profile/cubit/profile_action_cubit_test.dart @@ -1,5 +1,5 @@ -import 'package:atproto/com_atproto_moderation_defs.dart'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_lex/com/atproto/moderation/defs.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/cubit/profile_action_cubit.dart'; diff --git a/test/features/profile/cubit/profile_connections_cubit_test.dart b/test/features/profile/cubit/profile_connections_cubit_test.dart index c42eee3..3b453bb 100644 --- a/test/features/profile/cubit/profile_connections_cubit_test.dart +++ b/test/features/profile/cubit/profile_connections_cubit_test.dart @@ -1,5 +1,5 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/network/constellation_client.dart'; import 'package:lazurite/features/profile/cubit/profile_connections_cubit.dart'; diff --git a/test/features/profile/cubit/profile_context_cubit_test.dart b/test/features/profile/cubit/profile_context_cubit_test.dart index 897632d..8e8ac3b 100644 --- a/test/features/profile/cubit/profile_context_cubit_test.dart +++ b/test/features/profile/cubit/profile_context_cubit_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/cubit/profile_context_cubit.dart'; import 'package:lazurite/features/profile/data/profile_context_repository.dart'; diff --git a/test/features/profile/cubit/suggested_follows_cubit_test.dart b/test/features/profile/cubit/suggested_follows_cubit_test.dart index cc6e8f8..0763336 100644 --- a/test/features/profile/cubit/suggested_follows_cubit_test.dart +++ b/test/features/profile/cubit/suggested_follows_cubit_test.dart @@ -1,5 +1,5 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/cubit/suggested_follows_cubit.dart'; import 'package:lazurite/features/profile/data/profile_repository.dart'; diff --git a/test/features/profile/data/follow_audit_repository_test.dart b/test/features/profile/data/follow_audit_repository_test.dart index d7f530e..be4d782 100644 --- a/test/features/profile/data/follow_audit_repository_test.dart +++ b/test/features/profile/data/follow_audit_repository_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto/com_atproto_repo_applywrites.dart'; -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/com/atproto/repo/apply_writes.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/data/follow_audit_repository.dart'; diff --git a/test/features/profile/data/profile_context_repository_test.dart b/test/features/profile/data/profile_context_repository_test.dart index a1d6c0a..79d3a79 100644 --- a/test/features/profile/data/profile_context_repository_test.dart +++ b/test/features/profile/data/profile_context_repository_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/features/profile/data/profile_repository_actor_likes_test.dart b/test/features/profile/data/profile_repository_actor_likes_test.dart index 4f21c53..47a6652 100644 --- a/test/features/profile/data/profile_repository_actor_likes_test.dart +++ b/test/features/profile/data/profile_repository_actor_likes_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/profile/data/profile_repository_test.dart b/test/features/profile/data/profile_repository_test.dart index f2d8b65..bc44523 100644 --- a/test/features/profile/data/profile_repository_test.dart +++ b/test/features/profile/data/profile_repository_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:atproto_core/atproto_core.dart' as atp_core; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_core/poptart_core.dart' as atp_core; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; diff --git a/test/features/profile/presentation/profile_connections_screen_test.dart b/test/features/profile/presentation/profile_connections_screen_test.dart index 5ce8abc..a1c0e46 100644 --- a/test/features/profile/presentation/profile_connections_screen_test.dart +++ b/test/features/profile/presentation/profile_connections_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/profile/presentation/profile_context_screen_test.dart b/test/features/profile/presentation/profile_context_screen_test.dart index f2e74dd..a6330dc 100644 --- a/test/features/profile/presentation/profile_context_screen_test.dart +++ b/test/features/profile/presentation/profile_context_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart' as bsky_graph; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/profile/presentation/profile_edit_screen_test.dart b/test/features/profile/presentation/profile_edit_screen_test.dart index ef103b3..5d89557 100644 --- a/test/features/profile/presentation/profile_edit_screen_test.dart +++ b/test/features/profile/presentation/profile_edit_screen_test.dart @@ -1,5 +1,5 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/profile/presentation/profile_screen_test.dart b/test/features/profile/presentation/profile_screen_test.dart index 1d20b6d..123a6a9 100644 --- a/test/features/profile/presentation/profile_screen_test.dart +++ b/test/features/profile/presentation/profile_screen_test.dart @@ -1,10 +1,10 @@ import 'dart:async'; -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart' hide ReplyRef; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart' hide ReplyRef; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart b/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart index 30d6d38..d7076c9 100644 --- a/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart +++ b/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart @@ -1,7 +1,7 @@ import 'package:bloc_test/bloc_test.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/profile/cubit/suggested_follows_cubit.dart'; diff --git a/test/features/search/bloc/search_bloc_test.dart b/test/features/search/bloc/search_bloc_test.dart index ac6223d..3fe78dd 100644 --- a/test/features/search/bloc/search_bloc_test.dart +++ b/test/features/search/bloc/search_bloc_test.dart @@ -1,8 +1,8 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/core/database/app_database.dart'; import 'package:lazurite/features/search/bloc/search_bloc.dart'; diff --git a/test/features/search/cubit/hashtag_cubit_test.dart b/test/features/search/cubit/hashtag_cubit_test.dart index 08c4fac..a39027a 100644 --- a/test/features/search/cubit/hashtag_cubit_test.dart +++ b/test/features/search/cubit/hashtag_cubit_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/cubit/hashtag_cubit.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; diff --git a/test/features/search/cubit/topic_cubit_test.dart b/test/features/search/cubit/topic_cubit_test.dart index 664825e..cd30eec 100644 --- a/test/features/search/cubit/topic_cubit_test.dart +++ b/test/features/search/cubit/topic_cubit_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/cubit/topic_cubit.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; diff --git a/test/features/search/data/hashtag_utils_test.dart b/test/features/search/data/hashtag_utils_test.dart index b82a46d..c505c63 100644 --- a/test/features/search/data/hashtag_utils_test.dart +++ b/test/features/search/data/hashtag_utils_test.dart @@ -1,8 +1,8 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; -import 'package:bluesky/app_bsky_richtext_facet.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; +import 'package:poptart_lex/app/bsky/richtext/facet.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/data/hashtag_utils.dart'; diff --git a/test/features/search/data/post_text_extractor_test.dart b/test/features/search/data/post_text_extractor_test.dart index 537a7b4..7a47047 100644 --- a/test/features/search/data/post_text_extractor_test.dart +++ b/test/features/search/data/post_text_extractor_test.dart @@ -1,11 +1,11 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_embed_external.dart'; -import 'package:bluesky/app_bsky_embed_images.dart'; -import 'package:bluesky/app_bsky_embed_record.dart'; -import 'package:bluesky/app_bsky_embed_recordwithmedia.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_post.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/embed/external.dart'; +import 'package:poptart_lex/app/bsky/embed/images.dart'; +import 'package:poptart_lex/app/bsky/embed/record.dart'; +import 'package:poptart_lex/app/bsky/embed/record_with_media.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/post.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/data/post_text_extractor.dart'; diff --git a/test/features/search/data/search_repository_post_filters_test.dart b/test/features/search/data/search_repository_post_filters_test.dart index dbfafca..1d7ecbe 100644 --- a/test/features/search/data/search_repository_post_filters_test.dart +++ b/test/features/search/data/search_repository_post_filters_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_feed_searchposts.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/search_posts.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/data/post_search_filters.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; diff --git a/test/features/search/data/search_repository_test.dart b/test/features/search/data/search_repository_test.dart index c8973c7..fd15730 100644 --- a/test/features/search/data/search_repository_test.dart +++ b/test/features/search/data/search_repository_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/search/data/search_repository.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/features/search/presentation/hashtag_screen_test.dart b/test/features/search/presentation/hashtag_screen_test.dart index 60b16c1..30dfa06 100644 --- a/test/features/search/presentation/hashtag_screen_test.dart +++ b/test/features/search/presentation/hashtag_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/search/presentation/profile_post_search_screen_test.dart b/test/features/search/presentation/profile_post_search_screen_test.dart index 2134dee..46c4152 100644 --- a/test/features/search/presentation/profile_post_search_screen_test.dart +++ b/test/features/search/presentation/profile_post_search_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/search/presentation/search_screen_test.dart b/test/features/search/presentation/search_screen_test.dart index 5802056..9b2cfda 100644 --- a/test/features/search/presentation/search_screen_test.dart +++ b/test/features/search/presentation/search_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart'; +import 'package:poptart_core/poptart_core.dart'; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/settings/data/video_repository_test.dart b/test/features/settings/data/video_repository_test.dart index 3d5528a..381f205 100644 --- a/test/features/settings/data/video_repository_test.dart +++ b/test/features/settings/data/video_repository_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:bluesky/app_bsky_video_getuploadlimits.dart'; +import 'package:poptart_lex/app/bsky/video/get_upload_limits.dart'; import 'package:lazurite/features/settings/data/video_repository.dart'; class FakeVideoUploadLimitsApi implements VideoUploadLimitsApi { diff --git a/test/features/starter_packs/bloc/starter_pack_bloc_test.dart b/test/features/starter_packs/bloc/starter_pack_bloc_test.dart index 540c9c6..7fdc8bd 100644 --- a/test/features/starter_packs/bloc/starter_pack_bloc_test.dart +++ b/test/features/starter_packs/bloc/starter_pack_bloc_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/starter_packs/bloc/starter_pack_bloc.dart'; import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart'; diff --git a/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart b/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart index 84b1071..6006f1d 100644 --- a/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart +++ b/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; +import 'package:poptart_core/poptart_core.dart' show AtUri; import 'package:bloc_test/bloc_test.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/features/starter_packs/cubit/actor_starter_packs_cubit.dart'; import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart'; diff --git a/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart b/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart index 5f3e135..53bc9d9 100644 --- a/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart +++ b/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart b/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart index 7899563..3ded405 100644 --- a/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart +++ b/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart b/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart index 3e08866..df7abf2 100644 --- a/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart +++ b/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart @@ -1,7 +1,7 @@ -import 'package:atproto_core/atproto_core.dart' show AtUri; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; -import 'package:bluesky/app_bsky_graph_defs.dart'; +import 'package:poptart_core/poptart_core.dart' show AtUri; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; +import 'package:poptart_lex/app/bsky/graph/defs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/typeahead/data/typeahead_repository_test.dart b/test/features/typeahead/data/typeahead_repository_test.dart index 2d655db..9115d98 100644 --- a/test/features/typeahead/data/typeahead_repository_test.dart +++ b/test/features/typeahead/data/typeahead_repository_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:bluesky/app_bsky_actor_defs.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:lazurite/features/moderation/data/moderation_service.dart'; diff --git a/test/shared/presentation/helpers/notification_icon_mapper_test.dart b/test/shared/presentation/helpers/notification_icon_mapper_test.dart index 159a5e3..7cbdc03 100644 --- a/test/shared/presentation/helpers/notification_icon_mapper_test.dart +++ b/test/shared/presentation/helpers/notification_icon_mapper_test.dart @@ -1,4 +1,4 @@ -import 'package:bluesky/app_bsky_notification_listnotifications.dart' as bsky; +import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:lazurite/shared/presentation/helpers/notification_icon_mapper.dart'; diff --git a/test/shared/utils/format_utils_test.dart b/test/shared/utils/format_utils_test.dart index fe67134..c799827 100644 --- a/test/shared/utils/format_utils_test.dart +++ b/test/shared/utils/format_utils_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:intl/intl.dart'; -import 'package:atproto_core/atproto_core.dart'; -import 'package:bluesky/app_bsky_actor_defs.dart'; -import 'package:bluesky/app_bsky_feed_defs.dart'; +import 'package:poptart_core/poptart_core.dart'; +import 'package:poptart_lex/app/bsky/actor/defs.dart'; +import 'package:poptart_lex/app/bsky/feed/defs.dart'; import 'package:lazurite/shared/utils/format_utils.dart'; void main() {