Skip to content

Feature/add widget book generator #369

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/add widget book generator #369

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d115d9
added widget book generator
jorre127 Feb 10, 2025
36f8299
updated to new flutter version
jorre127 Feb 10, 2025
facdadc
Removed firebase
jorre127 Feb 10, 2025
d2db304
updated widgetbook
jorre127 Feb 10, 2025
8ce9525
updated widget book generator
jorre127 Feb 11, 2025
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 .fvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.24.0"
"flutter": "3.27.2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use 3.27.2, use .3 or .4 instead

flutter/flutter#159289 Fixes an issue with fullscreen route transitions.
This was a big one

}
3 changes: 2 additions & 1 deletion lib/screen/todo/todo_list/todo_list_screen.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:flutter_template/di/injectable.dart';
import 'package:flutter_template/model/webservice/todo/todo.dart';
import 'package:flutter_template/styles/theme_data.dart';
import 'package:flutter_template/util/extension/color_extension.dart';
import 'package:flutter_template/util/keys.dart';
import 'package:flutter_template/viewmodel/todo/todo_list/todo_list_viewmodel.dart';
import 'package:flutter_template/widget/general/action/action_item.dart';
Expand Down Expand Up @@ -104,7 +105,7 @@ class TodoListScreenState extends State<TodoListScreen> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Container(
height: 1,
color: theme.main.withOpacity(0.1),
color: theme.main.withOpacityValue(0.1),
),
),
);
Expand Down
15 changes: 8 additions & 7 deletions lib/styles/theme_data.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:flutter_template/di/injectable.dart';
import 'package:flutter_template/styles/theme_colors.dart';
import 'package:flutter_template/styles/theme_fonts.dart';
import 'package:flutter_template/util/extension/color_extension.dart';
import 'package:flutter_template/util/theme/theme_config.dart';
import 'package:icapps_architecture/icapps_architecture.dart';

Expand All @@ -27,7 +28,7 @@ class FlutterTemplateThemeData {
textSelectionTheme: TextSelectionThemeData(
cursorColor: ThemeColors.accentThink40,
selectionHandleColor: ThemeColors.accentThink40,
selectionColor: ThemeColors.accentThink40.withOpacity(0.4),
selectionColor: ThemeColors.accentThink40.withOpacityValue(0.4),
),
pageTransitionsTheme: PageTransitionsTheme(
builders: {
Expand Down Expand Up @@ -263,9 +264,9 @@ class FlutterTemplateTheme {
bodyNeutralFaded: ThemeColors.neutral48,
actionDefault: ThemeColors.accentThink32,
effects: FlutterTemplateThemeEffects(
elevationDefault1: ThemeColors.main16.withOpacity(0.04),
elevationDefault2: ThemeColors.main16.withOpacity(0.08),
elevationDefault3: ThemeColors.main16.withOpacity(0.12),
elevationDefault1: ThemeColors.main16.withOpacityValue(0.04),
elevationDefault2: ThemeColors.main16.withOpacityValue(0.08),
elevationDefault3: ThemeColors.main16.withOpacityValue(0.12),
),
);

Expand Down Expand Up @@ -318,9 +319,9 @@ class FlutterTemplateTheme {
bodyNeutralFaded: ThemeColors.neutral48,
actionDefault: ThemeColors.accentThink32,
effects: FlutterTemplateThemeEffects(
elevationDefault1: ThemeColors.main16.withOpacity(0.04),
elevationDefault2: ThemeColors.main16.withOpacity(0.08),
elevationDefault3: ThemeColors.main16.withOpacity(0.12),
elevationDefault1: ThemeColors.main16.withOpacityValue(0.04),
elevationDefault2: ThemeColors.main16.withOpacityValue(0.08),
elevationDefault3: ThemeColors.main16.withOpacityValue(0.12),
),
);

Expand Down
5 changes: 5 additions & 0 deletions lib/util/extension/color_extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'package:flutter/material.dart';

extension ColorExtension on Color {
Color withOpacityValue(double opacity) => withValues(alpha: opacity);
}
3 changes: 2 additions & 1 deletion lib/util/extension/text_style_extensions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_template/util/extension/color_extension.dart';

extension TextStyleExtensions on TextStyle {
TextStyle withOpacity0() => _withOpacity(0);
Expand All @@ -9,5 +10,5 @@ extension TextStyleExtensions on TextStyle {

TextStyle withOpacity60() => _withOpacity(0.6); //Light dark

TextStyle _withOpacity(double opacity) => copyWith(color: color?.withOpacity(opacity));
TextStyle _withOpacity(double opacity) => copyWith(color: color?.withOpacityValue(opacity));
}
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_back_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import 'package:flutter_template/util/keys.dart';
import 'package:flutter_template/widget/general/action/action_item.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:icapps_icons/icapps_icons.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateBackButton extends StatelessWidget {
final VoidCallback? onClick;
final bool fullScreen;
Expand Down
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import 'package:flutter_template/styles/theme_data.dart';
import 'package:flutter_template/styles/theme_durations.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:icapps_architecture/icapps_architecture.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

enum ButtonType {
regular,
text,
}

@widgetBookWidget
class FlutterTemplateButton extends StatelessWidget {
final String text;
final bool isEnabled;
Expand Down
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_checkbox.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:icapps_architecture/icapps_architecture.dart';
import 'package:icapps_icons/icapps_icons.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateCheckBox extends StatelessWidget {
final bool value;
final ValueChanged<bool> onChanged;
Expand Down
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_input_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_template/styles/theme_data.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateInputField extends StatelessWidget {
final bool enabled;
final String hint;
Expand Down
3 changes: 3 additions & 0 deletions lib/widget/library/flutter_template_network_image.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ import 'package:flutter_template/di/injectable.dart';
import 'package:flutter_template/util/cache/cache_controlling.dart';
import 'package:flutter_template/util/env/flavor_config.dart';
import 'package:flutter_template/util/logging/flutter_template_logger.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateNetworkImage extends StatelessWidget {
final String? url;
final String? fallbackUrl;
final BoxFit fit;
final double? height;
final double? width;
@WidgetBookWidgetField(ignore: true)
final Duration? duration;

const FlutterTemplateNetworkImage({
Expand Down
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_progress_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_template/util/env/flavor_config.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateProgressIndicator extends StatelessWidget {
final bool dark;

Expand Down
2 changes: 2 additions & 0 deletions lib/widget/library/flutter_template_switch.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import 'package:flutter_template/styles/theme_dimens.dart';
import 'package:flutter_template/styles/theme_durations.dart';
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
import 'package:icapps_architecture/icapps_architecture.dart';
import 'package:widget_book_widget_generator_annotations/widget_book_widget_generator_annotations.dart';

@widgetBookWidget
class FlutterTemplateSwitch extends StatelessWidget {
final bool value;
final ValueChanged<bool> onChanged;
Expand Down
9 changes: 7 additions & 2 deletions lib/widgetbook/widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import 'package:flutter/material.dart';
import 'package:flutter_template/architecture.dart';
import 'package:flutter_template/di/environments.dart';
import 'package:flutter_template/di/injectable.dart';
import 'package:flutter_template/styles/theme_data.dart';
import 'package:flutter_template/util/env/flavor_config.dart';
import 'package:flutter_template/util/theme/theme_config.dart';
import 'package:flutter_template/widgetbook/widgetbook.directories.g.dart';
import 'package:flutter_template/widgetbook/widgetbook_widgets/widgetbook_screen.dart';
import 'package:icapps_architecture/icapps_architecture.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Future<void> main() async {
await initArchitecture();
final themeConfig = ThemeConfigUtil();
getIt.registerSingleton(themeConfig);

const values = FlavorValues(
baseUrl: 'https://jsonplaceholder.typicode.com/',
Expand All @@ -26,6 +26,7 @@ Future<void> main() async {
color: Colors.red,
values: values,
);
await configureDependencies(Environments.dev);

runApp(const WidgetbookApp());
}
Expand All @@ -43,6 +44,10 @@ class WidgetbookApp extends StatelessWidget {
...Devices.android.all,
]),
InspectorAddon(),
BuilderAddon(
name: 'main',
builder: (context, widget) => WidgetBookScreen(child: widget),
),
ThemeAddon(
themes: [
WidgetbookTheme(
Expand Down
47 changes: 28 additions & 19 deletions lib/widgetbook/widgetbook.directories.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// **************************************************************************

// ignore_for_file: no_leading_underscores_for_library_prefixes
import 'package:flutter_template/widgetbook/widgetbook.usecases.dart' as _i3;
import 'package:flutter_template/widgetbook/widgetbook_widgets/use_cases.dart'
as _i2;
import 'package:widgetbook/widgetbook.dart' as _i1;
Expand All @@ -30,42 +31,50 @@ final directories = <_i1.WidgetbookNode>[
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateBackButton',
useCase: _i1.WidgetbookUseCase(
name: 'Default',
builder: _i2.backButton,
name: 'FlutterTemplateBackButton',
builder: _i3.flutterTemplateBackButtonUseCase,
),
),
_i1.WidgetbookComponent(
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateButton',
useCases: [
_i1.WidgetbookUseCase(
name: 'Default',
builder: _i2.button,
),
_i1.WidgetbookUseCase(
name: 'Text',
builder: _i2.textButton,
),
],
useCase: _i1.WidgetbookUseCase(
name: 'FlutterTemplateButton',
builder: _i3.flutterTemplateButtonUseCase,
),
),
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateCheckBox',
useCase: _i1.WidgetbookUseCase(
name: 'Default',
builder: _i2.checkBox,
name: 'FlutterTemplateCheckBox',
builder: _i3.flutterTemplateCheckBoxUseCase,
),
),
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateInputField',
useCase: _i1.WidgetbookUseCase(
name: 'FlutterTemplateInputField',
builder: _i3.flutterTemplateInputFieldUseCase,
),
),
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateNetworkImage',
useCase: _i1.WidgetbookUseCase(
name: 'FlutterTemplateNetworkImage',
builder: _i3.flutterTemplateNetworkImageUseCase,
),
),
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateProgressIndicator',
useCase: _i1.WidgetbookUseCase(
name: 'Default',
builder: _i2.progressIndicator,
name: 'FlutterTemplateProgressIndicator',
builder: _i3.flutterTemplateProgressIndicatorUseCase,
),
),
_i1.WidgetbookLeafComponent(
name: 'FlutterTemplateSwitch',
useCase: _i1.WidgetbookUseCase(
name: 'Default',
builder: _i2.switchWidget,
name: 'FlutterTemplateSwitch',
builder: _i3.flutterTemplateSwitchUseCase,
),
),
],
Expand Down
Loading
Loading