Skip to content

Commit

Permalink
Apply proper theme colours
Browse files Browse the repository at this point in the history
Fixes #31
  • Loading branch information
ThexXTURBOXx committed Jul 30, 2024
1 parent faa2450 commit ecd3894
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 17 deletions.
18 changes: 10 additions & 8 deletions lib/mode/page_report_mode.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,34 +72,36 @@ class PageWidgetState extends State<PageWidget> {
},
child: Builder(
builder: (context) => Catcher2Utils.isCupertinoAppAncestor(context)
? _buildCupertinoPage()
: _buildMaterialPage(),
? _buildCupertinoPage(context)
: _buildMaterialPage(context),
),
);

Widget _buildMaterialPage() => Scaffold(
Widget _buildMaterialPage(BuildContext context) => Scaffold(
appBar: AppBar(
title: Text(
widget.pageReportMode.localizationOptions.pageReportModeTitle,
),
),
body: _buildInnerWidget(),
body: _buildInnerWidget(context),
);

Widget _buildCupertinoPage() => CupertinoPageScaffold(
Widget _buildCupertinoPage(BuildContext context) => CupertinoPageScaffold(
navigationBar: CupertinoNavigationBar(
middle: Text(
widget.pageReportMode.localizationOptions.pageReportModeTitle,
),
),
child: SafeArea(
child: _buildInnerWidget(),
child: _buildInnerWidget(context),
),
);

Widget _buildInnerWidget() => Container(
Widget _buildInnerWidget(BuildContext context) => Container(
padding: const EdgeInsets.symmetric(vertical: 10),
decoration: const BoxDecoration(color: Colors.white),
decoration: BoxDecoration(
color: Theme.of(context).scaffoldBackgroundColor,
),
child: Column(
children: [
const Padding(
Expand Down
22 changes: 13 additions & 9 deletions lib/utils/catcher_2_error_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,31 @@ class Catcher2ErrorWidget extends StatelessWidget {
Widget build(BuildContext context) => LayoutBuilder(
builder: (context, constraint) =>
constraint.maxWidth < maxWidthForSmallMode
? _buildSmallErrorWidget()
: _buildNormalErrorWidget(),
? _buildSmallErrorWidget(context)
: _buildNormalErrorWidget(context),
);

Widget _buildSmallErrorWidget() => const Center(
Widget _buildSmallErrorWidget(BuildContext context) => Center(
child: Icon(
Icons.error_outline,
color: Colors.red,
color: Theme.of(context).colorScheme.error,
size: 40,
),
);

Widget _buildNormalErrorWidget() => Container(
Widget _buildNormalErrorWidget(BuildContext context) => Container(
margin: const EdgeInsets.all(20),
child: Center(
child: ListView(
children: [
_buildIcon(),
_buildIcon(context),
Text(
title,
style: const TextStyle(color: Colors.black, fontSize: 25),
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(fontSize: 25) ??
const TextStyle(fontSize: 25),
textAlign: TextAlign.center,
),
const SizedBox(height: 10),
Expand All @@ -57,9 +61,9 @@ class Catcher2ErrorWidget extends StatelessWidget {
),
);

Widget _buildIcon() => const Icon(
Widget _buildIcon(BuildContext context) => Icon(
Icons.announcement,
color: Colors.red,
color: Theme.of(context).colorScheme.error,
size: 40,
);

Expand Down

0 comments on commit ecd3894

Please sign in to comment.