Skip to content

Commit b4bc12e

Browse files
iOSonntagiOSonntag
committed
fix: all warnings
1 parent bea8d13 commit b4bc12e

File tree

9 files changed

+95
-86
lines changed

9 files changed

+95
-86
lines changed

‎lib/architect/plans/button/default.link.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class DefaultButtonLink extends ArchBaseStatelessWidget<ButtonData> {
3838
return TextButton(
3939
onPressed: data.enabled ? data.onPrimaryAction : null,
4040
style: ButtonStyle(
41-
overlayColor: MaterialStateProperty.all(textColor.withOpacity(0.2)),
42-
minimumSize: MaterialStateProperty.all(Size.zero),
43-
padding: MaterialStateProperty.all(EdgeInsets.zero),
41+
overlayColor: WidgetStateProperty.all(textColor.withOpacity(0.2)),
42+
minimumSize: WidgetStateProperty.all(Size.zero),
43+
padding: WidgetStateProperty.all(EdgeInsets.zero),
4444
),
4545
child: Container(
4646
padding: _contentPadding(context),

‎lib/architect/plans/info_box/default.content_placeholder.dart

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -32,53 +32,51 @@ class DefaultInfoBoxContentPlaceholder extends ArchBaseStatelessWidget<InfoBoxDa
3232
Color iconColor = data.onSurface ? context.colors.onSurfaceLeastFocus : context.colors.onBackgroundLeastFocus;
3333
// Color iconColor = signalColor;
3434

35-
return Container(
36-
child: Column(
37-
mainAxisSize: MainAxisSize.min,
38-
children: [
39-
40-
if (data.icon != null) Align(
41-
alignment: Alignment.topCenter,
42-
child: Padding(
43-
padding: context.paddingXS.setTop(0.0),
44-
child: Icon(data.icon!,
45-
size: context.dimensions.iconSizeXL,
46-
color: iconColor,
47-
),
48-
),
49-
),
50-
51-
if (data.title != null) Padding(
52-
padding: data.subtitle != null ? EdgeInsets.zero : context.dimensions.paddingMOnly(bottom: true),
53-
child: TextTitle.medium(data.title!,
54-
color: titleColor,
35+
return Column(
36+
mainAxisSize: MainAxisSize.min,
37+
children: [
38+
39+
if (data.icon != null) Align(
40+
alignment: Alignment.topCenter,
41+
child: Padding(
42+
padding: context.paddingXS.setTop(0.0),
43+
child: Icon(data.icon!,
44+
size: context.dimensions.iconSizeXL,
45+
color: iconColor,
5546
),
5647
),
57-
58-
if (data.subtitle != null) Padding(
59-
padding: context.dimensions.paddingMOnly(bottom: true),
60-
child: TextTitle.small(data.subtitle!,
61-
color: subtitleColor,
62-
),
48+
),
49+
50+
if (data.title != null) Padding(
51+
padding: data.subtitle != null ? EdgeInsets.zero : context.dimensions.paddingMOnly(bottom: true),
52+
child: TextTitle.medium(data.title!,
53+
color: titleColor,
6354
),
64-
65-
if (data.message != null) TextBody.medium(data.message!,
66-
color: textColor,
67-
textAlign: TextAlign.center,
55+
),
56+
57+
if (data.subtitle != null) Padding(
58+
padding: context.dimensions.paddingMOnly(bottom: true),
59+
child: TextTitle.small(data.subtitle!,
60+
color: subtitleColor,
6861
),
69-
70-
if (data.onAction != null) Padding(
71-
padding: context.dimensions.paddingXLOnly(top: true),
72-
child: ArchButton(
73-
title: data.actionTitle ?? LibStrings.lib_general_actionRetry.tr(),
74-
type: kButtonType.primary,
75-
onPressed: data.onAction,
76-
),
62+
),
63+
64+
if (data.message != null) TextBody.medium(data.message!,
65+
color: textColor,
66+
textAlign: TextAlign.center,
67+
),
68+
69+
if (data.onAction != null) Padding(
70+
padding: context.dimensions.paddingXLOnly(top: true),
71+
child: ArchButton(
72+
title: data.actionTitle ?? LibStrings.lib_general_actionRetry.tr(),
73+
type: kButtonType.primary,
74+
onPressed: data.onAction,
7775
),
78-
79-
context.spaceXXL,
80-
],
81-
),
76+
),
77+
78+
context.spaceXXL,
79+
],
8280
);
8381
}
8482

‎lib/blue_forms/widgets/form_input_images.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class _FormInputImagesWidgetMulti extends StatefulWidget {
7070
final void Function(List<Uint8List> images) onSave;
7171

7272
const _FormInputImagesWidgetMulti({
73+
// ignore: unused_element
7374
super.key,
7475
required this.definition,
7576
required this.labelColor,
@@ -330,7 +331,7 @@ class _FormInputImagesWidgetMultiState extends State<_FormInputImagesWidgetMulti
330331
{
331332
images = images.sublist(0, widget.definition.max - _images.length);
332333

333-
if (!context.mounted) return;
334+
if (!mounted) return;
334335
await DialogCenter.showNotice(context, message: 'dfhbsiadbfiandsfli');
335336
}
336337

‎lib/brixies/intrinsic_height_page_view.dart

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class _IntrinsicHeightPageViewState extends State<IntrinsicHeightPageView> with
6161
@override
6262
Widget build(BuildContext context)
6363
{
64-
return Container(
64+
return SizedBox(
6565
height: _currentHeight,
6666
child: PageView(
6767
controller: _pageController,
@@ -71,31 +71,31 @@ class _IntrinsicHeightPageViewState extends State<IntrinsicHeightPageView> with
7171
),
7272
);
7373

74-
return TweenAnimationBuilder<double>(
75-
curve: Curves.easeInOutCubic,
76-
duration: const Duration(milliseconds: 100),
77-
tween: Tween<double>(begin: _heights[0], end: _currentHeight),
78-
builder: (context, value, child)
79-
{
80-
return SizedBox(
81-
height: _currentHeight,
82-
child: PageView(
83-
controller: _pageController,
84-
physics: widget.physics,
85-
children: _buildChildren(context),
86-
),
87-
);
88-
},
89-
// child: PageView(
90-
// controller: _pageController,
91-
// physics: widget.physics,
92-
// children: _sizeReportingChildren
93-
// .asMap()
94-
// .map((index, child) => MapEntry(index, child))
95-
// .values
96-
// .toList(),
97-
// ),
98-
);
74+
// return TweenAnimationBuilder<double>(
75+
// curve: Curves.easeInOutCubic,
76+
// duration: const Duration(milliseconds: 100),
77+
// tween: Tween<double>(begin: _heights[0], end: _currentHeight),
78+
// builder: (context, value, child)
79+
// {
80+
// return SizedBox(
81+
// height: _currentHeight,
82+
// child: PageView(
83+
// controller: _pageController,
84+
// physics: widget.physics,
85+
// children: _buildChildren(context),
86+
// ),
87+
// );
88+
// },
89+
// // child: PageView(
90+
// // controller: _pageController,
91+
// // physics: widget.physics,
92+
// // children: _sizeReportingChildren
93+
// // .asMap()
94+
// // .map((index, child) => MapEntry(index, child))
95+
// // .values
96+
// // .toList(),
97+
// // ),
98+
// );
9999
}
100100

101101
void _onSizeChanged(int index, Size size)

‎lib/devspace.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,36 @@ import 'dart:math' as math;
88
import 'dart:ui' as ui;
99
import 'dart:ui';
1010

11-
import 'package:cached_query_flutter/cached_query_flutter.dart';
1211
import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
1312
import 'package:amplify_flutter/amplify_flutter.dart';
13+
import 'package:app_settings/app_settings.dart';
1414
import 'package:auto_size_text/auto_size_text.dart';
15+
import 'package:cached_query_flutter/cached_query_flutter.dart';
1516
import 'package:easy_localization/easy_localization.dart';
1617
import 'package:flutter/foundation.dart';
1718
import 'package:flutter/material.dart' as material;
1819
import 'package:flutter/material.dart';
1920
import 'package:flutter/services.dart';
20-
import 'package:flutter/widgets.dart';
2121
import 'package:flutter_animate/flutter_animate.dart';
2222
import 'package:flutter_image_compress/flutter_image_compress.dart';
2323
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
2424
import 'package:get_it/get_it.dart';
2525
import 'package:go_router/go_router.dart';
2626
import 'package:http/http.dart' as http;
2727
import 'package:http/http.dart';
28+
import 'package:image/image.dart' as img;
2829
import 'package:image_picker/image_picker.dart';
2930
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
3031
import 'package:loading_indicator/loading_indicator.dart';
3132
import 'package:material_symbols_icons/symbols.dart';
3233
import 'package:measure_size/measure_size.dart';
34+
import 'package:omni_datetime_picker/omni_datetime_picker.dart';
35+
import 'package:package_info_plus/package_info_plus.dart';
3336
import 'package:path/path.dart' as path;
34-
import 'package:image/image.dart' as img;
3537
import 'package:provider/provider.dart';
3638
import 'package:simple_animations/simple_animations.dart';
3739
import 'package:super_tooltip/super_tooltip.dart';
3840
import 'package:url_launcher/url_launcher.dart' as p_url_launcher;
39-
import 'package:omni_datetime_picker/omni_datetime_picker.dart';
40-
import 'package:app_settings/app_settings.dart';
41-
import 'package:package_info_plus/package_info_plus.dart';
4241

4342
import 'lib_strings.dart';
4443

@@ -55,13 +54,13 @@ part 'animations/movie_orchestra.dart';
5554
part 'app_flow_systems/app_flow_paged_steps.dart';
5655
part 'app_flow_systems/paginated_list_view.dart';
5756
part 'app_flow_systems/steps_bar.dart';
57+
part 'app_scaffolds/app.dart';
5858
// app_scaffolds
5959

6060
part 'app_scaffolds/app_events.dart';
6161
part 'app_scaffolds/app_helper.dart';
6262
part 'app_scaffolds/app_loader.dart';
6363
part 'app_scaffolds/app_router.dart';
64-
part 'app_scaffolds/app.dart';
6564
part 'architect/architect.dart';
6665
part 'architect/architect_plans.dart';
6766
part 'architect/materials/arch_base.dart';
@@ -128,13 +127,13 @@ part 'architect/plans/text_field/arch.dart';
128127
part 'architect/plans/text_field/data.dart';
129128
part 'architect/plans/text_field/default.dart';
130129
part 'architect/plans/text_field/default.regular.dart';
131-
part 'blue_forms/blue_forms.dart';
132130
// async
133131

134132
part 'async/async_content_block.dart';
135133
part 'async/async_data_loader.dart';
136134
part 'async/loadable_view.dart';
137135
part 'async/loading_overlay.dart';
136+
part 'blue_forms/blue_forms.dart';
138137
// blue_forms
139138

140139
part 'blue_forms/models/elements/base.dart';
@@ -153,8 +152,8 @@ part 'blue_forms/util/common_form_inputs.dart';
153152
part 'blue_forms/util/input_validators.dart';
154153
part 'blue_forms/widgets/form_async_dependency.dart';
155154
part 'blue_forms/widgets/form_element.dart';
156-
part 'blue_forms/widgets/form_input_container.dart';
157155
part 'blue_forms/widgets/form_group.dart';
156+
part 'blue_forms/widgets/form_input_container.dart';
158157
part 'blue_forms/widgets/form_input_date_time.dart';
159158
part 'blue_forms/widgets/form_input_images.dart';
160159
part 'blue_forms/widgets/form_input_pick_option.dart';

‎lib/extended_theme/additional_color_theme_data.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ abstract class AdditionalColorsDefaults {
88

99
AdditionalColorsDefaults._();
1010

11+
static const Color background = Color(0xFFFFFFFF);
12+
static const Color onBackground = Color(0xFF333333);
1113
static const Color onBackgroundLessFocus = Color(0xFF959595);
1214
static const Color onBackgroundLeastFocus = Color(0xFFDEDEDE);
1315
static const Color onSurfaceLessFocus = Color(0xFF959595);
@@ -24,6 +26,8 @@ abstract class AdditionalColorsDefaults {
2426

2527
class AdditionalColorsThemeData extends ThemeExtension<AdditionalColorsThemeData> {
2628

29+
final Color background;
30+
final Color onBackground;
2731
final Color onBackgroundLessFocus;
2832
final Color onBackgroundLeastFocus;
2933
final Color onSurfaceLessFocus;
@@ -37,6 +41,8 @@ class AdditionalColorsThemeData extends ThemeExtension<AdditionalColorsThemeData
3741
final Color onCongratulations;
3842

3943
const AdditionalColorsThemeData({
44+
this.background = AdditionalColorsDefaults.background,
45+
this.onBackground = AdditionalColorsDefaults.onBackground,
4046
this.onBackgroundLessFocus = AdditionalColorsDefaults.onBackgroundLessFocus,
4147
this.onBackgroundLeastFocus = AdditionalColorsDefaults.onBackgroundLeastFocus,
4248
this.onSurfaceLessFocus = AdditionalColorsDefaults.onSurfaceLessFocus,
@@ -52,6 +58,8 @@ class AdditionalColorsThemeData extends ThemeExtension<AdditionalColorsThemeData
5258

5359
@override
5460
ThemeExtension<AdditionalColorsThemeData> copyWith({
61+
Color? background,
62+
Color? onBackground,
5563
Color? onBackgroundLessFocus,
5664
Color? onBackgroundLeastFocus,
5765
Color? onSurfaceLessFocus,
@@ -66,6 +74,8 @@ class AdditionalColorsThemeData extends ThemeExtension<AdditionalColorsThemeData
6674
})
6775
{
6876
return AdditionalColorsThemeData(
77+
background: background ?? this.background,
78+
onBackground: onBackground ?? this.onBackground,
6979
onBackgroundLessFocus: onBackgroundLessFocus ?? this.onBackgroundLessFocus,
7080
onBackgroundLeastFocus: onBackgroundLeastFocus ?? this.onBackgroundLeastFocus,
7181
onSurfaceLessFocus: onSurfaceLessFocus ?? this.onSurfaceLessFocus,
@@ -86,6 +96,8 @@ class AdditionalColorsThemeData extends ThemeExtension<AdditionalColorsThemeData
8696
if (other == null || other is! AdditionalColorsThemeData) return this;
8797

8898
return AdditionalColorsThemeData(
99+
background: Color.lerp(background, other.background, t)!,
100+
onBackground: Color.lerp(onBackground, other.onBackground, t)!,
89101
onBackgroundLessFocus: Color.lerp(onBackgroundLessFocus, other.onBackgroundLessFocus, t)!,
90102
onBackgroundLeastFocus: Color.lerp(onBackgroundLeastFocus, other.onBackgroundLeastFocus, t)!,
91103
onSurfaceLessFocus: Color.lerp(onSurfaceLessFocus, other.onSurfaceLessFocus, t)!,

‎lib/extended_theme/colors_access.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ class ColorsAccess {
1212
required this.context
1313
});
1414

15+
Color get background => Theme.of(context).extension<AdditionalColorsThemeData>()?.background ?? AdditionalColorsDefaults.background;
16+
Color get onBackground => Theme.of(context).extension<AdditionalColorsThemeData>()?.onBackground ?? AdditionalColorsDefaults.onBackground;
1517
Color get onBackgroundLessFocus => Theme.of(context).extension<AdditionalColorsThemeData>()?.onBackgroundLessFocus ?? AdditionalColorsDefaults.onBackgroundLessFocus;
1618
Color get onBackgroundLeastFocus => Theme.of(context).extension<AdditionalColorsThemeData>()?.onBackgroundLeastFocus ?? AdditionalColorsDefaults.onBackgroundLeastFocus;
1719
Color get onSurfaceLessFocus => Theme.of(context).extension<AdditionalColorsThemeData>()?.onSurfaceLessFocus ?? AdditionalColorsDefaults.onSurfaceLessFocus;
@@ -44,12 +46,8 @@ class ColorsAccess {
4446
Color get onError => Theme.of(context).colorScheme.onError;
4547
Color get errorContainer => Theme.of(context).colorScheme.errorContainer;
4648
Color get onErrorContainer => Theme.of(context).colorScheme.onErrorContainer;
47-
Color get background => Theme.of(context).colorScheme.background;
48-
Color get onBackground => Theme.of(context).colorScheme.onBackground;
4949
Color get surface => Theme.of(context).colorScheme.surface;
5050
Color get onSurface => Theme.of(context).colorScheme.onSurface;
51-
Color get surfaceVariant => Theme.of(context).colorScheme.surfaceVariant;
52-
Color get onSurfaceVariant => Theme.of(context).colorScheme.onSurfaceVariant;
5351
Color get outline => Theme.of(context).colorScheme.outline;
5452
Color get outlineVariant => Theme.of(context).colorScheme.outlineVariant;
5553
Color get shadow => Theme.of(context).colorScheme.shadow;

‎lib/test_data/test_data.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class _TestDataUrls {
3232
{
3333
Dev.logWarning(this, 'TEST DATA USED. A random image from the internet was requested. Make sure to remove this code in production.');
3434

35-
return 'https://loremflickr.com/${width}/${height}/${keywords.join(',')}?random=${math.Random().nextInt(100000)}';
35+
return 'https://loremflickr.com/$width/$height/${keywords.join(',')}?random=${math.Random().nextInt(100000)}';
3636
}
3737

3838
}

‎pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ dependencies:
3636
app_settings: ^5.1.1
3737
package_info_plus: ^6.0.0
3838
flutter_secure_storage: ^4.2.1
39+
path: ^1.9.0
3940

4041
dev_dependencies:
4142
flutter_test:

0 commit comments

Comments
 (0)