beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add margin to account for the bottom bar

Browse source
This commit is contained in:
Vishnu Mohandas 2021-02-08 14:56:49 +05:30
parent 77b909f3d2
commit 8d0fc44776
4 changed files with 101 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/db/files_db.dart
View file

@ -27,7 +27,6 @@ class FilesDB {
static final columnLatitude = 'latitude';
static final columnLongitude = 'longitude';
static final columnFileType = 'file_type';
static final columnIsEncrypted = 'is_encrypted';
static final columnIsDeleted = 'is_deleted';
static final columnCreationTime = 'creation_time';
static final columnModificationTime = 'modification_time';
@ -78,7 +77,6 @@ class FilesDB {
$columnLatitude REAL,
$columnLongitude REAL,
$columnFileType INTEGER,
$columnIsEncrypted INTEGER DEFAULT 1,
$columnModificationTime TEXT NOT NULL,
$columnEncryptedKey TEXT,
$columnKeyDecryptionNonce TEXT,
@ -389,7 +387,6 @@ class FilesDB {
$columnLatitude,
$columnLongitude,
$columnFileType,
$columnIsEncrypted,
$columnModificationTime,
$columnEncryptedKey,
$columnKeyDecryptionNonce,
@ -427,7 +424,6 @@ class FilesDB {
$columnLatitude,
$columnLongitude,
$columnFileType,
$columnIsEncrypted,
$columnModificationTime,
$columnEncryptedKey,
$columnKeyDecryptionNonce,
@ -685,7 +681,6 @@ class FilesDB {
default:
row[columnFileType] = -1;
}
row[columnIsEncrypted] = file.isEncrypted ? 1 : 0;
row[columnCreationTime] = file.creationTime;
row[columnModificationTime] = file.modificationTime;
row[columnUpdationTime] = file.updationTime;
@ -718,7 +713,6 @@ class FilesDB {
default:
row[columnFileType] = -1;
}
row[columnIsEncrypted] = file.isEncrypted ? 1 : 0;
row[columnCreationTime] = file.creationTime;
row[columnModificationTime] = file.modificationTime;
row[columnUpdationTime] = file.updationTime;
@ -741,7 +735,6 @@ class FilesDB {
file.location = Location(row[columnLatitude], row[columnLongitude]);
}
file.fileType = getFileType(row[columnFileType]);
file.isEncrypted = row[columnIsEncrypted] == 1;
file.creationTime = int.parse(row[columnCreationTime]);
file.modificationTime = int.parse(row[columnModificationTime]);
file.updationTime = row[columnUpdationTime] == null

84
lib/ui/collections_gallery_widget.dart
View file

@ -101,48 +101,52 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
Widget _getCollectionsGalleryWidget(CollectionItems items) {
return SingleChildScrollView(
child: Column(
children: [
Padding(padding: EdgeInsets.all(6)),
SectionTitle("device folders"),
Padding(padding: EdgeInsets.all(6)),
Container(
height: 160,
child: Align(
alignment: Alignment.centerLeft,
child: items.folders.isEmpty
? nothingToSeeHere
: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
physics:
ScrollPhysics(), // to disable GridView's scrolling
itemBuilder: (context, index) {
return _buildFolder(context, items.folders[index]);
},
itemCount: items.folders.length,
),
child: Container(
margin: const EdgeInsets.only(bottom: 50),
child: Column(
children: [
Padding(padding: EdgeInsets.all(6)),
SectionTitle("device folders"),
Padding(padding: EdgeInsets.all(6)),
Container(
height: 160,
child: Align(
alignment: Alignment.centerLeft,
child: items.folders.isEmpty
? nothingToSeeHere
: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
physics:
ScrollPhysics(), // to disable GridView's scrolling
itemBuilder: (context, index) {
return _buildFolder(context, items.folders[index]);
},
itemCount: items.folders.length,
),
),
),
),
Divider(),
Padding(padding: EdgeInsets.all(6)),
SectionTitle("backed-up memories"),
Padding(padding: EdgeInsets.all(10)),
GridView.builder(
shrinkWrap: true,
padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
physics: 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: 2,
mainAxisSpacing: 12,
Divider(),
Padding(padding: EdgeInsets.all(6)),
SectionTitle("backed-up memories"),
Padding(padding: EdgeInsets.all(10)),
GridView.builder(
shrinkWrap: true,
padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
physics: 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: 2,
mainAxisSpacing: 12,
),
),
),
],
],
),
),
);
}

31
lib/ui/gallery.dart
View file

@ -198,21 +198,26 @@ class _GalleryState extends State<Gallery> {
),
itemCount: itemCount,
);
if (widget.selectedFiles.files.isNotEmpty && widget.isHomePageGallery) {
return Stack(children: [
gallery,
Container(
height: 60,
child: GalleryAppBarWidget(
GalleryAppBarType.homepage,
null,
widget.selectedFiles,
if (widget.isHomePageGallery) {
gallery = Container(
margin: const EdgeInsets.only(bottom: 50),
child: gallery,
);
if (widget.selectedFiles.files.isNotEmpty) {
gallery = Stack(children: [
gallery,
Container(
height: 60,
child: GalleryAppBarWidget(
GalleryAppBarType.homepage,
null,
widget.selectedFiles,
),
),
),
]);
} else {
return gallery;
]);
}
}
return gallery;
}
Widget _buildListItem(BuildContext context, int index) {

75
lib/ui/shared_collections_gallery.dart
View file

@ -89,46 +89,49 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
Widget _getSharedCollectionsGallery(SharedCollections collections) {
return SingleChildScrollView(
child: Column(
children: [
Padding(padding: EdgeInsets.all(6)),
SectionTitle("incoming"),
Padding(padding: EdgeInsets.all(16)),
collections.incoming.length > 0
? GridView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return _buildIncomingCollection(
context, collections.incoming[index]);
},
itemCount: collections.incoming.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
),
)
: nothingToSeeHere,
Padding(padding: EdgeInsets.all(16)),
Divider(height: 0),
Padding(padding: EdgeInsets.all(14)),
SectionTitle("outgoing"),
Padding(padding: EdgeInsets.all(16)),
collections.outgoing.length > 0
? Padding(
padding: const EdgeInsets.fromLTRB(12, 0, 0, 0),
child: ListView.builder(
child: Container(
margin: const EdgeInsets.only(bottom: 50),
child: Column(
children: [
Padding(padding: EdgeInsets.all(6)),
SectionTitle("incoming"),
Padding(padding: EdgeInsets.all(16)),
collections.incoming.length > 0
? GridView.builder(
shrinkWrap: true,
padding: EdgeInsets.only(bottom: 12),
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return _buildOutgoingCollection(
context, collections.outgoing[index]);
return _buildIncomingCollection(
context, collections.incoming[index]);
},
itemCount: collections.outgoing.length,
),
)
: nothingToSeeHere,
],
itemCount: collections.incoming.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
),
)
: nothingToSeeHere,
Padding(padding: EdgeInsets.all(16)),
Divider(height: 0),
Padding(padding: EdgeInsets.all(14)),
SectionTitle("outgoing"),
Padding(padding: EdgeInsets.all(16)),
collections.outgoing.length > 0
? Padding(
padding: const EdgeInsets.fromLTRB(12, 0, 0, 0),
child: ListView.builder(
shrinkWrap: true,
padding: EdgeInsets.only(bottom: 12),
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return _buildOutgoingCollection(
context, collections.outgoing[index]);
},
itemCount: collections.outgoing.length,
),
)
: nothingToSeeHere,
],
),
),
);
}