fix: logo for web & forum logo display

Author: ILoveScratch2

lib/models/forum_model.dart

@@ -9,6 +9,7 @@ class Forum {
   final String createdByUid;
   final DateTime createdAt;
   final DateTime updatedAt;
+  final String? avatarUrl;
 
   Forum({
     required this.id,
@@ -19,6 +20,7 @@ class Forum {
     required this.createdByUid,
     required this.createdAt,
     required this.updatedAt,
+    this.avatarUrl,
   });
 
   factory Forum.fromJson(Map<String, dynamic> json) {
@@ -31,20 +33,23 @@ class Forum {
       createdByUid: json['created_by_uid'] as String,
       createdAt: DateTime.parse(json['created_at'] as String),
       updatedAt: DateTime.parse(json['updated_at'] as String),
+      avatarUrl: json['avatar_url'] as String?,
     );
   }
 
-  factory Forum.fromServerRow(List<dynamic> row) {
+  factory Forum.fromServerRow(List<dynamic> row, {String? baseUrl}) {
     final ms = ((double.tryParse(row[3].toString()) ?? 0) * 1000).toInt();
+    final fid = row[0].toString();
     return Forum(
-      id: row[0].toString(),
+      id: fid,
       name: row[1] as String,
       description: (row[4] as String?) ?? '',
       isPublic: true,
       isCommunity: true,
       createdByUid: row[2].toString(),
       createdAt: DateTime.fromMillisecondsSinceEpoch(ms),
       updatedAt: DateTime.fromMillisecondsSinceEpoch(ms),
+      avatarUrl: baseUrl != null ? '$baseUrl/avatar/get_avatar/forum/$fid' : null,
     );
   }
 
@@ -58,6 +63,7 @@ class Forum {
       'created_by_uid': createdByUid,
       'created_at': createdAt.toIso8601String(),
       'updated_at': updatedAt.toIso8601String(),
+      if (avatarUrl != null) 'avatar_url': avatarUrl,
     };
   }
 }

lib/screens/forum_detail_screen.dart

@@ -216,9 +216,23 @@ class _ForumDetailScreenState extends State<ForumDetailScreen> {
   ) {
     return AppBar(
       leading: BackButton(onPressed: () => context.pop()),
-      title: Text(
-        forum.name,
-        style: TextStyle(color: colorScheme.onPrimaryContainer),
+      title: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          ProfilePictureWidget(
+            avatarUrl: forum.avatarUrl,
+            radius: 16,
+            fallbackIcon: Icons.forum,
+          ),
+          const SizedBox(width: 10),
+          Flexible(
+            child: Text(
+              forum.name,
+              style: TextStyle(color: colorScheme.onPrimaryContainer),
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ],
       ),
       flexibleSpace: Container(
         decoration: BoxDecoration(
@@ -264,9 +278,23 @@ class _ForumDetailScreenState extends State<ForumDetailScreen> {
           pinned: true,
           leading: BackButton(onPressed: () => context.pop()),
           flexibleSpace: FlexibleSpaceBar(
-            title: Text(
-              forum.name,
-              style: TextStyle(color: colorScheme.onPrimaryContainer),
+            title: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                ProfilePictureWidget(
+                  avatarUrl: forum.avatarUrl,
+                  radius: 14,
+                  fallbackIcon: Icons.forum,
+                ),
+                const SizedBox(width: 8),
+                Flexible(
+                  child: Text(
+                    forum.name,
+                    style: TextStyle(color: colorScheme.onPrimaryContainer),
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+              ],
             ),
             background: Container(color: colorScheme.surfaceContainerHighest),
           ),

lib/screens/forum_screen.dart

@@ -4,6 +4,7 @@ import '../l10n/app_localizations.dart';
 import '../models/forum_model.dart';
 import '../services/api/tf_api_client.dart';
 import '../services/auth_state.dart';
+import '../widgets/account/profile_picture.dart';
 import '../utils/talker.dart';
 
 class ForumScreen extends StatefulWidget {
@@ -269,9 +270,10 @@ class _ForumListTile extends StatelessWidget {
           shape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.all(Radius.circular(12)),
           ),
-          leading: Icon(
-            Icons.forum,
-            color: Theme.of(context).colorScheme.primary,
+          leading: ProfilePictureWidget(
+            avatarUrl: forum.avatarUrl,
+            radius: 20,
+            fallbackIcon: Icons.forum,
           ),
           title: Text(forum.name),
           subtitle: Text(

lib/services/api/tf_api_client.dart

@@ -705,6 +705,21 @@ class TfApiClient {
     return _parseBool(result);
   }
 
+  Future<bool> uploadForumAvatar(
+    int uid,
+    String password,
+    int fid,
+    String picBase64,
+  ) async {
+    final result = await secretPost(
+      '/avatar/upload_forum_avatar',
+      {'fid': fid, 'pic': picBase64},
+      uid: uid,
+      password: password,
+    );
+    return _parseBool(result);
+  }
+
   Future<bool> uploadDefaultAvatar(
     int uid,
     String password,
@@ -730,7 +745,7 @@ class TfApiClient {
       final data = jsonDecode(response.body);
       if (data is! List) return [];
       return data
-          .map((row) => Forum.fromServerRow(row as List<dynamic>))
+          .map((row) => Forum.fromServerRow(row as List<dynamic>, baseUrl: baseUrl))
           .toList();
     } catch (e) {
       talker.error('getForumList failed', e);

lib/utils/web_splash_stub.dart

@@ -0,0 +1,2 @@
+/// No-op stub for platforms without dart:js (mobile, desktop).
+void removeWebSplash() {}

lib/utils/web_splash_web.dart

@@ -0,0 +1,5 @@
+import 'dart:js' as js;
+
+void removeWebSplash() {
+  js.context.callMethod('removeSplashFromWeb', []);
+}

lib/widgets/account/profile_picture.dart

@@ -4,12 +4,14 @@ class ProfilePictureWidget extends StatelessWidget {
   final String? avatarUrl;
   final double radius;
   final String? fallbackText;
+  final IconData? fallbackIcon;
 
   const ProfilePictureWidget({
     super.key,
     this.avatarUrl,
     this.radius = 24,
     this.fallbackText,
+    this.fallbackIcon,
   });
 
   @override
@@ -26,7 +28,7 @@ class ProfilePictureWidget extends StatelessWidget {
       radius: radius,
       backgroundColor: Theme.of(context).colorScheme.primaryContainer,
       child: Icon(
-        Icons.person,
+        fallbackIcon ?? Icons.person,
         size: radius,
         color: Theme.of(context).colorScheme.onPrimaryContainer,
       ),