✨ Android install update

ios/Podfile.lock

@@ -73,6 +73,8 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 8.1)
     - nanopb (~> 3.30910.0)
   - Flutter (1.0.0)
+  - flutter_app_update (0.0.1):
+    - Flutter
   - flutter_inappwebview_ios (0.0.1):
     - Flutter
     - flutter_inappwebview_ios/Core (= 0.0.1)
@@ -223,6 +225,7 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
+  - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
@@ -293,6 +296,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
+  flutter_app_update:
+    :path: ".symlinks/plugins/flutter_app_update/ios"
   flutter_inappwebview_ios:
     :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_keyboard_visibility:
@@ -372,6 +377,7 @@ SPEC CHECKSUMS:
   FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
   FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf

lib/main.dart

@@ -30,7 +30,6 @@ import 'package:image_picker_platform_interface/image_picker_platform_interface.
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:flutter_langdetect/flutter_langdetect.dart' as langdetect;
-import 'package:island/services/update_service.dart';
 
 @pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
@@ -144,15 +143,6 @@ void main() async {
       ),
     ),
   );
-
-  // Schedule update check shortly after startup, when a context is available.
-  // Uses the global overlay key to obtain a BuildContext safely.
-  WidgetsBinding.instance.addPostFrameCallback((_) {
-    final ctx = globalOverlay.currentContext;
-    if (ctx != null) {
-      UpdateService().checkForUpdates(ctx);
-    }
-  });
 }
 
 // Router will be provided through Riverpod

lib/models/user.dart

@@ -34,6 +34,23 @@ sealed class ProfileLink with _$ProfileLink {
       _$ProfileLinkFromJson(json);
 }
 
+class ProfileLinkConverter
+    implements JsonConverter<List<ProfileLink>, dynamic> {
+  const ProfileLinkConverter();
+
+  @override
+  List<ProfileLink> fromJson(dynamic json) {
+    return json is List<dynamic>
+        ? json.map((e) => ProfileLink.fromJson(e)).cast<ProfileLink>().toList()
+        : <ProfileLink>[];
+  }
+
+  @override
+  List<dynamic> toJson(List<ProfileLink> object) {
+    return object.map((e) => e.toJson()).toList();
+  }
+}
+
 @freezed
 sealed class SnAccountProfile with _$SnAccountProfile {
   const factory SnAccountProfile({
@@ -47,7 +64,7 @@ sealed class SnAccountProfile with _$SnAccountProfile {
     @Default('') String location,
     @Default('') String timeZone,
     DateTime? birthday,
-    @Default([]) List<ProfileLink> links,
+    @ProfileLinkConverter() @Default([]) List<ProfileLink> links,
     DateTime? lastSeenAt,
     SnAccountBadge? activeBadge,
     required int experience,

lib/models/user.freezed.dart

@@ -610,7 +610,7 @@ as String,
 /// @nodoc
 mixin _$SnAccountProfile {
 
- String get id; String get firstName; String get middleName; String get lastName; String get bio; String get gender; String get pronouns; String get location; String get timeZone; DateTime? get birthday; List<ProfileLink> get links; DateTime? get lastSeenAt; SnAccountBadge? get activeBadge; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; SnCloudFile? get background; SnVerificationMark? get verification; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String get firstName; String get middleName; String get lastName; String get bio; String get gender; String get pronouns; String get location; String get timeZone; DateTime? get birthday;@ProfileLinkConverter() List<ProfileLink> get links; DateTime? get lastSeenAt; SnAccountBadge? get activeBadge; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; SnCloudFile? get background; SnVerificationMark? get verification; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAccountProfile
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -643,7 +643,7 @@ abstract mixin class $SnAccountProfileCopyWith<$Res>  {
   factory $SnAccountProfileCopyWith(SnAccountProfile value, $Res Function(SnAccountProfile) _then) = _$SnAccountProfileCopyWithImpl;
 @useResult
 $Res call({
- String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, List<ProfileLink> links, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday,@ProfileLinkConverter() List<ProfileLink> links, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -814,7 +814,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday,  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday, @ProfileLinkConverter()  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAccountProfile() when $default != null:
 return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.bio,_that.gender,_that.pronouns,_that.location,_that.timeZone,_that.birthday,_that.links,_that.lastSeenAt,_that.activeBadge,_that.experience,_that.level,_that.levelingProgress,_that.picture,_that.background,_that.verification,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -835,7 +835,7 @@ return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.b
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday,  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday, @ProfileLinkConverter()  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAccountProfile():
 return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.bio,_that.gender,_that.pronouns,_that.location,_that.timeZone,_that.birthday,_that.links,_that.lastSeenAt,_that.activeBadge,_that.experience,_that.level,_that.levelingProgress,_that.picture,_that.background,_that.verification,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -852,7 +852,7 @@ return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.b
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday,  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String firstName,  String middleName,  String lastName,  String bio,  String gender,  String pronouns,  String location,  String timeZone,  DateTime? birthday, @ProfileLinkConverter()  List<ProfileLink> links,  DateTime? lastSeenAt,  SnAccountBadge? activeBadge,  int experience,  int level,  double levelingProgress,  SnCloudFile? picture,  SnCloudFile? background,  SnVerificationMark? verification,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAccountProfile() when $default != null:
 return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.bio,_that.gender,_that.pronouns,_that.location,_that.timeZone,_that.birthday,_that.links,_that.lastSeenAt,_that.activeBadge,_that.experience,_that.level,_that.levelingProgress,_that.picture,_that.background,_that.verification,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -867,7 +867,7 @@ return $default(_that.id,_that.firstName,_that.middleName,_that.lastName,_that.b
 @JsonSerializable()
 
 class _SnAccountProfile implements SnAccountProfile {
-  const _SnAccountProfile({required this.id, this.firstName = '', this.middleName = '', this.lastName = '', this.bio = '', this.gender = '', this.pronouns = '', this.location = '', this.timeZone = '', this.birthday, final  List<ProfileLink> links = const [], this.lastSeenAt, this.activeBadge, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.background, required this.verification, required this.createdAt, required this.updatedAt, required this.deletedAt}): _links = links;
+  const _SnAccountProfile({required this.id, this.firstName = '', this.middleName = '', this.lastName = '', this.bio = '', this.gender = '', this.pronouns = '', this.location = '', this.timeZone = '', this.birthday, @ProfileLinkConverter() final  List<ProfileLink> links = const [], this.lastSeenAt, this.activeBadge, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.background, required this.verification, required this.createdAt, required this.updatedAt, required this.deletedAt}): _links = links;
   factory _SnAccountProfile.fromJson(Map<String, dynamic> json) => _$SnAccountProfileFromJson(json);
 
 @override final  String id;
@@ -881,7 +881,7 @@ class _SnAccountProfile implements SnAccountProfile {
 @override@JsonKey() final  String timeZone;
 @override final  DateTime? birthday;
  final  List<ProfileLink> _links;
-@override@JsonKey() List<ProfileLink> get links {
+@override@JsonKey()@ProfileLinkConverter() List<ProfileLink> get links {
   if (_links is EqualUnmodifiableListView) return _links;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_links);
@@ -932,7 +932,7 @@ abstract mixin class _$SnAccountProfileCopyWith<$Res> implements $SnAccountProfi
   factory _$SnAccountProfileCopyWith(_SnAccountProfile value, $Res Function(_SnAccountProfile) _then) = __$SnAccountProfileCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday, List<ProfileLink> links, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String firstName, String middleName, String lastName, String bio, String gender, String pronouns, String location, String timeZone, DateTime? birthday,@ProfileLinkConverter() List<ProfileLink> links, DateTime? lastSeenAt, SnAccountBadge? activeBadge, int experience, int level, double levelingProgress, SnCloudFile? picture, SnCloudFile? background, SnVerificationMark? verification, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 

lib/models/user.g.dart

@@ -69,10 +69,9 @@ _SnAccountProfile _$SnAccountProfileFromJson(Map<String, dynamic> json) =>
               ? null
               : DateTime.parse(json['birthday'] as String),
       links:
-          (json['links'] as List<dynamic>?)
+          json['links'] == null
-              ?.map((e) => ProfileLink.fromJson(e as Map<String, dynamic>))
+              ? const []
-              .toList() ??
+              : const ProfileLinkConverter().fromJson(json['links']),
-          const [],
       lastSeenAt:
           json['last_seen_at'] == null
               ? null
@@ -122,7 +121,7 @@ Map<String, dynamic> _$SnAccountProfileToJson(_SnAccountProfile instance) =>
       'location': instance.location,
       'time_zone': instance.timeZone,
       'birthday': instance.birthday?.toIso8601String(),
-      'links': instance.links.map((e) => e.toJson()).toList(),
+      'links': const ProfileLinkConverter().toJson(instance.links),
       'last_seen_at': instance.lastSeenAt?.toIso8601String(),
       'active_badge': instance.activeBadge?.toJson(),
       'experience': instance.experience,

lib/screens/about.dart

@@ -7,12 +7,12 @@ import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/services/udid.native.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/services/update_service.dart';
-import 'package:island/widgets/content/sheet.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -205,33 +205,16 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                                 // Fetch latest release and show the unified sheet
                                 final svc = UpdateService();
                                 // Reuse service fetch + compare to decide content
+                                showLoadingModal(context);
                                 final release = await svc.fetchLatestRelease();
+                                if (!context.mounted) return;
+                                hideLoadingModal(context);
                                 if (release != null) {
                                   await svc.showUpdateSheet(context, release);
                                 } else {
-                                  // Fallback: show a simple sheet indicating no info
+                                  showInfoAlert(
-                                  // Use your SheetScaffold for consistent styling
+                                    'Currently cannot get update from the GitHub.',
-                                  // Show a minimal message
+                                    'Unable to check for updates',
-                                  // ignore: use_build_context_synchronously
-                                  showModalBottomSheet(
-                                    context: context,
-                                    isScrollControlled: true,
-                                    useSafeArea: true,
-                                    showDragHandle: true,
-                                    backgroundColor:
-                                        Theme.of(context).colorScheme.surface,
-                                    builder:
-                                        (_) => const SheetScaffold(
-                                          titleText: 'Update',
-                                          child: Center(
-                                            child: Padding(
-                                              padding: EdgeInsets.all(24),
-                                              child: Text(
-                                                'Unable to fetch release info at this time.',
-                                              ),
-                                            ),
-                                          ),
-                                        ),
                                   );
                                 }
                               },

lib/screens/creators/poll/poll_list.dart

@@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/poll/poll_feedback.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -70,7 +71,7 @@ class CreatorPollListScreen extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(title: const Text('Polls')),
       floatingActionButton: FloatingActionButton(
         onPressed: () => _createPoll(context),

lib/screens/creators/webfeed/webfeed_edit.dart

@@ -114,10 +114,11 @@ class WebFeedEditScreen extends HookConsumerWidget {
 
     return feedAsync.when(
       loading:
-          () =>
+          () => const AppScaffold(
-              const Scaffold(body: Center(child: CircularProgressIndicator())),
+            body: Center(child: CircularProgressIndicator()),
+          ),
       error:
-          (error, stack) => Scaffold(
+          (error, stack) => AppScaffold(
             appBar: AppBar(title: const Text('Error')),
             body: Center(child: Text('Error: $error')),
           ),

lib/screens/poll/poll_editor.dart

@@ -9,6 +9,7 @@ import 'package:gap/gap.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/models/poll.dart';
+import 'package:island/widgets/app_scaffold.dart';
 import 'package:uuid/uuid.dart';
 
 class PollEditorState {
@@ -413,7 +414,7 @@ class PollEditorScreen extends ConsumerWidget {
       });
     }
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: Text(model.id == null ? 'Create Poll' : 'Edit Poll'),
         actions: [
@@ -428,175 +429,175 @@ class PollEditorScreen extends ConsumerWidget {
           const Gap(8),
         ],
       ),
-      body: SafeArea(
+      body: Column(
-        child: Form(
+        children: [
-          key: ValueKey(model.id),
+          Expanded(
-          child: ListView(
+            child: Form(
-            padding: const EdgeInsets.all(16),
+              key: ValueKey(model.id),
-            children: [
+              child: ListView(
-              TextFormField(
+                padding: const EdgeInsets.all(16),
-                initialValue: model.title ?? '',
-                decoration: const InputDecoration(
-                  labelText: 'Title',
-                  border: OutlineInputBorder(
-                    borderRadius: BorderRadius.all(Radius.circular(16)),
-                  ),
-                ),
-                textInputAction: TextInputAction.next,
-                maxLength: 256,
-                onChanged: notifier.setTitle,
-                onTapOutside:
-                    (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                validator: (v) {
-                  if (v == null || v.trim().isEmpty) {
-                    return 'Title is required';
-                  }
-                  return null;
-                },
-              ),
-              const Gap(12),
-              TextFormField(
-                initialValue: model.description ?? '',
-                decoration: const InputDecoration(
-                  labelText: 'Description',
-                  alignLabelWithHint: true,
-                  border: OutlineInputBorder(
-                    borderRadius: BorderRadius.all(Radius.circular(16)),
-                  ),
-                ),
-                maxLines: 3,
-                maxLength: 4096,
-                onChanged: notifier.setDescription,
-                onTapOutside:
-                    (_) => FocusManager.instance.primaryFocus?.unfocus(),
-              ),
-              const Gap(12),
-              _EndDatePicker(
-                value: model.endedAt,
-                onChanged: notifier.setEndedAt,
-              ),
-              const Gap(24),
-              Row(
                 children: [
-                  Text(
+                  TextFormField(
-                    'Questions',
+                    initialValue: model.title ?? '',
-                    style: Theme.of(context).textTheme.titleLarge,
+                    decoration: const InputDecoration(
-                  ),
+                      labelText: 'Title',
-                  const Spacer(),
+                      border: OutlineInputBorder(
-                  MenuAnchor(
+                        borderRadius: BorderRadius.all(Radius.circular(16)),
-                    builder: (context, controller, child) {
+                      ),
-                      return FilledButton.icon(
+                    ),
-                        onPressed: () {
+                    textInputAction: TextInputAction.next,
-                          controller.isOpen
+                    maxLength: 256,
-                              ? controller.close()
+                    onChanged: notifier.setTitle,
-                              : controller.open();
+                    onTapOutside:
-                        },
+                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                        icon: const Icon(Icons.add),
+                    validator: (v) {
-                        label: const Text('Add question'),
+                      if (v == null || v.trim().isEmpty) {
-                      );
+                        return 'Title is required';
+                      }
+                      return null;
                     },
-                    menuChildren:
-                        SnPollQuestionType.values
-                            .map(
-                              (t) => MenuItemButton(
-                                leadingIcon: Icon(_iconForType(t)),
-                                onPressed: () => notifier.addQuestion(t),
-                                child: Text(_labelForType(t)),
-                              ),
-                            )
-                            .toList(),
                   ),
+                  const Gap(12),
+                  TextFormField(
+                    initialValue: model.description ?? '',
+                    decoration: const InputDecoration(
+                      labelText: 'Description',
+                      alignLabelWithHint: true,
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.all(Radius.circular(16)),
+                      ),
+                    ),
+                    maxLines: 3,
+                    maxLength: 4096,
+                    onChanged: notifier.setDescription,
+                    onTapOutside:
+                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  ),
+                  const Gap(12),
+                  _EndDatePicker(
+                    value: model.endedAt,
+                    onChanged: notifier.setEndedAt,
+                  ),
+                  const Gap(24),
+                  Row(
+                    children: [
+                      Text(
+                        'Questions',
+                        style: Theme.of(context).textTheme.titleLarge,
+                      ),
+                      const Spacer(),
+                      MenuAnchor(
+                        builder: (context, controller, child) {
+                          return FilledButton.icon(
+                            onPressed: () {
+                              controller.isOpen
+                                  ? controller.close()
+                                  : controller.open();
+                            },
+                            icon: const Icon(Icons.add),
+                            label: const Text('Add question'),
+                          );
+                        },
+                        menuChildren:
+                            SnPollQuestionType.values
+                                .map(
+                                  (t) => MenuItemButton(
+                                    leadingIcon: Icon(_iconForType(t)),
+                                    onPressed: () => notifier.addQuestion(t),
+                                    child: Text(_labelForType(t)),
+                                  ),
+                                )
+                                .toList(),
+                      ),
+                    ],
+                  ),
+                  const Gap(8),
+                  if (model.questions.isEmpty)
+                    _EmptyState(
+                      title: 'No questions yet',
+                      subtitle:
+                          'Use "Add question" to start building your poll.',
+                    )
+                  else
+                    ReorderableListView.builder(
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      itemCount: model.questions.length,
+                      onReorder: (oldIndex, newIndex) {
+                        // Convert to stepwise moves using provided functions
+                        if (newIndex > oldIndex) newIndex -= 1;
+                        final steps = newIndex - oldIndex;
+                        if (steps == 0) return;
+                        if (steps > 0) {
+                          for (int i = 0; i < steps; i++) {
+                            notifier.moveQuestionDown(oldIndex + i);
+                          }
+                        } else {
+                          for (int i = 0; i > steps; i--) {
+                            notifier.moveQuestionUp(oldIndex + i);
+                          }
+                        }
+                      },
+                      buildDefaultDragHandles: false,
+                      itemBuilder: (context, index) {
+                        final q = model.questions[index];
+                        return Card(
+                          key: ValueKey('q_$index'),
+                          margin: const EdgeInsets.symmetric(vertical: 8),
+                          clipBehavior: Clip.antiAlias,
+                          child: Column(
+                            children: [
+                              _QuestionHeader(
+                                index: index,
+                                question: q,
+                                onMoveUp:
+                                    index > 0
+                                        ? () => notifier.moveQuestionUp(index)
+                                        : null,
+                                onMoveDown:
+                                    index < model.questions.length - 1
+                                        ? () => notifier.moveQuestionDown(index)
+                                        : null,
+                                onDelete: () => notifier.removeQuestion(index),
+                              ),
+                              const Divider(height: 1),
+                              Padding(
+                                padding: const EdgeInsets.all(16),
+                                child: _QuestionEditor(
+                                  index: index,
+                                  question: q,
+                                ),
+                              ),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+                  const Gap(96),
                 ],
               ),
-              const Gap(8),
+            ),
-              if (model.questions.isEmpty)
+          ),
-                _EmptyState(
+          Row(
-                  title: 'No questions yet',
+            children: [
-                  subtitle: 'Use "Add question" to start building your poll.',
+              OutlinedButton.icon(
-                )
+                onPressed: () {
-              else
+                  Navigator.of(context).maybePop();
-                ReorderableListView.builder(
+                },
-                  shrinkWrap: true,
+                icon: const Icon(Icons.close),
-                  physics: const NeverScrollableScrollPhysics(),
+                label: const Text('Cancel'),
-                  itemCount: model.questions.length,
+              ),
-                  onReorder: (oldIndex, newIndex) {
+              const Spacer(),
-                    // Convert to stepwise moves using provided functions
+              FilledButton.icon(
-                    if (newIndex > oldIndex) newIndex -= 1;
+                onPressed: () {
-                    final steps = newIndex - oldIndex;
+                  _submitPoll(context, ref);
-                    if (steps == 0) return;
+                },
-                    if (steps > 0) {
+                icon: const Icon(Icons.cloud_upload_outlined),
-                      for (int i = 0; i < steps; i++) {
+                label: Text(model.id == null ? 'Create' : 'Update'),
-                        notifier.moveQuestionDown(oldIndex + i);
+              ),
-                      }
-                    } else {
-                      for (int i = 0; i > steps; i--) {
-                        notifier.moveQuestionUp(oldIndex + i);
-                      }
-                    }
-                  },
-                  buildDefaultDragHandles: false,
-                  itemBuilder: (context, index) {
-                    final q = model.questions[index];
-                    return Card(
-                      key: ValueKey('q_$index'),
-                      margin: const EdgeInsets.symmetric(vertical: 8),
-                      clipBehavior: Clip.antiAlias,
-                      child: Column(
-                        children: [
-                          _QuestionHeader(
-                            index: index,
-                            question: q,
-                            onMoveUp:
-                                index > 0
-                                    ? () => notifier.moveQuestionUp(index)
-                                    : null,
-                            onMoveDown:
-                                index < model.questions.length - 1
-                                    ? () => notifier.moveQuestionDown(index)
-                                    : null,
-                            onDelete: () => notifier.removeQuestion(index),
-                          ),
-                          const Divider(height: 1),
-                          Padding(
-                            padding: const EdgeInsets.all(16),
-                            child: _QuestionEditor(index: index, question: q),
-                          ),
-                        ],
-                      ),
-                    );
-                  },
-                ),
-              const Gap(96),
             ],
           ),
-        ),
+        ],
-      ),
-      bottomNavigationBar: Padding(
-        padding: EdgeInsets.fromLTRB(
-          16,
-          8,
-          16,
-          16 + MediaQuery.of(context).padding.bottom,
-        ),
-        child: Row(
-          children: [
-            OutlinedButton.icon(
-              onPressed: () {
-                Navigator.of(context).maybePop();
-              },
-              icon: const Icon(Icons.close),
-              label: const Text('Cancel'),
-            ),
-            const Spacer(),
-            FilledButton.icon(
-              onPressed: () {
-                _submitPoll(context, ref);
-              },
-              icon: const Icon(Icons.cloud_upload_outlined),
-              label: Text(model.id == null ? 'Create' : 'Update'),
-            ),
-          ],
-        ),
       ),
     );
   }

lib/services/update_service.dart

@@ -1,19 +1,27 @@
 import 'dart:async';
+import 'dart:developer';
+import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_app_update/azhon_app_update.dart';
+import 'package:flutter_app_update/update_model.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:collection/collection.dart'; // Added for firstWhereOrNull
 import 'package:styled_widget/styled_widget.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:island/widgets/content/sheet.dart';
 
 /// Data model for a GitHub release we care about
 class GithubReleaseInfo {
-  final String tagName; // e.g. 3.1.0+118
+  final String tagName;
-  final String name; // release title
+  final String name;
-  final String body; // changelog markdown
+  final String body;
-  final String htmlUrl; // release page
+  final String htmlUrl;
   final DateTime createdAt;
+  final List<GithubReleaseAsset> assets;
 
   const GithubReleaseInfo({
     required this.tagName,
@@ -21,9 +29,28 @@ class GithubReleaseInfo {
     required this.body,
     required this.htmlUrl,
     required this.createdAt,
+    this.assets = const [],
   });
 }
 
+/// Data model for a GitHub release asset
+class GithubReleaseAsset {
+  final String name;
+  final String browserDownloadUrl;
+
+  const GithubReleaseAsset({
+    required this.name,
+    required this.browserDownloadUrl,
+  });
+
+  factory GithubReleaseAsset.fromJson(Map<String, dynamic> json) {
+    return GithubReleaseAsset(
+      name: json['name'] as String,
+      browserDownloadUrl: json['browser_download_url'] as String,
+    );
+  }
+}
+
 /// Parses version and build number from "x.y.z+build"
 class _ParsedVersion implements Comparable<_ParsedVersion> {
   final int major;
@@ -85,31 +112,52 @@ class UpdateService {
   /// Checks GitHub for the latest release and compares against the current app version.
   /// If update is available, shows a bottom sheet with changelog and an action to open release page.
   Future<void> checkForUpdates(BuildContext context) async {
+    log('[Update] Checking for updates...');
     try {
       final release = await fetchLatestRelease();
-      if (release == null) return;
+      if (release == null) {
+        log('[Update] No latest release found or could not fetch.');
+        return;
+      }
+      log('[Update] Fetched latest release: ${release.tagName}');
 
       final info = await PackageInfo.fromPlatform();
       final localVersionStr = '${info.version}+${info.buildNumber}';
+      log('[Update] Local app version: $localVersionStr');
 
       final latest = _ParsedVersion.tryParse(release.tagName);
       final local = _ParsedVersion.tryParse(localVersionStr);
 
       if (latest == null || local == null) {
+        log(
+          '[Update] Failed to parse versions. Latest: ${release.tagName}, Local: $localVersionStr',
+        );
         // If parsing fails, do nothing silently
         return;
       }
+      log('[Update] Parsed versions. Latest: $latest, Local: $local');
 
       final needsUpdate = latest.compareTo(local) > 0;
-      if (!needsUpdate) return;
+      if (!needsUpdate) {
+        log('[Update] App is up to date. No update needed.');
+        return;
+      }
+      log('[Update] Update available! Latest: $latest, Local: $local');
 
-      if (!context.mounted) return;
+      if (!context.mounted) {
+        log('[Update] Context not mounted, cannot show update sheet.');
+        return;
+      }
 
       // Delay to ensure UI is ready (if called at startup)
       await Future.delayed(const Duration(milliseconds: 100));
 
-      await showUpdateSheet(context, release);
+      if (context.mounted) {
-    } catch (_) {
+        await showUpdateSheet(context, release);
+        log('[Update] Update sheet shown.');
+      }
+    } catch (e) {
+      log('[Update] Error checking for updates: $e');
       // Ignore errors (network, api, etc.)
       return;
     }
@@ -126,25 +174,62 @@ class UpdateService {
       context: context,
       isScrollControlled: true,
       useRootNavigator: true,
-      builder:
+      builder: (ctx) {
-          (ctx) => _UpdateSheet(
+        String? androidUpdateUrl;
-            release: release,
+        if (Platform.isAndroid) {
-            onOpen: () async {
+          androidUpdateUrl = _getAndroidUpdateUrl(release.assets);
-              final uri = Uri.parse(release.htmlUrl);
+        }
-              if (await canLaunchUrl(uri)) {
+        return _UpdateSheet(
-                await launchUrl(uri, mode: LaunchMode.externalApplication);
+          release: release,
-              }
+          onOpen: () async {
-            },
+            final uri = Uri.parse(release.htmlUrl);
-          ),
+            if (await canLaunchUrl(uri)) {
+              await launchUrl(uri, mode: LaunchMode.externalApplication);
+            }
+          },
+          androidUpdateUrl: androidUpdateUrl,
+        );
+      },
     );
   }
 
+  String? _getAndroidUpdateUrl(List<GithubReleaseAsset> assets) {
+    final arm64 = assets.firstWhereOrNull(
+      (asset) => asset.name == 'app-arm64-v8a-release.apk',
+    );
+    final armeabi = assets.firstWhereOrNull(
+      (asset) => asset.name == 'app-armeabi-v7a-release.apk',
+    );
+    final x86_64 = assets.firstWhereOrNull(
+      (asset) => asset.name == 'app-x86_64-release.apk',
+    );
+
+    // Prioritize arm64, then armeabi, then x86_64
+    if (arm64 != null) {
+      return arm64.browserDownloadUrl;
+    } else if (armeabi != null) {
+      return armeabi.browserDownloadUrl;
+    } else if (x86_64 != null) {
+      return x86_64.browserDownloadUrl;
+    }
+    return null;
+  }
+
   /// Fetch the latest release info from GitHub.
   /// Public so other screens (e.g., About) can manually trigger update checks.
   Future<GithubReleaseInfo?> fetchLatestRelease() async {
+    log(
+      '[Update] Fetching latest release from GitHub API: $_releasesLatestApi',
+    );
     final resp = await _dio.get(_releasesLatestApi);
-    if (resp.statusCode != 200) return null;
+    if (resp.statusCode != 200) {
+      log(
+        '[Update] Failed to fetch latest release. Status code: ${resp.statusCode}',
+      );
+      return null;
+    }
     final data = resp.data as Map<String, dynamic>;
+    log('[Update] Successfully fetched release data.');
 
     final tagName = (data['tag_name'] ?? '').toString();
     final name = (data['name'] ?? tagName).toString();
@@ -152,25 +237,52 @@ class UpdateService {
     final htmlUrl = (data['html_url'] ?? '').toString();
     final createdAtStr = (data['created_at'] ?? '').toString();
     final createdAt = DateTime.tryParse(createdAtStr) ?? DateTime.now();
+    final assetsData =
+        (data['assets'] as List<dynamic>?)
+            ?.map((e) => GithubReleaseAsset.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [];
 
-    if (tagName.isEmpty || htmlUrl.isEmpty) return null;
+    if (tagName.isEmpty || htmlUrl.isEmpty) {
+      log(
+        '[Update] Missing tag_name or html_url in release data. TagName: "$tagName", HtmlUrl: "$htmlUrl"',
+      );
+      return null;
+    }
 
+    log('[Update] Returning GithubReleaseInfo for tag: $tagName');
     return GithubReleaseInfo(
       tagName: tagName,
       name: name,
       body: body,
       htmlUrl: htmlUrl,
       createdAt: createdAt,
+      assets: assetsData,
     );
   }
 }
 
 class _UpdateSheet extends StatelessWidget {
-  const _UpdateSheet({required this.release, required this.onOpen});
+  const _UpdateSheet({
+    required this.release,
+    required this.onOpen,
+    this.androidUpdateUrl, // Made nullable
+  });
 
+  final String? androidUpdateUrl; // Changed to nullable
   final GithubReleaseInfo release;
   final VoidCallback onOpen;
 
+  Future<void> installUpdate(String url) async {
+    UpdateModel model = UpdateModel(
+      url,
+      "solian-update-${release.tagName}.apk",
+      "ic_launcher",
+      'https://apps.apple.com/us/app/solian/id6499032345',
+    );
+    AzhonAppUpdate.update(model);
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -208,7 +320,21 @@ class _UpdateSheet extends StatelessWidget {
             Column(
               children: [
                 Row(
+                  spacing: 8,
                   children: [
+                    if (!kIsWeb &&
+                        Platform.isAndroid &&
+                        androidUpdateUrl != null)
+                      Expanded(
+                        child: FilledButton.icon(
+                          onPressed: () {
+                            log(androidUpdateUrl!);
+                            installUpdate(androidUpdateUrl!);
+                          },
+                          icon: const Icon(Symbols.update),
+                          label: const Text('Install update'),
+                        ),
+                      ),
                     Expanded(
                       child: FilledButton.icon(
                         onPressed: onOpen,

lib/widgets/app_wrapper.dart

@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/services/notify.dart';
 import 'package:island/services/sharing_intent.dart';
+import 'package:island/services/update_service.dart';
 import 'package:island/widgets/content/network_status_sheet.dart';
 import 'package:island/widgets/tour/tour.dart';
 
@@ -21,6 +22,7 @@ class AppWrapper extends HookConsumerWidget {
       });
       final sharingService = SharingIntentService();
       sharingService.initialize(context);
+      UpdateService().checkForUpdates(context);
       return () {
         sharingService.dispose();
         ntySubs?.cancel();

lib/widgets/content/markdown.dart

@@ -176,7 +176,7 @@ class MarkdownTextContent extends HookConsumerWidget {
                           uri: stickerUri,
                           width: size,
                           height: size,
-                          fit: BoxFit.cover,
+                          fit: BoxFit.contain,
                           noCacheOptimization: true,
                         ),
                       ),

pubspec.lock

@@ -662,6 +662,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_app_update:
+    dependency: "direct main"
+    description:
+      name: flutter_app_update
+      sha256: "09290240949c4651581cd6fc535e52d019e189e694d6019c56b5a56c2e69ba65"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
   flutter_blurhash:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.1.0+120
+version: 3.1.0+121
 
 environment:
   sdk: ^3.7.2
@@ -133,6 +133,7 @@ dependencies:
   flutter_typeahead: ^5.2.0
   flutter_langdetect: ^0.0.2
   waveform_flutter: ^1.2.0
+  flutter_app_update: ^3.2.2
 
 dev_dependencies:
   flutter_test: