mirror of https://github.com/immich-app/immich.git
feat: improve mobile screen reader accessibility (#17876)
* WIP: adding screen reader support to mobile * implemented getAltText * implemented alt text solution that stores the alt text in the DB, which isn't really great * moved alt text computation to immich_thumbnail.dart * added unit tests * revert unintended changes * Added text to remaining buttons in Photo page * fixed import * Fixed issue of easy_localization not parsing select blocks * Transferred the new screen reader help to web frontend * remove unused property * npm run format:fix * code review * revert unwanted change * dart fmt * revert web changes --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>pull/18007/head^2
parent
ed5b260eeb
commit
f54cfa7a5a
@ -0,0 +1,55 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:immich_mobile/entities/asset.entity.dart';
|
||||
import 'package:immich_mobile/domain/models/exif.model.dart';
|
||||
import 'package:immich_mobile/utils/translation.dart';
|
||||
|
||||
String getAltText(
|
||||
ExifInfo? exifInfo,
|
||||
DateTime fileCreatedAt,
|
||||
AssetType type,
|
||||
List<String> peopleNames,
|
||||
) {
|
||||
if (exifInfo?.description != null && exifInfo!.description!.isNotEmpty) {
|
||||
return exifInfo.description!;
|
||||
}
|
||||
final (template, args) =
|
||||
getAltTextTemplate(exifInfo, fileCreatedAt, type, peopleNames);
|
||||
return t(template, args);
|
||||
}
|
||||
|
||||
(String, Map<String, String>) getAltTextTemplate(
|
||||
ExifInfo? exifInfo,
|
||||
DateTime fileCreatedAt,
|
||||
AssetType type,
|
||||
List<String> peopleNames,
|
||||
) {
|
||||
final isVideo = type == AssetType.video;
|
||||
final hasLocation = exifInfo?.city != null && exifInfo?.country != null;
|
||||
final date = DateFormat.yMMMMd().format(fileCreatedAt);
|
||||
final args = {
|
||||
"isVideo": isVideo.toString(),
|
||||
"date": date,
|
||||
"city": exifInfo?.city ?? "",
|
||||
"country": exifInfo?.country ?? "",
|
||||
"person1": peopleNames.elementAtOrNull(0) ?? "",
|
||||
"person2": peopleNames.elementAtOrNull(1) ?? "",
|
||||
"person3": peopleNames.elementAtOrNull(2) ?? "",
|
||||
"additionalCount": (peopleNames.length - 3).toString(),
|
||||
};
|
||||
final template = hasLocation
|
||||
? (switch (peopleNames.length) {
|
||||
0 => "image_alt_text_date_place",
|
||||
1 => "image_alt_text_date_place_1_person",
|
||||
2 => "image_alt_text_date_place_2_people",
|
||||
3 => "image_alt_text_date_place_3_people",
|
||||
_ => "image_alt_text_date_place_4_or_more_people"
|
||||
})
|
||||
: (switch (peopleNames.length) {
|
||||
0 => "image_alt_text_date",
|
||||
1 => "image_alt_text_date_1_person",
|
||||
2 => "image_alt_text_date_2_people",
|
||||
3 => "image_alt_text_date_3_people",
|
||||
_ => "image_alt_text_date_4_or_more_people"
|
||||
});
|
||||
return (template, args);
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:immich_mobile/domain/models/exif.model.dart';
|
||||
import 'package:immich_mobile/entities/asset.entity.dart';
|
||||
import 'package:immich_mobile/utils/thumbnail_utils.dart';
|
||||
|
||||
void main() {
|
||||
final dateTime = DateTime(2025, 04, 25, 12, 13, 14);
|
||||
final dateTimeString = DateFormat.yMMMMd().format(dateTime);
|
||||
|
||||
test('returns description if it has one', () {
|
||||
final result = getAltText(
|
||||
const ExifInfo(description: 'description'),
|
||||
dateTime,
|
||||
AssetType.image,
|
||||
[],
|
||||
);
|
||||
expect(result, 'description');
|
||||
});
|
||||
|
||||
test('returns image alt text with date if no location', () {
|
||||
final (template, args) = getAltTextTemplate(
|
||||
const ExifInfo(),
|
||||
dateTime,
|
||||
AssetType.image,
|
||||
[],
|
||||
);
|
||||
expect(template, "image_alt_text_date");
|
||||
expect(args["isVideo"], "false");
|
||||
expect(args["date"], dateTimeString);
|
||||
});
|
||||
|
||||
test('returns image alt text with date and place', () {
|
||||
final (template, args) = getAltTextTemplate(
|
||||
const ExifInfo(city: 'city', country: 'country'),
|
||||
dateTime,
|
||||
AssetType.video,
|
||||
[],
|
||||
);
|
||||
expect(template, "image_alt_text_date_place");
|
||||
expect(args["isVideo"], "true");
|
||||
expect(args["date"], dateTimeString);
|
||||
expect(args["city"], "city");
|
||||
expect(args["country"], "country");
|
||||
});
|
||||
|
||||
test('returns image alt text with date and some people', () {
|
||||
final (template, args) = getAltTextTemplate(
|
||||
const ExifInfo(),
|
||||
dateTime,
|
||||
AssetType.image,
|
||||
["Alice", "Bob"],
|
||||
);
|
||||
expect(template, "image_alt_text_date_2_people");
|
||||
expect(args["isVideo"], "false");
|
||||
expect(args["date"], dateTimeString);
|
||||
expect(args["person1"], "Alice");
|
||||
expect(args["person2"], "Bob");
|
||||
});
|
||||
|
||||
test('returns image alt text with date and location and many people', () {
|
||||
final (template, args) = getAltTextTemplate(
|
||||
const ExifInfo(city: "city", country: 'country'),
|
||||
dateTime,
|
||||
AssetType.video,
|
||||
["Alice", "Bob", "Carol", "David", "Eve"],
|
||||
);
|
||||
expect(template, "image_alt_text_date_place_4_or_more_people");
|
||||
expect(args["isVideo"], "true");
|
||||
expect(args["date"], dateTimeString);
|
||||
expect(args["city"], "city");
|
||||
expect(args["country"], "country");
|
||||
expect(args["person1"], "Alice");
|
||||
expect(args["person2"], "Bob");
|
||||
expect(args["person3"], "Carol");
|
||||
expect(args["additionalCount"], "2");
|
||||
});
|
||||
}
|
||||
Loading…
Reference in New Issue