github/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-06-07 20:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refact 2

Browse Source
This commit is contained in:
wuzihao051119 2025-06-04 19:51:59 +08:00
parent 02b62e5183
commit 07d2b272ae
16 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/lib/constants/enums.dart Normal file
View File

@ -0,0 +1,5 @@
enum TextSearchType {
context,
filename,
description,
}

5
mobile/lib/entities/album.entity.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
import 'package:immich_mobile/utils/datetime_comparison.dart';
@ -24,7 +23,7 @@ class Album {
this.lastModifiedAssetTimestamp,
required this.shared,
required this.activityEnabled,
this.sortOrder = AssetOrder.desc,
this.assetOrder = AssetOrder.desc,
});
// fields stored in DB
@ -159,7 +158,7 @@ class Album {
a.remoteAssetCount = dto.assetCount;
a.owner.value = await db.users.getById(dto.ownerId);
if (dto.order != null) {
a.sortOrder =
a.assetOrder =
dto.order == AssetOrder.asc ? AssetOrder.asc : AssetOrder.desc;
}

1
mobile/lib/entities/asset.entity.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'dart:io';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/domain/models/exif.model.dart';
import 'package:immich_mobile/extensions/string_extensions.dart';
import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'

2
mobile/lib/infrastructure/utils/asset.mixin.dart
View File

@ -1,6 +1,6 @@
import 'package:drift/drift.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
import 'package:openapi/api.dart';
mixin AssetEntityMixin on Table {
TextColumn get name => text()();

2
mobile/lib/interfaces/album_api.interface.dart
View File

@ -1,5 +1,5 @@
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:openapi/api.dart';
abstract interface class IAlbumApiRepository {
Future<Album> get(String id);

1
mobile/lib/interfaces/asset_api.interface.dart
View File

@ -1,4 +1,3 @@
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:openapi/api.dart';

1
mobile/lib/models/search/search_filter.model.dart
View File

@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/interfaces/person_api.interface.dart';
import 'package:openapi/api.dart';
class SearchLocationFilter {
String? country;

1
mobile/lib/pages/library/folder/folder.page.dart
View File

@ -3,7 +3,6 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/extensions/theme_extensions.dart';
import 'package:immich_mobile/models/folder/recursive_folder.model.dart';

1
mobile/lib/pages/library/places/places_collection.page.dart
View File

@ -16,6 +16,7 @@ import 'package:immich_mobile/services/api.service.dart';
import 'package:immich_mobile/widgets/common/search_field.dart';
import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
import 'package:maplibre_gl/maplibre_gl.dart';
import 'package:openapi/api.dart';
@RoutePage()
class PlacesCollectionPage extends HookConsumerWidget {

1
mobile/lib/pages/search/search.page.dart
View File

@ -12,6 +12,7 @@ import 'package:immich_mobile/models/search/search_filter.model.dart';
import 'package:immich_mobile/providers/search/paginated_search.provider.dart';
import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart';
import 'package:immich_mobile/widgets/common/search_field.dart';
import 'package:immich_mobile/widgets/search/search_filter/camera_picker.dart';

2
mobile/lib/providers/album/album.provider.dart
View File

@ -115,7 +115,7 @@ class AlbumNotifier extends StateNotifier<List<Album>> {
Future<Album?> toggleAssetOrder(Album album) {
final order =
album.sortOrder == AssetOrder.asc ? AssetOrder.desc : AssetOrder.asc;
album.assetOrder == AssetOrder.asc ? AssetOrder.desc : AssetOrder.asc;
return albumService.updateAssetOrder(album, order);
}

2
mobile/lib/providers/album/album_sort_by_options.provider.g.dart generated
View File

@ -38,6 +38,6 @@ final albumSortOrderProvider =
allTransitiveDependencies: null,
);
typedef _$AlbumSortOrder = AutoDisposeNotifier<bool>;
typedef _$AlbumAssetOrder = AutoDisposeNotifier<bool>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

2
mobile/lib/repositories/album_api.repository.dart
View File

@ -162,7 +162,7 @@ class AlbumApiRepository extends ApiRepository implements IAlbumApiRepository {
startDate: dto.startDate,
endDate: dto.endDate,
activityEnabled: dto.isActivityEnabled,
sortOrder: dto.order == AssetOrder.asc ? AssetOrder.asc : AssetOrder.desc,
assetOrder: dto.order == AssetOrder.asc ? AssetOrder.asc : AssetOrder.desc,
);
album.remoteAssetCount = dto.assetCount;
album.owner.value =

2
mobile/lib/services/album.service.dart
View File

@ -487,7 +487,7 @@ class AlbumService {
try {
final updateAlbum =
await _albumApiRepository.update(album.remoteId!, sortOrder: order);
album.sortOrder = updateAlbum.sortOrder;
album.assetOrder = updateAlbum.assetOrder;
return _albumRepository.update(album);
} catch (error, stackTrace) {

1
mobile/lib/services/folder.service.dart
View File

@ -1,5 +1,4 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/models/folder/recursive_folder.model.dart';
import 'package:immich_mobile/models/folder/root_folder.model.dart';

2
mobile/lib/services/sync.service.dart
View File

@ -459,7 +459,7 @@ class SyncService {
album.lastModifiedAssetTimestamp = originalDto.lastModifiedAssetTimestamp;
album.shared = dto.shared;
album.activityEnabled = dto.activityEnabled;
album.sortOrder = dto.sortOrder;
album.assetOrder = dto.assetOrder;
final remoteThumbnailAssetId = dto.remoteThumbnailAssetId;
if (remoteThumbnailAssetId != null &&