Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(mobile): allow contact picking for names in mobile app #15817

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mobile/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
<uses-permission android:name="android.permission.MANAGE_MEDIA" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
Expand Down Expand Up @@ -124,4 +125,4 @@
<data android:scheme="geo" />
</intent>
</queries>
</manifest>
</manifest>
2 changes: 2 additions & 0 deletions mobile/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@
<string>We need to manage backup your photos album</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>We need to manage backup your photos album</string>
<key>NSContactsUsageDescription</key>
<string>We need contact access to help you assign names to people in your photos from your contacts' names.</string>
<key>NSUserActivityTypes</key>
<array>
<string>INSendMessageIntent</string>
Expand Down
138 changes: 129 additions & 9 deletions mobile/lib/widgets/search/person_name_edit_form.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import 'dart:typed_data';

import 'package:easy_localization/easy_localization.dart';
import 'package:fast_contacts/fast_contacts.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/providers/search/people.provider.dart';
import 'package:permission_handler/permission_handler.dart';

class PersonNameEditFormResult {
final bool success;
Expand All @@ -26,21 +30,137 @@ class PersonNameEditForm extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final controller = useTextEditingController(text: personName);
final isError = useState(false);
final contacts = useState<List<Contact>>([]);
final filteredContacts = useState<List<Contact>>([]);
final isLoading = useState(false);

useEffect(
() {
Future<void> loadContacts() async {
try {
var status = await Permission.contacts.status;
// Check status and re-request permission if needed
if (!status.isPermanentlyDenied) {
status = await Permission.contacts.request();
}

if (status.isGranted) {
isLoading.value = true;
contacts.value = await FastContacts.getAllContacts();
isLoading.value = false;
}
} catch (e) {
debugPrint('Failed to load contacts: $e');
}
}

loadContacts();
return null;
},
[],
);

useEffect(
() {
// Filter contacts based on the input name
void filterContacts() {
if (controller.text.isEmpty) {
filteredContacts.value = [];
return;
}
filteredContacts.value = contacts.value
.where(
(contact) =>
contact.displayName
.toLowerCase()
.contains(controller.text.toLowerCase()) &&
contact.displayName !=
controller
.text, // If contact 100% matches the input, also hide it
)
.toList();
}

// Filter contacts on first load too
filterContacts();

controller.addListener(filterContacts);
return () => controller.removeListener(filterContacts);
},
[contacts.value],
);

return AlertDialog(
title: const Text(
"search_page_person_add_name_dialog_title",
style: TextStyle(fontWeight: FontWeight.bold),
).tr(),
content: SingleChildScrollView(
child: TextFormField(
controller: controller,
autofocus: true,
decoration: InputDecoration(
hintText: 'search_page_person_add_name_dialog_hint'.tr(),
border: const OutlineInputBorder(),
errorText: isError.value ? 'Error occured' : null,
),
content: SizedBox(
width: MediaQuery.of(context).size.width * 0.6,
height: filteredContacts.value.isEmpty
? 64
: MediaQuery.of(context).size.height * 0.4,
child: Column(
children: [
TextFormField(
controller: controller,
autofocus: true,
decoration: InputDecoration(
hintText: 'search_page_person_add_name_dialog_hint'.tr(),
border: const OutlineInputBorder(),
errorText: isError.value ? 'Error occured' : null,
suffixIcon: isLoading.value
? const SizedBox(
width: 20,
height: 20,
child: Padding(
padding: EdgeInsets.all(10.0),
child: CircularProgressIndicator(),
),
)
: null,
),
),
const SizedBox(height: 8),
Expanded(
child: filteredContacts.value.isNotEmpty
? ListView.builder(
itemCount: filteredContacts.value.length,
itemBuilder: (context, index) {
final contact = filteredContacts.value[index];
return ListTile(
leading: FutureBuilder<Uint8List?>(
future: FastContacts.getContactImage(contact.id),
builder: (context, snapshot) {
if (snapshot.hasData && snapshot.data != null) {
return CircleAvatar(
radius: 16,
backgroundImage: MemoryImage(snapshot.data!),
);
}
return const CircleAvatar(
radius: 16,
child: Icon(Icons.person, size: 20),
);
},
),
dense: true,
title: Text(
contact.displayName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
onTap: () {
controller.text = contact.displayName;
filteredContacts.value = [];
FocusScope.of(context).unfocus();
},
);
},
)
: const SizedBox.shrink(),
),
],
),
),
actions: [
Expand Down
56 changes: 32 additions & 24 deletions mobile/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
version: "76.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "0.3.3"
analyzer:
dependency: "direct overridden"
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.11.0"
analyzer_plugin:
dependency: "direct overridden"
description:
Expand Down Expand Up @@ -250,10 +250,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.0"
connectivity_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -414,6 +414,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.1"
fast_contacts:
dependency: "direct main"
description:
name: fast_contacts
sha256: "69b7c2208f9da3666c1577191b3d8f6193c90567eb0a9dfead8e59607caebe87"
url: "https://pub.dev"
source: hosted
version: "4.0.0"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -900,18 +908,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -940,10 +948,10 @@ packages:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
version: "0.1.3-main.0"
maplibre_gl:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1452,7 +1460,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
socket_io_client:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1513,10 +1521,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.0"
state_notifier:
dependency: transitive
description:
Expand Down Expand Up @@ -1545,10 +1553,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.0"
sync_http:
dependency: transitive
description:
Expand Down Expand Up @@ -1577,10 +1585,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.3"
thumbhash:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1737,10 +1745,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.0"
wakelock_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1793,10 +1801,10 @@ packages:
dependency: transitive
description:
name: webdriver
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.4"
win32:
dependency: transitive
description:
Expand Down
2 changes: 2 additions & 0 deletions mobile/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ dependencies:
#image editing packages
crop_image: ^1.0.13

fast_contacts: 4.0.0

openapi:
path: openapi

Expand Down