refactor: Refactor null safety and improve code quality across multiple files

- Updated notifications_page.dart to handle potential null values for author avatar and display name.
- Enhanced profile_page.dart to ensure safe access to profile description and gallery items.
- Modified gallery_action_buttons.dart to utilize Riverpod for managing favorite state.
- Changed gallery_photo_view.dart to safely check for photo alt text.
- Improved gallery_preview.dart to filter photos based on non-null thumbnails.
- Updated justified_gallery_view.dart to handle aspect ratios safely and ensure thumbnails are not null.
- Refactored timeline_item.dart to use Riverpod for gallery data and ensure safe access to actor details.
- Updated pubspec.yaml and pubspec.lock to include new dependencies and overrides for analyzer and linting packages.

analysis_options.yaml

···
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+
+analyzer:
+  plugins:
+    - custom_lint

lib/api.dart

···
 import 'package:grain/main.dart';
 import 'package:grain/models/atproto_session.dart';
 import 'package:http/http.dart' as http;
+import 'package:jose/jose.dart';
 import 'package:mime/mime.dart';
 
 import './auth.dart';
···
       throw Exception('Failed to fetch session');
     }
 
-    return AtprotoSession.fromJson(jsonDecode(response.body));
+    final json = jsonDecode(response.body);
+    final token = json['tokenSet'] ?? {};
+    return AtprotoSession(
+      accessToken: token['access_token'] as String,
+      tokenType: token['token_type'] as String,
+      expiresAt: DateTime.parse(token['expires_at'] as String),
+      dpopJwk: JsonWebKey.fromJson(json['dpopJwk'] as Map<String, dynamic>),
+      issuer: token['iss'] as String,
+      subject: token['sub'] as String,
+    );
   }
 
   Future<Profile?> fetchCurrentUser() async {
···
     }
     final result = jsonDecode(response.body) as Map<String, dynamic>;
     appLogger.i('Created comment result: $result');
+    return result['uri'] as String?;
+  }
+
+  Future<String?> createFavorite({required String galleryUri}) async {
+    final session = await auth.getValidSession();
+    if (session == null) {
+      appLogger.w('No valid session for createFavorite');
+      return null;
+    }
+    final dpopClient = DpopHttpClient(dpopKey: session.dpopJwk);
+    final issuer = session.issuer;
+    final did = session.subject;
+    final url = Uri.parse('$issuer/xrpc/com.atproto.repo.createRecord');
+    final record = {
+      'collection': 'social.grain.favorite',
+      'repo': did,
+      'record': {'subject': galleryUri, 'createdAt': DateTime.now().toUtc().toIso8601String()},
+    };
+    appLogger.i('Creating favorite: $record');
+    final response = await dpopClient.send(
+      method: 'POST',
+      url: url,
+      accessToken: session.accessToken,
+      headers: {'Content-Type': 'application/json'},
+      body: jsonEncode(record),
+    );
+    if (response.statusCode != 200 && response.statusCode != 201) {
+      appLogger.w('Failed to create favorite: \\${response.statusCode} \\${response.body}');
+      return null;
+    }
+    final result = jsonDecode(response.body) as Map<String, dynamic>;
+    appLogger.i('Created favorite result: $result');
     return result['uri'] as String?;
   }
 

lib/main.dart

···
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:grain/api.dart';
 import 'package:grain/app_logger.dart';
 import 'package:grain/app_theme.dart';
···
 Future<void> main() async {
   await AppConfig.init();
   appLogger.i('🚀 App started');
-  runApp(const MyApp());
+  runApp(const ProviderScope(child: MyApp()));
 }
 
 class MyApp extends StatefulWidget {

lib/models/aspect_ratio.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'aspect_ratio.freezed.dart';
+part 'aspect_ratio.g.dart';
+
+@freezed
+class AspectRatio with _$AspectRatio {
+  const factory AspectRatio({required int width, required int height}) = _AspectRatio;
+
+  factory AspectRatio.fromJson(Map<String, dynamic> json) => _$AspectRatioFromJson(json);
+}

lib/models/aspect_ratio.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'aspect_ratio.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+AspectRatio _$AspectRatioFromJson(Map<String, dynamic> json) {
+  return _AspectRatio.fromJson(json);
+}
+
+/// @nodoc
+mixin _$AspectRatio {
+  int get width => throw _privateConstructorUsedError;
+  int get height => throw _privateConstructorUsedError;
+
+  /// Serializes this AspectRatio to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of AspectRatio
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $AspectRatioCopyWith<AspectRatio> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $AspectRatioCopyWith<$Res> {
+  factory $AspectRatioCopyWith(
+    AspectRatio value,
+    $Res Function(AspectRatio) then,
+  ) = _$AspectRatioCopyWithImpl<$Res, AspectRatio>;
+  @useResult
+  $Res call({int width, int height});
+}
+
+/// @nodoc
+class _$AspectRatioCopyWithImpl<$Res, $Val extends AspectRatio>
+    implements $AspectRatioCopyWith<$Res> {
+  _$AspectRatioCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of AspectRatio
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? width = null, Object? height = null}) {
+    return _then(
+      _value.copyWith(
+            width: null == width
+                ? _value.width
+                : width // ignore: cast_nullable_to_non_nullable
+                      as int,
+            height: null == height
+                ? _value.height
+                : height // ignore: cast_nullable_to_non_nullable
+                      as int,
+          )
+          as $Val,
+    );
+  }
+}
+
+/// @nodoc
+abstract class _$$AspectRatioImplCopyWith<$Res>
+    implements $AspectRatioCopyWith<$Res> {
+  factory _$$AspectRatioImplCopyWith(
+    _$AspectRatioImpl value,
+    $Res Function(_$AspectRatioImpl) then,
+  ) = __$$AspectRatioImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({int width, int height});
+}
+
+/// @nodoc
+class __$$AspectRatioImplCopyWithImpl<$Res>
+    extends _$AspectRatioCopyWithImpl<$Res, _$AspectRatioImpl>
+    implements _$$AspectRatioImplCopyWith<$Res> {
+  __$$AspectRatioImplCopyWithImpl(
+    _$AspectRatioImpl _value,
+    $Res Function(_$AspectRatioImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of AspectRatio
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? width = null, Object? height = null}) {
+    return _then(
+      _$AspectRatioImpl(
+        width: null == width
+            ? _value.width
+            : width // ignore: cast_nullable_to_non_nullable
+                  as int,
+        height: null == height
+            ? _value.height
+            : height // ignore: cast_nullable_to_non_nullable
+                  as int,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$AspectRatioImpl implements _AspectRatio {
+  const _$AspectRatioImpl({required this.width, required this.height});
+
+  factory _$AspectRatioImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AspectRatioImplFromJson(json);
+
+  @override
+  final int width;
+  @override
+  final int height;
+
+  @override
+  String toString() {
+    return 'AspectRatio(width: $width, height: $height)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$AspectRatioImpl &&
+            (identical(other.width, width) || other.width == width) &&
+            (identical(other.height, height) || other.height == height));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, width, height);
+
+  /// Create a copy of AspectRatio
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$AspectRatioImplCopyWith<_$AspectRatioImpl> get copyWith =>
+      __$$AspectRatioImplCopyWithImpl<_$AspectRatioImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$AspectRatioImplToJson(this);
+  }
+}
+
+abstract class _AspectRatio implements AspectRatio {
+  const factory _AspectRatio({
+    required final int width,
+    required final int height,
+  }) = _$AspectRatioImpl;
+
+  factory _AspectRatio.fromJson(Map<String, dynamic> json) =
+      _$AspectRatioImpl.fromJson;
+
+  @override
+  int get width;
+  @override
+  int get height;
+
+  /// Create a copy of AspectRatio
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$AspectRatioImplCopyWith<_$AspectRatioImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/aspect_ratio.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'aspect_ratio.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$AspectRatioImpl _$$AspectRatioImplFromJson(Map<String, dynamic> json) =>
+    _$AspectRatioImpl(
+      width: (json['width'] as num).toInt(),
+      height: (json['height'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$$AspectRatioImplToJson(_$AspectRatioImpl instance) =>
+    <String, dynamic>{'width': instance.width, 'height': instance.height};

lib/models/atproto_session.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:jose/jose.dart';
 
-class AtprotoSession {
-  final String accessToken;
-  final String? refreshToken;
-  final String tokenType;
-  final DateTime expiresAt;
-  final JsonWebKey dpopJwk;
-  final String issuer;
-  final String subject;
+part 'atproto_session.freezed.dart';
+part 'atproto_session.g.dart';
 
-  AtprotoSession({
-    required this.accessToken,
-    this.refreshToken,
-    required this.tokenType,
-    required this.expiresAt,
-    required this.dpopJwk,
-    required this.issuer,
-    required this.subject,
-  });
+@freezed
+class AtprotoSession with _$AtprotoSession {
+  const factory AtprotoSession({
+    required String accessToken,
+    required String tokenType,
+    required DateTime expiresAt,
+    required JsonWebKey dpopJwk,
+    required String issuer,
+    required String subject,
+  }) = _AtprotoSession;
 
-  factory AtprotoSession.fromJson(Map<String, dynamic> json) {
-    final token = json['tokenSet'] ?? {};
-    final dpopJwkJson = json['dpopJwk'] ?? {};
-
-    return AtprotoSession(
-      accessToken: token['access_token'],
-      refreshToken: token['refresh_token'],
-      tokenType: token['token_type'],
-      expiresAt: DateTime.parse(token['expires_at']),
-      dpopJwk: JsonWebKey.fromJson(dpopJwkJson),
-      issuer: token['iss'],
-      subject: token['sub'],
-    );
-  }
-
-  Map<String, dynamic> toJson() => {
-    'tokenSet': {
-      'access_token': accessToken,
-      'refresh_token': refreshToken,
-      'token_type': tokenType,
-      'expires_at': expiresAt.toIso8601String(),
-      'iss': issuer,
-      'sub': subject,
-    },
-    'dpopJwk': dpopJwk.toJson(),
-  };
+  factory AtprotoSession.fromJson(Map<String, dynamic> json) => _$AtprotoSessionFromJson(json);
 }

lib/models/atproto_session.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'atproto_session.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+AtprotoSession _$AtprotoSessionFromJson(Map<String, dynamic> json) {
+  return _AtprotoSession.fromJson(json);
+}
+
+/// @nodoc
+mixin _$AtprotoSession {
+  String get accessToken => throw _privateConstructorUsedError;
+  String get tokenType => throw _privateConstructorUsedError;
+  DateTime get expiresAt => throw _privateConstructorUsedError;
+  JsonWebKey get dpopJwk => throw _privateConstructorUsedError;
+  String get issuer => throw _privateConstructorUsedError;
+  String get subject => throw _privateConstructorUsedError;
+
+  /// Serializes this AtprotoSession to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of AtprotoSession
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $AtprotoSessionCopyWith<AtprotoSession> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $AtprotoSessionCopyWith<$Res> {
+  factory $AtprotoSessionCopyWith(
+    AtprotoSession value,
+    $Res Function(AtprotoSession) then,
+  ) = _$AtprotoSessionCopyWithImpl<$Res, AtprotoSession>;
+  @useResult
+  $Res call({
+    String accessToken,
+    String tokenType,
+    DateTime expiresAt,
+    JsonWebKey dpopJwk,
+    String issuer,
+    String subject,
+  });
+}
+
+/// @nodoc
+class _$AtprotoSessionCopyWithImpl<$Res, $Val extends AtprotoSession>
+    implements $AtprotoSessionCopyWith<$Res> {
+  _$AtprotoSessionCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of AtprotoSession
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? accessToken = null,
+    Object? tokenType = null,
+    Object? expiresAt = null,
+    Object? dpopJwk = null,
+    Object? issuer = null,
+    Object? subject = null,
+  }) {
+    return _then(
+      _value.copyWith(
+            accessToken: null == accessToken
+                ? _value.accessToken
+                : accessToken // ignore: cast_nullable_to_non_nullable
+                      as String,
+            tokenType: null == tokenType
+                ? _value.tokenType
+                : tokenType // ignore: cast_nullable_to_non_nullable
+                      as String,
+            expiresAt: null == expiresAt
+                ? _value.expiresAt
+                : expiresAt // ignore: cast_nullable_to_non_nullable
+                      as DateTime,
+            dpopJwk: null == dpopJwk
+                ? _value.dpopJwk
+                : dpopJwk // ignore: cast_nullable_to_non_nullable
+                      as JsonWebKey,
+            issuer: null == issuer
+                ? _value.issuer
+                : issuer // ignore: cast_nullable_to_non_nullable
+                      as String,
+            subject: null == subject
+                ? _value.subject
+                : subject // ignore: cast_nullable_to_non_nullable
+                      as String,
+          )
+          as $Val,
+    );
+  }
+}
+
+/// @nodoc
+abstract class _$$AtprotoSessionImplCopyWith<$Res>
+    implements $AtprotoSessionCopyWith<$Res> {
+  factory _$$AtprotoSessionImplCopyWith(
+    _$AtprotoSessionImpl value,
+    $Res Function(_$AtprotoSessionImpl) then,
+  ) = __$$AtprotoSessionImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String accessToken,
+    String tokenType,
+    DateTime expiresAt,
+    JsonWebKey dpopJwk,
+    String issuer,
+    String subject,
+  });
+}
+
+/// @nodoc
+class __$$AtprotoSessionImplCopyWithImpl<$Res>
+    extends _$AtprotoSessionCopyWithImpl<$Res, _$AtprotoSessionImpl>
+    implements _$$AtprotoSessionImplCopyWith<$Res> {
+  __$$AtprotoSessionImplCopyWithImpl(
+    _$AtprotoSessionImpl _value,
+    $Res Function(_$AtprotoSessionImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of AtprotoSession
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? accessToken = null,
+    Object? tokenType = null,
+    Object? expiresAt = null,
+    Object? dpopJwk = null,
+    Object? issuer = null,
+    Object? subject = null,
+  }) {
+    return _then(
+      _$AtprotoSessionImpl(
+        accessToken: null == accessToken
+            ? _value.accessToken
+            : accessToken // ignore: cast_nullable_to_non_nullable
+                  as String,
+        tokenType: null == tokenType
+            ? _value.tokenType
+            : tokenType // ignore: cast_nullable_to_non_nullable
+                  as String,
+        expiresAt: null == expiresAt
+            ? _value.expiresAt
+            : expiresAt // ignore: cast_nullable_to_non_nullable
+                  as DateTime,
+        dpopJwk: null == dpopJwk
+            ? _value.dpopJwk
+            : dpopJwk // ignore: cast_nullable_to_non_nullable
+                  as JsonWebKey,
+        issuer: null == issuer
+            ? _value.issuer
+            : issuer // ignore: cast_nullable_to_non_nullable
+                  as String,
+        subject: null == subject
+            ? _value.subject
+            : subject // ignore: cast_nullable_to_non_nullable
+                  as String,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$AtprotoSessionImpl implements _AtprotoSession {
+  const _$AtprotoSessionImpl({
+    required this.accessToken,
+    required this.tokenType,
+    required this.expiresAt,
+    required this.dpopJwk,
+    required this.issuer,
+    required this.subject,
+  });
+
+  factory _$AtprotoSessionImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AtprotoSessionImplFromJson(json);
+
+  @override
+  final String accessToken;
+  @override
+  final String tokenType;
+  @override
+  final DateTime expiresAt;
+  @override
+  final JsonWebKey dpopJwk;
+  @override
+  final String issuer;
+  @override
+  final String subject;
+
+  @override
+  String toString() {
+    return 'AtprotoSession(accessToken: $accessToken, tokenType: $tokenType, expiresAt: $expiresAt, dpopJwk: $dpopJwk, issuer: $issuer, subject: $subject)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$AtprotoSessionImpl &&
+            (identical(other.accessToken, accessToken) ||
+                other.accessToken == accessToken) &&
+            (identical(other.tokenType, tokenType) ||
+                other.tokenType == tokenType) &&
+            (identical(other.expiresAt, expiresAt) ||
+                other.expiresAt == expiresAt) &&
+            (identical(other.dpopJwk, dpopJwk) || other.dpopJwk == dpopJwk) &&
+            (identical(other.issuer, issuer) || other.issuer == issuer) &&
+            (identical(other.subject, subject) || other.subject == subject));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    accessToken,
+    tokenType,
+    expiresAt,
+    dpopJwk,
+    issuer,
+    subject,
+  );
+
+  /// Create a copy of AtprotoSession
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$AtprotoSessionImplCopyWith<_$AtprotoSessionImpl> get copyWith =>
+      __$$AtprotoSessionImplCopyWithImpl<_$AtprotoSessionImpl>(
+        this,
+        _$identity,
+      );
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$AtprotoSessionImplToJson(this);
+  }
+}
+
+abstract class _AtprotoSession implements AtprotoSession {
+  const factory _AtprotoSession({
+    required final String accessToken,
+    required final String tokenType,
+    required final DateTime expiresAt,
+    required final JsonWebKey dpopJwk,
+    required final String issuer,
+    required final String subject,
+  }) = _$AtprotoSessionImpl;
+
+  factory _AtprotoSession.fromJson(Map<String, dynamic> json) =
+      _$AtprotoSessionImpl.fromJson;
+
+  @override
+  String get accessToken;
+  @override
+  String get tokenType;
+  @override
+  DateTime get expiresAt;
+  @override
+  JsonWebKey get dpopJwk;
+  @override
+  String get issuer;
+  @override
+  String get subject;
+
+  /// Create a copy of AtprotoSession
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$AtprotoSessionImplCopyWith<_$AtprotoSessionImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/atproto_session.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'atproto_session.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$AtprotoSessionImpl _$$AtprotoSessionImplFromJson(Map<String, dynamic> json) =>
+    _$AtprotoSessionImpl(
+      accessToken: json['accessToken'] as String,
+      tokenType: json['tokenType'] as String,
+      expiresAt: DateTime.parse(json['expiresAt'] as String),
+      dpopJwk: JsonWebKey.fromJson(json['dpopJwk'] as Map<String, dynamic>),
+      issuer: json['issuer'] as String,
+      subject: json['subject'] as String,
+    );
+
+Map<String, dynamic> _$$AtprotoSessionImplToJson(
+  _$AtprotoSessionImpl instance,
+) => <String, dynamic>{
+  'accessToken': instance.accessToken,
+  'tokenType': instance.tokenType,
+  'expiresAt': instance.expiresAt.toIso8601String(),
+  'dpopJwk': instance.dpopJwk,
+  'issuer': instance.issuer,
+  'subject': instance.subject,
+};

lib/models/comment.dart

···
-import 'gallery.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
-class Comment {
-  final String uri;
-  final String cid;
-  final Map<String, dynamic> author;
-  final String text;
-  final String? replyTo;
-  final String? createdAt;
-  final GalleryPhoto? focus;
-  final List<Map<String, dynamic>>? facets;
+import 'gallery_photo.dart';
+
+part 'comment.freezed.dart';
+part 'comment.g.dart';
 
-  Comment({
-    required this.uri,
-    required this.cid,
-    required this.author,
-    required this.text,
-    this.replyTo,
-    this.createdAt,
-    this.focus,
-    this.facets,
-  });
+@freezed
+class Comment with _$Comment {
+  const factory Comment({
+    required String uri,
+    required String cid,
+    required Map<String, dynamic> author,
+    required String text,
+    String? replyTo,
+    String? createdAt,
+    GalleryPhoto? focus,
+    List<Map<String, dynamic>>? facets,
+  }) = _Comment;
 
-  factory Comment.fromJson(Map<String, dynamic> json) {
-    final record = json['record'] as Map<String, dynamic>? ?? {};
-    return Comment(
-      uri: json['uri'] ?? '',
-      cid: json['cid'] ?? '',
-      author: json['author'] ?? {},
-      text: json['text'] ?? record['text'] ?? '',
-      replyTo: json['replyTo'] ?? record['replyTo'],
-      createdAt: json['createdAt'] ?? record['createdAt'],
-      focus: json['focus'] != null ? GalleryPhoto.fromJson(json['focus']) : null,
-      facets:
-          (json['facets'] as List?)?.map((f) => Map<String, dynamic>.from(f)).toList() ??
-          (record['facets'] as List?)?.map((f) => Map<String, dynamic>.from(f)).toList(),
-    );
-  }
+  factory Comment.fromJson(Map<String, dynamic> json) => _$CommentFromJson(json);
 }

lib/models/comment.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'comment.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+Comment _$CommentFromJson(Map<String, dynamic> json) {
+  return _Comment.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Comment {
+  String get uri => throw _privateConstructorUsedError;
+  String get cid => throw _privateConstructorUsedError;
+  Map<String, dynamic> get author => throw _privateConstructorUsedError;
+  String get text => throw _privateConstructorUsedError;
+  String? get replyTo => throw _privateConstructorUsedError;
+  String? get createdAt => throw _privateConstructorUsedError;
+  GalleryPhoto? get focus => throw _privateConstructorUsedError;
+  List<Map<String, dynamic>>? get facets => throw _privateConstructorUsedError;
+
+  /// Serializes this Comment to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $CommentCopyWith<Comment> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $CommentCopyWith<$Res> {
+  factory $CommentCopyWith(Comment value, $Res Function(Comment) then) =
+      _$CommentCopyWithImpl<$Res, Comment>;
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    Map<String, dynamic> author,
+    String text,
+    String? replyTo,
+    String? createdAt,
+    GalleryPhoto? focus,
+    List<Map<String, dynamic>>? facets,
+  });
+
+  $GalleryPhotoCopyWith<$Res>? get focus;
+}
+
+/// @nodoc
+class _$CommentCopyWithImpl<$Res, $Val extends Comment>
+    implements $CommentCopyWith<$Res> {
+  _$CommentCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? author = null,
+    Object? text = null,
+    Object? replyTo = freezed,
+    Object? createdAt = freezed,
+    Object? focus = freezed,
+    Object? facets = freezed,
+  }) {
+    return _then(
+      _value.copyWith(
+            uri: null == uri
+                ? _value.uri
+                : uri // ignore: cast_nullable_to_non_nullable
+                      as String,
+            cid: null == cid
+                ? _value.cid
+                : cid // ignore: cast_nullable_to_non_nullable
+                      as String,
+            author: null == author
+                ? _value.author
+                : author // ignore: cast_nullable_to_non_nullable
+                      as Map<String, dynamic>,
+            text: null == text
+                ? _value.text
+                : text // ignore: cast_nullable_to_non_nullable
+                      as String,
+            replyTo: freezed == replyTo
+                ? _value.replyTo
+                : replyTo // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            createdAt: freezed == createdAt
+                ? _value.createdAt
+                : createdAt // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            focus: freezed == focus
+                ? _value.focus
+                : focus // ignore: cast_nullable_to_non_nullable
+                      as GalleryPhoto?,
+            facets: freezed == facets
+                ? _value.facets
+                : facets // ignore: cast_nullable_to_non_nullable
+                      as List<Map<String, dynamic>>?,
+          )
+          as $Val,
+    );
+  }
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $GalleryPhotoCopyWith<$Res>? get focus {
+    if (_value.focus == null) {
+      return null;
+    }
+
+    return $GalleryPhotoCopyWith<$Res>(_value.focus!, (value) {
+      return _then(_value.copyWith(focus: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$CommentImplCopyWith<$Res> implements $CommentCopyWith<$Res> {
+  factory _$$CommentImplCopyWith(
+    _$CommentImpl value,
+    $Res Function(_$CommentImpl) then,
+  ) = __$$CommentImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    Map<String, dynamic> author,
+    String text,
+    String? replyTo,
+    String? createdAt,
+    GalleryPhoto? focus,
+    List<Map<String, dynamic>>? facets,
+  });
+
+  @override
+  $GalleryPhotoCopyWith<$Res>? get focus;
+}
+
+/// @nodoc
+class __$$CommentImplCopyWithImpl<$Res>
+    extends _$CommentCopyWithImpl<$Res, _$CommentImpl>
+    implements _$$CommentImplCopyWith<$Res> {
+  __$$CommentImplCopyWithImpl(
+    _$CommentImpl _value,
+    $Res Function(_$CommentImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? author = null,
+    Object? text = null,
+    Object? replyTo = freezed,
+    Object? createdAt = freezed,
+    Object? focus = freezed,
+    Object? facets = freezed,
+  }) {
+    return _then(
+      _$CommentImpl(
+        uri: null == uri
+            ? _value.uri
+            : uri // ignore: cast_nullable_to_non_nullable
+                  as String,
+        cid: null == cid
+            ? _value.cid
+            : cid // ignore: cast_nullable_to_non_nullable
+                  as String,
+        author: null == author
+            ? _value._author
+            : author // ignore: cast_nullable_to_non_nullable
+                  as Map<String, dynamic>,
+        text: null == text
+            ? _value.text
+            : text // ignore: cast_nullable_to_non_nullable
+                  as String,
+        replyTo: freezed == replyTo
+            ? _value.replyTo
+            : replyTo // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        createdAt: freezed == createdAt
+            ? _value.createdAt
+            : createdAt // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        focus: freezed == focus
+            ? _value.focus
+            : focus // ignore: cast_nullable_to_non_nullable
+                  as GalleryPhoto?,
+        facets: freezed == facets
+            ? _value._facets
+            : facets // ignore: cast_nullable_to_non_nullable
+                  as List<Map<String, dynamic>>?,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$CommentImpl implements _Comment {
+  const _$CommentImpl({
+    required this.uri,
+    required this.cid,
+    required final Map<String, dynamic> author,
+    required this.text,
+    this.replyTo,
+    this.createdAt,
+    this.focus,
+    final List<Map<String, dynamic>>? facets,
+  }) : _author = author,
+       _facets = facets;
+
+  factory _$CommentImpl.fromJson(Map<String, dynamic> json) =>
+      _$$CommentImplFromJson(json);
+
+  @override
+  final String uri;
+  @override
+  final String cid;
+  final Map<String, dynamic> _author;
+  @override
+  Map<String, dynamic> get author {
+    if (_author is EqualUnmodifiableMapView) return _author;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_author);
+  }
+
+  @override
+  final String text;
+  @override
+  final String? replyTo;
+  @override
+  final String? createdAt;
+  @override
+  final GalleryPhoto? focus;
+  final List<Map<String, dynamic>>? _facets;
+  @override
+  List<Map<String, dynamic>>? get facets {
+    final value = _facets;
+    if (value == null) return null;
+    if (_facets is EqualUnmodifiableListView) return _facets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
+  @override
+  String toString() {
+    return 'Comment(uri: $uri, cid: $cid, author: $author, text: $text, replyTo: $replyTo, createdAt: $createdAt, focus: $focus, facets: $facets)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$CommentImpl &&
+            (identical(other.uri, uri) || other.uri == uri) &&
+            (identical(other.cid, cid) || other.cid == cid) &&
+            const DeepCollectionEquality().equals(other._author, _author) &&
+            (identical(other.text, text) || other.text == text) &&
+            (identical(other.replyTo, replyTo) || other.replyTo == replyTo) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.focus, focus) || other.focus == focus) &&
+            const DeepCollectionEquality().equals(other._facets, _facets));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    uri,
+    cid,
+    const DeepCollectionEquality().hash(_author),
+    text,
+    replyTo,
+    createdAt,
+    focus,
+    const DeepCollectionEquality().hash(_facets),
+  );
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$CommentImplCopyWith<_$CommentImpl> get copyWith =>
+      __$$CommentImplCopyWithImpl<_$CommentImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$CommentImplToJson(this);
+  }
+}
+
+abstract class _Comment implements Comment {
+  const factory _Comment({
+    required final String uri,
+    required final String cid,
+    required final Map<String, dynamic> author,
+    required final String text,
+    final String? replyTo,
+    final String? createdAt,
+    final GalleryPhoto? focus,
+    final List<Map<String, dynamic>>? facets,
+  }) = _$CommentImpl;
+
+  factory _Comment.fromJson(Map<String, dynamic> json) = _$CommentImpl.fromJson;
+
+  @override
+  String get uri;
+  @override
+  String get cid;
+  @override
+  Map<String, dynamic> get author;
+  @override
+  String get text;
+  @override
+  String? get replyTo;
+  @override
+  String? get createdAt;
+  @override
+  GalleryPhoto? get focus;
+  @override
+  List<Map<String, dynamic>>? get facets;
+
+  /// Create a copy of Comment
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$CommentImplCopyWith<_$CommentImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/comment.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'comment.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$CommentImpl _$$CommentImplFromJson(Map<String, dynamic> json) =>
+    _$CommentImpl(
+      uri: json['uri'] as String,
+      cid: json['cid'] as String,
+      author: json['author'] as Map<String, dynamic>,
+      text: json['text'] as String,
+      replyTo: json['replyTo'] as String?,
+      createdAt: json['createdAt'] as String?,
+      focus: json['focus'] == null
+          ? null
+          : GalleryPhoto.fromJson(json['focus'] as Map<String, dynamic>),
+      facets: (json['facets'] as List<dynamic>?)
+          ?.map((e) => e as Map<String, dynamic>)
+          .toList(),
+    );
+
+Map<String, dynamic> _$$CommentImplToJson(_$CommentImpl instance) =>
+    <String, dynamic>{
+      'uri': instance.uri,
+      'cid': instance.cid,
+      'author': instance.author,
+      'text': instance.text,
+      'replyTo': instance.replyTo,
+      'createdAt': instance.createdAt,
+      'focus': instance.focus,
+      'facets': instance.facets,
+    };

lib/models/gallery.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import 'gallery_photo.dart';
+import 'gallery_viewer.dart';
 import 'profile.dart';
 
-class Gallery {
-  final String uri;
-  final String cid;
-  final String title;
-  final String description;
-  final List<GalleryPhoto> items;
-  final Profile? creator;
-  final String? createdAt;
-  final int? favCount;
-  final int? commentCount;
-  final Map<String, dynamic>? viewer;
-  final List<Map<String, dynamic>>? facets;
+part 'gallery.freezed.dart';
+part 'gallery.g.dart';
 
-  Gallery({
-    required this.uri,
-    required this.cid,
-    required this.title,
-    required this.description,
-    required this.items,
-    this.creator,
-    this.createdAt,
-    this.favCount,
-    this.commentCount,
-    this.viewer,
-    this.facets,
-  });
+@freezed
+class Gallery with _$Gallery {
+  const factory Gallery({
+    required String uri,
+    required String cid,
+    String? title,
+    String? description,
+    required List<GalleryPhoto> items,
+    Profile? creator,
+    String? createdAt,
+    int? favCount,
+    int? commentCount,
+    GalleryViewer? viewer,
+    List<Map<String, dynamic>>? facets,
+  }) = _Gallery;
 
-  factory Gallery.fromJson(Map<String, dynamic> json) {
-    final record = json['record'] as Map<String, dynamic>? ?? {};
-    return Gallery(
-      uri: json['uri'] ?? '',
-      cid: json['cid'] ?? '',
-      title: record['title'] ?? '',
-      description: record['description'] ?? '',
-      items: (json['items'] as List<dynamic>? ?? [])
-          .map((item) => GalleryPhoto.fromJson(item as Map<String, dynamic>))
-          .toList(),
-      creator: json['creator'] != null ? Profile.fromJson(json['creator']) : null,
-      createdAt: json['createdAt'],
-      favCount: json['favCount'],
-      commentCount: json['commentCount'],
-      viewer: json['viewer'],
-      facets: (record['facets'] as List?)?.map((f) => Map<String, dynamic>.from(f)).toList(),
-    );
-  }
-}
-
-class GalleryPhoto {
-  final String uri;
-  final String cid;
-  final String thumb;
-  final String fullsize;
-  final String alt;
-  final int width;
-  final int height;
-
-  GalleryPhoto({
-    required this.uri,
-    required this.cid,
-    required this.thumb,
-    required this.fullsize,
-    required this.alt,
-    required this.width,
-    required this.height,
-  });
-
-  factory GalleryPhoto.fromJson(Map<String, dynamic> json) {
-    return GalleryPhoto(
-      uri: json['uri'] ?? '',
-      cid: json['cid'] ?? '',
-      thumb: json['thumb'] ?? '',
-      fullsize: json['fullsize'] ?? '',
-      alt: json['alt'] ?? '',
-      width: json['aspectRatio']?['width'] ?? 0,
-      height: json['aspectRatio']?['height'] ?? 0,
-    );
-  }
+  factory Gallery.fromJson(Map<String, dynamic> json) => _$GalleryFromJson(json);
 }

lib/models/gallery.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'gallery.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+Gallery _$GalleryFromJson(Map<String, dynamic> json) {
+  return _Gallery.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Gallery {
+  String get uri => throw _privateConstructorUsedError;
+  String get cid => throw _privateConstructorUsedError;
+  String? get title => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  List<GalleryPhoto> get items => throw _privateConstructorUsedError;
+  Profile? get creator => throw _privateConstructorUsedError;
+  String? get createdAt => throw _privateConstructorUsedError;
+  int? get favCount => throw _privateConstructorUsedError;
+  int? get commentCount => throw _privateConstructorUsedError;
+  GalleryViewer? get viewer => throw _privateConstructorUsedError;
+  List<Map<String, dynamic>>? get facets => throw _privateConstructorUsedError;
+
+  /// Serializes this Gallery to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $GalleryCopyWith<Gallery> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $GalleryCopyWith<$Res> {
+  factory $GalleryCopyWith(Gallery value, $Res Function(Gallery) then) =
+      _$GalleryCopyWithImpl<$Res, Gallery>;
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    String? title,
+    String? description,
+    List<GalleryPhoto> items,
+    Profile? creator,
+    String? createdAt,
+    int? favCount,
+    int? commentCount,
+    GalleryViewer? viewer,
+    List<Map<String, dynamic>>? facets,
+  });
+
+  $ProfileCopyWith<$Res>? get creator;
+  $GalleryViewerCopyWith<$Res>? get viewer;
+}
+
+/// @nodoc
+class _$GalleryCopyWithImpl<$Res, $Val extends Gallery>
+    implements $GalleryCopyWith<$Res> {
+  _$GalleryCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? title = freezed,
+    Object? description = freezed,
+    Object? items = null,
+    Object? creator = freezed,
+    Object? createdAt = freezed,
+    Object? favCount = freezed,
+    Object? commentCount = freezed,
+    Object? viewer = freezed,
+    Object? facets = freezed,
+  }) {
+    return _then(
+      _value.copyWith(
+            uri: null == uri
+                ? _value.uri
+                : uri // ignore: cast_nullable_to_non_nullable
+                      as String,
+            cid: null == cid
+                ? _value.cid
+                : cid // ignore: cast_nullable_to_non_nullable
+                      as String,
+            title: freezed == title
+                ? _value.title
+                : title // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            description: freezed == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            items: null == items
+                ? _value.items
+                : items // ignore: cast_nullable_to_non_nullable
+                      as List<GalleryPhoto>,
+            creator: freezed == creator
+                ? _value.creator
+                : creator // ignore: cast_nullable_to_non_nullable
+                      as Profile?,
+            createdAt: freezed == createdAt
+                ? _value.createdAt
+                : createdAt // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            favCount: freezed == favCount
+                ? _value.favCount
+                : favCount // ignore: cast_nullable_to_non_nullable
+                      as int?,
+            commentCount: freezed == commentCount
+                ? _value.commentCount
+                : commentCount // ignore: cast_nullable_to_non_nullable
+                      as int?,
+            viewer: freezed == viewer
+                ? _value.viewer
+                : viewer // ignore: cast_nullable_to_non_nullable
+                      as GalleryViewer?,
+            facets: freezed == facets
+                ? _value.facets
+                : facets // ignore: cast_nullable_to_non_nullable
+                      as List<Map<String, dynamic>>?,
+          )
+          as $Val,
+    );
+  }
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $ProfileCopyWith<$Res>? get creator {
+    if (_value.creator == null) {
+      return null;
+    }
+
+    return $ProfileCopyWith<$Res>(_value.creator!, (value) {
+      return _then(_value.copyWith(creator: value) as $Val);
+    });
+  }
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $GalleryViewerCopyWith<$Res>? get viewer {
+    if (_value.viewer == null) {
+      return null;
+    }
+
+    return $GalleryViewerCopyWith<$Res>(_value.viewer!, (value) {
+      return _then(_value.copyWith(viewer: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$GalleryImplCopyWith<$Res> implements $GalleryCopyWith<$Res> {
+  factory _$$GalleryImplCopyWith(
+    _$GalleryImpl value,
+    $Res Function(_$GalleryImpl) then,
+  ) = __$$GalleryImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    String? title,
+    String? description,
+    List<GalleryPhoto> items,
+    Profile? creator,
+    String? createdAt,
+    int? favCount,
+    int? commentCount,
+    GalleryViewer? viewer,
+    List<Map<String, dynamic>>? facets,
+  });
+
+  @override
+  $ProfileCopyWith<$Res>? get creator;
+  @override
+  $GalleryViewerCopyWith<$Res>? get viewer;
+}
+
+/// @nodoc
+class __$$GalleryImplCopyWithImpl<$Res>
+    extends _$GalleryCopyWithImpl<$Res, _$GalleryImpl>
+    implements _$$GalleryImplCopyWith<$Res> {
+  __$$GalleryImplCopyWithImpl(
+    _$GalleryImpl _value,
+    $Res Function(_$GalleryImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? title = freezed,
+    Object? description = freezed,
+    Object? items = null,
+    Object? creator = freezed,
+    Object? createdAt = freezed,
+    Object? favCount = freezed,
+    Object? commentCount = freezed,
+    Object? viewer = freezed,
+    Object? facets = freezed,
+  }) {
+    return _then(
+      _$GalleryImpl(
+        uri: null == uri
+            ? _value.uri
+            : uri // ignore: cast_nullable_to_non_nullable
+                  as String,
+        cid: null == cid
+            ? _value.cid
+            : cid // ignore: cast_nullable_to_non_nullable
+                  as String,
+        title: freezed == title
+            ? _value.title
+            : title // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        description: freezed == description
+            ? _value.description
+            : description // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        items: null == items
+            ? _value._items
+            : items // ignore: cast_nullable_to_non_nullable
+                  as List<GalleryPhoto>,
+        creator: freezed == creator
+            ? _value.creator
+            : creator // ignore: cast_nullable_to_non_nullable
+                  as Profile?,
+        createdAt: freezed == createdAt
+            ? _value.createdAt
+            : createdAt // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        favCount: freezed == favCount
+            ? _value.favCount
+            : favCount // ignore: cast_nullable_to_non_nullable
+                  as int?,
+        commentCount: freezed == commentCount
+            ? _value.commentCount
+            : commentCount // ignore: cast_nullable_to_non_nullable
+                  as int?,
+        viewer: freezed == viewer
+            ? _value.viewer
+            : viewer // ignore: cast_nullable_to_non_nullable
+                  as GalleryViewer?,
+        facets: freezed == facets
+            ? _value._facets
+            : facets // ignore: cast_nullable_to_non_nullable
+                  as List<Map<String, dynamic>>?,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$GalleryImpl implements _Gallery {
+  const _$GalleryImpl({
+    required this.uri,
+    required this.cid,
+    this.title,
+    this.description,
+    required final List<GalleryPhoto> items,
+    this.creator,
+    this.createdAt,
+    this.favCount,
+    this.commentCount,
+    this.viewer,
+    final List<Map<String, dynamic>>? facets,
+  }) : _items = items,
+       _facets = facets;
+
+  factory _$GalleryImpl.fromJson(Map<String, dynamic> json) =>
+      _$$GalleryImplFromJson(json);
+
+  @override
+  final String uri;
+  @override
+  final String cid;
+  @override
+  final String? title;
+  @override
+  final String? description;
+  final List<GalleryPhoto> _items;
+  @override
+  List<GalleryPhoto> get items {
+    if (_items is EqualUnmodifiableListView) return _items;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_items);
+  }
+
+  @override
+  final Profile? creator;
+  @override
+  final String? createdAt;
+  @override
+  final int? favCount;
+  @override
+  final int? commentCount;
+  @override
+  final GalleryViewer? viewer;
+  final List<Map<String, dynamic>>? _facets;
+  @override
+  List<Map<String, dynamic>>? get facets {
+    final value = _facets;
+    if (value == null) return null;
+    if (_facets is EqualUnmodifiableListView) return _facets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
+  @override
+  String toString() {
+    return 'Gallery(uri: $uri, cid: $cid, title: $title, description: $description, items: $items, creator: $creator, createdAt: $createdAt, favCount: $favCount, commentCount: $commentCount, viewer: $viewer, facets: $facets)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$GalleryImpl &&
+            (identical(other.uri, uri) || other.uri == uri) &&
+            (identical(other.cid, cid) || other.cid == cid) &&
+            (identical(other.title, title) || other.title == title) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            const DeepCollectionEquality().equals(other._items, _items) &&
+            (identical(other.creator, creator) || other.creator == creator) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.favCount, favCount) ||
+                other.favCount == favCount) &&
+            (identical(other.commentCount, commentCount) ||
+                other.commentCount == commentCount) &&
+            (identical(other.viewer, viewer) || other.viewer == viewer) &&
+            const DeepCollectionEquality().equals(other._facets, _facets));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    uri,
+    cid,
+    title,
+    description,
+    const DeepCollectionEquality().hash(_items),
+    creator,
+    createdAt,
+    favCount,
+    commentCount,
+    viewer,
+    const DeepCollectionEquality().hash(_facets),
+  );
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$GalleryImplCopyWith<_$GalleryImpl> get copyWith =>
+      __$$GalleryImplCopyWithImpl<_$GalleryImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$GalleryImplToJson(this);
+  }
+}
+
+abstract class _Gallery implements Gallery {
+  const factory _Gallery({
+    required final String uri,
+    required final String cid,
+    final String? title,
+    final String? description,
+    required final List<GalleryPhoto> items,
+    final Profile? creator,
+    final String? createdAt,
+    final int? favCount,
+    final int? commentCount,
+    final GalleryViewer? viewer,
+    final List<Map<String, dynamic>>? facets,
+  }) = _$GalleryImpl;
+
+  factory _Gallery.fromJson(Map<String, dynamic> json) = _$GalleryImpl.fromJson;
+
+  @override
+  String get uri;
+  @override
+  String get cid;
+  @override
+  String? get title;
+  @override
+  String? get description;
+  @override
+  List<GalleryPhoto> get items;
+  @override
+  Profile? get creator;
+  @override
+  String? get createdAt;
+  @override
+  int? get favCount;
+  @override
+  int? get commentCount;
+  @override
+  GalleryViewer? get viewer;
+  @override
+  List<Map<String, dynamic>>? get facets;
+
+  /// Create a copy of Gallery
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$GalleryImplCopyWith<_$GalleryImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/gallery.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'gallery.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$GalleryImpl _$$GalleryImplFromJson(Map<String, dynamic> json) =>
+    _$GalleryImpl(
+      uri: json['uri'] as String,
+      cid: json['cid'] as String,
+      title: json['title'] as String?,
+      description: json['description'] as String?,
+      items: (json['items'] as List<dynamic>)
+          .map((e) => GalleryPhoto.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      creator: json['creator'] == null
+          ? null
+          : Profile.fromJson(json['creator'] as Map<String, dynamic>),
+      createdAt: json['createdAt'] as String?,
+      favCount: (json['favCount'] as num?)?.toInt(),
+      commentCount: (json['commentCount'] as num?)?.toInt(),
+      viewer: json['viewer'] == null
+          ? null
+          : GalleryViewer.fromJson(json['viewer'] as Map<String, dynamic>),
+      facets: (json['facets'] as List<dynamic>?)
+          ?.map((e) => e as Map<String, dynamic>)
+          .toList(),
+    );
+
+Map<String, dynamic> _$$GalleryImplToJson(_$GalleryImpl instance) =>
+    <String, dynamic>{
+      'uri': instance.uri,
+      'cid': instance.cid,
+      'title': instance.title,
+      'description': instance.description,
+      'items': instance.items,
+      'creator': instance.creator,
+      'createdAt': instance.createdAt,
+      'favCount': instance.favCount,
+      'commentCount': instance.commentCount,
+      'viewer': instance.viewer,
+      'facets': instance.facets,
+    };

lib/models/gallery_photo.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import 'aspect_ratio.dart';
+
+part 'gallery_photo.freezed.dart';
+part 'gallery_photo.g.dart';
+
+@freezed
+class GalleryPhoto with _$GalleryPhoto {
+  const factory GalleryPhoto({
+    String? uri,
+    String? cid,
+    String? thumb,
+    String? fullsize,
+    String? alt,
+    AspectRatio? aspectRatio,
+  }) = _GalleryPhoto;
+
+  factory GalleryPhoto.fromJson(Map<String, dynamic> json) => _$GalleryPhotoFromJson(json);
+}

lib/models/gallery_photo.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'gallery_photo.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+GalleryPhoto _$GalleryPhotoFromJson(Map<String, dynamic> json) {
+  return _GalleryPhoto.fromJson(json);
+}
+
+/// @nodoc
+mixin _$GalleryPhoto {
+  String? get uri => throw _privateConstructorUsedError;
+  String? get cid => throw _privateConstructorUsedError;
+  String? get thumb => throw _privateConstructorUsedError;
+  String? get fullsize => throw _privateConstructorUsedError;
+  String? get alt => throw _privateConstructorUsedError;
+  AspectRatio? get aspectRatio => throw _privateConstructorUsedError;
+
+  /// Serializes this GalleryPhoto to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $GalleryPhotoCopyWith<GalleryPhoto> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $GalleryPhotoCopyWith<$Res> {
+  factory $GalleryPhotoCopyWith(
+    GalleryPhoto value,
+    $Res Function(GalleryPhoto) then,
+  ) = _$GalleryPhotoCopyWithImpl<$Res, GalleryPhoto>;
+  @useResult
+  $Res call({
+    String? uri,
+    String? cid,
+    String? thumb,
+    String? fullsize,
+    String? alt,
+    AspectRatio? aspectRatio,
+  });
+
+  $AspectRatioCopyWith<$Res>? get aspectRatio;
+}
+
+/// @nodoc
+class _$GalleryPhotoCopyWithImpl<$Res, $Val extends GalleryPhoto>
+    implements $GalleryPhotoCopyWith<$Res> {
+  _$GalleryPhotoCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = freezed,
+    Object? cid = freezed,
+    Object? thumb = freezed,
+    Object? fullsize = freezed,
+    Object? alt = freezed,
+    Object? aspectRatio = freezed,
+  }) {
+    return _then(
+      _value.copyWith(
+            uri: freezed == uri
+                ? _value.uri
+                : uri // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            cid: freezed == cid
+                ? _value.cid
+                : cid // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            thumb: freezed == thumb
+                ? _value.thumb
+                : thumb // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            fullsize: freezed == fullsize
+                ? _value.fullsize
+                : fullsize // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            alt: freezed == alt
+                ? _value.alt
+                : alt // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            aspectRatio: freezed == aspectRatio
+                ? _value.aspectRatio
+                : aspectRatio // ignore: cast_nullable_to_non_nullable
+                      as AspectRatio?,
+          )
+          as $Val,
+    );
+  }
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $AspectRatioCopyWith<$Res>? get aspectRatio {
+    if (_value.aspectRatio == null) {
+      return null;
+    }
+
+    return $AspectRatioCopyWith<$Res>(_value.aspectRatio!, (value) {
+      return _then(_value.copyWith(aspectRatio: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$GalleryPhotoImplCopyWith<$Res>
+    implements $GalleryPhotoCopyWith<$Res> {
+  factory _$$GalleryPhotoImplCopyWith(
+    _$GalleryPhotoImpl value,
+    $Res Function(_$GalleryPhotoImpl) then,
+  ) = __$$GalleryPhotoImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String? uri,
+    String? cid,
+    String? thumb,
+    String? fullsize,
+    String? alt,
+    AspectRatio? aspectRatio,
+  });
+
+  @override
+  $AspectRatioCopyWith<$Res>? get aspectRatio;
+}
+
+/// @nodoc
+class __$$GalleryPhotoImplCopyWithImpl<$Res>
+    extends _$GalleryPhotoCopyWithImpl<$Res, _$GalleryPhotoImpl>
+    implements _$$GalleryPhotoImplCopyWith<$Res> {
+  __$$GalleryPhotoImplCopyWithImpl(
+    _$GalleryPhotoImpl _value,
+    $Res Function(_$GalleryPhotoImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = freezed,
+    Object? cid = freezed,
+    Object? thumb = freezed,
+    Object? fullsize = freezed,
+    Object? alt = freezed,
+    Object? aspectRatio = freezed,
+  }) {
+    return _then(
+      _$GalleryPhotoImpl(
+        uri: freezed == uri
+            ? _value.uri
+            : uri // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        cid: freezed == cid
+            ? _value.cid
+            : cid // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        thumb: freezed == thumb
+            ? _value.thumb
+            : thumb // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        fullsize: freezed == fullsize
+            ? _value.fullsize
+            : fullsize // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        alt: freezed == alt
+            ? _value.alt
+            : alt // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        aspectRatio: freezed == aspectRatio
+            ? _value.aspectRatio
+            : aspectRatio // ignore: cast_nullable_to_non_nullable
+                  as AspectRatio?,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$GalleryPhotoImpl implements _GalleryPhoto {
+  const _$GalleryPhotoImpl({
+    this.uri,
+    this.cid,
+    this.thumb,
+    this.fullsize,
+    this.alt,
+    this.aspectRatio,
+  });
+
+  factory _$GalleryPhotoImpl.fromJson(Map<String, dynamic> json) =>
+      _$$GalleryPhotoImplFromJson(json);
+
+  @override
+  final String? uri;
+  @override
+  final String? cid;
+  @override
+  final String? thumb;
+  @override
+  final String? fullsize;
+  @override
+  final String? alt;
+  @override
+  final AspectRatio? aspectRatio;
+
+  @override
+  String toString() {
+    return 'GalleryPhoto(uri: $uri, cid: $cid, thumb: $thumb, fullsize: $fullsize, alt: $alt, aspectRatio: $aspectRatio)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$GalleryPhotoImpl &&
+            (identical(other.uri, uri) || other.uri == uri) &&
+            (identical(other.cid, cid) || other.cid == cid) &&
+            (identical(other.thumb, thumb) || other.thumb == thumb) &&
+            (identical(other.fullsize, fullsize) ||
+                other.fullsize == fullsize) &&
+            (identical(other.alt, alt) || other.alt == alt) &&
+            (identical(other.aspectRatio, aspectRatio) ||
+                other.aspectRatio == aspectRatio));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, uri, cid, thumb, fullsize, alt, aspectRatio);
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$GalleryPhotoImplCopyWith<_$GalleryPhotoImpl> get copyWith =>
+      __$$GalleryPhotoImplCopyWithImpl<_$GalleryPhotoImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$GalleryPhotoImplToJson(this);
+  }
+}
+
+abstract class _GalleryPhoto implements GalleryPhoto {
+  const factory _GalleryPhoto({
+    final String? uri,
+    final String? cid,
+    final String? thumb,
+    final String? fullsize,
+    final String? alt,
+    final AspectRatio? aspectRatio,
+  }) = _$GalleryPhotoImpl;
+
+  factory _GalleryPhoto.fromJson(Map<String, dynamic> json) =
+      _$GalleryPhotoImpl.fromJson;
+
+  @override
+  String? get uri;
+  @override
+  String? get cid;
+  @override
+  String? get thumb;
+  @override
+  String? get fullsize;
+  @override
+  String? get alt;
+  @override
+  AspectRatio? get aspectRatio;
+
+  /// Create a copy of GalleryPhoto
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$GalleryPhotoImplCopyWith<_$GalleryPhotoImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/gallery_photo.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'gallery_photo.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$GalleryPhotoImpl _$$GalleryPhotoImplFromJson(Map<String, dynamic> json) =>
+    _$GalleryPhotoImpl(
+      uri: json['uri'] as String?,
+      cid: json['cid'] as String?,
+      thumb: json['thumb'] as String?,
+      fullsize: json['fullsize'] as String?,
+      alt: json['alt'] as String?,
+      aspectRatio: json['aspectRatio'] == null
+          ? null
+          : AspectRatio.fromJson(json['aspectRatio'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$$GalleryPhotoImplToJson(_$GalleryPhotoImpl instance) =>
+    <String, dynamic>{
+      'uri': instance.uri,
+      'cid': instance.cid,
+      'thumb': instance.thumb,
+      'fullsize': instance.fullsize,
+      'alt': instance.alt,
+      'aspectRatio': instance.aspectRatio,
+    };

lib/models/gallery_viewer.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'gallery_viewer.freezed.dart';
+part 'gallery_viewer.g.dart';
+
+@freezed
+class GalleryViewer with _$GalleryViewer {
+  const factory GalleryViewer({String? fav}) = _GalleryViewer;
+
+  factory GalleryViewer.fromJson(Map<String, dynamic> json) => _$GalleryViewerFromJson(json);
+}

lib/models/gallery_viewer.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'gallery_viewer.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+GalleryViewer _$GalleryViewerFromJson(Map<String, dynamic> json) {
+  return _GalleryViewer.fromJson(json);
+}
+
+/// @nodoc
+mixin _$GalleryViewer {
+  String? get fav => throw _privateConstructorUsedError;
+
+  /// Serializes this GalleryViewer to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of GalleryViewer
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $GalleryViewerCopyWith<GalleryViewer> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $GalleryViewerCopyWith<$Res> {
+  factory $GalleryViewerCopyWith(
+    GalleryViewer value,
+    $Res Function(GalleryViewer) then,
+  ) = _$GalleryViewerCopyWithImpl<$Res, GalleryViewer>;
+  @useResult
+  $Res call({String? fav});
+}
+
+/// @nodoc
+class _$GalleryViewerCopyWithImpl<$Res, $Val extends GalleryViewer>
+    implements $GalleryViewerCopyWith<$Res> {
+  _$GalleryViewerCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of GalleryViewer
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? fav = freezed}) {
+    return _then(
+      _value.copyWith(
+            fav: freezed == fav
+                ? _value.fav
+                : fav // ignore: cast_nullable_to_non_nullable
+                      as String?,
+          )
+          as $Val,
+    );
+  }
+}
+
+/// @nodoc
+abstract class _$$GalleryViewerImplCopyWith<$Res>
+    implements $GalleryViewerCopyWith<$Res> {
+  factory _$$GalleryViewerImplCopyWith(
+    _$GalleryViewerImpl value,
+    $Res Function(_$GalleryViewerImpl) then,
+  ) = __$$GalleryViewerImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String? fav});
+}
+
+/// @nodoc
+class __$$GalleryViewerImplCopyWithImpl<$Res>
+    extends _$GalleryViewerCopyWithImpl<$Res, _$GalleryViewerImpl>
+    implements _$$GalleryViewerImplCopyWith<$Res> {
+  __$$GalleryViewerImplCopyWithImpl(
+    _$GalleryViewerImpl _value,
+    $Res Function(_$GalleryViewerImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of GalleryViewer
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? fav = freezed}) {
+    return _then(
+      _$GalleryViewerImpl(
+        fav: freezed == fav
+            ? _value.fav
+            : fav // ignore: cast_nullable_to_non_nullable
+                  as String?,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$GalleryViewerImpl implements _GalleryViewer {
+  const _$GalleryViewerImpl({this.fav});
+
+  factory _$GalleryViewerImpl.fromJson(Map<String, dynamic> json) =>
+      _$$GalleryViewerImplFromJson(json);
+
+  @override
+  final String? fav;
+
+  @override
+  String toString() {
+    return 'GalleryViewer(fav: $fav)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$GalleryViewerImpl &&
+            (identical(other.fav, fav) || other.fav == fav));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, fav);
+
+  /// Create a copy of GalleryViewer
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$GalleryViewerImplCopyWith<_$GalleryViewerImpl> get copyWith =>
+      __$$GalleryViewerImplCopyWithImpl<_$GalleryViewerImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$GalleryViewerImplToJson(this);
+  }
+}
+
+abstract class _GalleryViewer implements GalleryViewer {
+  const factory _GalleryViewer({final String? fav}) = _$GalleryViewerImpl;
+
+  factory _GalleryViewer.fromJson(Map<String, dynamic> json) =
+      _$GalleryViewerImpl.fromJson;
+
+  @override
+  String? get fav;
+
+  /// Create a copy of GalleryViewer
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$GalleryViewerImplCopyWith<_$GalleryViewerImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/gallery_viewer.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'gallery_viewer.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$GalleryViewerImpl _$$GalleryViewerImplFromJson(Map<String, dynamic> json) =>
+    _$GalleryViewerImpl(fav: json['fav'] as String?);
+
+Map<String, dynamic> _$$GalleryViewerImplToJson(_$GalleryViewerImpl instance) =>
+    <String, dynamic>{'fav': instance.fav};

lib/models/notification.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
 import 'profile.dart';
 
-class Notification {
-  final String uri;
-  final String cid;
-  final Profile author;
-  final Map<String, dynamic> record;
-  final String reason;
-  final String? reasonSubject;
-  final bool isRead;
-  final String indexedAt;
+part 'notification.freezed.dart';
+part 'notification.g.dart';
 
-  Notification({
-    required this.uri,
-    required this.cid,
-    required this.author,
-    required this.record,
-    required this.reason,
-    this.reasonSubject,
-    required this.isRead,
-    required this.indexedAt,
-  });
+@freezed
+class Notification with _$Notification {
+  const factory Notification({
+    required String uri,
+    required String cid,
+    required Profile author,
+    required Map<String, dynamic> record,
+    required String reason,
+    String? reasonSubject,
+    required bool isRead,
+    required String indexedAt,
+  }) = _Notification;
 
-  factory Notification.fromJson(Map<String, dynamic> json) {
-    return Notification(
-      uri: json['uri'] as String,
-      cid: json['cid'] as String,
-      author: Profile.fromJson(json['author'] as Map<String, dynamic>),
-      record: json['record'] as Map<String, dynamic>,
-      reason: json['reason'] as String,
-      reasonSubject: json['reasonSubject'] as String?,
-      isRead: json['isRead'] as bool? ?? false,
-      indexedAt: json['indexedAt'] as String,
-    );
-  }
+  factory Notification.fromJson(Map<String, dynamic> json) => _$NotificationFromJson(json);
 }

lib/models/notification.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'notification.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+Notification _$NotificationFromJson(Map<String, dynamic> json) {
+  return _Notification.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Notification {
+  String get uri => throw _privateConstructorUsedError;
+  String get cid => throw _privateConstructorUsedError;
+  Profile get author => throw _privateConstructorUsedError;
+  Map<String, dynamic> get record => throw _privateConstructorUsedError;
+  String get reason => throw _privateConstructorUsedError;
+  String? get reasonSubject => throw _privateConstructorUsedError;
+  bool get isRead => throw _privateConstructorUsedError;
+  String get indexedAt => throw _privateConstructorUsedError;
+
+  /// Serializes this Notification to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $NotificationCopyWith<Notification> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $NotificationCopyWith<$Res> {
+  factory $NotificationCopyWith(
+    Notification value,
+    $Res Function(Notification) then,
+  ) = _$NotificationCopyWithImpl<$Res, Notification>;
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    Profile author,
+    Map<String, dynamic> record,
+    String reason,
+    String? reasonSubject,
+    bool isRead,
+    String indexedAt,
+  });
+
+  $ProfileCopyWith<$Res> get author;
+}
+
+/// @nodoc
+class _$NotificationCopyWithImpl<$Res, $Val extends Notification>
+    implements $NotificationCopyWith<$Res> {
+  _$NotificationCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? author = null,
+    Object? record = null,
+    Object? reason = null,
+    Object? reasonSubject = freezed,
+    Object? isRead = null,
+    Object? indexedAt = null,
+  }) {
+    return _then(
+      _value.copyWith(
+            uri: null == uri
+                ? _value.uri
+                : uri // ignore: cast_nullable_to_non_nullable
+                      as String,
+            cid: null == cid
+                ? _value.cid
+                : cid // ignore: cast_nullable_to_non_nullable
+                      as String,
+            author: null == author
+                ? _value.author
+                : author // ignore: cast_nullable_to_non_nullable
+                      as Profile,
+            record: null == record
+                ? _value.record
+                : record // ignore: cast_nullable_to_non_nullable
+                      as Map<String, dynamic>,
+            reason: null == reason
+                ? _value.reason
+                : reason // ignore: cast_nullable_to_non_nullable
+                      as String,
+            reasonSubject: freezed == reasonSubject
+                ? _value.reasonSubject
+                : reasonSubject // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            isRead: null == isRead
+                ? _value.isRead
+                : isRead // ignore: cast_nullable_to_non_nullable
+                      as bool,
+            indexedAt: null == indexedAt
+                ? _value.indexedAt
+                : indexedAt // ignore: cast_nullable_to_non_nullable
+                      as String,
+          )
+          as $Val,
+    );
+  }
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $ProfileCopyWith<$Res> get author {
+    return $ProfileCopyWith<$Res>(_value.author, (value) {
+      return _then(_value.copyWith(author: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$NotificationImplCopyWith<$Res>
+    implements $NotificationCopyWith<$Res> {
+  factory _$$NotificationImplCopyWith(
+    _$NotificationImpl value,
+    $Res Function(_$NotificationImpl) then,
+  ) = __$$NotificationImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String uri,
+    String cid,
+    Profile author,
+    Map<String, dynamic> record,
+    String reason,
+    String? reasonSubject,
+    bool isRead,
+    String indexedAt,
+  });
+
+  @override
+  $ProfileCopyWith<$Res> get author;
+}
+
+/// @nodoc
+class __$$NotificationImplCopyWithImpl<$Res>
+    extends _$NotificationCopyWithImpl<$Res, _$NotificationImpl>
+    implements _$$NotificationImplCopyWith<$Res> {
+  __$$NotificationImplCopyWithImpl(
+    _$NotificationImpl _value,
+    $Res Function(_$NotificationImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uri = null,
+    Object? cid = null,
+    Object? author = null,
+    Object? record = null,
+    Object? reason = null,
+    Object? reasonSubject = freezed,
+    Object? isRead = null,
+    Object? indexedAt = null,
+  }) {
+    return _then(
+      _$NotificationImpl(
+        uri: null == uri
+            ? _value.uri
+            : uri // ignore: cast_nullable_to_non_nullable
+                  as String,
+        cid: null == cid
+            ? _value.cid
+            : cid // ignore: cast_nullable_to_non_nullable
+                  as String,
+        author: null == author
+            ? _value.author
+            : author // ignore: cast_nullable_to_non_nullable
+                  as Profile,
+        record: null == record
+            ? _value._record
+            : record // ignore: cast_nullable_to_non_nullable
+                  as Map<String, dynamic>,
+        reason: null == reason
+            ? _value.reason
+            : reason // ignore: cast_nullable_to_non_nullable
+                  as String,
+        reasonSubject: freezed == reasonSubject
+            ? _value.reasonSubject
+            : reasonSubject // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        isRead: null == isRead
+            ? _value.isRead
+            : isRead // ignore: cast_nullable_to_non_nullable
+                  as bool,
+        indexedAt: null == indexedAt
+            ? _value.indexedAt
+            : indexedAt // ignore: cast_nullable_to_non_nullable
+                  as String,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$NotificationImpl implements _Notification {
+  const _$NotificationImpl({
+    required this.uri,
+    required this.cid,
+    required this.author,
+    required final Map<String, dynamic> record,
+    required this.reason,
+    this.reasonSubject,
+    required this.isRead,
+    required this.indexedAt,
+  }) : _record = record;
+
+  factory _$NotificationImpl.fromJson(Map<String, dynamic> json) =>
+      _$$NotificationImplFromJson(json);
+
+  @override
+  final String uri;
+  @override
+  final String cid;
+  @override
+  final Profile author;
+  final Map<String, dynamic> _record;
+  @override
+  Map<String, dynamic> get record {
+    if (_record is EqualUnmodifiableMapView) return _record;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_record);
+  }
+
+  @override
+  final String reason;
+  @override
+  final String? reasonSubject;
+  @override
+  final bool isRead;
+  @override
+  final String indexedAt;
+
+  @override
+  String toString() {
+    return 'Notification(uri: $uri, cid: $cid, author: $author, record: $record, reason: $reason, reasonSubject: $reasonSubject, isRead: $isRead, indexedAt: $indexedAt)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$NotificationImpl &&
+            (identical(other.uri, uri) || other.uri == uri) &&
+            (identical(other.cid, cid) || other.cid == cid) &&
+            (identical(other.author, author) || other.author == author) &&
+            const DeepCollectionEquality().equals(other._record, _record) &&
+            (identical(other.reason, reason) || other.reason == reason) &&
+            (identical(other.reasonSubject, reasonSubject) ||
+                other.reasonSubject == reasonSubject) &&
+            (identical(other.isRead, isRead) || other.isRead == isRead) &&
+            (identical(other.indexedAt, indexedAt) ||
+                other.indexedAt == indexedAt));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    uri,
+    cid,
+    author,
+    const DeepCollectionEquality().hash(_record),
+    reason,
+    reasonSubject,
+    isRead,
+    indexedAt,
+  );
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$NotificationImplCopyWith<_$NotificationImpl> get copyWith =>
+      __$$NotificationImplCopyWithImpl<_$NotificationImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$NotificationImplToJson(this);
+  }
+}
+
+abstract class _Notification implements Notification {
+  const factory _Notification({
+    required final String uri,
+    required final String cid,
+    required final Profile author,
+    required final Map<String, dynamic> record,
+    required final String reason,
+    final String? reasonSubject,
+    required final bool isRead,
+    required final String indexedAt,
+  }) = _$NotificationImpl;
+
+  factory _Notification.fromJson(Map<String, dynamic> json) =
+      _$NotificationImpl.fromJson;
+
+  @override
+  String get uri;
+  @override
+  String get cid;
+  @override
+  Profile get author;
+  @override
+  Map<String, dynamic> get record;
+  @override
+  String get reason;
+  @override
+  String? get reasonSubject;
+  @override
+  bool get isRead;
+  @override
+  String get indexedAt;
+
+  /// Create a copy of Notification
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$NotificationImplCopyWith<_$NotificationImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/notification.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'notification.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$NotificationImpl _$$NotificationImplFromJson(Map<String, dynamic> json) =>
+    _$NotificationImpl(
+      uri: json['uri'] as String,
+      cid: json['cid'] as String,
+      author: Profile.fromJson(json['author'] as Map<String, dynamic>),
+      record: json['record'] as Map<String, dynamic>,
+      reason: json['reason'] as String,
+      reasonSubject: json['reasonSubject'] as String?,
+      isRead: json['isRead'] as bool,
+      indexedAt: json['indexedAt'] as String,
+    );
+
+Map<String, dynamic> _$$NotificationImplToJson(_$NotificationImpl instance) =>
+    <String, dynamic>{
+      'uri': instance.uri,
+      'cid': instance.cid,
+      'author': instance.author,
+      'record': instance.record,
+      'reason': instance.reason,
+      'reasonSubject': instance.reasonSubject,
+      'isRead': instance.isRead,
+      'indexedAt': instance.indexedAt,
+    };

lib/models/profile.dart

···
-class Profile {
-  final String did;
-  final String handle;
-  final String displayName;
-  final String description;
-  final String avatar;
-  final int followersCount;
-  final int followsCount;
-  final int galleryCount;
+import 'package:freezed_annotation/freezed_annotation.dart';
 
-  Profile({
-    required this.did,
-    required this.handle,
-    required this.displayName,
-    required this.description,
-    required this.avatar,
-    required this.followersCount,
-    required this.followsCount,
-    required this.galleryCount,
-  });
+part 'profile.freezed.dart';
+part 'profile.g.dart';
 
-  factory Profile.fromJson(Map<String, dynamic> json) {
-    return Profile(
-      did: json['did'] ?? '',
-      handle: json['handle'] ?? '',
-      displayName: json['displayName'] ?? '',
-      description: json['description'] ?? '',
-      avatar: json['avatar'] ?? '',
-      followersCount: json['followersCount'] ?? 0,
-      followsCount: json['followsCount'] ?? 0,
-      galleryCount: json['galleryCount'] ?? 0,
-    );
-  }
+@freezed
+class Profile with _$Profile {
+  const factory Profile({
+    required String did,
+    required String handle,
+    String? displayName,
+    String? description,
+    String? avatar,
+    int? followersCount,
+    int? followsCount,
+    int? galleryCount,
+  }) = _Profile;
 
-  Map<String, dynamic> toJson() {
-    return {
-      'did': did,
-      'handle': handle,
-      'displayName': displayName,
-      'description': description,
-      'avatar': avatar,
-      'followersCount': followersCount,
-      'followsCount': followsCount,
-      'galleryCount': galleryCount,
-    };
-  }
+  factory Profile.fromJson(Map<String, dynamic> json) => _$ProfileFromJson(json);
 }

lib/models/profile.freezed.dart

···
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'profile.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+Profile _$ProfileFromJson(Map<String, dynamic> json) {
+  return _Profile.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Profile {
+  String get did => throw _privateConstructorUsedError;
+  String get handle => throw _privateConstructorUsedError;
+  String? get displayName => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  String? get avatar => throw _privateConstructorUsedError;
+  int? get followersCount => throw _privateConstructorUsedError;
+  int? get followsCount => throw _privateConstructorUsedError;
+  int? get galleryCount => throw _privateConstructorUsedError;
+
+  /// Serializes this Profile to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Profile
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $ProfileCopyWith<Profile> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProfileCopyWith<$Res> {
+  factory $ProfileCopyWith(Profile value, $Res Function(Profile) then) =
+      _$ProfileCopyWithImpl<$Res, Profile>;
+  @useResult
+  $Res call({
+    String did,
+    String handle,
+    String? displayName,
+    String? description,
+    String? avatar,
+    int? followersCount,
+    int? followsCount,
+    int? galleryCount,
+  });
+}
+
+/// @nodoc
+class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
+    implements $ProfileCopyWith<$Res> {
+  _$ProfileCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Profile
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? did = null,
+    Object? handle = null,
+    Object? displayName = freezed,
+    Object? description = freezed,
+    Object? avatar = freezed,
+    Object? followersCount = freezed,
+    Object? followsCount = freezed,
+    Object? galleryCount = freezed,
+  }) {
+    return _then(
+      _value.copyWith(
+            did: null == did
+                ? _value.did
+                : did // ignore: cast_nullable_to_non_nullable
+                      as String,
+            handle: null == handle
+                ? _value.handle
+                : handle // ignore: cast_nullable_to_non_nullable
+                      as String,
+            displayName: freezed == displayName
+                ? _value.displayName
+                : displayName // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            description: freezed == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            avatar: freezed == avatar
+                ? _value.avatar
+                : avatar // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            followersCount: freezed == followersCount
+                ? _value.followersCount
+                : followersCount // ignore: cast_nullable_to_non_nullable
+                      as int?,
+            followsCount: freezed == followsCount
+                ? _value.followsCount
+                : followsCount // ignore: cast_nullable_to_non_nullable
+                      as int?,
+            galleryCount: freezed == galleryCount
+                ? _value.galleryCount
+                : galleryCount // ignore: cast_nullable_to_non_nullable
+                      as int?,
+          )
+          as $Val,
+    );
+  }
+}
+
+/// @nodoc
+abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
+  factory _$$ProfileImplCopyWith(
+    _$ProfileImpl value,
+    $Res Function(_$ProfileImpl) then,
+  ) = __$$ProfileImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    String did,
+    String handle,
+    String? displayName,
+    String? description,
+    String? avatar,
+    int? followersCount,
+    int? followsCount,
+    int? galleryCount,
+  });
+}
+
+/// @nodoc
+class __$$ProfileImplCopyWithImpl<$Res>
+    extends _$ProfileCopyWithImpl<$Res, _$ProfileImpl>
+    implements _$$ProfileImplCopyWith<$Res> {
+  __$$ProfileImplCopyWithImpl(
+    _$ProfileImpl _value,
+    $Res Function(_$ProfileImpl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of Profile
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? did = null,
+    Object? handle = null,
+    Object? displayName = freezed,
+    Object? description = freezed,
+    Object? avatar = freezed,
+    Object? followersCount = freezed,
+    Object? followsCount = freezed,
+    Object? galleryCount = freezed,
+  }) {
+    return _then(
+      _$ProfileImpl(
+        did: null == did
+            ? _value.did
+            : did // ignore: cast_nullable_to_non_nullable
+                  as String,
+        handle: null == handle
+            ? _value.handle
+            : handle // ignore: cast_nullable_to_non_nullable
+                  as String,
+        displayName: freezed == displayName
+            ? _value.displayName
+            : displayName // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        description: freezed == description
+            ? _value.description
+            : description // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        avatar: freezed == avatar
+            ? _value.avatar
+            : avatar // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        followersCount: freezed == followersCount
+            ? _value.followersCount
+            : followersCount // ignore: cast_nullable_to_non_nullable
+                  as int?,
+        followsCount: freezed == followsCount
+            ? _value.followsCount
+            : followsCount // ignore: cast_nullable_to_non_nullable
+                  as int?,
+        galleryCount: freezed == galleryCount
+            ? _value.galleryCount
+            : galleryCount // ignore: cast_nullable_to_non_nullable
+                  as int?,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$ProfileImpl implements _Profile {
+  const _$ProfileImpl({
+    required this.did,
+    required this.handle,
+    this.displayName,
+    this.description,
+    this.avatar,
+    this.followersCount,
+    this.followsCount,
+    this.galleryCount,
+  });
+
+  factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ProfileImplFromJson(json);
+
+  @override
+  final String did;
+  @override
+  final String handle;
+  @override
+  final String? displayName;
+  @override
+  final String? description;
+  @override
+  final String? avatar;
+  @override
+  final int? followersCount;
+  @override
+  final int? followsCount;
+  @override
+  final int? galleryCount;
+
+  @override
+  String toString() {
+    return 'Profile(did: $did, handle: $handle, displayName: $displayName, description: $description, avatar: $avatar, followersCount: $followersCount, followsCount: $followsCount, galleryCount: $galleryCount)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProfileImpl &&
+            (identical(other.did, did) || other.did == did) &&
+            (identical(other.handle, handle) || other.handle == handle) &&
+            (identical(other.displayName, displayName) ||
+                other.displayName == displayName) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.avatar, avatar) || other.avatar == avatar) &&
+            (identical(other.followersCount, followersCount) ||
+                other.followersCount == followersCount) &&
+            (identical(other.followsCount, followsCount) ||
+                other.followsCount == followsCount) &&
+            (identical(other.galleryCount, galleryCount) ||
+                other.galleryCount == galleryCount));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    did,
+    handle,
+    displayName,
+    description,
+    avatar,
+    followersCount,
+    followsCount,
+    galleryCount,
+  );
+
+  /// Create a copy of Profile
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
+      __$$ProfileImplCopyWithImpl<_$ProfileImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$ProfileImplToJson(this);
+  }
+}
+
+abstract class _Profile implements Profile {
+  const factory _Profile({
+    required final String did,
+    required final String handle,
+    final String? displayName,
+    final String? description,
+    final String? avatar,
+    final int? followersCount,
+    final int? followsCount,
+    final int? galleryCount,
+  }) = _$ProfileImpl;
+
+  factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
+
+  @override
+  String get did;
+  @override
+  String get handle;
+  @override
+  String? get displayName;
+  @override
+  String? get description;
+  @override
+  String? get avatar;
+  @override
+  int? get followersCount;
+  @override
+  int? get followsCount;
+  @override
+  int? get galleryCount;
+
+  /// Create a copy of Profile
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/profile.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'profile.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
+    _$ProfileImpl(
+      did: json['did'] as String,
+      handle: json['handle'] as String,
+      displayName: json['displayName'] as String?,
+      description: json['description'] as String?,
+      avatar: json['avatar'] as String?,
+      followersCount: (json['followersCount'] as num?)?.toInt(),
+      followsCount: (json['followsCount'] as num?)?.toInt(),
+      galleryCount: (json['galleryCount'] as num?)?.toInt(),
+    );
+
+Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
+    <String, dynamic>{
+      'did': instance.did,
+      'handle': instance.handle,
+      'displayName': instance.displayName,
+      'description': instance.description,
+      'avatar': instance.avatar,
+      'followersCount': instance.followersCount,
+      'followsCount': instance.followsCount,
+      'galleryCount': instance.galleryCount,
+    };

lib/providers/gallery_cache_provider.dart

···
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import '../api.dart';
+import '../models/gallery.dart';
+
+part 'gallery_cache_provider.g.dart';
+
+/// Holds a cache of galleries by URI.
+@Riverpod(keepAlive: true)
+class GalleryCache extends _$GalleryCache {
+  @override
+  Map<String, Gallery> build() => {};
+
+  void setGalleries(List<Gallery> galleries) {
+    final newMap = {for (final g in galleries) g.uri: g};
+    state = {...state, ...newMap};
+  }
+
+  void setGallery(Gallery gallery) {
+    state = {...state, gallery.uri: gallery};
+  }
+
+  void removeGallery(String uri) {
+    final newState = {...state}..remove(uri);
+    state = newState;
+  }
+
+  Gallery? getGallery(String uri) => state[uri];
+
+  Future<void> toggleFavorite(String uri) async {
+    // Fetch the latest gallery from the API to ensure up-to-date favorite state
+    final latestGallery = await apiService.getGallery(uri: uri);
+    if (latestGallery == null) return;
+    final isCurrentlyFav = latestGallery.viewer?.fav != null;
+    final isFav = !isCurrentlyFav;
+    bool success = false;
+    String? newFavUri;
+    if (isFav) {
+      newFavUri = await apiService.createFavorite(galleryUri: uri);
+      success = newFavUri != null;
+    } else {
+      success = await apiService.deleteRecord(latestGallery.viewer?.fav ?? uri);
+      newFavUri = null;
+    }
+    if (success) {
+      final newCount = (latestGallery.favCount ?? 0) + (isFav ? 1 : -1);
+      final updatedViewer = latestGallery.viewer?.copyWith(fav: newFavUri);
+      state = {...state, uri: latestGallery.copyWith(favCount: newCount, viewer: updatedViewer)};
+    }
+  }
+}

lib/providers/gallery_cache_provider.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'gallery_cache_provider.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$galleryCacheHash() => r'dc64ef86246ea4ac742837cfcc8a9353375f2144';
+
+/// Holds a cache of galleries by URI.
+///
+/// Copied from [GalleryCache].
+@ProviderFor(GalleryCache)
+final galleryCacheProvider =
+    NotifierProvider<GalleryCache, Map<String, Gallery>>.internal(
+      GalleryCache.new,
+      name: r'galleryCacheProvider',
+      debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$galleryCacheHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+typedef _$GalleryCache = Notifier<Map<String, Gallery>>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/screens/comments_page.dart

···
 import 'package:grain/api.dart';
 import 'package:grain/models/comment.dart';
 import 'package:grain/models/gallery.dart';
+import 'package:grain/models/gallery_photo.dart';
 import 'package:grain/screens/profile_page.dart';
 import 'package:grain/utils.dart';
 import 'package:grain/widgets/app_image.dart';
···
                     padding: const EdgeInsets.fromLTRB(12, 12, 12, 100),
                     children: [
                       if (_gallery != null)
-                        Text(_gallery!.title, style: theme.textTheme.titleMedium),
+                        Text(_gallery!.title ?? '', style: theme.textTheme.titleMedium),
                       const SizedBox(height: 12),
                       _CommentsList(
                         comments: _comments,
···
                   },
                 ),
                 if (comment.focus != null &&
-                    (comment.focus!.thumb.isNotEmpty || comment.focus!.fullsize.isNotEmpty))
+                    ((comment.focus!.thumb?.isNotEmpty ?? false) ||
+                        (comment.focus!.fullsize?.isNotEmpty ?? false)))
                   Padding(
                     padding: const EdgeInsets.only(top: 8.0),
                     child: Align(
···
                       child: ConstrainedBox(
                         constraints: const BoxConstraints(maxWidth: 180, maxHeight: 180),
                         child: AspectRatio(
-                          aspectRatio: (comment.focus!.width > 0 && comment.focus!.height > 0)
-                              ? comment.focus!.width / comment.focus!.height
+                          aspectRatio:
+                              (comment.focus!.aspectRatio != null &&
+                                  (comment.focus!.aspectRatio!.width > 0 &&
+                                      comment.focus!.aspectRatio!.height > 0))
+                              ? comment.focus!.aspectRatio!.width /
+                                    comment.focus!.aspectRatio!.height
                               : 1.0,
                           child: ClipRRect(
                             borderRadius: BorderRadius.circular(8),
···
                                         thumb: comment.focus!.thumb,
                                         fullsize: comment.focus!.fullsize,
                                         alt: comment.focus!.alt,
-                                        width: comment.focus!.width,
-                                        height: comment.focus!.height,
+                                        aspectRatio: comment.focus!.aspectRatio,
                                       ),
                                     )
                                   : null,
                               child: AppImage(
-                                url: comment.focus!.thumb.isNotEmpty
+                                url: (comment.focus!.thumb?.isNotEmpty ?? false)
                                     ? comment.focus!.thumb
                                     : comment.focus!.fullsize,
                                 fit: BoxFit.cover,

lib/screens/create_gallery_page.dart

···
   void initState() {
     super.initState();
     if (widget.gallery != null) {
-      _titleController.text = widget.gallery!.title;
-      _descController.text = widget.gallery!.description;
+      _titleController.text = widget.gallery?.title ?? '';
+      _descController.text = widget.gallery?.description ?? '';
       // Load existing images
       Future.microtask(() async {
         final List<GalleryImage> loadedImages = [];
         for (final item in widget.gallery!.items) {
           try {
-            final response = await HttpClient().getUrl(Uri.parse(item.thumb));
+            final response = await HttpClient().getUrl(Uri.parse(item.thumb ?? ''));
             final file = await response.close().then((res) async {
               final bytes = await consolidateHttpClientResponseBytes(res);
               final tempDir = await getTemporaryDirectory();

lib/screens/explore_page.dart

···
       itemBuilder: (context, index) {
         final profile = results[index];
         return ListTile(
-          leading: profile.avatar.isNotEmpty
+          leading: profile.avatar?.isNotEmpty == true
               ? ClipOval(
                   child: AppImage(url: profile.avatar, width: 32, height: 32, fit: BoxFit.cover),
                 )
···
                   child: Icon(Icons.account_circle, color: theme.iconTheme.color),
                 ),
           title: Text(
-            profile.displayName.isNotEmpty ? profile.displayName : '@${profile.handle}',
+            profile.displayName?.isNotEmpty == true ? profile.displayName! : '@${profile.handle}',
             style: theme.textTheme.bodyLarge,
           ),
           subtitle: profile.handle.isNotEmpty

lib/screens/gallery_page.dart

···
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:grain/api.dart';
-import 'package:grain/models/gallery.dart';
+import 'package:grain/models/gallery_photo.dart';
+import 'package:grain/providers/gallery_cache_provider.dart';
 import 'package:grain/screens/create_gallery_page.dart';
 import 'package:grain/screens/profile_page.dart';
 import 'package:grain/widgets/app_image.dart';
···
 import 'package:grain/widgets/gallery_photo_view.dart';
 import 'package:grain/widgets/justified_gallery_view.dart';
 
-class GalleryPage extends StatefulWidget {
+class GalleryPage extends ConsumerStatefulWidget {
   final String uri;
   final String? currentUserDid;
   const GalleryPage({super.key, required this.uri, this.currentUserDid});
 
   @override
-  State<GalleryPage> createState() => _GalleryPageState();
+  ConsumerState<GalleryPage> createState() => _GalleryPageState();
 }
 
-class _GalleryPageState extends State<GalleryPage> {
-  Gallery? _gallery;
+class _GalleryPageState extends ConsumerState<GalleryPage> {
   bool _loading = true;
   bool _error = false;
   GalleryPhoto? _selectedPhoto;
···
   @override
   void initState() {
     super.initState();
-    _fetchGallery();
+    _maybeFetchGallery();
   }
 
-  Future<void> _fetchGallery() async {
+  Future<void> _maybeFetchGallery() async {
+    final cached = ref.read(galleryCacheProvider)[widget.uri];
+    if (cached != null) {
+      setState(() {
+        _loading = false;
+        _error = false;
+      });
+      return;
+    }
     setState(() {
       _loading = true;
       _error = false;
     });
     try {
       final gallery = await apiService.getGallery(uri: widget.uri);
-      setState(() {
-        _gallery = gallery;
-        _loading = false;
-      });
-      // Pre-cache thumbnails and fullsize images in the background
       if (gallery != null) {
-        Future.microtask(() {
-          for (final item in gallery.items) {
-            if (item.thumb.isNotEmpty) {
-              precacheImage(CachedNetworkImageProvider(item.thumb), context);
-            }
-            if (item.fullsize.isNotEmpty) {
-              precacheImage(CachedNetworkImageProvider(item.fullsize), context);
-            }
-          }
+        ref.read(galleryCacheProvider.notifier).setGallery(gallery);
+        setState(() {
+          _loading = false;
+        });
+      } else {
+        setState(() {
+          _error = true;
+          _loading = false;
         });
       }
     } catch (e) {
···
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
+    final gallery = ref.watch(galleryCacheProvider)[widget.uri];
     if (_loading) {
       return Scaffold(
         backgroundColor: theme.scaffoldBackgroundColor,
···
         ),
       );
     }
-    if (_error || _gallery == null) {
+    if (_error || gallery == null) {
       return Scaffold(
         backgroundColor: theme.scaffoldBackgroundColor,
         body: const Center(child: Text('Failed to load gallery.')),
       );
     }
-    final gallery = _gallery!;
     final isLoggedIn = widget.currentUserDid != null;
-    final galleryItems = gallery.items.where((item) => item.thumb.isNotEmpty).toList();
+    final galleryItems = gallery.items.where((item) => item.thumb?.isNotEmpty ?? false).toList();
 
     return Stack(
       children: [
···
                       isScrollControlled: true,
                       builder: (context) => CreateGalleryPage(gallery: gallery),
                     );
-                    _fetchGallery();
+                    _maybeFetchGallery();
                   },
                 ),
             ],
···
                   children: [
                     const SizedBox(height: 10),
                     Text(
-                      gallery.title.isNotEmpty ? gallery.title : 'Gallery',
+                      gallery.title?.isNotEmpty == true ? gallery.title! : 'Gallery',
                       style: theme.textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.w600),
                     ),
                     const SizedBox(height: 10),
···
                             backgroundColor: theme.colorScheme.surfaceContainerHighest,
                             backgroundImage:
                                 gallery.creator?.avatar != null &&
-                                    gallery.creator!.avatar.isNotEmpty
+                                    gallery.creator!.avatar?.isNotEmpty == true
                                 ? null
                                 : null,
-                            child: (gallery.creator == null || gallery.creator!.avatar.isEmpty)
+                            child:
+                                (gallery.creator == null ||
+                                    (gallery.creator!.avatar?.isNotEmpty != true))
                                 ? Icon(
                                     Icons.account_circle,
                                     size: 24,
···
                                   )
                                 : ClipOval(
                                     child: AppImage(
-                                      url: gallery.creator!.avatar,
+                                      url: gallery.creator!.avatar!,
                                       width: 36,
                                       height: 36,
                                       fit: BoxFit.cover,
···
                 ),
               ),
               const SizedBox(height: 12),
-              if (gallery.description.isNotEmpty)
+              if ((gallery.description?.isNotEmpty ?? false))
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 8).copyWith(bottom: 8),
                   child: FacetedText(
-                    text: gallery.description,
+                    text: gallery.description ?? '',
                     facets: gallery.facets,
                     style: theme.textTheme.bodyMedium?.copyWith(color: theme.colorScheme.onSurface),
                     linkStyle: theme.textTheme.bodyMedium?.copyWith(

lib/screens/home_page.dart

···
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:grain/api.dart';
-import 'package:grain/models/gallery.dart';
 import 'package:grain/screens/create_gallery_page.dart';
-import 'package:grain/widgets/app_image.dart';
 import 'package:grain/widgets/app_version_text.dart';
 import 'package:grain/widgets/bottom_nav_bar.dart';
 import 'package:grain/widgets/timeline_item.dart';
 
+import '../providers/gallery_cache_provider.dart';
 import 'explore_page.dart';
 import 'log_page.dart';
 import 'notifications_page.dart';
 import 'profile_page.dart';
 
-class TimelineItem {
-  final Gallery gallery;
-  TimelineItem({required this.gallery});
-  factory TimelineItem.fromGallery(Gallery gallery) {
-    return TimelineItem(gallery: gallery);
-  }
-}
-
 class MyHomePage extends StatefulWidget {
   final String title;
   final VoidCallback? onSignOut;
···
   bool showProfile = false;
   bool showNotifications = false;
   bool showExplore = false;
-  List<TimelineItem> _timeline = [];
-  List<TimelineItem> _followingTimeline = [];
+  List<String> _timelineUris = [];
+  List<String> _followingTimelineUris = [];
   bool _timelineLoading = true;
   bool _followingTimelineLoading = false;
   int _tabIndex = 0; // 0 = Timeline, 1 = Following
···
   }
 
   Future<void> _fetchTimeline({String? algorithm}) async {
+    final container = ProviderScope.containerOf(context, listen: false);
     if (algorithm == "following") {
       setState(() {
         _followingTimelineLoading = true;
       });
       try {
         final galleries = await apiService.getTimeline(algorithm: algorithm);
+        print("Fetched following timeline: ${galleries.length} items");
+        container.read(galleryCacheProvider.notifier).setGalleries(galleries);
         setState(() {
-          _followingTimeline = galleries.map((g) => TimelineItem.fromGallery(g)).toList();
+          _followingTimelineUris = galleries.map((g) => g.uri).toList();
           _followingTimelineLoading = false;
         });
       } catch (e) {
         setState(() {
-          _followingTimeline = [];
+          _followingTimelineUris = [];
           _followingTimelineLoading = false;
         });
       }
···
       });
       try {
         final galleries = await apiService.getTimeline(algorithm: algorithm);
+        container.read(galleryCacheProvider.notifier).setGalleries(galleries);
         setState(() {
-          _timeline = galleries.map((g) => TimelineItem.fromGallery(g)).toList();
+          _timelineUris = galleries.map((g) => g.uri).toList();
           _timelineLoading = false;
         });
       } catch (e) {
         setState(() {
-          _timeline = [];
+          _timelineUris = [];
           _timelineLoading = false;
         });
       }
···
 
   Widget _buildTimelineSliver(BuildContext context, {bool following = false}) {
     final loading = following ? _followingTimelineLoading : _timelineLoading;
-    final timeline = following ? _followingTimeline : _timeline;
+    final uris = following ? _followingTimelineUris : _timelineUris;
     return CustomScrollView(
       key: PageStorageKey(following ? 'following' : 'timeline'),
       slivers: [
         SliverOverlapInjector(handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context)),
-        if (timeline.isEmpty && loading)
+        if (uris.isEmpty && loading)
           SliverFillRemaining(
             hasScrollBody: false,
             child: Center(
···
               ),
             ),
           ),
-        if (timeline.isEmpty && !loading)
+        if (uris.isEmpty && !loading)
           SliverFillRemaining(
             hasScrollBody: false,
             child: Center(
               child: Text(following ? 'No following timeline items.' : 'No timeline items.'),
             ),
           ),
-        if (timeline.isNotEmpty)
+        if (uris.isNotEmpty)
           SliverList(
             delegate: SliverChildBuilderDelegate((context, index) {
-              final item = timeline[index];
-              return TimelineItemWidget(gallery: item.gallery);
-            }, childCount: timeline.length),
+              final uri = uris[index];
+              return TimelineItemWidget(galleryUri: uri);
+            }, childCount: uris.length),
           ),
       ],
     );
   }
 
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    if (apiService.currentUser == null) {
-      return Scaffold(
-        body: Center(
-          child: CircularProgressIndicator(strokeWidth: 2, color: theme.colorScheme.primary),
-        ),
-      );
-    }
-    // Home page: show tabs
-    if (!showProfile && !showNotifications && !showExplore) {
-      if (_tabController == null) _initTabController();
-      return Scaffold(
-        drawer: Drawer(
-          child: ListView(
-            padding: EdgeInsets.zero,
-            children: [
-              Container(
-                height: 250,
-                decoration: BoxDecoration(
-                  color: theme.scaffoldBackgroundColor,
-                  border: Border(bottom: BorderSide(color: theme.dividerColor, width: 1)),
+  Widget _buildAppDrawer(ThemeData theme, String? avatarUrl) {
+    return Drawer(
+      child: ListView(
+        padding: EdgeInsets.zero,
+        children: [
+          Container(
+            height: 250,
+            decoration: BoxDecoration(
+              color: theme.colorScheme.surface,
+              border: Border(bottom: BorderSide(color: theme.dividerColor, width: 1)),
+            ),
+            padding: const EdgeInsets.fromLTRB(16, 115, 16, 16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                CircleAvatar(
+                  radius: 22,
+                  backgroundColor: theme.scaffoldBackgroundColor,
+                  backgroundImage: (avatarUrl != null && avatarUrl.isNotEmpty)
+                      ? NetworkImage(avatarUrl)
+                      : null,
+                  child: (avatarUrl == null || avatarUrl.isEmpty)
+                      ? Icon(Icons.person, size: 44, color: theme.hintColor)
+                      : null,
+                ),
+                const SizedBox(height: 6),
+                Text(
+                  apiService.currentUser?.displayName ?? '',
+                  style: theme.textTheme.bodyLarge?.copyWith(
+                    fontWeight: FontWeight.bold,
+                    color: theme.colorScheme.onSurface,
+                  ),
                 ),
-                padding: const EdgeInsets.fromLTRB(16, 115, 16, 16),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.center,
+                if (apiService.currentUser?.handle != null)
+                  Text(
+                    '@${apiService.currentUser!.handle}',
+                    style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
+                  ),
+                const SizedBox(height: 6),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
                   children: [
-                    CircleAvatar(
-                      radius: 22,
-                      backgroundColor: theme.scaffoldBackgroundColor,
-                      child: ClipOval(
-                        child: AppImage(
-                          url: apiService.currentUser!.avatar,
-                          width: 44,
-                          height: 44,
-                          fit: BoxFit.cover,
-                        ),
+                    Text(
+                      (apiService.currentUser?.followersCount ?? 0).toString(),
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                        color: theme.colorScheme.onSurface,
                       ),
                     ),
-                    const SizedBox(height: 6),
+                    const SizedBox(width: 4),
                     Text(
-                      apiService.currentUser?.displayName ?? '',
-                      style: theme.textTheme.bodyLarge?.copyWith(
+                      'Followers',
+                      style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
+                    ),
+                    const SizedBox(width: 16),
+                    Text(
+                      (apiService.currentUser?.followsCount ?? 0).toString(),
+                      style: theme.textTheme.bodyMedium?.copyWith(
                         fontWeight: FontWeight.bold,
                         color: theme.colorScheme.onSurface,
                       ),
                     ),
-                    if (apiService.currentUser?.handle != null)
-                      Text(
-                        '@${apiService.currentUser!.handle}',
-                        style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
-                      ),
-                    const SizedBox(height: 6),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        Text(
-                          (apiService.currentUser?.followersCount ?? 0).toString(),
-                          style: theme.textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: theme.colorScheme.onSurface,
-                          ),
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          'Followers',
-                          style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
-                        ),
-                        const SizedBox(width: 16),
-                        Text(
-                          (apiService.currentUser?.followsCount ?? 0).toString(),
-                          style: theme.textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: theme.colorScheme.onSurface,
-                          ),
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          'Following',
-                          style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
-                        ),
-                      ],
+                    const SizedBox(width: 4),
+                    Text(
+                      'Following',
+                      style: theme.textTheme.bodySmall?.copyWith(color: theme.hintColor),
                     ),
                   ],
                 ),
-              ),
-              ListTile(
-                leading: const Icon(FontAwesomeIcons.house),
-                title: const Text('Home'),
-                onTap: () {
-                  Navigator.pop(context);
-                  setState(() {
-                    showProfile = false;
-                    showNotifications = false;
-                    showExplore = false;
-                  });
-                },
-              ),
-              ListTile(
-                leading: const Icon(FontAwesomeIcons.magnifyingGlass),
-                title: const Text('Explore'),
-                onTap: () {
-                  Navigator.pop(context);
-                  setState(() {
-                    showExplore = true;
-                    showProfile = false;
-                    showNotifications = false;
-                  });
-                },
-              ),
-              ListTile(
-                leading: const Icon(FontAwesomeIcons.user),
-                title: const Text('Profile'),
-                onTap: () {
-                  Navigator.pop(context);
-                  setState(() {
-                    showProfile = true;
-                    showNotifications = false;
-                    showExplore = false;
-                  });
-                },
-              ),
-              ListTile(
-                leading: const Icon(FontAwesomeIcons.list),
-                title: const Text('Logs'),
-                onTap: () {
-                  Navigator.pop(context);
-                  Navigator.of(
-                    context,
-                  ).push(MaterialPageRoute(builder: (context) => const LogPage()));
-                },
-              ),
-              const SizedBox(height: 16),
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16.0),
-                child: Center(child: AppVersionText()),
-              ),
-            ],
+              ],
+            ),
+          ),
+          ListTile(
+            leading: const Icon(FontAwesomeIcons.house),
+            title: const Text('Home'),
+            onTap: () {
+              Navigator.pop(context);
+              setState(() {
+                showProfile = false;
+                showNotifications = false;
+                showExplore = false;
+              });
+            },
+          ),
+          ListTile(
+            leading: const Icon(FontAwesomeIcons.magnifyingGlass),
+            title: const Text('Explore'),
+            onTap: () {
+              Navigator.pop(context);
+              setState(() {
+                showExplore = true;
+                showProfile = false;
+                showNotifications = false;
+              });
+            },
+          ),
+          ListTile(
+            leading: const Icon(FontAwesomeIcons.user),
+            title: const Text('Profile'),
+            onTap: () {
+              Navigator.pop(context);
+              setState(() {
+                showProfile = true;
+                showNotifications = false;
+                showExplore = false;
+              });
+            },
+          ),
+          ListTile(
+            leading: const Icon(FontAwesomeIcons.list),
+            title: const Text('Logs'),
+            onTap: () {
+              Navigator.pop(context);
+              Navigator.of(context).push(MaterialPageRoute(builder: (context) => const LogPage()));
+            },
           ),
+          const SizedBox(height: 16),
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16.0),
+            child: Center(child: AppVersionText()),
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final avatarUrl = apiService.currentUser?.avatar;
+    if (apiService.currentUser == null) {
+      return Scaffold(
+        body: Center(
+          child: CircularProgressIndicator(strokeWidth: 2, color: theme.colorScheme.primary),
         ),
+      );
+    }
+    // Home page: show tabs
+    if (!showProfile && !showNotifications && !showExplore) {
+      if (_tabController == null) _initTabController();
+      return Scaffold(
+        onDrawerChanged: (isOpen) {
+          setState(() {});
+        },
+        drawer: _buildAppDrawer(theme, avatarUrl),
         body: NestedScrollView(
           floatHeaderSlivers: true,
           headerSliverBuilder: (context, innerBoxIsScrolled) => [
···
     }
     // Explore, Notifications, Profile: no tabs, no TabController
     return Scaffold(
-      drawer: Drawer(
-        child: ListView(
-          padding: EdgeInsets.zero,
-          children: [
-            Container(
-              decoration: BoxDecoration(
-                color: theme.scaffoldBackgroundColor,
-                border: Border(bottom: BorderSide(color: theme.dividerColor, width: 1)),
-              ),
-              padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  CircleAvatar(
-                    radius: 22,
-                    backgroundColor: theme.scaffoldBackgroundColor,
-                    child: ClipOval(
-                      child: AppImage(
-                        url: apiService.currentUser!.avatar,
-                        width: 24,
-                        height: 24,
-                        fit: BoxFit.cover,
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 6),
-                  Text(
-                    apiService.currentUser?.displayName ?? '',
-                    style: theme.textTheme.bodyLarge?.copyWith(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 15,
-                      color: theme.colorScheme.onSurface,
-                    ),
-                  ),
-                  if (apiService.currentUser?.handle != null)
-                    Text(
-                      '@${apiService.currentUser!.handle}',
-                      style: theme.textTheme.bodySmall?.copyWith(
-                        color: theme.hintColor,
-                        fontSize: 11,
-                      ),
-                    ),
-                  const SizedBox(height: 6),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Text(
-                        (apiService.currentUser?.followersCount ?? 0).toString(),
-                        style: theme.textTheme.bodyMedium?.copyWith(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 13,
-                          color: theme.colorScheme.onSurface,
-                        ),
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        'Followers',
-                        style: theme.textTheme.bodySmall?.copyWith(
-                          color: theme.hintColor,
-                          fontSize: 10,
-                        ),
-                      ),
-                      const SizedBox(width: 16),
-                      Text(
-                        (apiService.currentUser?.followsCount ?? 0).toString(),
-                        style: theme.textTheme.bodyMedium?.copyWith(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 13,
-                          color: theme.colorScheme.onSurface,
-                        ),
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        'Following',
-                        style: theme.textTheme.bodySmall?.copyWith(
-                          color: theme.hintColor,
-                          fontSize: 10,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            ListTile(
-              leading: const Icon(FontAwesomeIcons.house),
-              title: const Text('Home'),
-              onTap: () {
-                Navigator.pop(context);
-                setState(() {
-                  showProfile = false;
-                  showNotifications = false;
-                  showExplore = false;
-                });
-              },
-            ),
-            ListTile(
-              leading: const Icon(FontAwesomeIcons.magnifyingGlass),
-              title: const Text('Explore'),
-              onTap: () {
-                Navigator.pop(context);
-                setState(() {
-                  showExplore = true;
-                  showProfile = false;
-                  showNotifications = false;
-                });
-              },
-            ),
-            ListTile(
-              leading: const Icon(FontAwesomeIcons.user),
-              title: const Text('Profile'),
-              onTap: () {
-                Navigator.pop(context);
-                setState(() {
-                  showProfile = true;
-                  showNotifications = false;
-                  showExplore = false;
-                });
-              },
-            ),
-            ListTile(
-              leading: const Icon(FontAwesomeIcons.list),
-              title: const Text('Logs'),
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.of(
-                  context,
-                ).push(MaterialPageRoute(builder: (context) => const LogPage()));
-              },
-            ),
-            const SizedBox(height: 16),
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16.0),
-              child: Center(child: AppVersionText()),
-            ),
-          ],
-        ),
-      ),
+      drawer: _buildAppDrawer(theme, avatarUrl),
       appBar: (showExplore || showNotifications)
           ? AppBar(
               backgroundColor: theme.appBarTheme.backgroundColor,

lib/screens/notifications_page.dart

···
     return ListTile(
       leading: CircleAvatar(
         backgroundColor: theme.colorScheme.surfaceVariant,
-        backgroundImage: author.avatar.isNotEmpty ? NetworkImage(author.avatar) : null,
-        child: author.avatar.isEmpty
+        backgroundImage: (author.avatar?.isNotEmpty ?? false) ? NetworkImage(author.avatar!) : null,
+        child: (author.avatar?.isEmpty ?? true)
             ? Icon(Icons.account_circle, color: theme.iconTheme.color)
             : null,
       ),
       title: Text(
-        author.displayName.isNotEmpty ? author.displayName : '@${author.handle}',
+        (author.displayName?.isNotEmpty ?? false) ? author.displayName! : '@${author.handle}',
         style: theme.textTheme.bodyLarge,
       ),
       subtitle: Text(

lib/screens/profile_page.dart

···
     if ((profile?.description ?? '').isNotEmpty) {
       try {
         final desc = profile != null ? profile.description : '';
-        descriptionFacets = await _extractFacets(desc);
+        descriptionFacets = await _extractFacets(desc ?? '');
       } catch (_) {
         descriptionFacets = null;
       }
···
                               if (_galleries.isNotEmpty && index < _galleries.length) {
                                 final gallery = _galleries[index];
                                 final hasPhoto =
-                                    gallery.items.isNotEmpty && gallery.items[0].thumb.isNotEmpty;
+                                    gallery.items.isNotEmpty &&
+                                    (gallery.items[0].thumb?.isNotEmpty ?? false);
                                 return GestureDetector(
                                   onTap: () {
                                     if (gallery.uri.isNotEmpty) {
···
                                         ? AppImage(url: gallery.items[0].thumb, fit: BoxFit.cover)
                                         : Center(
                                             child: Text(
-                                              gallery.title,
+                                              gallery.title ?? '',
                                               style: TextStyle(
                                                 fontSize: 12,
                                                 color: theme.colorScheme.onSurfaceVariant,
···
                               itemBuilder: (context, index) {
                                 final gallery = _favs[index];
                                 final hasPhoto =
-                                    gallery.items.isNotEmpty && gallery.items[0].thumb.isNotEmpty;
+                                    gallery.items.isNotEmpty &&
+                                    (gallery.items[0].thumb?.isNotEmpty ?? false);
                                 return GestureDetector(
                                   onTap: () {
                                     if (gallery.uri.isNotEmpty) {
···
                                         ? AppImage(url: gallery.items[0].thumb, fit: BoxFit.cover)
                                         : Center(
                                             child: Text(
-                                              gallery.title,
+                                              gallery.title ?? '',
                                               style: TextStyle(
                                                 fontSize: 12,
                                                 color: theme.colorScheme.onSurfaceVariant,

lib/widgets/gallery_action_buttons.dart

···
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:grain/app_theme.dart';
 import 'package:grain/models/gallery.dart';
+import 'package:grain/providers/gallery_cache_provider.dart';
 import 'package:share_plus/share_plus.dart';
 
 import '../screens/comments_page.dart';
 
-class GalleryActionButtons extends StatelessWidget {
+class GalleryActionButtons extends ConsumerWidget {
   final Gallery gallery;
   final String? currentUserDid;
   final BuildContext parentContext;
···
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
-    final isFav = gallery.viewer != null && gallery.viewer!['fav'] != null;
+    final isFav = gallery.viewer != null && gallery.viewer?.fav != null;
     return isLoggedIn
         ? Row(
             mainAxisAlignment: MainAxisAlignment.start,
             children: [
               InkWell(
                 borderRadius: BorderRadius.circular(10),
-                onTap: onFavorite ?? () {},
+                onTap:
+                    onFavorite ??
+                    () async {
+                      await ref.read(galleryCacheProvider.notifier).toggleFavorite(gallery.uri);
+                    },
                 child: Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 4),
                   child: Row(

lib/widgets/gallery_photo_view.dart

···
 import 'package:flutter/material.dart';
-import 'package:grain/models/gallery.dart';
+import 'package:grain/models/gallery_photo.dart';
 import 'package:grain/widgets/app_image.dart';
 
 class GalleryPhotoView extends StatefulWidget {
···
                   ),
                 ),
               ),
-              if (photo.alt.isNotEmpty)
+              if (photo.alt != null && photo.alt?.isNotEmpty == true)
                 Container(
                   width: double.infinity,
                   color: Colors.black.withOpacity(0.7),
                   padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
                   child: Text(
-                    photo.alt,
+                    photo.alt!,
                     style: const TextStyle(color: Colors.white, fontSize: 16),
                     textAlign: TextAlign.center,
                   ),

lib/widgets/gallery_preview.dart

···
     final Color bgColor = theme.brightness == Brightness.dark
         ? Colors.grey[900]!
         : Colors.grey[100]!;
-    final photos = gallery.items.where((item) => item.thumb.isNotEmpty).toList();
+    final photos = gallery.items
+        .where((item) => item.thumb != null && item.thumb!.isNotEmpty)
+        .toList();
     return AspectRatio(
       aspectRatio: 3 / 2,
       child: Row(

lib/widgets/justified_gallery_view.dart

···
 import 'package:flutter/material.dart';
-import 'package:grain/models/gallery.dart';
+import 'package:grain/models/gallery_photo.dart';
 import 'package:grain/widgets/app_image.dart';
 
 class JustifiedGalleryView extends StatelessWidget {
···
   double aspectSum = 0;
   for (var i = 0; i < items.length; i++) {
     final item = items[i];
-    final imgW = item.width.toDouble();
-    final imgH = item.height.toDouble();
+    // Use aspectRatio model if available, fallback to 4:3
+    final imgW = (item.aspectRatio != null && item.aspectRatio!.width > 0)
+        ? item.aspectRatio!.width.toDouble()
+        : 4.0;
+    final imgH = (item.aspectRatio != null && item.aspectRatio!.height > 0)
+        ? item.aspectRatio!.height.toDouble()
+        : 3.0;
     final aspect = imgW / imgH;
     currentRow.add(
       _JustifiedImage(
-        thumb: item.thumb,
+        thumb: item.thumb ?? '',
         displayWidth: 0, // placeholder, will be set later
         displayHeight: 0, // placeholder, will be set later
         originalIndex: i,
···
       final rowHeight = estRowHeight.clamp(80.0, maxRowHeight);
       for (var j = 0; j < currentRow.length; j++) {
         final img = items[i - currentRow.length + 1 + j];
-        final width = rowHeight * (img.width / img.height);
+        final imgW2 = (img.aspectRatio != null && img.aspectRatio!.width > 0)
+            ? img.aspectRatio!.width.toDouble()
+            : 4.0;
+        final imgH2 = (img.aspectRatio != null && img.aspectRatio!.height > 0)
+            ? img.aspectRatio!.height.toDouble()
+            : 3.0;
+        final width = rowHeight * (imgW2 / imgH2);
         currentRow[j] = _JustifiedImage(
-          thumb: img.thumb,
+          thumb: img.thumb ?? '',
           displayWidth: width,
           displayHeight: rowHeight.toDouble(),
           originalIndex: i - currentRow.length + 1 + j,

lib/widgets/timeline_item.dart

···
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:grain/api.dart';
-import 'package:grain/models/gallery.dart';
 import 'package:grain/utils.dart';
 import 'package:grain/widgets/app_image.dart';
 import 'package:grain/widgets/gallery_action_buttons.dart';
 import 'package:grain/widgets/gallery_preview.dart';
 
+import '../providers/gallery_cache_provider.dart';
 import '../screens/gallery_page.dart';
 import '../screens/profile_page.dart';
 
-class TimelineItemWidget extends StatelessWidget {
-  final Gallery gallery;
+class TimelineItemWidget extends ConsumerWidget {
+  final String galleryUri;
   final VoidCallback? onProfileTap;
-  const TimelineItemWidget({super.key, required this.gallery, this.onProfileTap});
+  const TimelineItemWidget({super.key, required this.galleryUri, this.onProfileTap});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final gallery = ref.watch(galleryCacheProvider)[galleryUri];
+    if (gallery == null) {
+      return const SizedBox.shrink(); // or a loading/placeholder widget
+    }
     final actor = gallery.creator;
     final createdAt = gallery.createdAt;
     final theme = Theme.of(context);
···
                 child: CircleAvatar(
                   radius: 18,
                   backgroundColor: theme.scaffoldBackgroundColor,
-                  child: (actor != null && actor.avatar.isNotEmpty)
+                  child: (actor != null && (actor.avatar?.isNotEmpty ?? false))
                       ? ClipOval(
                           child: AppImage(
                             url: actor.avatar,
···
                   children: [
                     Flexible(
                       child: Text(
-                        actor != null && actor.displayName.isNotEmpty
-                            ? actor.displayName
+                        actor != null && (actor.displayName?.isNotEmpty ?? false)
+                            ? actor.displayName ?? ''
                             : (actor != null ? '@${actor.handle}' : ''),
                         style: theme.textTheme.titleMedium?.copyWith(
                           fontWeight: FontWeight.w600,
···
           )
         else
           const SizedBox.shrink(),
-        if (gallery.title.isNotEmpty)
+        if (gallery.title?.isNotEmpty == true)
           Padding(
             padding: const EdgeInsets.only(top: 8, left: 8, right: 8),
             child: Text(
-              gallery.title,
+              gallery.title ?? '',
               style: theme.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600),
             ),
           ),
-        if (gallery.description.isNotEmpty)
+        if (gallery.description?.isNotEmpty == true)
           Padding(
             padding: const EdgeInsets.only(top: 4, left: 8, right: 8),
             child: Text(
-              gallery.description,
+              gallery.description ?? '',
               style: theme.textTheme.bodySmall?.copyWith(
                 fontSize: 13,
                 color: theme.colorScheme.onSurfaceVariant,

pubspec.lock

···
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
+      url: "https://pub.dev"
+    source: hosted
+    version: "80.0.0"
+  analyzer:
+    dependency: "direct overridden"
+    description:
+      name: analyzer
+      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.0"
+  analyzer_plugin:
+    dependency: "direct overridden"
+    description:
+      name: analyzer_plugin
+      sha256: "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.0"
   archive:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "4.0.7"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
   asn1lib:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.4"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.1.2"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.10.1"
   cached_network_image:
     dependency: "direct main"
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  ci:
+    dependency: transitive
+    description:
+      name: ci
+      sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "1.1.2"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.10.1"
   collection:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  custom_lint:
+    dependency: "direct dev"
+    description:
+      name: custom_lint
+      sha256: "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.3"
+  custom_lint_builder:
+    dependency: transitive
+    description:
+      name: custom_lint_builder
+      sha256: e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.3"
+  custom_lint_core:
+    dependency: transitive
+    description:
+      name: custom_lint_core
+      sha256: "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.1"
+  custom_lint_visitor:
+    dependency: "direct overridden"
+    description:
+      name: custom_lint_visitor
+      sha256: "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0+7.3.0"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   desktop_webview_window:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "2.0.28"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
   flutter_secure_storage:
     dependency: "direct main"
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "10.8.0"
+  freezed:
+    dependency: "direct dev"
+    description:
+      name: freezed
+      sha256: "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.8"
   freezed_annotation:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: freezed_annotation
       sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
       url: "https://pub.dev"
     source: hosted
     version: "2.4.4"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
   google_fonts:
     dependency: "direct main"
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "6.2.1"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  hotreloader:
+    dependency: transitive
+    description:
+      name: hotreloader
+      sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
   http:
     dependency: "direct main"
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "0.2.1+1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
   jose:
     dependency: "direct main"
     description:
···
     source: hosted
     version: "0.6.7"
   json_annotation:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: json_annotation
       sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
     version: "4.9.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.9.5"
   leak_tracker:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "2.6.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
   package_info_plus:
     dependency: "direct main"
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "3.9.1"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
   posix:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "6.0.3"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
   quiver:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "3.2.2"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  riverpod_analyzer_utils:
+    dependency: transitive
+    description:
+      name: riverpod_analyzer_utils
+      sha256: "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.9"
+  riverpod_annotation:
+    dependency: "direct main"
+    description:
+      name: riverpod_annotation
+      sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  riverpod_generator:
+    dependency: "direct dev"
+    description:
+      name: riverpod_generator
+      sha256: "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.4"
+  riverpod_lint:
+    dependency: "direct dev"
+    description:
+      name: riverpod_lint
+      sha256: b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.4"
   rxdart:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.5"
   source_span:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "1.12.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   stream_channel:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "0.7.4"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   typed_data:
     dependency: transitive
     description:
···
       url: "https://pub.dev"
     source: hosted
     version: "15.0.0"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
   web:
     dependency: transitive
     description:
···
     source: hosted
     version: "6.5.0"
   xrpc:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: xrpc
       sha256: bacfa0f6824fdeaa631aad1a5fd064c3f140c771fed94cbd04df3b7d1e008709
       url: "https://pub.dev"
     source: hosted
     version: "0.6.1"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
   dart: ">=3.8.1 <4.0.0"
   flutter: ">=3.27.0"

pubspec.yaml

···
   jose: ^0.3.4
   uuid: ^4.5.1
   crypto: ^3.0.6
-  xrpc: ^0.6.1
   mime: ^1.0.6
   image: ^4.5.4
   bluesky_text: ^0.7.2
+  flutter_riverpod: ^2.6.1
+  riverpod_annotation: ^2.6.1
+  freezed_annotation: ^2.4.4
+  json_annotation: ^4.9.0
+
+dependency_overrides:
+  analyzer: 7.3.0
+  analyzer_plugin: 0.12.0
+  custom_lint_visitor: 1.0.0+7.3.0
 
 dev_dependencies:
   flutter_test:
···
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^5.0.0
+  custom_lint: ^0.7.3
+  riverpod_lint: ^2.6.4
+  riverpod_generator: ^2.6.4
+  build_runner: ^2.5.4
+  freezed: ^2.4.7
+  json_serializable: ^6.8.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec