Merge branch 'redesign' of github.com:ente-io/frame into redesign
This commit is contained in:
commit
e446ee3f9d
|
@ -6,7 +6,6 @@ import 'package:photos/events/files_updated_event.dart';
|
|||
import 'package:photos/models/galleryType.dart';
|
||||
import 'package:photos/models/magic_metadata.dart';
|
||||
import 'package:photos/models/selected_files.dart';
|
||||
import 'package:photos/ui/common/bottomShadow.dart';
|
||||
import 'package:photos/ui/gallery.dart';
|
||||
import 'package:photos/ui/gallery_app_bar_widget.dart';
|
||||
import 'package:photos/ui/gallery_overlay_widget.dart';
|
||||
|
@ -52,6 +51,7 @@ class ArchivePage extends StatelessWidget {
|
|||
tagPrefix: tagPrefix,
|
||||
selectedFiles: _selectedFiles,
|
||||
initialFiles: null,
|
||||
footer: SizedBox(height: 32),
|
||||
);
|
||||
return Scaffold(
|
||||
appBar: PreferredSize(
|
||||
|
@ -66,7 +66,6 @@ class ArchivePage extends StatelessWidget {
|
|||
alignment: Alignment.bottomCenter,
|
||||
children: [
|
||||
gallery,
|
||||
BottomShadowWidget(),
|
||||
GalleryOverlayWidget(
|
||||
overlayType,
|
||||
_selectedFiles,
|
||||
|
|
|
@ -37,6 +37,7 @@ class DeviceFolderPage extends StatelessWidget {
|
|||
? _getHeaderWidget()
|
||||
: Container(),
|
||||
initialFiles: [folder.thumbnail],
|
||||
footer: SizedBox(height: 32),
|
||||
);
|
||||
return Scaffold(
|
||||
appBar: PreferredSize(
|
||||
|
|
|
@ -39,6 +39,7 @@ class _LocationSearchResultsPageState extends State<LocationSearchResultsPage> {
|
|||
child: Gallery(
|
||||
tagPrefix: "location_search",
|
||||
selectedFiles: _selectedFiles,
|
||||
footer: SizedBox(height: 32),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
@ -70,6 +71,7 @@ class _TrashPageState extends State<TrashPage> {
|
|||
selectedFiles: widget._selectedFiles,
|
||||
header: _headerWidget(),
|
||||
initialFiles: null,
|
||||
footer: const SizedBox(height: 32),
|
||||
);
|
||||
|
||||
return Scaffold(
|
||||
|
@ -152,7 +154,8 @@ class BottomButtonsWidget extends StatelessWidget {
|
|||
decoration: BoxDecoration(
|
||||
color: Color.fromRGBO(255, 101, 101, 0.2),
|
||||
),
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 24, vertical: Platform.isIOS ? 24 : 0),
|
||||
child: Center(
|
||||
child: Text(
|
||||
'Delete All',
|
||||
|
|
Loading…
Reference in a new issue