Sync update: 2026-05-19 23:27:14

whatsapp_app/lib/screens/conversations_screen.dart

@@ -15,134 +15,202 @@ class ConversationsScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final svc  = Get.find<WhatsAppService>();
     final ctrl = Get.put(ConversationsController());
+    final isDark = AppTheme.isDark(context);
 
     return Scaffold(
-      backgroundColor: AppTheme.background,
-      appBar: _buildAppBar(ctrl),
+      backgroundColor: AppTheme.background(context),
+      appBar: _buildAppBar(context, ctrl),
       body: Obx(() {
         // Not connected
         if (svc.status.value == WsStatus.disconnected ||
             svc.status.value == WsStatus.connecting) {
-          return _buildConnecting();
+          return _buildConnecting(context);
         }
         // QR Code needed
         if (svc.qrData.value != null) {
           return const QrView();
         }
         // Loading conversations
-        if (ctrl.isLoading.value) {
-          return const Center(
+        if (ctrl.isLoading.value && ctrl.conversations.isEmpty) {
+          return Center(
             child: CircularProgressIndicator(color: AppTheme.primary),
           );
         }
         // Error
-        if (ctrl.errorMessage.value != null) {
-          return _buildError(ctrl);
+        if (ctrl.errorMessage.value != null && ctrl.conversations.isEmpty) {
+          return _buildError(context, ctrl);
         }
         // Empty
         if (ctrl.conversations.isEmpty) {
-          return _buildEmpty();
+          return _buildEmpty(context);
         }
         // List
-        return _buildList(ctrl);
+        return _buildList(context, ctrl);
       }),
     );
   }
 
-  AppBar _buildAppBar(ConversationsController ctrl) {
+  PreferredSizeWidget _buildAppBar(
+      BuildContext context, ConversationsController ctrl) {
     final searching = false.obs;
+    final isDark = AppTheme.isDark(context);
 
     return AppBar(
-      backgroundColor: AppTheme.surface,
+      backgroundColor: AppTheme.surface(context),
+      elevation: 0,
       title: Obx(() => searching.value
           ? TextField(
               autofocus: true,
-              style: const TextStyle(color: AppTheme.textPrimary),
-              decoration: const InputDecoration(
+              style: TextStyle(color: isDark ? Colors.white : Colors.white),
+              cursorColor: Colors.white,
+              decoration: InputDecoration(
                 hintText: 'Search...',
                 border: InputBorder.none,
-                hintStyle: TextStyle(color: AppTheme.textSecondary),
+                hintStyle: TextStyle(
+                    color: Colors.white.withOpacity(0.7)),
               ),
               onChanged: ctrl.search,
             )
-          : const Text('WhatsApp', style: TextStyle(color: AppTheme.textPrimary))),
+          : const Text(
+              'WhatsApp',
+              style: TextStyle(
+                fontWeight: FontWeight.bold,
+                fontSize: 20,
+              ),
+            )),
       actions: [
         Obx(() => IconButton(
+              icon: Icon(
+                searching.value ? Icons.close : Icons.search,
+                color: isDark ? AppTheme.darkTextSecondary : Colors.white,
+              ),
+              onPressed: () {
+                searching.value = !searching.value;
+                if (!searching.value) ctrl.loadConversations();
+              },
+            )),
+        IconButton(
           icon: Icon(
-            searching.value ? Icons.close : Icons.search,
-            color: AppTheme.iconColor,
+            Icons.more_vert,
+            color: isDark ? AppTheme.darkTextSecondary : Colors.white,
+          ),
+          onPressed: () => _showOptionsMenu(context, ctrl),
+        ),
+      ],
+      bottom: PreferredSize(
+        preferredSize: const Size.fromHeight(1),
+        child: Container(
+          height: 1,
+          color: isDark
+              ? Colors.white.withOpacity(0.08)
+              : Colors.white.withOpacity(0.15),
+        ),
+      ),
+    );
+  }
+
+  void _showOptionsMenu(
+      BuildContext context, ConversationsController ctrl) {
+    showMenu(
+      context: context,
+      position: const RelativeRect.fromLTRB(1000, 56, 0, 0),
+      color: AppTheme.isDark(context)
+          ? AppTheme.darkSurface
+          : Colors.white,
+      items: [
+        PopupMenuItem(
+          onTap: ctrl.loadConversations,
+          child: Text(
+            'Refresh',
+            style: TextStyle(color: AppTheme.textPrimary(context)),
           ),
-          onPressed: () {
-            searching.value = !searching.value;
-            if (!searching.value) ctrl.loadConversations();
-          },
-        )),
-        PopupMenuButton<String>(
-          icon: const Icon(Icons.more_vert, color: AppTheme.iconColor),
-          color: AppTheme.surface,
-          onSelected: (v) {
-            if (v == 'refresh') ctrl.loadConversations();
-          },
-          itemBuilder: (_) => [
-            const PopupMenuItem(
-              value: 'refresh',
-              child: Text('Refresh', style: TextStyle(color: AppTheme.textPrimary)),
-            ),
-          ],
         ),
       ],
     );
   }
 
-  Widget _buildConnecting() => Center(
-    child: Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const CircularProgressIndicator(color: AppTheme.primary),
-        const SizedBox(height: 16),
-        Text(
-          'Connecting to server...',
-          style: TextStyle(color: AppTheme.textSecondary),
+  Widget _buildConnecting(BuildContext context) => Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            CircularProgressIndicator(color: AppTheme.primary),
+            const SizedBox(height: 16),
+            Text(
+              'Connecting to server...',
+              style:
+                  TextStyle(color: AppTheme.textSecondary(context)),
+            ),
+          ],
         ),
-      ],
-    ),
-  );
+      );
 
-  Widget _buildError(ConversationsController ctrl) => Center(
-    child: Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const Icon(Icons.error_outline, color: Colors.redAccent, size: 48),
-        const SizedBox(height: 12),
-        Text(
-          ctrl.errorMessage.value ?? 'Error',
-          style: const TextStyle(color: AppTheme.textSecondary),
-          textAlign: TextAlign.center,
+  Widget _buildError(
+          BuildContext context, ConversationsController ctrl) =>
+      Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(Icons.error_outline,
+                  color: Colors.redAccent, size: 48),
+              const SizedBox(height: 12),
+              Text(
+                ctrl.errorMessage.value ?? 'Error',
+                style: TextStyle(
+                    color: AppTheme.textSecondary(context)),
+                textAlign: TextAlign.center,
+              ),
+              const SizedBox(height: 16),
+              ElevatedButton(
+                onPressed: ctrl.loadConversations,
+                style: ElevatedButton.styleFrom(
+                    backgroundColor: AppTheme.primary),
+                child: const Text('Retry',
+                    style: TextStyle(color: Colors.white)),
+              ),
+            ],
+          ),
         ),
-        const SizedBox(height: 16),
-        ElevatedButton(
-          onPressed: ctrl.loadConversations,
-          style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primary),
-          child: const Text('Retry'),
+      );
+
+  Widget _buildEmpty(BuildContext context) => Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.chat_bubble_outline,
+                size: 64,
+                color:
+                    AppTheme.textSecondary(context).withOpacity(0.4)),
+            const SizedBox(height: 16),
+            Text(
+              'No conversations yet',
+              style: TextStyle(
+                  color: AppTheme.textSecondary(context),
+                  fontSize: 16),
+            ),
+          ],
         ),
-      ],
-    ),
-  );
+      );
 
-  Widget _buildEmpty() => const Center(
-    child: Text(
-      'No conversations found',
-      style: TextStyle(color: AppTheme.textSecondary),
-    ),
-  );
-
-  Widget _buildList(ConversationsController ctrl) {
+  Widget _buildList(
+      BuildContext context, ConversationsController ctrl) {
     return RefreshIndicator(
       color: AppTheme.primary,
-      backgroundColor: AppTheme.surface,
+      backgroundColor: AppTheme.isDark(context)
+          ? AppTheme.darkSurface
+          : Colors.white,
       onRefresh: ctrl.loadConversations,
-      child: ListView.builder(
+      child: ListView.separated(
         itemCount: ctrl.conversations.length,
+        separatorBuilder: (_, __) => Divider(
+          height: 1,
+          thickness: 0.5,
+          indent: 76,
+          color: AppTheme.isDark(context)
+              ? Colors.white.withOpacity(0.06)
+              : Colors.black.withOpacity(0.08),
+        ),
         itemBuilder: (_, i) {
           final chat = ctrl.conversations[i];
           return ConversationTile(