change: 使用服务器提供的头像 (#173)

* 删掉 gravatar * 固定 sentry 版本，修复编译错误 fix #163
he0119 · Nov 12, 2021 · 8979990 · 8979990
1 parent c603405
commit 8979990
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 33 deletions.
diff --git a/lib/board/graphql/queries/topic_detail.dart b/lib/board/graphql/queries/topic_detail.dart
@@ -8,7 +8,7 @@ query topicDetail($topicId: ID!, $orderBy: String!, $after: String) {
     isPin
     user {
       username
-      email
+      avatarUrl
     }
     createdAt
     editedAt
@@ -24,7 +24,7 @@ query topicDetail($topicId: ID!, $orderBy: String!, $after: String) {
         body
         user {
           username
-          email
+          avatarUrl
         }
         createdAt
         editedAt

diff --git a/lib/board/graphql/queries/topics.dart b/lib/board/graphql/queries/topics.dart
@@ -16,7 +16,7 @@ query topics($after: String) {
         editedAt
         user {
           username
-          email
+          avatarUrl
         }
         comments(last: 1) {
           edges {

diff --git a/lib/board/view/widgets/item_title.dart b/lib/board/view/widgets/item_title.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:smarthome/core/core.dart';
 import 'package:smarthome/user/user.dart';
 import 'package:smarthome/utils/date_format_extension.dart';
-import 'package:smarthome/widgets/gravatar.dart';
+import 'package:smarthome/widgets/avatar.dart';
 
 class ItemTitle extends StatelessWidget {
   final User? user;
@@ -19,7 +19,7 @@ class ItemTitle extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      leading: CircleGravatar(email: user!.email!),
+      leading: MyCircleAvatar(avatarUrl: user?.avatarUrl),
       title: Text(user!.username),
       subtitle: Text(editedAt!.toLocalStr()),
       trailing: (onSelected != null)

diff --git a/lib/user/graphql/queries/viewer.dart b/lib/user/graphql/queries/viewer.dart
@@ -3,6 +3,7 @@ query viewer {
   viewer {
     username
     email
+    avatarUrl
   }
 }
 ''';
diff --git a/lib/user/model/user.dart b/lib/user/model/user.dart
@@ -9,15 +9,16 @@ part 'user.g.dart';
 class User extends Equatable {
   final String username;
   final String? email;
+  final String? avatarUrl;
 
-  const User({required this.username, required this.email});
+  const User({required this.username, required this.email, this.avatarUrl});
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
 
   Map<String, dynamic> toJson() => _$UserToJson(this);
 
   @override
-  List<Object?> get props => [username, email];
+  List<Object?> get props => [username, email, avatarUrl];
 
   @override
   String toString() => username;

diff --git a/lib/user/model/user.g.dart b/lib/user/model/user.g.dart
diff --git a/lib/utils/gravatar_url.dart b/lib/utils/gravatar_url.dart
diff --git a/lib/widgets/gravatar.dart → lib/widgets/avatar.dart b/lib/widgets/gravatar.dart → lib/widgets/avatar.dart
@@ -3,24 +3,28 @@ import 'dart:io';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:smarthome/utils/gravatar_url.dart';
 
-class CircleGravatar extends StatelessWidget {
-  final String email;
-  final int? size;
+class MyCircleAvatar extends StatelessWidget {
+  final String? avatarUrl;
 
-  const CircleGravatar({
+  const MyCircleAvatar({
     Key? key,
-    required this.email,
-    this.size,
+    required this.avatarUrl,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    final url = avatarUrl;
+    if (url == null) {
+      return CircleAvatar(
+        backgroundColor: Colors.grey,
+        child: Text('?', style: TextStyle(fontSize: 24)),
+      );
+    }
     // CachedNetworkImage 暂时不支持 Windows
     if (kIsWeb || !Platform.isWindows) {
       return CachedNetworkImage(
-        imageUrl: getGravatarUrl(email: email, size: size),
+        imageUrl: url,
         imageBuilder: (context, imageProvider) => CircleAvatar(
           backgroundImage: imageProvider,
         ),
@@ -29,7 +33,7 @@ class CircleGravatar extends StatelessWidget {
       );
     } else {
       return CircleAvatar(
-        backgroundImage: NetworkImage(getGravatarUrl(email: email, size: size)),
+        backgroundImage: NetworkImage(url),
       );
     }
   }

diff --git a/lib/widgets/drawer.dart b/lib/widgets/drawer.dart
@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smarthome/core/core.dart';
 import 'package:smarthome/routers/delegate.dart';
 import 'package:smarthome/storage/storage.dart';
-import 'package:smarthome/widgets/gravatar.dart';
+import 'package:smarthome/widgets/avatar.dart';
 
 class MyDrawer extends StatelessWidget {
   const MyDrawer({Key? key}) : super(key: key);
@@ -19,9 +19,8 @@ class MyDrawer extends StatelessWidget {
                 UserAccountsDrawerHeader(
                   accountName: Text(state.currentUser.username),
                   accountEmail: Text(state.currentUser.email!),
-                  currentAccountPicture: CircleGravatar(
-                    email: state.currentUser.email!,
-                    size: 512,
+                  currentAccountPicture: MyCircleAvatar(
+                    avatarUrl: state.currentUser.avatarUrl,
                   ),
                 ),
               ListTile(

diff --git a/pubspec.lock b/pubspec.lock
@@ -862,7 +862,7 @@ packages:
     source: hosted
     version: "0.26.0"
   sentry:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: sentry
       url: "https://pub.flutter-io.cn"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -27,6 +27,7 @@ dependencies:
   enum_to_string: ^2.0.0
   version: ^2.0.0
   tuple: ^2.0.0
+  sentry: 6.0.1
 
   # Flutter
   flutter_bloc: ^7.3.3