Merge pull request #420 from ente-io/refactor_collections_gallery
Refactor collections gallery
This commit is contained in:
Ashil
GitHub
commit
110a5831ab
91
lib/ui/collections/collection_item_widget.dart
Normal file
91
lib/ui/collections/collection_item_widget.dart
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
import 'dart:math';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/db/files_db.dart';
|
||||||
|
import 'package:photos/models/collection_items.dart';
|
||||||
|
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
||||||
|
import 'package:photos/ui/viewer/gallery/collection_page.dart';
|
||||||
|
import 'package:photos/utils/navigation_util.dart';
|
||||||
|
|
||||||
|
class CollectionItem extends StatelessWidget {
|
||||||
|
CollectionItem(
|
||||||
|
this.c, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: Key(c.collection.id.toString()));
|
||||||
|
|
||||||
|
final CollectionWithThumbnail c;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
const double horizontalPaddingOfGridRow = 16;
|
||||||
|
const double crossAxisSpacingOfGrid = 9;
|
||||||
|
Size size = MediaQuery.of(context).size;
|
||||||
|
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
|
||||||
|
double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
|
||||||
|
(albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
|
||||||
|
TextStyle albumTitleTextStyle =
|
||||||
|
Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 14);
|
||||||
|
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
|
||||||
|
(totalWhiteSpaceOfRow / albumsCountInOneRow);
|
||||||
|
return GestureDetector(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: <Widget>[
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
child: SizedBox(
|
||||||
|
height: sideOfThumbnail,
|
||||||
|
width: sideOfThumbnail,
|
||||||
|
child: Hero(
|
||||||
|
tag: "collection" + c.thumbnail.tag(),
|
||||||
|
child: ThumbnailWidget(
|
||||||
|
c.thumbnail,
|
||||||
|
shouldShowArchiveStatus: c.collection.isArchived(),
|
||||||
|
key: Key(
|
||||||
|
"collection" + c.thumbnail.tag(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
constraints: BoxConstraints(maxWidth: sideOfThumbnail - 40),
|
||||||
|
child: Text(
|
||||||
|
c.collection.name,
|
||||||
|
style: albumTitleTextStyle,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
FutureBuilder<int>(
|
||||||
|
future: FilesDB.instance.collectionFileCount(c.collection.id),
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.hasData && snapshot.data > 0) {
|
||||||
|
return RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: albumTitleTextStyle.copyWith(
|
||||||
|
color: albumTitleTextStyle.color.withOpacity(0.5),
|
||||||
|
),
|
||||||
|
children: [
|
||||||
|
const TextSpan(text: " \u2022 "),
|
||||||
|
TextSpan(text: snapshot.data.toString()),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
routeToPage(context, CollectionPage(c));
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
45
lib/ui/collections/create_new_album_widget.dart
Normal file
45
lib/ui/collections/create_new_album_widget.dart
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:fluttertoast/fluttertoast.dart';
|
||||||
|
import 'package:photos/core/event_bus.dart';
|
||||||
|
import 'package:photos/events/tab_changed_event.dart';
|
||||||
|
import 'package:photos/utils/toast_util.dart';
|
||||||
|
|
||||||
|
class CreateNewAlbumWidget extends StatelessWidget {
|
||||||
|
const CreateNewAlbumWidget({
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return InkWell(
|
||||||
|
child: Container(
|
||||||
|
margin: const EdgeInsets.fromLTRB(30, 30, 30, 54),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Theme.of(context).backgroundColor,
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
blurRadius: 2,
|
||||||
|
spreadRadius: 0,
|
||||||
|
offset: const Offset(0, 0),
|
||||||
|
color: Theme.of(context).iconTheme.color.withOpacity(0.3),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
),
|
||||||
|
child: Icon(
|
||||||
|
Icons.add,
|
||||||
|
color: Theme.of(context).iconTheme.color.withOpacity(0.25),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onTap: () async {
|
||||||
|
await showToast(
|
||||||
|
context,
|
||||||
|
"Long press to select photos and click + to create an album",
|
||||||
|
toastLength: Toast.LENGTH_LONG,
|
||||||
|
);
|
||||||
|
Bus.instance
|
||||||
|
.fire(TabChangedEvent(0, TabChangedEventSource.collectionsPage));
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
98
lib/ui/collections/device_folder_icon_widget.dart
Normal file
98
lib/ui/collections/device_folder_icon_widget.dart
Normal file
|
|
@ -0,0 +1,98 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/core/configuration.dart';
|
||||||
|
import 'package:photos/models/device_folder.dart';
|
||||||
|
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
||||||
|
import 'package:photos/ui/viewer/gallery/device_folder_page.dart';
|
||||||
|
import 'package:photos/utils/navigation_util.dart';
|
||||||
|
|
||||||
|
class DeviceFolderIcon extends StatelessWidget {
|
||||||
|
const DeviceFolderIcon(
|
||||||
|
this.folder, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
static final kUnsyncedIconOverlay = Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.topCenter,
|
||||||
|
end: Alignment.bottomCenter,
|
||||||
|
colors: [
|
||||||
|
Colors.transparent,
|
||||||
|
Colors.black.withOpacity(0.6),
|
||||||
|
],
|
||||||
|
stops: const [0.7, 1],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.bottomRight,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(right: 8, bottom: 8),
|
||||||
|
child: Icon(
|
||||||
|
Icons.cloud_off_outlined,
|
||||||
|
size: 18,
|
||||||
|
color: Colors.white.withOpacity(0.9),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
final DeviceFolder folder;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final isBackedUp =
|
||||||
|
Configuration.instance.getPathsToBackUp().contains(folder.path);
|
||||||
|
return GestureDetector(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 2),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 140,
|
||||||
|
width: 120,
|
||||||
|
child: Column(
|
||||||
|
children: <Widget>[
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 120,
|
||||||
|
width: 120,
|
||||||
|
child: Hero(
|
||||||
|
tag:
|
||||||
|
"device_folder:" + folder.path + folder.thumbnail.tag(),
|
||||||
|
child: Stack(
|
||||||
|
children: [
|
||||||
|
ThumbnailWidget(
|
||||||
|
folder.thumbnail,
|
||||||
|
shouldShowSyncStatus: false,
|
||||||
|
key: Key(
|
||||||
|
"device_folder:" +
|
||||||
|
folder.path +
|
||||||
|
folder.thumbnail.tag(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
isBackedUp ? Container() : kUnsyncedIconOverlay,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 10),
|
||||||
|
child: Text(
|
||||||
|
folder.name,
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.subtitle1
|
||||||
|
.copyWith(fontSize: 12),
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
routeToPage(context, DeviceFolderPage(folder));
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
39
lib/ui/collections/device_folders_grid_view_widget.dart
Normal file
39
lib/ui/collections/device_folders_grid_view_widget.dart
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/models/device_folder.dart';
|
||||||
|
import 'package:photos/ui/collections/device_folder_icon_widget.dart';
|
||||||
|
import 'package:photos/ui/viewer/gallery/empte_state.dart';
|
||||||
|
|
||||||
|
class DeviceFoldersGridViewWidget extends StatelessWidget {
|
||||||
|
final List<DeviceFolder> folders;
|
||||||
|
|
||||||
|
const DeviceFoldersGridViewWidget(
|
||||||
|
this.folders, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 170,
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: folders.isEmpty
|
||||||
|
? const EmptyState()
|
||||||
|
: ListView.builder(
|
||||||
|
shrinkWrap: true,
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
|
||||||
|
physics: const ScrollPhysics(),
|
||||||
|
// to disable GridView's scrolling
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return DeviceFolderIcon(folders[index]);
|
||||||
|
},
|
||||||
|
itemCount: folders.length,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
47
lib/ui/collections/ente_section_title.dart
Normal file
47
lib/ui/collections/ente_section_title.dart
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/ente_theme_data.dart';
|
||||||
|
|
||||||
|
class EnteSectionTitle extends StatelessWidget {
|
||||||
|
final double opacity;
|
||||||
|
|
||||||
|
const EnteSectionTitle({
|
||||||
|
this.opacity = 0.8,
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
margin: const EdgeInsets.fromLTRB(16, 12, 0, 0),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: "On ",
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.headline6
|
||||||
|
.copyWith(fontSize: 22),
|
||||||
|
),
|
||||||
|
TextSpan(
|
||||||
|
text: "ente",
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontFamily: 'Montserrat',
|
||||||
|
fontSize: 22,
|
||||||
|
color: Theme.of(context).colorScheme.defaultTextColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
102
lib/ui/collections/hidden_collections_button_widget.dart
Normal file
102
lib/ui/collections/hidden_collections_button_widget.dart
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/core/configuration.dart';
|
||||||
|
import 'package:photos/db/files_db.dart';
|
||||||
|
import 'package:photos/models/magic_metadata.dart';
|
||||||
|
import 'package:photos/ui/viewer/gallery/archive_page.dart';
|
||||||
|
import 'package:photos/utils/navigation_util.dart';
|
||||||
|
|
||||||
|
class HiddenCollectionsButtonWidget extends StatelessWidget {
|
||||||
|
final TextStyle textStyle;
|
||||||
|
|
||||||
|
const HiddenCollectionsButtonWidget(
|
||||||
|
this.textStyle, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return OutlinedButton(
|
||||||
|
style: OutlinedButton.styleFrom(
|
||||||
|
backgroundColor: Theme.of(context).backgroundColor,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
padding: const EdgeInsets.all(0),
|
||||||
|
side: BorderSide(
|
||||||
|
width: 0.5,
|
||||||
|
color: Theme.of(context).iconTheme.color.withOpacity(0.24),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 48,
|
||||||
|
width: double.infinity,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.visibility_off,
|
||||||
|
color: Theme.of(context).iconTheme.color,
|
||||||
|
),
|
||||||
|
const Padding(padding: EdgeInsets.all(6)),
|
||||||
|
FutureBuilder<int>(
|
||||||
|
future: FilesDB.instance.fileCountWithVisibility(
|
||||||
|
kVisibilityArchive,
|
||||||
|
Configuration.instance.getUserID(),
|
||||||
|
),
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.hasData && snapshot.data > 0) {
|
||||||
|
return RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: textStyle,
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: "Hidden",
|
||||||
|
style: Theme.of(context).textTheme.subtitle1,
|
||||||
|
),
|
||||||
|
const TextSpan(text: " \u2022 "),
|
||||||
|
TextSpan(
|
||||||
|
text: snapshot.data.toString(),
|
||||||
|
),
|
||||||
|
//need to query in db and bring this value
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: textStyle,
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: "Hidden",
|
||||||
|
style: Theme.of(context).textTheme.subtitle1,
|
||||||
|
),
|
||||||
|
//need to query in db and bring this value
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Icon(
|
||||||
|
Icons.chevron_right,
|
||||||
|
color: Theme.of(context).iconTheme.color,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onPressed: () async {
|
||||||
|
routeToPage(
|
||||||
|
context,
|
||||||
|
ArchivePage(),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
50
lib/ui/collections/remote_collections_grid_view_widget.dart
Normal file
50
lib/ui/collections/remote_collections_grid_view_widget.dart
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
import 'dart:math';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/models/collection_items.dart';
|
||||||
|
import 'package:photos/ui/collections/collection_item_widget.dart';
|
||||||
|
import 'package:photos/ui/collections/create_new_album_widget.dart';
|
||||||
|
|
||||||
|
class RemoteCollectionsGridViewWidget extends StatelessWidget {
|
||||||
|
final List<CollectionWithThumbnail> collections;
|
||||||
|
|
||||||
|
const RemoteCollectionsGridViewWidget(
|
||||||
|
this.collections, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
const double horizontalPaddingOfGridRow = 16;
|
||||||
|
const double crossAxisSpacingOfGrid = 9;
|
||||||
|
Size size = MediaQuery.of(context).size;
|
||||||
|
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
|
||||||
|
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
|
||||||
|
horizontalPaddingOfGridRow -
|
||||||
|
((crossAxisSpacingOfGrid / 2) * (albumsCountInOneRow - 1));
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
|
child: GridView.builder(
|
||||||
|
shrinkWrap: true,
|
||||||
|
physics: const ScrollPhysics(),
|
||||||
|
// to disable GridView's scrolling
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
if (index < collections.length) {
|
||||||
|
return CollectionItem(collections[index]);
|
||||||
|
} else {
|
||||||
|
return const CreateNewAlbumWidget();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
itemCount: collections.length + 1,
|
||||||
|
// To include the + button
|
||||||
|
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: albumsCountInOneRow,
|
||||||
|
mainAxisSpacing: 12,
|
||||||
|
crossAxisSpacing: crossAxisSpacingOfGrid,
|
||||||
|
childAspectRatio: sideOfThumbnail / (sideOfThumbnail + 24),
|
||||||
|
), //24 is height of album title
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
33
lib/ui/collections/section_title.dart
Normal file
33
lib/ui/collections/section_title.dart
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class SectionTitle extends StatelessWidget {
|
||||||
|
final String title;
|
||||||
|
final Alignment alignment;
|
||||||
|
final double opacity;
|
||||||
|
|
||||||
|
const SectionTitle(
|
||||||
|
this.title, {
|
||||||
|
this.opacity = 0.8,
|
||||||
|
Key key,
|
||||||
|
this.alignment = Alignment.centerLeft,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
margin: const EdgeInsets.fromLTRB(16, 12, 0, 0),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Align(
|
||||||
|
alignment: alignment,
|
||||||
|
child: Text(
|
||||||
|
title,
|
||||||
|
style:
|
||||||
|
Theme.of(context).textTheme.headline6.copyWith(fontSize: 22),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
97
lib/ui/collections/trash_button_widget.dart
Normal file
97
lib/ui/collections/trash_button_widget.dart
Normal file
|
|
@ -0,0 +1,97 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:photos/db/trash_db.dart';
|
||||||
|
import 'package:photos/ui/viewer/gallery/trash_page.dart';
|
||||||
|
import 'package:photos/utils/navigation_util.dart';
|
||||||
|
|
||||||
|
class TrashButtonWidget extends StatelessWidget {
|
||||||
|
const TrashButtonWidget(
|
||||||
|
this.textStyle, {
|
||||||
|
Key key,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
final TextStyle textStyle;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return OutlinedButton(
|
||||||
|
style: OutlinedButton.styleFrom(
|
||||||
|
backgroundColor: Theme.of(context).backgroundColor,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
padding: const EdgeInsets.all(0),
|
||||||
|
side: BorderSide(
|
||||||
|
width: 0.5,
|
||||||
|
color: Theme.of(context).iconTheme.color.withOpacity(0.24),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 48,
|
||||||
|
width: double.infinity,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.delete,
|
||||||
|
color: Theme.of(context).iconTheme.color,
|
||||||
|
),
|
||||||
|
const Padding(padding: EdgeInsets.all(6)),
|
||||||
|
FutureBuilder<int>(
|
||||||
|
future: TrashDB.instance.count(),
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.hasData && snapshot.data > 0) {
|
||||||
|
return RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: textStyle,
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: "Trash",
|
||||||
|
style: Theme.of(context).textTheme.subtitle1,
|
||||||
|
),
|
||||||
|
const TextSpan(text: " \u2022 "),
|
||||||
|
TextSpan(
|
||||||
|
text: snapshot.data.toString(),
|
||||||
|
),
|
||||||
|
//need to query in db and bring this value
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: textStyle,
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: "Trash",
|
||||||
|
style: Theme.of(context).textTheme.subtitle1,
|
||||||
|
),
|
||||||
|
//need to query in db and bring this value
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Icon(
|
||||||
|
Icons.chevron_right,
|
||||||
|
color: Theme.of(context).iconTheme.color,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onPressed: () async {
|
||||||
|
routeToPage(
|
||||||
|
context,
|
||||||
|
TrashPage(),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,35 +1,29 @@
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'dart:math';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:fluttertoast/fluttertoast.dart';
|
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:photos/core/configuration.dart';
|
import 'package:photos/core/configuration.dart';
|
||||||
import 'package:photos/core/event_bus.dart';
|
import 'package:photos/core/event_bus.dart';
|
||||||
import 'package:photos/db/files_db.dart';
|
import 'package:photos/db/files_db.dart';
|
||||||
import 'package:photos/db/trash_db.dart';
|
|
||||||
import 'package:photos/ente_theme_data.dart';
|
|
||||||
import 'package:photos/events/backup_folders_updated_event.dart';
|
import 'package:photos/events/backup_folders_updated_event.dart';
|
||||||
import 'package:photos/events/collection_updated_event.dart';
|
import 'package:photos/events/collection_updated_event.dart';
|
||||||
import 'package:photos/events/local_photos_updated_event.dart';
|
import 'package:photos/events/local_photos_updated_event.dart';
|
||||||
import 'package:photos/events/tab_changed_event.dart';
|
|
||||||
import 'package:photos/events/user_logged_out_event.dart';
|
import 'package:photos/events/user_logged_out_event.dart';
|
||||||
import 'package:photos/models/collection_items.dart';
|
import 'package:photos/models/collection_items.dart';
|
||||||
import 'package:photos/models/device_folder.dart';
|
import 'package:photos/models/device_folder.dart';
|
||||||
import 'package:photos/models/magic_metadata.dart';
|
|
||||||
import 'package:photos/services/collections_service.dart';
|
import 'package:photos/services/collections_service.dart';
|
||||||
|
import 'package:photos/ui/collections/device_folders_grid_view_widget.dart';
|
||||||
|
import 'package:photos/ui/collections/ente_section_title.dart';
|
||||||
|
import 'package:photos/ui/collections/hidden_collections_button_widget.dart';
|
||||||
|
import 'package:photos/ui/collections/remote_collections_grid_view_widget.dart';
|
||||||
|
import 'package:photos/ui/collections/section_title.dart';
|
||||||
|
import 'package:photos/ui/collections/trash_button_widget.dart';
|
||||||
import 'package:photos/ui/common/loading_widget.dart';
|
import 'package:photos/ui/common/loading_widget.dart';
|
||||||
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
|
||||||
import 'package:photos/ui/viewer/gallery/archive_page.dart';
|
|
||||||
import 'package:photos/ui/viewer/gallery/collection_page.dart';
|
|
||||||
import 'package:photos/ui/viewer/gallery/device_all_page.dart';
|
import 'package:photos/ui/viewer/gallery/device_all_page.dart';
|
||||||
import 'package:photos/ui/viewer/gallery/device_folder_page.dart';
|
|
||||||
import 'package:photos/ui/viewer/gallery/empte_state.dart';
|
import 'package:photos/ui/viewer/gallery/empte_state.dart';
|
||||||
import 'package:photos/ui/viewer/gallery/trash_page.dart';
|
|
||||||
import 'package:photos/utils/local_settings.dart';
|
import 'package:photos/utils/local_settings.dart';
|
||||||
import 'package:photos/utils/navigation_util.dart';
|
import 'package:photos/utils/navigation_util.dart';
|
||||||
import 'package:photos/utils/toast_util.dart';
|
|
||||||
|
|
||||||
class CollectionsGalleryWidget extends StatefulWidget {
|
class CollectionsGalleryWidget extends StatefulWidget {
|
||||||
const CollectionsGalleryWidget({Key key}) : super(key: key);
|
const CollectionsGalleryWidget({Key key}) : super(key: key);
|
||||||
|
|
@ -133,19 +127,13 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _getCollectionsGalleryWidget(CollectionItems items) {
|
Widget _getCollectionsGalleryWidget(CollectionItems items) {
|
||||||
const double horizontalPaddingOfGridRow = 16;
|
|
||||||
const double crossAxisSpacingOfGrid = 9;
|
|
||||||
final TextStyle trashAndHiddenTextStyle = Theme.of(context)
|
final TextStyle trashAndHiddenTextStyle = Theme.of(context)
|
||||||
.textTheme
|
.textTheme
|
||||||
.subtitle1
|
.subtitle1
|
||||||
.copyWith(
|
.copyWith(
|
||||||
color: Theme.of(context).textTheme.subtitle1.color.withOpacity(0.5),
|
color: Theme.of(context).textTheme.subtitle1.color.withOpacity(0.5),
|
||||||
);
|
);
|
||||||
Size size = MediaQuery.of(context).size;
|
|
||||||
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
|
|
||||||
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
|
|
||||||
horizontalPaddingOfGridRow -
|
|
||||||
((crossAxisSpacingOfGrid / 2) * (albumsCountInOneRow - 1));
|
|
||||||
return SingleChildScrollView(
|
return SingleChildScrollView(
|
||||||
child: Container(
|
child: Container(
|
||||||
margin: const EdgeInsets.only(bottom: 50),
|
margin: const EdgeInsets.only(bottom: 50),
|
||||||
|
|
@ -174,28 +162,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
padding: EdgeInsets.all(22),
|
padding: EdgeInsets.all(22),
|
||||||
child: EmptyState(),
|
child: EmptyState(),
|
||||||
)
|
)
|
||||||
: Padding(
|
: DeviceFoldersGridViewWidget(items.folders),
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
|
||||||
child: SizedBox(
|
|
||||||
height: 170,
|
|
||||||
child: Align(
|
|
||||||
alignment: Alignment.centerLeft,
|
|
||||||
child: items.folders.isEmpty
|
|
||||||
? const EmptyState()
|
|
||||||
: ListView.builder(
|
|
||||||
shrinkWrap: true,
|
|
||||||
scrollDirection: Axis.horizontal,
|
|
||||||
padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
|
|
||||||
physics: const ScrollPhysics(),
|
|
||||||
// to disable GridView's scrolling
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
return DeviceFolderIcon(items.folders[index]);
|
|
||||||
},
|
|
||||||
itemCount: items.folders.length,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Padding(padding: EdgeInsets.all(4)),
|
const Padding(padding: EdgeInsets.all(4)),
|
||||||
const Divider(),
|
const Divider(),
|
||||||
Row(
|
Row(
|
||||||
|
|
@ -208,30 +175,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
),
|
),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
Configuration.instance.hasConfiguredAccount()
|
Configuration.instance.hasConfiguredAccount()
|
||||||
? Padding(
|
? RemoteCollectionsGridViewWidget(items.collections)
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
child: GridView.builder(
|
|
||||||
shrinkWrap: true,
|
|
||||||
physics: const ScrollPhysics(),
|
|
||||||
// to disable GridView's scrolling
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
return _buildCollection(
|
|
||||||
context,
|
|
||||||
items.collections,
|
|
||||||
index,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
itemCount: items.collections.length + 1,
|
|
||||||
// To include the + button
|
|
||||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
|
||||||
crossAxisCount: albumsCountInOneRow,
|
|
||||||
mainAxisSpacing: 12,
|
|
||||||
crossAxisSpacing: crossAxisSpacingOfGrid,
|
|
||||||
childAspectRatio:
|
|
||||||
sideOfThumbnail / (sideOfThumbnail + 24),
|
|
||||||
), //24 is height of album title
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: const EmptyState(),
|
: const EmptyState(),
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
const Divider(),
|
const Divider(),
|
||||||
|
|
@ -240,181 +184,9 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
OutlinedButton(
|
TrashButtonWidget(trashAndHiddenTextStyle),
|
||||||
style: OutlinedButton.styleFrom(
|
|
||||||
backgroundColor: Theme.of(context).backgroundColor,
|
|
||||||
shape: RoundedRectangleBorder(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.all(0),
|
|
||||||
side: BorderSide(
|
|
||||||
width: 0.5,
|
|
||||||
color:
|
|
||||||
Theme.of(context).iconTheme.color.withOpacity(0.24),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: SizedBox(
|
|
||||||
height: 48,
|
|
||||||
width: double.infinity,
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Icon(
|
|
||||||
Icons.delete,
|
|
||||||
color: Theme.of(context).iconTheme.color,
|
|
||||||
),
|
|
||||||
const Padding(padding: EdgeInsets.all(6)),
|
|
||||||
FutureBuilder<int>(
|
|
||||||
future: TrashDB.instance.count(),
|
|
||||||
builder: (context, snapshot) {
|
|
||||||
if (snapshot.hasData && snapshot.data > 0) {
|
|
||||||
return RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
style: trashAndHiddenTextStyle,
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: "Trash",
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.subtitle1,
|
|
||||||
),
|
|
||||||
const TextSpan(text: " \u2022 "),
|
|
||||||
TextSpan(
|
|
||||||
text: snapshot.data.toString(),
|
|
||||||
),
|
|
||||||
//need to query in db and bring this value
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
style: trashAndHiddenTextStyle,
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: "Trash",
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.subtitle1,
|
|
||||||
),
|
|
||||||
//need to query in db and bring this value
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
Icon(
|
|
||||||
Icons.chevron_right,
|
|
||||||
color: Theme.of(context).iconTheme.color,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
onPressed: () async {
|
|
||||||
routeToPage(
|
|
||||||
context,
|
|
||||||
TrashPage(),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
OutlinedButton(
|
HiddenCollectionsButtonWidget(trashAndHiddenTextStyle),
|
||||||
style: OutlinedButton.styleFrom(
|
|
||||||
backgroundColor: Theme.of(context).backgroundColor,
|
|
||||||
shape: RoundedRectangleBorder(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.all(0),
|
|
||||||
side: BorderSide(
|
|
||||||
width: 0.5,
|
|
||||||
color:
|
|
||||||
Theme.of(context).iconTheme.color.withOpacity(0.24),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: SizedBox(
|
|
||||||
height: 48,
|
|
||||||
width: double.infinity,
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Icon(
|
|
||||||
Icons.visibility_off,
|
|
||||||
color: Theme.of(context).iconTheme.color,
|
|
||||||
),
|
|
||||||
const Padding(padding: EdgeInsets.all(6)),
|
|
||||||
FutureBuilder<int>(
|
|
||||||
future:
|
|
||||||
FilesDB.instance.fileCountWithVisibility(
|
|
||||||
kVisibilityArchive,
|
|
||||||
Configuration.instance.getUserID(),
|
|
||||||
),
|
|
||||||
builder: (context, snapshot) {
|
|
||||||
if (snapshot.hasData && snapshot.data > 0) {
|
|
||||||
return RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
style: trashAndHiddenTextStyle,
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: "Hidden",
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.subtitle1,
|
|
||||||
),
|
|
||||||
const TextSpan(text: " \u2022 "),
|
|
||||||
TextSpan(
|
|
||||||
text: snapshot.data.toString(),
|
|
||||||
),
|
|
||||||
//need to query in db and bring this value
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
style: trashAndHiddenTextStyle,
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: "Hidden",
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.subtitle1,
|
|
||||||
),
|
|
||||||
//need to query in db and bring this value
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
Icon(
|
|
||||||
Icons.chevron_right,
|
|
||||||
color: Theme.of(context).iconTheme.color,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
onPressed: () async {
|
|
||||||
routeToPage(
|
|
||||||
context,
|
|
||||||
ArchivePage(),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -493,48 +265,6 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildCollection(
|
|
||||||
BuildContext context,
|
|
||||||
List<CollectionWithThumbnail> collections,
|
|
||||||
int index,
|
|
||||||
) {
|
|
||||||
if (index < collections.length) {
|
|
||||||
final c = collections[index];
|
|
||||||
return CollectionItem(c);
|
|
||||||
} else {
|
|
||||||
return InkWell(
|
|
||||||
child: Container(
|
|
||||||
margin: const EdgeInsets.fromLTRB(30, 30, 30, 54),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Theme.of(context).backgroundColor,
|
|
||||||
boxShadow: [
|
|
||||||
BoxShadow(
|
|
||||||
blurRadius: 2,
|
|
||||||
spreadRadius: 0,
|
|
||||||
offset: const Offset(0, 0),
|
|
||||||
color: Theme.of(context).iconTheme.color.withOpacity(0.3),
|
|
||||||
)
|
|
||||||
],
|
|
||||||
borderRadius: BorderRadius.circular(4),
|
|
||||||
),
|
|
||||||
child: Icon(
|
|
||||||
Icons.add,
|
|
||||||
color: Theme.of(context).iconTheme.color.withOpacity(0.25),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
onTap: () async {
|
|
||||||
await showToast(
|
|
||||||
context,
|
|
||||||
"long press to select photos and click + to create an album",
|
|
||||||
toastLength: Toast.LENGTH_LONG,
|
|
||||||
);
|
|
||||||
Bus.instance
|
|
||||||
.fire(TabChangedEvent(0, TabChangedEventSource.collectionsPage));
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_localFilesSubscription.cancel();
|
_localFilesSubscription.cancel();
|
||||||
|
|
@ -547,255 +277,3 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
@override
|
@override
|
||||||
bool get wantKeepAlive => true;
|
bool get wantKeepAlive => true;
|
||||||
}
|
}
|
||||||
|
|
||||||
class DeviceFolderIcon extends StatelessWidget {
|
|
||||||
const DeviceFolderIcon(
|
|
||||||
this.folder, {
|
|
||||||
Key key,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
static final kUnsyncedIconOverlay = Container(
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
gradient: LinearGradient(
|
|
||||||
begin: Alignment.topCenter,
|
|
||||||
end: Alignment.bottomCenter,
|
|
||||||
colors: [
|
|
||||||
Colors.transparent,
|
|
||||||
Colors.black.withOpacity(0.6),
|
|
||||||
],
|
|
||||||
stops: const [0.7, 1],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: Align(
|
|
||||||
alignment: Alignment.bottomRight,
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.only(right: 8, bottom: 8),
|
|
||||||
child: Icon(
|
|
||||||
Icons.cloud_off_outlined,
|
|
||||||
size: 18,
|
|
||||||
color: Colors.white.withOpacity(0.9),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
final DeviceFolder folder;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final isBackedUp =
|
|
||||||
Configuration.instance.getPathsToBackUp().contains(folder.path);
|
|
||||||
return GestureDetector(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 2),
|
|
||||||
child: SizedBox(
|
|
||||||
height: 140,
|
|
||||||
width: 120,
|
|
||||||
child: Column(
|
|
||||||
children: <Widget>[
|
|
||||||
ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(4),
|
|
||||||
child: SizedBox(
|
|
||||||
height: 120,
|
|
||||||
width: 120,
|
|
||||||
child: Hero(
|
|
||||||
tag:
|
|
||||||
"device_folder:" + folder.path + folder.thumbnail.tag(),
|
|
||||||
child: Stack(
|
|
||||||
children: [
|
|
||||||
ThumbnailWidget(
|
|
||||||
folder.thumbnail,
|
|
||||||
shouldShowSyncStatus: false,
|
|
||||||
key: Key(
|
|
||||||
"device_folder:" +
|
|
||||||
folder.path +
|
|
||||||
folder.thumbnail.tag(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
isBackedUp ? Container() : kUnsyncedIconOverlay,
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 10),
|
|
||||||
child: Text(
|
|
||||||
folder.name,
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.subtitle1
|
|
||||||
.copyWith(fontSize: 12),
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
onTap: () {
|
|
||||||
routeToPage(context, DeviceFolderPage(folder));
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class CollectionItem extends StatelessWidget {
|
|
||||||
CollectionItem(
|
|
||||||
this.c, {
|
|
||||||
Key key,
|
|
||||||
}) : super(key: Key(c.collection.id.toString()));
|
|
||||||
|
|
||||||
final CollectionWithThumbnail c;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
const double horizontalPaddingOfGridRow = 16;
|
|
||||||
const double crossAxisSpacingOfGrid = 9;
|
|
||||||
Size size = MediaQuery.of(context).size;
|
|
||||||
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
|
|
||||||
double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
|
|
||||||
(albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
|
|
||||||
TextStyle albumTitleTextStyle =
|
|
||||||
Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 14);
|
|
||||||
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
|
|
||||||
(totalWhiteSpaceOfRow / albumsCountInOneRow);
|
|
||||||
return GestureDetector(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: <Widget>[
|
|
||||||
ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(4),
|
|
||||||
child: SizedBox(
|
|
||||||
height: sideOfThumbnail,
|
|
||||||
width: sideOfThumbnail,
|
|
||||||
child: Hero(
|
|
||||||
tag: "collection" + c.thumbnail.tag(),
|
|
||||||
child: ThumbnailWidget(
|
|
||||||
c.thumbnail,
|
|
||||||
shouldShowArchiveStatus: c.collection.isArchived(),
|
|
||||||
key: Key(
|
|
||||||
"collection" + c.thumbnail.tag(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
constraints: BoxConstraints(maxWidth: sideOfThumbnail - 40),
|
|
||||||
child: Text(
|
|
||||||
c.collection.name,
|
|
||||||
style: albumTitleTextStyle,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
FutureBuilder<int>(
|
|
||||||
future: FilesDB.instance.collectionFileCount(c.collection.id),
|
|
||||||
builder: (context, snapshot) {
|
|
||||||
if (snapshot.hasData && snapshot.data > 0) {
|
|
||||||
return RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
style: albumTitleTextStyle.copyWith(
|
|
||||||
color: albumTitleTextStyle.color.withOpacity(0.5),
|
|
||||||
),
|
|
||||||
children: [
|
|
||||||
const TextSpan(text: " \u2022 "),
|
|
||||||
TextSpan(text: snapshot.data.toString()),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
onTap: () {
|
|
||||||
routeToPage(context, CollectionPage(c));
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SectionTitle extends StatelessWidget {
|
|
||||||
final String title;
|
|
||||||
final Alignment alignment;
|
|
||||||
final double opacity;
|
|
||||||
|
|
||||||
const SectionTitle(
|
|
||||||
this.title, {
|
|
||||||
this.opacity = 0.8,
|
|
||||||
Key key,
|
|
||||||
this.alignment = Alignment.centerLeft,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Container(
|
|
||||||
margin: const EdgeInsets.fromLTRB(16, 12, 0, 0),
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
Align(
|
|
||||||
alignment: alignment,
|
|
||||||
child: Text(
|
|
||||||
title,
|
|
||||||
style:
|
|
||||||
Theme.of(context).textTheme.headline6.copyWith(fontSize: 22),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class EnteSectionTitle extends StatelessWidget {
|
|
||||||
final double opacity;
|
|
||||||
|
|
||||||
const EnteSectionTitle({
|
|
||||||
this.opacity = 0.8,
|
|
||||||
Key key,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Container(
|
|
||||||
margin: const EdgeInsets.fromLTRB(16, 12, 0, 0),
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.centerLeft,
|
|
||||||
child: RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: "On ",
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.headline6
|
|
||||||
.copyWith(fontSize: 22),
|
|
||||||
),
|
|
||||||
TextSpan(
|
|
||||||
text: "ente",
|
|
||||||
style: TextStyle(
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontFamily: 'Montserrat',
|
|
||||||
fontSize: 22,
|
|
||||||
color: Theme.of(context).colorScheme.defaultTextColor,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ import 'package:photos/events/user_logged_out_event.dart';
|
||||||
import 'package:photos/models/collection_items.dart';
|
import 'package:photos/models/collection_items.dart';
|
||||||
import 'package:photos/models/gallery_type.dart';
|
import 'package:photos/models/gallery_type.dart';
|
||||||
import 'package:photos/services/collections_service.dart';
|
import 'package:photos/services/collections_service.dart';
|
||||||
import 'package:photos/ui/collections_gallery_widget.dart';
|
import 'package:photos/ui/collections/section_title.dart';
|
||||||
import 'package:photos/ui/common/gradient_button.dart';
|
import 'package:photos/ui/common/gradient_button.dart';
|
||||||
import 'package:photos/ui/common/loading_widget.dart';
|
import 'package:photos/ui/common/loading_widget.dart';
|
||||||
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue