🐛 Optimzation and bug fixes

lib/database/drift_db.dart

@@ -68,6 +68,10 @@ class AppDatabase extends _$AppDatabase {
     return (delete(chatMessages)..where((m) => m.id.equals(id))).go();
   }
 
+  Future<int> getTotalMessagesForRoom(String roomId) {
+    return (select(chatMessages)..where((m) => m.roomId.equals(roomId))).get().then((list) => list.length);
+  }
+
   Future<List<LocalChatMessage>> searchMessages(
     String roomId,
     String query,

lib/screens/account/leveling.dart

@@ -95,8 +95,24 @@ class LevelingScreen extends HookConsumerWidget {
           title: Text('levelingProgress'.tr()),
           bottom: TabBar(
             tabs: [
-              Tab(text: 'leveling'.tr()),
+              Tab(
-              Tab(text: 'stellarProgram'.tr()),
+                child: Text(
+                  'leveling'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
+              Tab(
+                child: Text(
+                  'stellarProgram'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
             ],
           ),
         ),

lib/screens/chat/room.dart

@@ -355,17 +355,20 @@ class MessagesNotifier extends _$MessagesNotifier {
         offset: offset,
         limit: take,
       );
-      dbMessages = chatMessagesFromDb.map(_database.companionToMessage).toList();
+      dbMessages =
+          chatMessagesFromDb.map(_database.companionToMessage).toList();
     }
 
     List<LocalChatMessage> filteredMessages = dbMessages;
 
     if (_withLinks == true) {
-      filteredMessages = filteredMessages.where((msg) => _hasLink(msg)).toList();
+      filteredMessages =
+          filteredMessages.where((msg) => _hasLink(msg)).toList();
     }
 
     if (_withAttachments == true) {
-      filteredMessages = filteredMessages.where((msg) => _hasAttachment(msg)).toList();
+      filteredMessages =
+          filteredMessages.where((msg) => _hasAttachment(msg)).toList();
     }
 
     final dbLocalMessages = filteredMessages;
@@ -513,7 +516,9 @@ class MessagesNotifier extends _$MessagesNotifier {
       showErrorAlert(err);
     } finally {
       developer.log('Finished message sync', name: 'MessagesNotifier');
-      Future.microtask(() => ref.read(isSyncingProvider.notifier).state = false);
+      Future.microtask(
+        () => ref.read(isSyncingProvider.notifier).state = false,
+      );
       _isSyncing = false;
     }
   }
@@ -524,7 +529,9 @@ class MessagesNotifier extends _$MessagesNotifier {
     bool synced = false,
   }) async {
     try {
-      if (offset == 0 && !synced && (_searchQuery == null || _searchQuery!.isEmpty)) {
+      if (offset == 0 &&
+          !synced &&
+          (_searchQuery == null || _searchQuery!.isEmpty)) {
         _fetchAndCacheMessages(offset: 0, take: take).catchError((_) {
           return <LocalChatMessage>[];
         });
@@ -584,7 +591,9 @@ class MessagesNotifier extends _$MessagesNotifier {
         _hasMore = false;
       }
 
-      state = AsyncValue.data(_sortMessages([...currentMessages, ...newMessages]));
+      state = AsyncValue.data(
+        _sortMessages([...currentMessages, ...newMessages]),
+      );
     } catch (err, stackTrace) {
       developer.log(
         'Error loading more messages',
@@ -1481,12 +1490,6 @@ class ChatRoomScreen extends HookConsumerWidget {
               ),
         ),
         actions: [
-          IconButton(
-            icon: const Icon(Icons.search),
-            onPressed: () {
-              context.pushNamed('searchMessages', pathParameters: {'id': id});
-            },
-          ),
           AudioCallButton(roomId: id),
           IconButton(
             icon: const Icon(Icons.more_vert),
@@ -1496,7 +1499,8 @@ class ChatRoomScreen extends HookConsumerWidget {
           ),
           const Gap(8),
         ],
-        bottom: isSyncing
+        bottom:
+            isSyncing
                 ? const PreferredSize(
                   preferredSize: Size.fromHeight(2),
                   child: LinearProgressIndicator(

lib/screens/chat/room.g.dart

@@ -6,7 +6,7 @@ part of 'room.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$messagesNotifierHash() => r'dda98f5bf525f3b2bc0a7c89bc6eaa3c8b95f142';
+String _$messagesNotifierHash() => r'fc3b66dfb8dd3fc55d142dae5c5e7bdc67eca5d4';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/screens/chat/room_detail.dart

@@ -20,10 +20,17 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:island/pods/database.dart';
 
 part 'room_detail.freezed.dart';
 part 'room_detail.g.dart';
 
+@riverpod
+Future<int> totalMessagesCount(Ref ref, String roomId) async {
+  final database = ref.watch(databaseProvider);
+  return database.getTotalMessagesForRoom(roomId);
+}
+
 class ChatDetailScreen extends HookConsumerWidget {
   final String id;
   const ChatDetailScreen({super.key, required this.id});
@@ -32,6 +39,7 @@ class ChatDetailScreen extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final roomState = ref.watch(chatroomProvider(id));
     final roomIdentity = ref.watch(chatroomIdentityProvider(id));
+    final totalMessages = ref.watch(totalMessagesCountProvider(id));
 
     const kNotifyLevelText = [
       'chatNotifyLevelAll',
@@ -366,6 +374,11 @@ class ChatDetailScreen extends HookConsumerWidget {
                                   leading: const Icon(Icons.search),
                                   trailing: const Icon(Symbols.chevron_right),
                                   title: const Text('Search Messages').tr(),
+                                  subtitle: totalMessages.when(
+                                    data: (count) => Text('$count messages').tr(),
+                                    loading: () => const CircularProgressIndicator(),
+                                    error: (err, stack) => Text('Error: $err'),
+                                  ),
                                   onTap: () {
                                     context.pushNamed('searchMessages', pathParameters: {'id': id});
                                   },

lib/screens/chat/room_detail.g.dart

@@ -6,8 +6,8 @@ part of 'room_detail.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$chatMemberListNotifierHash() =>
+String _$totalMessagesCountHash() =>
-    r'3ea30150278523e9f6b23f9200ea9a9fbae9c973';
+    r'a15c03461f25c2d4d39c0926509bf626ae2550a6';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -30,6 +30,128 @@ class _SystemHash {
   }
 }
 
+/// See also [totalMessagesCount].
+@ProviderFor(totalMessagesCount)
+const totalMessagesCountProvider = TotalMessagesCountFamily();
+
+/// See also [totalMessagesCount].
+class TotalMessagesCountFamily extends Family<AsyncValue<int>> {
+  /// See also [totalMessagesCount].
+  const TotalMessagesCountFamily();
+
+  /// See also [totalMessagesCount].
+  TotalMessagesCountProvider call(String roomId) {
+    return TotalMessagesCountProvider(roomId);
+  }
+
+  @override
+  TotalMessagesCountProvider getProviderOverride(
+    covariant TotalMessagesCountProvider provider,
+  ) {
+    return call(provider.roomId);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'totalMessagesCountProvider';
+}
+
+/// See also [totalMessagesCount].
+class TotalMessagesCountProvider extends AutoDisposeFutureProvider<int> {
+  /// See also [totalMessagesCount].
+  TotalMessagesCountProvider(String roomId)
+    : this._internal(
+        (ref) => totalMessagesCount(ref as TotalMessagesCountRef, roomId),
+        from: totalMessagesCountProvider,
+        name: r'totalMessagesCountProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$totalMessagesCountHash,
+        dependencies: TotalMessagesCountFamily._dependencies,
+        allTransitiveDependencies:
+            TotalMessagesCountFamily._allTransitiveDependencies,
+        roomId: roomId,
+      );
+
+  TotalMessagesCountProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.roomId,
+  }) : super.internal();
+
+  final String roomId;
+
+  @override
+  Override overrideWith(
+    FutureOr<int> Function(TotalMessagesCountRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: TotalMessagesCountProvider._internal(
+        (ref) => create(ref as TotalMessagesCountRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        roomId: roomId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<int> createElement() {
+    return _TotalMessagesCountProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is TotalMessagesCountProvider && other.roomId == roomId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, roomId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin TotalMessagesCountRef on AutoDisposeFutureProviderRef<int> {
+  /// The parameter `roomId` of this provider.
+  String get roomId;
+}
+
+class _TotalMessagesCountProviderElement
+    extends AutoDisposeFutureProviderElement<int>
+    with TotalMessagesCountRef {
+  _TotalMessagesCountProviderElement(super.provider);
+
+  @override
+  String get roomId => (origin as TotalMessagesCountProvider).roomId;
+}
+
+String _$chatMemberListNotifierHash() =>
+    r'3ea30150278523e9f6b23f9200ea9a9fbae9c973';
+
 abstract class _$ChatMemberListNotifier
     extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnChatMember>> {
   late final String roomId;

lib/screens/developers/app_detail.dart

@@ -27,7 +27,9 @@ class AppDetailScreen extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final tabController = useTabController(initialLength: 2);
-    final appData = ref.watch(customAppProvider(publisherName, projectId, appId));
+    final appData = ref.watch(
+      customAppProvider(publisherName, projectId, appId),
+    );
 
     return AppScaffold(
       appBar: AppBar(
@@ -35,7 +37,8 @@ class AppDetailScreen extends HookConsumerWidget {
         actions: [
           IconButton(
             icon: const Icon(Symbols.edit),
-            onPressed: appData.value == null
+            onPressed:
+                appData.value == null
                     ? null
                     : () {
                       context.pushNamed(
@@ -51,7 +54,26 @@ class AppDetailScreen extends HookConsumerWidget {
         ],
         bottom: TabBar(
           controller: tabController,
-          tabs: [Tab(text: 'overview'.tr()), Tab(text: 'secrets'.tr())],
+          tabs: [
+            Tab(
+              child: Text(
+                'overview'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'secrets'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+          ],
         ),
       ),
       body: appData.when(
@@ -70,9 +92,11 @@ class AppDetailScreen extends HookConsumerWidget {
           );
         },
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (err, stack) => ResponseErrorWidget(
+        error:
+            (err, stack) => ResponseErrorWidget(
               error: err,
-          onRetry: () => ref.invalidate(
+              onRetry:
+                  () => ref.invalidate(
                     customAppProvider(publisherName, projectId, appId),
                   ),
             ),
@@ -98,7 +122,8 @@ class _AppOverview extends StatelessWidget {
               children: [
                 Container(
                   color: Theme.of(context).colorScheme.surfaceContainer,
-                  child: app.background != null
+                  child:
+                      app.background != null
                           ? CloudFileWidget(
                             item: app.background!,
                             fit: BoxFit.cover,

lib/screens/developers/bot_detail.dart

@@ -52,7 +52,26 @@ class BotDetailScreen extends HookConsumerWidget {
         ],
         bottom: TabBar(
           controller: tabController,
-          tabs: [Tab(text: 'overview'.tr()), Tab(text: 'keys'.tr())],
+          tabs: [
+            Tab(
+              child: Text(
+                'overview'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'keys'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+          ],
         ),
       ),
       body: botData.when(

lib/screens/developers/project_detail.dart

@@ -58,7 +58,26 @@ class ProjectDetailScreen extends HookConsumerWidget {
         ],
         bottom: TabBar(
           controller: tabController,
-          tabs: [Tab(text: 'customApps'.tr()), Tab(text: 'bots'.tr())],
+          tabs: [
+            Tab(
+              child: Text(
+                'customApps'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'bots'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+          ],
         ),
       ),
       body: TabBarView(

lib/screens/discovery/articles.dart

@@ -143,8 +143,26 @@ class ArticlesScreen extends ConsumerWidget {
               bottom: TabBar(
                 isScrollable: true,
                 tabs: [
-                  const Tab(text: 'All'),
+                  Tab(
-                  ...feeds.map((feed) => Tab(text: feed.title)),
+                    child: Text(
+                      'All',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        color: Theme.of(context).appBarTheme.foregroundColor!,
+                      ),
+                    ),
+                  ),
+                  ...feeds.map(
+                    (feed) => Tab(
+                      child: Text(
+                        feed.title,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          color: Theme.of(context).appBarTheme.foregroundColor!,
+                        ),
+                      ),
+                    ),
+                  ),
                 ],
               ),
             ),