thoth000の修正

lib/interfaces/message_interface.dart

@@ -3,5 +3,5 @@ import 'package:chat_flutter/model/message.dart';
 abstract class MessageInterface {
   Future<void> sendMessage(String text, String roomId, String senderId);
 
-  Stream<List<Message>> getMessage(String roomId);
+  Stream<List<Message>> getMessage(String roomId, String userId);
 }

lib/main.dart

@@ -1,14 +1,15 @@
-import 'package:chat_flutter/services/messgae_service.dart';
-import 'package:chat_flutter/ui/pages/create_room/select_member.dart';
+import 'package:chat_flutter/services/message_service.dart';
+import 'package:chat_flutter/ui/pages/create_room/select_member_page.dart';
 import 'package:chat_flutter/services/auth/authenticator.dart';
 import 'package:chat_flutter/ui/pages/profile/profile_controller.dart';
-import 'package:chat_flutter/ui/pages/sign_in/sign_in.dart';
-import 'package:chat_flutter/ui/pages/sign_up/sign_up.dart';
+import 'package:chat_flutter/ui/pages/room/room_edit_page.dart';
+import 'package:chat_flutter/ui/pages/sign_in/sign_in_page.dart';
+import 'package:chat_flutter/ui/pages/sign_up/sign_up_page.dart';
 import 'package:flutter/material.dart';
-import 'package:chat_flutter/ui/pages/create_room/create_room.dart';
-import 'package:chat_flutter/ui/pages/home/home.dart';
-import 'package:chat_flutter/ui/pages/profile/profile_edit.dart';
-import 'package:chat_flutter/ui/pages/room/room.dart';
+import 'package:chat_flutter/ui/pages/create_room/create_room_page.dart';
+import 'package:chat_flutter/ui/pages/home/home_page.dart';
+import 'package:chat_flutter/ui/pages/profile/profile_edit_page.dart';
+import 'package:chat_flutter/ui/pages/room/room_page.dart';
 import 'package:provider/provider.dart';
 
 void main() {
@@ -22,44 +23,60 @@ void main() {
         create: (_) => MessageService(),
       ),
     ],
-    child: MyApp(),
+    child: Wrapped(),
   ));
 }
 
-class MyApp extends StatelessWidget {
+class Wrapped extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    // Authenticatorをコンストラクタで渡したかったので、MultiProviderではできなかった
     return ChangeNotifierProvider(
       create: (_) => ProfileController(
         Provider.of<Authenticator>(
           context,
           listen: false,
         ),
       ),
-      child: MaterialApp(
-        title: 'Flutter Demo',
-        theme: ThemeData(
-          primarySwatch: Colors.blue,
-          visualDensity: VisualDensity.adaptivePlatformDensity,
-        ),
-        initialRoute:
-            Provider.of<Authenticator>(context, listen: false).isSignIn.value
-                ? '/homePage'
-                : '/signUpPage',
-        routes: {
-          '/homePage': HomePage.wrapped,
-          '/signUpPage': (context) => SignUpPage.wrapped(
-              Provider.of<Authenticator>(context, listen: false)),
-          '/signInPage': (context) => SignInPage.wrapped(
-              Provider.of<Authenticator>(context, listen: false)),
-          '/roomPage': RoomPage.wrapped,
-          '/profileEditPage': (context) => ProfileEditPage(),
-          '/selectMemberPage': (context) => SelectMemberPage.wrapped(),
-          '/createGroupPage': (context) => CreateRoomPage.wrapped(
-              Provider.of<Authenticator>(context, listen: false)),
-        },
-      ),
+      child: MyApp(),
     );
   }
 }
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<String>(
+        future: Provider.of<ProfileController>(context, listen: false)
+            .getUserById(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return Container(
+              color: Colors.white,
+            );
+          }
+          return MaterialApp(
+            title: 'Flutter Demo',
+            theme: ThemeData(
+              primarySwatch: Colors.blue,
+              visualDensity: VisualDensity.adaptivePlatformDensity,
+            ),
+            initialRoute: snapshot.data != '' ? '/homePage' : '/signUpPage',
+            routes: {
+              '/homePage': HomePage.wrapped,
+              '/signUpPage': (context) => SignUpPage.wrapped(
+                  Provider.of<Authenticator>(context, listen: false)),
+              '/signInPage': (context) => SignInPage.wrapped(
+                  Provider.of<Authenticator>(context, listen: false)),
+              '/roomPage': (context) => RoomPage.wrapped(
+                  context, Provider.of<Authenticator>(context, listen: false)),
+              '/profileEditPage': (context) => ProfileEditPage(),
+              '/roomEditPage': (context) => RoomEditPage(),
+              '/selectMemberPage': (context) => SelectMemberPage.wrapped(
+                  Provider.of<Authenticator>(context, listen: false)),
+              '/createGroupPage': (context) => CreateRoomPage.wrapped(
+                  Provider.of<Authenticator>(context, listen: false)),
+            },
+          );
+        });
+  }
+}

lib/model/message.dart

@@ -4,29 +4,26 @@ class Message {
   String text;
   DateTime sendTime;
   bool isMe;
-  bool isRead;
   String senderId;
   String roomId;
   Message({
     this.text,
     this.sendTime,
     this.isMe,
-    this.isRead,
     this.senderId,
     this.roomId,
   });
 
-  factory Message.fromJson(Map<String, dynamic> json) {
+  factory Message.fromJson(Map<String, dynamic> json, String userId) {
     bool judgeIsMe(String senderId) {
       // 自分のIDと比較
-      return senderId == 'userId';
+      return senderId == userId;
     }
 
     return Message(
       text: json['text'].toString(),
       sendTime: (json['createdAt'] as Timestamp).toDate(),
       isMe: judgeIsMe(json['from'].toString()),
-      isRead: true,
       senderId: json['from'].toString(),
       roomId: json['to'].toString(),
     );

lib/model/room.dart

@@ -4,14 +4,22 @@ class Room {
   String name;
   String imgUrl;
   List<String> members;
-  String lastMessage;
-  String sendTime;
+  Map<String, dynamic> lastMessage;
   Room({
     this.id,
     this.name,
     this.imgUrl,
     this.members,
     this.lastMessage,
-    this.sendTime,
   });
+
+  factory Room.fromJson(Map<String, dynamic> json, String roomId) {
+    return Room(
+      id: roomId,
+      name: json['name'].toString(),
+      imgUrl: json['imgUrl'].toString(),
+      members: json['members'].cast<String>() as List<String>,
+      lastMessage: json['lastMessage'] as Map<String, dynamic>,
+    );
+  }
 }

lib/services/auth/authenticator.dart

@@ -3,10 +3,10 @@ import 'package:rxdart/rxdart.dart';
 
 class Authenticator {
   Authenticator() {
-    _isSignIn.value = firebaseUser.value != null;
+    _isSignIn.value = _firebaseUser.value != null;
     _firebaseAuth.onAuthStateChanged.pipe(_firebaseUser);
     _firebaseAuth.onAuthStateChanged
-        .map((firebaseUser) => firebaseUser != null)
+        .map((firebaseUser) => _firebaseUser != null)
         .pipe(_isSignIn);
   }
 
@@ -50,6 +50,9 @@ class Authenticator {
 
   Future<String> getUid() async {
     final current = await fetchFirebaseUser();
+    if (current == null) {
+      return '';
+    }
     return current.uid;
   }
 

lib/services/firebase_message_service.dart

@@ -9,22 +9,27 @@ class FirebaseMessageService {
       'from': message.senderId,
       'to': message.roomId,
       'text': message.text,
-      'createdAt': message.sendTime,
+      'createdAt': FieldValue.serverTimestamp(),
     };
+    final updateData = {'lastMessage': messageData};
     await _db
         .collection('message/v1/rooms/${message.roomId}/transcripts')
         .document()
         .setData(messageData);
+    await _db
+        .collection('message/v1/rooms')
+        .document('${message.roomId}')
+        .updateData(updateData);
   }
 
-  Stream<List<Message>> getMessageData(String roomId) {
+  Stream<List<Message>> getMessageData(String roomId, String userId) {
     final Stream<QuerySnapshot> querySnapshot = _db
         .collection('message/v1/rooms/$roomId/transcripts')
         .orderBy('createdAt', descending: false)
         .snapshots();
     return querySnapshot.map((snapshot) {
       return snapshot.documents.map((doc) {
-        return Message.fromJson(doc.data);
+        return Message.fromJson(doc.data, userId);
       }).toList();
     });
   }

lib/services/firebase_room_service.dart

@@ -16,7 +16,7 @@ class FirebaseRoomService {
     return docRef.documentID;
   }
 
-  Future<void> setRoomSetting(String userId, String roomId) async {
+  Future<void> setMyRoomSetting(String userId, String roomId) async {
     final settingData = {
       'allowNotification': false,
     };
@@ -26,4 +26,63 @@ class FirebaseRoomService {
         .document(roomId)
         .setData(settingData);
   }
+
+  Future<void> updateRoomData(Room room) async {
+    final Map<String, String> roomData = {
+      'name': room.name,
+      'imgUrl': room.imgUrl,
+    };
+    await _db
+        .collection('message/v1/rooms')
+        .document(room.id)
+        .updateData(roomData);
+  }
+
+  Future<void> setMyLastReadTime(String roomId, String userId) async {
+    final timeData = {
+      'lastReadTime': FieldValue.serverTimestamp(),
+    };
+    await _db
+        .collection('message/v1/rooms/$roomId/members')
+        .document('$userId')
+        .setData(timeData);
+  }
+
+  Stream<List<DateTime>> getLastReadTimeList(String roomId) {
+    final Stream<QuerySnapshot> querySnapshot = _db
+        .collection('message/v1/rooms/$roomId/members')
+        .orderBy('lastReadTime', descending: false)
+        .snapshots();
+    return querySnapshot.map((snapshot) {
+      return snapshot.documents.map((doc) {
+        return (doc.data['lastReadTime'] as Timestamp).toDate();
+      }).toList();
+    });
+  }
+
+  Future<List<Room>> getMyRoomList(String uid) async {
+    final QuerySnapshot querySnapshot = await _db
+        .collection('message/v1/users/$uid/room_setting')
+        .getDocuments();
+    final List<DocumentSnapshot> docList = querySnapshot.documents;
+    final List<String> roomIdList =
+        docList.map((doc) => doc.documentID).toList();
+    final List<Room> roomList = [];
+    for (final String roomId in roomIdList) {
+      final DocumentSnapshot roomData =
+          await _db.collection('message/v1/rooms').document('$roomId').get();
+      roomList.add(Room.fromJson(roomData.data, roomId));
+    }
+    //時間順に並び替え
+    roomList.sort((a, b) {
+      final aTime = a.lastMessage['createdAt'] as Timestamp;
+      final bTime = b.lastMessage['createdAt'] as Timestamp;
+      if (aTime.compareTo(bTime) > 0) {
+        return -1;
+      } else {
+        return 1;
+      }
+    });
+    return roomList;
+  }
 }

lib/services/firebase_storage_service.dart

@@ -6,9 +6,9 @@ class FirebaseStorageService {
   final _storage = FirebaseStorage.instance;
 
   Future<String> uploadImage(
-      File file, String uid, StorageType storageType) async {
+      File file, String id, StorageType storageType) async {
     final StorageReference ref =
-        _storage.ref().child('${storageTypeToString(storageType)}/$uid');
+        _storage.ref().child('${storageTypeToString(storageType)}/$id');
     final StorageUploadTask uploadTask = ref.putFile(file);
 
     await uploadTask.onComplete;

lib/services/firebase_user_service.dart

@@ -29,13 +29,34 @@ class FirebaseUserService {
     return User.fromJson(user, uid);
   }
 
-  Future<List<User>> getAllUser() async {
+  Future<String> getUserImgUrl(String uid) async {
+    final DocumentSnapshot result =
+        await _db.collection('message/v1/users').document('$uid').get();
+    return result.data['profileImageURL'].toString();
+  }
+
+  /*Future<List<User>> getAllUser() async {
     final QuerySnapshot result =
         await _db.collection('message/v1/users').getDocuments();
 
     return result.documents.map((doc) {
       final Map<String, dynamic> user = doc.data;
       return User.fromJson(user, doc.documentID);
     }).toList();
+  }*/
+
+  Future<List<User>> getSearchedUser(String name) async {
+    final startAt = [name];
+    final endAt = ['$name\uf8ff'];
+    final QuerySnapshot result = await _db
+        .collection('message/v1/users')
+        .orderBy('name')
+        .startAt(startAt)
+        .endAt(endAt)
+        .getDocuments();
+    return result.documents.map((doc) {
+      final Map<String, dynamic> user = doc.data;
+      return User.fromJson(user, doc.documentID);
+    }).toList();
   }
 }

lib/services/messgae_service.dart → lib/services/message_service.dart

@@ -9,13 +9,12 @@ class MessageService implements MessageInterface {
       text: text,
       senderId: senderId,
       roomId: roomId,
-      sendTime: DateTime.now(),
     );
     await FirebaseMessageService().setMessageData(message);
   }
 
   @override
-  Stream<List<Message>> getMessage(String roomId) {
-    return FirebaseMessageService().getMessageData(roomId);
+  Stream<List<Message>> getMessage(String roomId, String userId) {
+    return FirebaseMessageService().getMessageData(roomId, userId);
   }
 }