SK-589: implement ability to take a photo (#92)

CubeRomanMagellan · Magellan · web-flow · commit 3e176b23eb45 · 2025-11-25T15:14:40.000Z
* create monorepo

* add api

* remove client old api

* add tokens management

* rename sama_chat_api to sama_sdk

* add image share to support

* add image_picker

* add camera picker

* update agpVersion

---------

Co-authored-by: Magellan &lt;magellan@connectycube.com&gt;
diff --git a/sama_chat_client/android/gradle.properties b/sama_chat_client/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
 kotlinVersion=2.2.0
-agpVersion=8.9.0
+agpVersion=8.9.1
diff --git a/sama_chat_client/ios/Runner/Info.plist b/sama_chat_client/ios/Runner/Info.plist
@@ -48,6 +48,8 @@
 	<true/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To upload photos, please allow permission to access your photo library.</string>
+	<key>NSCameraUsageDescription</key>
+    <string>To upload photos from camera</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/sama_chat_client/lib/src/features/conversation/bloc/media_sender/media_sender_bloc.dart b/sama_chat_client/lib/src/features/conversation/bloc/media_sender/media_sender_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:equatable/equatable.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:path/path.dart';
 import 'package:sama_sdk/api/api.dart';
 
@@ -23,13 +23,18 @@ const maxAttachmentsCount = 10;
 class MediaSenderBloc extends Bloc<MediaSenderEvent, MediaSenderState> {
   final ConversationModel currentConversation;
   final MessagesRepository messagesRepository;
+  final ImagePicker picker = ImagePicker();
 
   MediaSenderBloc({
     required this.currentConversation,
     required this.messagesRepository,
   }) : super(MediaSenderState()) {
-    on<PickMoreFiles>(
-      _onPickFiles,
+    on<PickMedia>(
+      _onPickMedia,
+    );
+
+    on<PickCamera>(
+      _onPickCamera,
     );
 
     on<ChangeMessage>(
@@ -57,12 +62,17 @@ class MediaSenderBloc extends Bloc<MediaSenderEvent, MediaSenderState> {
     );
   }
 
-  FutureOr<void> _onPickFiles(
-      PickMoreFiles event, Emitter<MediaSenderState> emit) {
+  FutureOr<void> _onPickMedia(PickMedia event, Emitter<MediaSenderState> emit) {
     emit(state.copyWith(status: MediaSelectorStatus.picking));
     _pickMedia();
   }
 
+  FutureOr<void> _onPickCamera(
+      PickCamera event, Emitter<MediaSenderState> emit) {
+    emit(state.copyWith(status: MediaSelectorStatus.picking));
+    _pickCamera();
+  }
+
   FutureOr<void> _onFilesAdded(AddFiles event, Emitter<MediaSenderState> emit) {
     emit(state.copyWith(status: MediaSelectorStatus.mediaSelected));
     if (event.error?.isNotEmpty ?? false) {
@@ -175,25 +185,12 @@ class MediaSenderBloc extends Bloc<MediaSenderEvent, MediaSenderState> {
   }
 
   void _pickMedia() {
-    FilePicker.platform
-        .pickFiles(
-            type: FileType.media,
-            //TODO RP remove this if it's all ok on both android and iOS sides
-            // allowedExtensions: [
-            //   ...supportedImageAttachmentExtentions,
-            //   ...supportedVideoAttachmentExtentions
-            // ],
-            allowMultiple: true,
-            compressionQuality: 0)
-        .then((result) {
-      var files = result?.files;
-      if (files?.isEmpty ?? true) {
+    picker.pickMultipleMedia().then((result) {
+      if (result.isEmpty) {
         add(const AddFiles([]));
       } else {
-        var files = List<File>.from(result?.files
-                .map((platformFile) => File(platformFile.path!))
-                .toList() ??
-            []);
+        var files = List<File>.from(
+            result.map((platformFile) => File(platformFile.path)).toList());
         add(AddFiles(files));
       }
     }).catchError((onError) {
@@ -202,6 +199,19 @@ class MediaSenderBloc extends Bloc<MediaSenderEvent, MediaSenderState> {
     });
   }
 
+  void _pickCamera() {
+    picker.pickImage(source: ImageSource.camera).then((result) {
+      if (result?.path.isEmpty ?? true) {
+        add(const AddFiles([]));
+      } else {
+        add(AddFiles([File(result!.path)]));
+      }
+    }).catchError((onError) {
+      add(const AddFiles([],
+          error: 'Please allow permission access to Gallery'));
+    });
+  }
+
   FutureOr<void> _onMessageChanged(
       ChangeMessage event, Emitter<MediaSenderState> emit) {
     emit(state.copyWith(message: event.message));
diff --git a/sama_chat_client/lib/src/features/conversation/bloc/media_sender/media_sender_event.dart b/sama_chat_client/lib/src/features/conversation/bloc/media_sender/media_sender_event.dart
@@ -14,8 +14,12 @@ final class AddFiles extends MediaSenderEvent {
   const AddFiles(this.selectedFiles, {this.error});
 }
 
-final class PickMoreFiles extends MediaSenderEvent {
-  const PickMoreFiles();
+final class PickCamera extends MediaSenderEvent {
+  const PickCamera();
+}
+
+final class PickMedia extends MediaSenderEvent {
+  const PickMedia();
 }
 
 final class ChangeMessage extends MediaSenderEvent {
diff --git a/sama_chat_client/lib/src/features/conversation/view/media_sender.dart b/sama_chat_client/lib/src/features/conversation/view/media_sender.dart
@@ -44,8 +44,6 @@ class MediaSender extends StatelessWidget {
   Widget build(BuildContext context) {
     if (path != null) {
       BlocProvider.of<MediaSenderBloc>(context).add(AddFiles([File(path!)]));
-    } else {
-      BlocProvider.of<MediaSenderBloc>(context).add(const PickMoreFiles());
     }
     return BlocListener<MediaSenderBloc, MediaSenderState>(
       listener: (context, state) {
@@ -74,18 +72,7 @@ class MediaSender extends StatelessWidget {
                     const SizedBox(
                       height: 8,
                     ),
-                    if (state.selectedFiles.isEmpty &&
-                        state.status == MediaSelectorStatus.initial)
-                      Container(
-                        padding: const EdgeInsets.all(8),
-                        width: 48,
-                        height: 48,
-                        child: const CircularProgressIndicator(
-                          strokeWidth: 3.0,
-                        ),
-                      ),
-                    if (state.selectedFiles.isEmpty &&
-                        state.status != MediaSelectorStatus.initial)
+                    if (state.selectedFiles.isEmpty)
                       const Center(
                         child: Text(
                           'Select files',
@@ -131,25 +118,55 @@ class MediaSender extends StatelessWidget {
                     ),
                     Row(
                       children: [
-                        TextButton(
-                          onPressed: () {
-                            if (state.selectedFiles.length < 10 &&
-                                state.status !=
-                                    MediaSelectorStatus.processing) {
-                              BlocProvider.of<MediaSenderBloc>(context)
-                                  .add(const PickMoreFiles());
-                            }
-                          },
-                          child: Text(
-                            'Add',
-                            style: TextStyle(
-                                color: state.selectedFiles.length < 10 &&
-                                        state.status !=
-                                            MediaSelectorStatus.processing
-                                    ? slateBlue
-                                    : whiteAluminum),
-                          ),
-                        ),
+                        Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              TextButton(
+                                onPressed: () {
+                                  if (state.selectedFiles.length < 10 &&
+                                      state.status !=
+                                          MediaSelectorStatus.processing) {
+                                    BlocProvider.of<MediaSenderBloc>(context)
+                                        .add(const PickCamera());
+                                  }
+                                },
+                                style: TextButton.styleFrom(
+                                    tapTargetSize:
+                                        MaterialTapTargetSize.shrinkWrap),
+                                child: Text(
+                                  'Camera',
+                                  style: TextStyle(
+                                      color: state.selectedFiles.length < 10 &&
+                                              state.status !=
+                                                  MediaSelectorStatus.processing
+                                          ? slateBlue
+                                          : whiteAluminum),
+                                ),
+                              ),
+                              TextButton(
+                                onPressed: () {
+                                  if (state.selectedFiles.length < 10 &&
+                                      state.status !=
+                                          MediaSelectorStatus.processing) {
+                                    BlocProvider.of<MediaSenderBloc>(context)
+                                        .add(const PickMedia());
+                                  }
+                                },
+                                style: TextButton.styleFrom(
+                                    tapTargetSize:
+                                        MaterialTapTargetSize.shrinkWrap),
+                                child: Text(
+                                  'Media',
+                                  style: TextStyle(
+                                      color: state.selectedFiles.length < 10 &&
+                                              state.status !=
+                                                  MediaSelectorStatus.processing
+                                          ? slateBlue
+                                          : whiteAluminum),
+                                ),
+                              ),
+                            ]),
                         const Expanded(child: SizedBox.shrink()),
                         TextButton(
                             onPressed: () {
diff --git a/sama_chat_client/lib/src/features/conversation/view/message_input.dart b/sama_chat_client/lib/src/features/conversation/view/message_input.dart
@@ -196,8 +196,7 @@ class _MessageInputState extends State<MessageInput> {
     showDialog(
       barrierDismissible: false,
       context: context,
-      builder: (ctx) {
-        dialogContext = ctx;
+      builder: (_) {
         return AlertDialog(
             contentPadding:
                 const EdgeInsets.symmetric(vertical: 8.0, horizontal: 10.0),
@@ -214,9 +213,7 @@ class _MessageInputState extends State<MessageInput> {
                   path: path),
             ));
       },
-    ).then((result) async {
-      dialogContext = null;
-    });
+    );
   }
 
   @override
diff --git a/sama_chat_client/lib/src/features/conversation_group_create/bloc/group_bloc.dart b/sama_chat_client/lib/src/features/conversation_group_create/bloc/group_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:formz/formz.dart';
+import 'package:image_picker/image_picker.dart';
 
 import '../../../db/models/user_model.dart';
 import '../models/avatar.dart';
@@ -41,11 +41,9 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     GroupAvatarPicked event,
     Emitter<GroupState> emit,
   ) async {
-    await FilePicker.platform
-        .pickFiles(type: FileType.image, compressionQuality: 0)
-        .then((result) {
+    await ImagePicker().pickImage(source: ImageSource.gallery).then((result) {
       if (result != null) {
-        File file = File(result.files.single.path!);
+        File file = File(result.path);
         final avatarUrl = GroupAvatar.dirty(file);
         emit(
           state.copyWith(
diff --git a/sama_chat_client/lib/src/features/group_info/bloc/group_info_bloc.dart b/sama_chat_client/lib/src/features/group_info/bloc/group_info_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:formz/formz.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:sama_sdk/api/api.dart';
 
 import '../../../db/models/models.dart';
@@ -60,11 +60,11 @@ class GroupInfoBloc extends Bloc<GroupInfoEvent, GroupInfoState> {
     GroupAvatarPicked event,
     Emitter<GroupInfoState> emit,
   ) async {
-    await FilePicker.platform
-        .pickFiles(type: FileType.image, compressionQuality: 0)
+    await ImagePicker()
+        .pickImage(source: ImageSource.gallery)
         .then((result) async {
       if (result != null) {
-        File file = File(result.files.single.path!);
+        File file = File(result.path);
         try {
           final chat = await _conversationRepository.updateConversation(
               id: state.conversation.id, avatarUrl: file);
diff --git a/sama_chat_client/lib/src/features/profile/bloc/profile_bloc.dart b/sama_chat_client/lib/src/features/profile/bloc/profile_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:formz/formz.dart';
+import 'package:image_picker/image_picker.dart';
 
 import '../../../db/models/models.dart';
 import '../../../repository/user/user_repository.dart';
@@ -56,11 +56,11 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     ProfileAvatarPicked event,
     Emitter<ProfileState> emit,
   ) async {
-    await FilePicker.platform
-        .pickFiles(type: FileType.image, compressionQuality: 0)
+    await ImagePicker()
+        .pickImage(source: ImageSource.gallery)
         .then((result) async {
       if (result != null) {
-        File file = File(result.files.single.path!);
+        File file = File(result.path);
         try {
           final user = await _userRepository.updateAvatar(file);
           emit(state.copyWith(
diff --git a/sama_chat_client/pubspec.yaml b/sama_chat_client/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   connectivity_plus: ^6.0.3
   cupertino_icons: ^1.0.6
   equatable: ^2.0.5
-  file_picker: ^8.0.6
   firebase_core: ^3.6.0
   firebase_messaging: ^15.1.3
   flutter:
@@ -35,6 +34,7 @@ dependencies:
   go_router: ^14.8.1
   http: ^1.2.2
   image: ^4.2.0
+  image_picker: ^1.2.0
   intl: ^0.20.0
   mime: ^1.0.5
   objectbox: ^4.0.3

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,12 @@ final class AddFiles extends MediaSenderEvent {`
`14`	`14`	`const AddFiles(this.selectedFiles, {this.error});`
`15`	`15`	`}`
`16`	`16`
`17`		`-final class PickMoreFiles extends MediaSenderEvent {`
`18`		`- const PickMoreFiles();`
	`17`	`+final class PickCamera extends MediaSenderEvent {`
	`18`	`+ const PickCamera();`
	`19`	`+}`
	`20`	`+`
	`21`	`+final class PickMedia extends MediaSenderEvent {`
	`22`	`+ const PickMedia();`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`final class ChangeMessage extends MediaSenderEvent {`