浏览代码

Support archiving memories & hide them from home page

Neeraj Gupta 3 年之前
父节点
当前提交
8d66af68ac
共有 3 个文件被更改,包括 9 次插入6 次删除
  1. 6 3
      lib/db/files_db.dart
  2. 3 2
      lib/ui/gallery_app_bar_widget.dart
  3. 0 1
      lib/utils/file_magic_sync.dart

+ 6 - 3
lib/db/files_db.dart

@@ -362,7 +362,8 @@ class FilesDB {
     final results = await db.query(
     final results = await db.query(
       table,
       table,
       where:
       where:
-          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND  $columnOwnerID = ? AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)',
+          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND  $columnOwnerID = ? AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
+              ' AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = 0)',
       whereArgs: [startTime, endTime, ownerID],
       whereArgs: [startTime, endTime, ownerID],
       orderBy:
       orderBy:
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
@@ -379,7 +380,8 @@ class FilesDB {
     final results = await db.query(
     final results = await db.query(
       table,
       table,
       where:
       where:
-          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
+          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?)  AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = 0)'
+              ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
       whereArgs: [startTime, endTime, ownerID],
       whereArgs: [startTime, endTime, ownerID],
       orderBy:
       orderBy:
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
@@ -402,7 +404,8 @@ class FilesDB {
     final results = await db.query(
     final results = await db.query(
       table,
       table,
       where:
       where:
-          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) AND (($columnLocalID IS NOT NULL AND $columnDeviceFolder IN ($inParam)) OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
+          '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = 0)'
+              'AND (($columnLocalID IS NOT NULL AND $columnDeviceFolder IN ($inParam)) OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
       whereArgs: [startTime, endTime, ownerID],
       whereArgs: [startTime, endTime, ownerID],
       orderBy:
       orderBy:
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,

+ 3 - 2
lib/ui/gallery_app_bar_widget.dart

@@ -15,6 +15,7 @@ import 'package:photos/ui/create_collection_page.dart';
 import 'package:photos/ui/share_collection_widget.dart';
 import 'package:photos/ui/share_collection_widget.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/dialog_util.dart';
+import 'package:photos/utils/file_magic_sync.dart';
 import 'package:photos/utils/share_util.dart';
 import 'package:photos/utils/share_util.dart';
 import 'package:photos/utils/toast_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
 
@@ -259,9 +260,9 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           );
           );
           return items;
           return items;
         },
         },
-        onSelected: (value) {
+        onSelected: (value) async {
           if (value == 1) {
           if (value == 1) {
-            showToast("coming soon");
+            await changeVisibility(widget.selectedFiles.files.toList(), 1);
           }
           }
         },
         },
       ));
       ));

+ 0 - 1
lib/utils/file_magic_sync.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 
 import 'package:dio/dio.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
-import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/core/network.dart';
 import 'package:photos/core/network.dart';
 import 'package:photos/db/files_db.dart';
 import 'package:photos/db/files_db.dart';