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

Merge remote-tracking branch 'origin/redesign' into branding

Browse source
This commit is contained in:
vishnukvmd 2022-06-12 22:07:29 +05:30
parent 174c696111 2d0674c12b
commit e693779ff7
6 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.vscode/launch.json vendored
View file

@ -4,6 +4,7 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Android Prod",
"request": "launch",

15
lib/ui/collections_gallery_widget.dart
View file

@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
@ -133,7 +132,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
Widget _getCollectionsGalleryWidget(CollectionItems items) {
const double horizontalPaddingOfGridRow = 16;
const double crossAxisSpacingOfGrid = 5;
const double crossAxisSpacingOfGrid = 9;
final TextStyle trashAndHiddenTextStyle = Theme.of(context)
.textTheme
.subtitle1
@ -142,7 +141,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
);
Size size = MediaQuery.of(context).size;
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
final double sideOfThumbnail = (size.width / 2) -
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
horizontalPaddingOfGridRow -
((crossAxisSpacingOfGrid / 2) * (albumsCountInOneRow - 1));
return SingleChildScrollView(
@ -643,10 +642,16 @@ class CollectionItem extends StatelessWidget {
@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 =
(MediaQuery.of(context).size.width / 2) - 18.5;
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
(totalWhiteSpaceOfRow / albumsCountInOneRow);
return GestureDetector(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

4
lib/ui/free_space_page.dart
View file

@ -35,7 +35,9 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
);
Logger("FreeSpacePage")
.info("Space consumed: " + widget.status.size.toString());
return _getWidget(widget.status);
return SingleChildScrollView(
child: _getWidget(widget.status),
);
}
Widget _getWidget(BackupStatus status) {

2
lib/ui/payment/child_subscription_widget.dart
View file

@ -127,7 +127,7 @@ class ChildSubscriptionWidget extends StatelessWidget {
firstAction: 'No',
secondAction: 'Yes',
firstActionColor: Theme.of(context).buttonColor,
secondActionColor: Colors.white,
secondActionColor: Theme.of(context).colorScheme.onSurface,
);
if (choice != DialogUserChoice.secondChoice) {
return;

3
lib/ui/settings/backup_section_widget.dart
View file

@ -198,9 +198,6 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
TextButton(
child: Text(
"Ok",
style: TextStyle(
color: Colors.white,
),
),
onPressed: () {
if (Platform.isIOS) {

34
lib/ui/shared_collections_gallery.dart
View file

@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
@ -112,12 +111,13 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
Widget _getSharedCollectionsGallery(SharedCollections collections) {
const double horizontalPaddingOfGridRow = 16;
const double crossAxisSpacingOfGrid = 5;
const double crossAxisSpacingOfGrid = 9;
Size size = MediaQuery.of(context).size;
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
final double sideOfThumbnail = (size.width / 2) -
horizontalPaddingOfGridRow -
((crossAxisSpacingOfGrid / 2) * (albumsCountInOneRow - 1));
double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
(albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
(totalWhiteSpaceOfRow / albumsCountInOneRow);
return SingleChildScrollView(
child: Container(
margin: const EdgeInsets.only(bottom: 50),
@ -391,10 +391,16 @@ class IncomingCollectionItem extends StatelessWidget {
@override
Widget build(BuildContext context) {
const double horizontalPaddingOfGridRow = 16;
const double crossAxisSpacingOfGrid = 9;
TextStyle albumTitleTextStyle =
Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 14);
final double sideOfThumbnail =
(MediaQuery.of(context).size.width / 2) - 18.5;
Size size = MediaQuery.of(context).size;
int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
(albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
(totalWhiteSpaceOfRow / albumsCountInOneRow);
return GestureDetector(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -451,14 +457,16 @@ class IncomingCollectionItem extends StatelessWidget {
builder: (context, snapshot) {
if (snapshot.hasData && snapshot.data > 0) {
return RichText(
text: TextSpan(
style: albumTitleTextStyle.copyWith(
color:
albumTitleTextStyle.color.withOpacity(0.5)),
children: [
text: TextSpan(
style: albumTitleTextStyle.copyWith(
color: albumTitleTextStyle.color.withOpacity(0.5),
),
children: [
TextSpan(text: " \u2022 "),
TextSpan(text: snapshot.data.toString()),
]));
],
),
);
} else {
return Container();
}