kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-08 07:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mob][photos] Use better names

Browse Source
This commit is contained in:
ashilkn 2024-11-25 20:33:52 +05:30
parent ae81c73d5b
commit 8541eaee60
7 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/lib/main.dart
View File

@ -29,7 +29,6 @@ import "package:photos/l10n/l10n.dart";
import "package:photos/service_locator.dart";
import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/services/deeplink_service.dart";
import 'package:photos/services/favorites_service.dart';
import "package:photos/services/filedata/filedata_service.dart";
import 'package:photos/services/home_widget_service.dart';
@ -213,7 +212,6 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
_logger.info("_logFGHeartBeatInfo done $tlog");
unawaited(_scheduleHeartBeat(preferences, isBackground));
NotificationService.instance.init(preferences);
DeeplinkService.instance.init(preferences);
AppLifecycleService.instance.init(preferences);
if (isBackground) {
AppLifecycleService.instance.onAppInBackground('init via: $via $tlog');

3
mobile/lib/models/gallery_type.dart
View File

@ -295,7 +295,8 @@ extension GalleryAppBarExtn on GalleryType {
this == GalleryType.hiddenOwnedCollection) {
return true;
}
if (this == GalleryType.sharedPublicCollection && c!.isEnableCollect()) {
if (this == GalleryType.sharedPublicCollection &&
c!.isCollectEnabledForPublicLink()) {
return true;
}
if (this == GalleryType.sharedCollection) {

2
mobile/lib/services/collections_service.dart
View File

@ -1144,7 +1144,7 @@ class CollectionsService {
}
/// Is a public link opened in the app
bool isSharedPublicCollection(int collectionID) {
bool isSharedPublicLink(int collectionID) {
return _cachedPublicCollectionID.contains(collectionID);
}

6
mobile/lib/ui/viewer/file_details/added_by_widget.dart
View File

@ -15,9 +15,9 @@ class AddedByWidget extends StatelessWidget {
if (!file.isUploaded) {
return const SizedBox.shrink();
}
final bool isPublicFile = CollectionsService.instance
.isSharedPublicCollection(file.collectionID!);
if (isPublicFile) {
final bool fileIsFromSharedPublicLink =
CollectionsService.instance.isSharedPublicLink(file.collectionID!);
if (fileIsFromSharedPublicLink) {
return const SizedBox.shrink();
}
String? addedBy;

8
mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart
View File

@ -38,10 +38,10 @@ class GalleryFileWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final isFileSelected = selectedFiles?.isFileSelected(file) ?? false;
bool isPublicFile = false;
bool fileIsFromSharedPublicLink = false;
if (file.collectionID != null) {
isPublicFile = CollectionsService.instance
.isSharedPublicCollection(file.collectionID!);
fileIsFromSharedPublicLink =
CollectionsService.instance.isSharedPublicLink(file.collectionID!);
}
Color selectionColor = Colors.white;
if (isFileSelected && file.isUploaded && file.ownerID != currentUserID) {
@ -59,7 +59,7 @@ class GalleryFileWidget extends StatelessWidget {
thumbnailSize: photoGridSize < photoGridSizeDefault
? thumbnailLargeSize
: thumbnailSmallSize,
shouldShowOwnerAvatar: !(isFileSelected || isPublicFile),
shouldShowOwnerAvatar: !(isFileSelected || fileIsFromSharedPublicLink),
shouldShowVideoDuration: true,
);
return GestureDetector(

2
mobile/lib/utils/file_download_util.dart
View File

@ -98,7 +98,7 @@ Future<File?> downloadAndDecrypt(
ProgressCallback? progressCallback,
}) async {
if (await CollectionsService.instance
.isSharedPublicCollection(file.collectionID!)) {
.isSharedPublicLink(file.collectionID!)) {
final authToken = await CollectionsService.instance
.getSharedPublicAlbumToken(file.collectionID!);

3
mobile/lib/utils/thumbnail_util.dart
View File

@ -161,8 +161,7 @@ Future<void> _downloadAndDecryptThumbnail(FileDownloadItem item) async {
final file = item.file;
Uint8List encryptedThumbnail;
try {
if (CollectionsService.instance
.isSharedPublicCollection(file.collectionID!)) {
if (CollectionsService.instance.isSharedPublicLink(file.collectionID!)) {
final authToken = await CollectionsService.instance
.getSharedPublicAlbumToken(file.collectionID!);
final authJWTToken = await CollectionsService.instance