diff --git a/.github/workflows/melos-ci.yml b/.github/workflows/melos-ci.yml index dab1703..71bc34b 100644 --- a/.github/workflows/melos-ci.yml +++ b/.github/workflows/melos-ci.yml @@ -12,4 +12,4 @@ jobs: permissions: write-all with: subfolder: '.' # add optional subfolder to run workflow in - flutter_version: 3.19.6 + flutter_version: 3.24.3 diff --git a/LICENSE b/LICENSE index fe891f8..a0dd757 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2022 Iconica, All rights reserved. +Copyright (c) 2024 Iconica, All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/packages/chat_repository_interface/CHANGELOG.md b/packages/chat_repository_interface/CHANGELOG.md deleted file mode 100644 index 41cc7d8..0000000 --- a/packages/chat_repository_interface/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/chat_repository_interface/CHANGELOG.md b/packages/chat_repository_interface/CHANGELOG.md new file mode 120000 index 0000000..699cc9e --- /dev/null +++ b/packages/chat_repository_interface/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/packages/chat_repository_interface/lib/src/local/local_user_repository.dart b/packages/chat_repository_interface/lib/src/local/local_user_repository.dart index c57ef7f..f68fbc2 100644 --- a/packages/chat_repository_interface/lib/src/local/local_user_repository.dart +++ b/packages/chat_repository_interface/lib/src/local/local_user_repository.dart @@ -10,25 +10,25 @@ class LocalUserRepository implements UserRepositoryInterface { BehaviorSubject>(); final List _users = [ - UserModel( + const UserModel( id: "1", firstName: "John", lastName: "Doe", imageUrl: "https://picsum.photos/200/300", ), - UserModel( + const UserModel( id: "2", firstName: "Jane", lastName: "Doe", imageUrl: "https://picsum.photos/200/300", ), - UserModel( + const UserModel( id: "3", firstName: "Frans", lastName: "Timmermans", imageUrl: "https://picsum.photos/200/300", ), - UserModel( + const UserModel( id: "4", firstName: "Hendrik-Jan", lastName: "De derde", diff --git a/packages/chat_repository_interface/lib/src/services/chat_service.dart b/packages/chat_repository_interface/lib/src/services/chat_service.dart index 5113b01..e542ee4 100644 --- a/packages/chat_repository_interface/lib/src/services/chat_service.dart +++ b/packages/chat_repository_interface/lib/src/services/chat_service.dart @@ -188,9 +188,8 @@ class ChatService { /// Returns a [Stream] of [int]. Stream getUnreadMessagesCount({ required String userId, - }) { - return chatRepository.getUnreadMessagesCount(userId: userId); - } + }) => + chatRepository.getUnreadMessagesCount(userId: userId); /// Upload an image with the given parameters. /// [path] is the image path. diff --git a/packages/chat_repository_interface/pubspec.yaml b/packages/chat_repository_interface/pubspec.yaml index 0ae988b..e709fe1 100644 --- a/packages/chat_repository_interface/pubspec.yaml +++ b/packages/chat_repository_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: chat_repository_interface description: "A new Flutter package project." -version: 1.0.0 +version: 4.0.0 homepage: "https://github.com/Iconica-Development" publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub/ diff --git a/packages/firebase_chat_repository/CHANGELOG.md b/packages/firebase_chat_repository/CHANGELOG.md deleted file mode 100644 index 41cc7d8..0000000 --- a/packages/firebase_chat_repository/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/firebase_chat_repository/CHANGELOG.md b/packages/firebase_chat_repository/CHANGELOG.md new file mode 120000 index 0000000..699cc9e --- /dev/null +++ b/packages/firebase_chat_repository/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/packages/firebase_chat_repository/lib/firebase_chat_repository.dart b/packages/firebase_chat_repository/lib/firebase_chat_repository.dart index 0257c1d..e6effcb 100644 --- a/packages/firebase_chat_repository/lib/firebase_chat_repository.dart +++ b/packages/firebase_chat_repository/lib/firebase_chat_repository.dart @@ -1,2 +1,2 @@ -export 'src/firebase_chat_repository.dart'; -export 'src/firebase_user_repository.dart'; +export "src/firebase_chat_repository.dart"; +export "src/firebase_user_repository.dart"; diff --git a/packages/firebase_chat_repository/pubspec.yaml b/packages/firebase_chat_repository/pubspec.yaml index 86d07b0..852b764 100644 --- a/packages/firebase_chat_repository/pubspec.yaml +++ b/packages/firebase_chat_repository/pubspec.yaml @@ -1,6 +1,6 @@ name: firebase_chat_repository description: "A new Flutter package project." -version: 1.0.0 +version: 4.0.0 homepage: "https://github.com/Iconica-Development" publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub/ @@ -15,7 +15,7 @@ dependencies: chat_repository_interface: hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub - version: ^1.0.0 + version: ^4.0.0 firebase_storage: any cloud_firestore: any diff --git a/packages/flutter_chat/CHANGELOG.md~72104f3 (feat: refactor) b/packages/flutter_chat/CHANGELOG.md~72104f3 (feat: refactor) deleted file mode 100644 index 41cc7d8..0000000 --- a/packages/flutter_chat/CHANGELOG.md~72104f3 (feat: refactor) +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/flutter_chat/LICENSE~72104f3 (feat: refactor) b/packages/flutter_chat/LICENSE~72104f3 (feat: refactor) deleted file mode 100644 index ba75c69..0000000 --- a/packages/flutter_chat/LICENSE~72104f3 (feat: refactor) +++ /dev/null @@ -1 +0,0 @@ -TODO: Add your license here. diff --git a/packages/flutter_chat/README.md b/packages/flutter_chat/README.md deleted file mode 120000 index fe84005..0000000 --- a/packages/flutter_chat/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file diff --git a/packages/flutter_chat/README.md~72104f3 (feat: refactor) b/packages/flutter_chat/README.md~72104f3 (feat: refactor) deleted file mode 100644 index 02fe8ec..0000000 --- a/packages/flutter_chat/README.md~72104f3 (feat: refactor) +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/flutter_chat/lib/src/flutter_chat_navigator_userstory.dart b/packages/flutter_chat/lib/src/flutter_chat_navigator_userstory.dart index b0b1a80..256a63a 100644 --- a/packages/flutter_chat/lib/src/flutter_chat_navigator_userstory.dart +++ b/packages/flutter_chat/lib/src/flutter_chat_navigator_userstory.dart @@ -117,7 +117,9 @@ class _NavigatorWrapper extends StatelessWidget { route(context, chatProfileScreen(context, user, null)), onUploadImage: (data) async { var path = await chatService.uploadImage( - path: "chats/${chat.id}-$userId-${DateTime.now()}", image: data); + path: "chats/${chat.id}-$userId-${DateTime.now()}", + image: data, + ); await chatService.sendMessage( messageId: "${chat.id}-$userId-${DateTime.now()}", @@ -191,7 +193,9 @@ class _NavigatorWrapper extends StatelessWidget { String? path; if (image != null) { path = await chatService.uploadImage( - path: "groups/$title", image: image); + path: "groups/$title", + image: image, + ); } var chat = await createGroupChat( users, diff --git a/packages/flutter_chat/lib/src/screens/chat_profile_screen.dart b/packages/flutter_chat/lib/src/screens/chat_profile_screen.dart index 6c41a75..5338414 100644 --- a/packages/flutter_chat/lib/src/screens/chat_profile_screen.dart +++ b/packages/flutter_chat/lib/src/screens/chat_profile_screen.dart @@ -64,7 +64,7 @@ class ChatProfileScreen extends StatelessWidget { return options.builders.baseScreenBuilder!.call( context, - this.mapScreenType, + mapScreenType, _AppBar( user: userModel, chat: chatModel, diff --git a/packages/flutter_chat/lib/src/screens/chat_screen.dart b/packages/flutter_chat/lib/src/screens/chat_screen.dart index ac1dd84..88d6e8d 100644 --- a/packages/flutter_chat/lib/src/screens/chat_screen.dart +++ b/packages/flutter_chat/lib/src/screens/chat_screen.dart @@ -60,7 +60,7 @@ class ChatScreen extends StatelessWidget { return chatOptions.builders.baseScreenBuilder!.call( context, - this.mapScreenType, + mapScreenType, _AppBar( userId: userId, chatOptions: chatOptions, diff --git a/packages/flutter_chat/lib/src/screens/creation/new_group_chat_overview.dart b/packages/flutter_chat/lib/src/screens/creation/new_group_chat_overview.dart index d1013e7..5bcadff 100644 --- a/packages/flutter_chat/lib/src/screens/creation/new_group_chat_overview.dart +++ b/packages/flutter_chat/lib/src/screens/creation/new_group_chat_overview.dart @@ -50,7 +50,7 @@ class NewGroupChatOverview extends StatelessWidget { return options.builders.baseScreenBuilder!.call( context, - this.mapScreenType, + mapScreenType, _AppBar( options: options, ), diff --git a/packages/flutter_chat/pubspec.yaml b/packages/flutter_chat/pubspec.yaml index 258393b..3789ce6 100644 --- a/packages/flutter_chat/pubspec.yaml +++ b/packages/flutter_chat/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: version: ^1.6.0 chat_repository_interface: hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub - version: ^1.0.0 + version: ^4.0.0 dev_dependencies: flutter_test: diff --git a/packages/flutter_chat_firebase/CHANGELOG.md b/packages/flutter_chat_firebase/CHANGELOG.md deleted file mode 120000 index 699cc9e..0000000 --- a/packages/flutter_chat_firebase/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../../CHANGELOG.md \ No newline at end of file diff --git a/packages/flutter_chat_firebase/LICENSE b/packages/flutter_chat_firebase/LICENSE deleted file mode 120000 index 30cff74..0000000 --- a/packages/flutter_chat_firebase/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flutter_chat_firebase/README.md b/packages/flutter_chat_firebase/README.md deleted file mode 120000 index fe84005..0000000 --- a/packages/flutter_chat_firebase/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file diff --git a/packages/flutter_chat_interface/CHANGELOG.md b/packages/flutter_chat_interface/CHANGELOG.md deleted file mode 120000 index 699cc9e..0000000 --- a/packages/flutter_chat_interface/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../../CHANGELOG.md \ No newline at end of file diff --git a/packages/flutter_chat_interface/LICENSE b/packages/flutter_chat_interface/LICENSE deleted file mode 120000 index 30cff74..0000000 --- a/packages/flutter_chat_interface/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flutter_chat_interface/README.md b/packages/flutter_chat_interface/README.md deleted file mode 120000 index fe84005..0000000 --- a/packages/flutter_chat_interface/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file diff --git a/packages/flutter_chat_local/CHANGELOG.md b/packages/flutter_chat_local/CHANGELOG.md deleted file mode 120000 index 699cc9e..0000000 --- a/packages/flutter_chat_local/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../../CHANGELOG.md \ No newline at end of file diff --git a/packages/flutter_chat_local/LICENSE b/packages/flutter_chat_local/LICENSE deleted file mode 120000 index 30cff74..0000000 --- a/packages/flutter_chat_local/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flutter_chat_local/README.md b/packages/flutter_chat_local/README.md deleted file mode 120000 index fe84005..0000000 --- a/packages/flutter_chat_local/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file diff --git a/packages/flutter_chat_view/CHANGELOG.md b/packages/flutter_chat_view/CHANGELOG.md deleted file mode 120000 index 699cc9e..0000000 --- a/packages/flutter_chat_view/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../../CHANGELOG.md \ No newline at end of file diff --git a/packages/flutter_chat_view/LICENSE b/packages/flutter_chat_view/LICENSE deleted file mode 120000 index 30cff74..0000000 --- a/packages/flutter_chat_view/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flutter_chat_view/README.md b/packages/flutter_chat_view/README.md deleted file mode 120000 index fe84005..0000000 --- a/packages/flutter_chat_view/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file