Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make padding 20px (visually) throughout the application #679

Merged
merged 5 commits into from
Jan 4, 2023
Merged

Make padding 20px (visually) throughout the application #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7932338
init commit
whiskeyPeak Jan 1, 2023
9028caf
lint
whiskeyPeak Jan 1, 2023
a085f7e
format
whiskeyPeak Jan 1, 2023
f10fa9a
format
whiskeyPeak Jan 1, 2023
02f2d8c
Merge branch 'main' into fix-inconsistent-padding
Feichtmeier Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/app/common/app_page/page_layouts.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class OnePageLayout extends StatelessWidget {
@override
Widget build(BuildContext context) {
final width = windowSize.width;
final hPadding = 10 + 0.0007 * pow((width - 700) * 0.9, 2);
final hPadding = kPagePadding + 0.0007 * pow((width - 800) * 0.9, 2);
return ListView(
padding: adaptivePadding
? EdgeInsets.only(
Expand Down
13 changes: 8 additions & 5 deletions lib/app/common/constants.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,20 @@ import 'package:flutter/material.dart';
const kPagePadding = 20.0;
const kGridPadding = EdgeInsets.only(
bottom: kPagePadding,
left: kPagePadding - 5,
right: kPagePadding - 5,
);
const kHeaderPadding = EdgeInsets.only(
top: kPagePadding,
left: kPagePadding,
right: kPagePadding,
bottom: kPagePadding - 5,
);
const kHeaderPadding =
EdgeInsets.only(top: kPagePadding, left: 25, bottom: kPagePadding);
const kIconPadding = EdgeInsets.only(top: 8, bottom: 8, right: 5);
const kDialogWidth = 450.0;
const kGridDelegate = SliverGridDelegateWithMaxCrossAxisExtent(
mainAxisExtent: 150,
mainAxisSpacing: 15,
crossAxisSpacing: 15,
mainAxisSpacing: 10,
crossAxisSpacing: 10,
maxCrossAxisExtent: 550,
);
const kSnapcraftColor = Color(0xFFE95420);
Expand Down
7 changes: 6 additions & 1 deletion lib/app/explore/explore_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:software/app/common/app_format.dart';
import 'package:software/app/common/app_format_popup.dart';
import 'package:software/app/common/constants.dart';
import 'package:software/app/common/snap/snap_section_popup.dart';
import 'package:software/app/explore/explore_model.dart';

Expand All @@ -13,7 +14,11 @@ class ExploreHeader extends StatelessWidget {
final model = context.watch<ExploreModel>();

return Padding(
padding: const EdgeInsets.only(top: 25, left: 25, bottom: 20),
padding: const EdgeInsets.only(
top: kPagePadding,
left: kPagePadding,
bottom: kPagePadding - 5,
),
child: Align(
alignment: Alignment.centerLeft,
child: Wrap(
Expand Down
6 changes: 5 additions & 1 deletion lib/app/explore/search_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ class SearchPage extends StatelessWidget {

return snapshot.hasData && snapshot.data!.isNotEmpty
? GridView.builder(
padding: const EdgeInsets.only(bottom: 20, left: 20, right: 20),
padding: const EdgeInsets.only(
bottom: kPagePadding - 5,
left: kPagePadding - 5,
right: kPagePadding - 5,
),
gridDelegate: kGridDelegate,
shrinkWrap: true,
itemCount: snapshot.data!.length,
Expand Down
8 changes: 5 additions & 3 deletions lib/app/explore/section_banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import 'package:software/app/common/snap/snap_page.dart';
import 'package:software/app/common/snap/snap_section.dart';
import 'package:yaru_widgets/yaru_widgets.dart';

import '../common/constants.dart';

class SectionBanner extends StatelessWidget {
const SectionBanner({
super.key,
Expand All @@ -28,9 +30,9 @@ class SectionBanner extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.only(
top: 5,
left: kYaruPagePadding + 5,
right: kYaruPagePadding + 5,
bottom: kYaruPagePadding,
left: kPagePadding,
right: kPagePadding,
bottom: kPagePadding - 5,
),
child: InkWell(
onTap: onTap,
Expand Down
8 changes: 6 additions & 2 deletions lib/app/explore/section_grid.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ class SectionGrid extends StatelessWidget {

return GridView.builder(
physics: ignoreScrolling ? const NeverScrollableScrollPhysics() : null,
padding:
padding ?? const EdgeInsets.only(bottom: 20, left: 20, right: 20),
padding: padding ??
const EdgeInsets.only(
bottom: kPagePadding - 5,
left: kPagePadding - 5,
right: kPagePadding - 5,
),
shrinkWrap: true,
gridDelegate: kGridDelegate,
itemCount: sections.length,
Expand Down
2 changes: 1 addition & 1 deletion lib/app/updates/package_updates_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class _UpdatesHeader extends StatelessWidget {
return Align(
alignment: Alignment.centerLeft,
child: Padding(
padding: const EdgeInsets.all(kYaruPagePadding),
padding: const EdgeInsets.all(kPagePadding),
child: Wrap(
direction: Axis.horizontal,
alignment: WrapAlignment.start,
Expand Down
9 changes: 2 additions & 7 deletions lib/app/updates/snap_updates_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:snapd/snapd.dart';
import 'package:software/app/common/constants.dart';
import 'package:software/l10n/l10n.dart';
import 'package:software/services/snap_service.dart';
import 'package:software/app/common/loading_banner_grid.dart';
Expand All @@ -26,7 +27,6 @@ import 'package:software/app/common/updates_splash_screen.dart';
import 'package:software/app/updates/snap_updates_model.dart';
import 'package:ubuntu_service/ubuntu_service.dart';
import 'package:yaru_icons/yaru_icons.dart';
import 'package:yaru_widgets/yaru_widgets.dart';

class SnapUpdatesPage extends StatelessWidget {
const SnapUpdatesPage({Key? key}) : super(key: key);
Expand Down Expand Up @@ -64,12 +64,7 @@ class SnapUpdatesPage extends StatelessWidget {
return Column(
children: [
Padding(
padding: const EdgeInsets.only(
left: 25,
top: kYaruPagePadding,
bottom: kYaruPagePadding,
right: 25,
),
padding: const EdgeInsets.all(kPagePadding),
child: Row(
children: [
ElevatedButton(
Expand Down