Skip to content

Commit fb61fa5

Browse files
FeichtmeierFeichtmeier
authoredFeb 28, 2024··
Unify all pages (#12)
1 parent 5a74724 commit fb61fa5

5 files changed

+99
-142
lines changed
 

‎lib/contributors_page.dart

+3-25
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import 'package:flutter/material.dart';
22
import 'package:ubuntu_service/ubuntu_service.dart';
33

4-
import 'constants.dart';
54
import 'contributor_grid.dart';
65
import 'contributor_service.dart';
7-
import 'foot_note.dart';
8-
import 'header_lead.dart';
9-
import 'header_title.dart';
10-
import 'message_fab.dart';
11-
import 'scaffold_gradient.dart';
126
import 'splash_screen.dart';
13-
import 'top_menu_entry.dart';
7+
import 'sub_page.dart';
148

159
class ContributorsPage extends StatefulWidget {
1610
const ContributorsPage({super.key});
@@ -36,24 +30,8 @@ class _ContributorsPageState extends State<ContributorsPage> {
3630

3731
@override
3832
Widget build(BuildContext context) {
39-
return Container(
40-
decoration: scaffoldGradient(context),
41-
child: Scaffold(
42-
bottomNavigationBar: const FootNote(),
43-
backgroundColor: Colors.transparent,
44-
appBar: AppBar(
45-
backgroundColor: Colors.transparent,
46-
toolbarHeight: kToolBarHeight,
47-
leadingWidth: kLeadingWidth,
48-
leading: const HeaderLead(
49-
insertBackButton: true,
50-
),
51-
title: const HeaderTitle(),
52-
actions: createTopMenu(context),
53-
),
54-
body: initialized ? const ContributorGrid() : const SplashScreen(),
55-
floatingActionButton: const MessageFab(),
56-
),
33+
return SubPage(
34+
body: initialized ? const ContributorGrid() : const SplashScreen(),
5735
);
5836
}
5937
}

‎lib/getting_started_page.dart

+19-39
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,34 @@ import 'package:yaru_widgets/constants.dart';
55
import 'package:yaru_widgets/widgets.dart';
66

77
import 'build_context_x.dart';
8-
import 'constants.dart';
9-
import 'foot_note.dart';
10-
import 'header_lead.dart';
11-
import 'header_title.dart';
12-
import 'message_fab.dart';
13-
import 'scaffold_gradient.dart';
14-
import 'top_menu_entry.dart';
8+
import 'sub_page.dart';
159

1610
class GettingStartedPage extends StatelessWidget {
1711
const GettingStartedPage({super.key});
1812

1913
@override
2014
Widget build(BuildContext context) {
2115
final width = context.mq.size.width;
22-
return Container(
23-
decoration: scaffoldGradient(context),
24-
child: Scaffold(
25-
backgroundColor: Colors.transparent,
26-
appBar: AppBar(
27-
title: const HeaderTitle(),
28-
backgroundColor: Colors.transparent,
29-
toolbarHeight: kToolBarHeight,
30-
leadingWidth: kLeadingWidth,
31-
leading: const HeaderLead(),
32-
actions: createTopMenu(context),
33-
),
34-
body: Center(
35-
child: FutureBuilder(
36-
future: loadMarkdown(),
37-
builder: (context, shot) {
38-
if (!shot.hasData) {
39-
return const Center(
40-
child: YaruCircularProgressIndicator(),
41-
);
42-
}
43-
44-
return Markdown(
45-
padding: EdgeInsets.symmetric(
46-
vertical: kYaruPagePadding,
47-
horizontal: width < 700 ? kYaruPagePadding : width * 0.2,
48-
),
49-
data: shot.data!,
16+
return SubPage(
17+
body: Center(
18+
child: FutureBuilder(
19+
future: loadMarkdown(),
20+
builder: (context, shot) {
21+
if (!shot.hasData) {
22+
return const Center(
23+
child: YaruCircularProgressIndicator(),
5024
);
51-
},
52-
),
25+
}
26+
27+
return Markdown(
28+
padding: EdgeInsets.symmetric(
29+
vertical: kYaruPagePadding,
30+
horizontal: width < 700 ? kYaruPagePadding : width * 0.2,
31+
),
32+
data: shot.data!,
33+
);
34+
},
5335
),
54-
bottomNavigationBar: const FootNote(),
55-
floatingActionButton: const MessageFab(),
5636
),
5737
);
5838
}

‎lib/home_page.dart

+36-55
Original file line numberDiff line numberDiff line change
@@ -5,74 +5,55 @@ import 'package:universal_html/html.dart' as html;
55

66
import 'build_context_x.dart';
77
import 'constants.dart';
8-
import 'foot_note.dart';
9-
import 'header_lead.dart';
10-
import 'header_title.dart';
11-
import 'message_fab.dart';
128
import 'plated_icon.dart';
139
import 'repositories.dart';
14-
import 'scaffold_gradient.dart';
1510
import 'screen_message.dart';
16-
import 'top_menu_entry.dart';
11+
import 'sub_page.dart';
1712

1813
class HomePage extends StatelessWidget {
1914
const HomePage({super.key});
2015

2116
@override
2217
Widget build(BuildContext context) {
23-
return Container(
24-
decoration: scaffoldGradient(context),
25-
child: Scaffold(
26-
bottomNavigationBar: const FootNote(),
27-
backgroundColor: Colors.transparent,
28-
floatingActionButton: const MessageFab(),
29-
appBar: AppBar(
30-
backgroundColor: Colors.transparent,
31-
toolbarHeight: kToolBarHeight,
32-
leadingWidth: kLeadingWidth,
33-
leading: const HeaderLead(),
34-
title: const HeaderTitle(),
35-
actions: createTopMenu(context),
36-
),
37-
body: SizedBox(
38-
height: context.mq.size.height,
39-
child: ListView(
40-
padding: const EdgeInsets.all(50),
41-
children: [
42-
ScreenMessage(
43-
title: Shimmer.fromColors(
44-
loop: 1,
45-
period: const Duration(seconds: 3),
46-
baseColor: kBaseColor,
47-
highlightColor: kHighlightColor,
48-
child: const Text(kWelcomeTitle),
49-
),
50-
subTitle: Shimmer.fromColors(
51-
baseColor: kBaseColor,
52-
highlightColor: kHighlightColor,
53-
child: InkWell(
54-
borderRadius: BorderRadius.circular(5),
55-
onTap: () => Navigator.of(context).pushNamed('/projects'),
56-
child: const Text(kWelcomeButtonText),
57-
),
18+
return SubPage(
19+
body: SizedBox(
20+
height: context.mq.size.height,
21+
child: ListView(
22+
padding: const EdgeInsets.all(50),
23+
children: [
24+
ScreenMessage(
25+
title: Shimmer.fromColors(
26+
loop: 1,
27+
period: const Duration(seconds: 3),
28+
baseColor: kBaseColor,
29+
highlightColor: kHighlightColor,
30+
child: const Text(kWelcomeTitle),
31+
),
32+
subTitle: Shimmer.fromColors(
33+
baseColor: kBaseColor,
34+
highlightColor: kHighlightColor,
35+
child: InkWell(
36+
borderRadius: BorderRadius.circular(5),
37+
onTap: () => Navigator.of(context).pushNamed('/projects'),
38+
child: const Text(kWelcomeButtonText),
5839
),
59-
label: const Text(kAppTitle),
6040
),
61-
...repositories.map(
62-
(e) => ScreenMessage(
63-
label: Text(e.$1),
64-
title: Text(e.$2),
65-
subTitle: Text(e.$3),
66-
icon: PlatedIcon(
67-
onTap: () =>
68-
html.window.open(p.join(kGitHubPrefix, e.$1, e.$2), ''),
69-
icon: e.$4,
70-
shape: e.$2 == 'settings' ? BoxShape.circle : null,
71-
),
41+
label: const Text(kAppTitle),
42+
),
43+
...repositories.map(
44+
(e) => ScreenMessage(
45+
label: Text(e.$1),
46+
title: Text(e.$2),
47+
subTitle: Text(e.$3),
48+
icon: PlatedIcon(
49+
onTap: () =>
50+
html.window.open(p.join(kGitHubPrefix, e.$1, e.$2), ''),
51+
icon: e.$4,
52+
shape: e.$2 == 'settings' ? BoxShape.circle : null,
7253
),
7354
),
74-
],
75-
),
55+
),
56+
],
7657
),
7758
),
7859
);

‎lib/projects_page.dart

+3-23
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
11
import 'package:flutter/material.dart';
22

3-
import 'constants.dart';
4-
import 'foot_note.dart';
5-
import 'header_lead.dart';
6-
import 'header_title.dart';
7-
import 'message_fab.dart';
83
import 'projects_list.dart';
9-
import 'scaffold_gradient.dart';
10-
import 'top_menu_entry.dart';
4+
import 'sub_page.dart';
115

126
class ProjectsPage extends StatelessWidget {
137
const ProjectsPage({super.key});
148

159
@override
1610
Widget build(BuildContext context) {
17-
return Container(
18-
decoration: scaffoldGradient(context),
19-
child: Scaffold(
20-
bottomNavigationBar: const FootNote(),
21-
backgroundColor: Colors.transparent,
22-
floatingActionButton: const MessageFab(),
23-
appBar: AppBar(
24-
backgroundColor: Colors.transparent,
25-
toolbarHeight: kToolBarHeight,
26-
leadingWidth: kLeadingWidth,
27-
leading: const HeaderLead(),
28-
title: const HeaderTitle(),
29-
actions: createTopMenu(context),
30-
),
31-
body: const ProjectsList(),
32-
),
11+
return const SubPage(
12+
body: ProjectsList(),
3313
);
3414
}
3515
}

‎lib/sub_page.dart

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import 'package:flutter/material.dart';
2+
3+
import 'constants.dart';
4+
import 'foot_note.dart';
5+
import 'header_lead.dart';
6+
import 'header_title.dart';
7+
import 'message_fab.dart';
8+
import 'scaffold_gradient.dart';
9+
import 'top_menu_entry.dart';
10+
11+
class SubPage extends StatelessWidget {
12+
const SubPage({super.key, required this.body});
13+
14+
final Widget body;
15+
16+
@override
17+
Widget build(BuildContext context) {
18+
return Container(
19+
decoration: scaffoldGradient(context),
20+
child: Scaffold(
21+
bottomNavigationBar: const FootNote(),
22+
backgroundColor: Colors.transparent,
23+
appBar: AppBar(
24+
backgroundColor: Colors.transparent,
25+
toolbarHeight: kToolBarHeight,
26+
leadingWidth: kLeadingWidth,
27+
leading: const HeaderLead(
28+
insertBackButton: true,
29+
),
30+
title: const HeaderTitle(),
31+
actions: createTopMenu(context),
32+
),
33+
body: body,
34+
floatingActionButton: const MessageFab(),
35+
),
36+
);
37+
}
38+
}

0 commit comments

Comments
 (0)
Please sign in to comment.