Skip to content

GS Alert #269

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.

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 2 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion example/lib/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,14 @@ class _HomePageState extends State<HomePage> {
title: "GS Navigation Rail",
routePath: "/navigation-rail-preview",
),
const NavButton(
const NavButton(
title: "GS Slider",
routePath: "/slider-example",
),
const NavButton(
title: "GS Alert Box",
routePath: "/alert-box-example",
),

// // ===== Internal Testing Widgets =====
// const NavButton(
Expand Down
6 changes: 6 additions & 0 deletions example/lib/routes/router.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:gluestack_ui_example/home.dart';
import 'package:gluestack_ui_example/widgets/components/widgets/accordian_example.dart';
import 'package:gluestack_ui_example/widgets/components/widgets/alert_box_example.dart';
import 'package:gluestack_ui_example/widgets/components/widgets/bottom_sheet_example.dart';
import 'package:gluestack_ui_example/widgets/components/widgets/navigation_rail_example.dart';
import 'package:gluestack_ui_example/widgets/components/widgets/slider_example.dart';
Expand Down Expand Up @@ -199,6 +200,11 @@ final GoRouter router = GoRouter(
builder: (context, state) => const SliderExample(),
),

GoRoute(
path: "alert-box-example",
builder: (context, state) => const AlertBoxExample(),
),

// Generate individual Storybook screens for every widget. This is referenced in docs website iframe.
...kStories.map(
(item) => GoRoute(
Expand Down
93 changes: 93 additions & 0 deletions example/lib/widgets/components/widgets/alert_box_example.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import 'package:flutter/material.dart';
import 'package:gluestack_ui/gluestack_ui.dart';
import 'package:gluestack_ui_example/widgets/components/layout/base_layout.dart';
import 'package:gluestack_ui_example/widgets/components/layout/custom_gs_layout.dart';
import 'package:gluestack_ui_example/widgets/components/layout/drop_down.dart';

class AlertBoxExample extends StatefulWidget {
const AlertBoxExample({super.key});

@override
State<AlertBoxExample> createState() => _AlertBoxExampleState();
}

class _AlertBoxExampleState extends State<AlertBoxExample> {
final List dropdownActionOptions = [
GSAlertBoxActions.success,
GSAlertBoxActions.info,
GSAlertBoxActions.error,
GSAlertBoxActions.warning,
GSAlertBoxActions.muted,
];
GSAlertBoxActions selectedActionOption = GSAlertBoxActions.muted;

final List dropdownVariantOptions = [
GSAlertBoxVariants.solid,
GSAlertBoxVariants.outline,
];
GSAlertBoxVariants selectedVariantOption = GSAlertBoxVariants.solid;
void updateVariantSelectedOption(dynamic newOption) {
setState(() {
selectedVariantOption = newOption;
});
}

void updateActionSelectedOption(dynamic newOption) {
setState(() {
selectedActionOption = newOption;
});
}

@override
Widget build(BuildContext context) {
var code = '''
GSAlert(
description: const GSAlertText('Description of alert!'),
icon: const GSAlertBoxIcon(
iconData: Icons.info_outline,
),
variant: $selectedVariantOption,
action: $selectedActionOption,
),

''';
return CustomGSLayout(
title: "AlertBox",
style: GSStyle(
dark: GSStyle(bg: $GSColors.black),
),
body: BaseLayout(
code: code,
component: Center(
child: GSAlert(
description: const GSAlertText('Description of alert!'),
icon: const GSAlertBoxIcon(
iconData: Icons.info_outline,
),
variant: selectedVariantOption,
action: selectedActionOption,
),
),
controls: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomDropDown(
title: "action",
dropdownOptions: dropdownActionOptions,
selectedOption: selectedActionOption,
onChanged: updateActionSelectedOption,
),
const SizedBox(height: 20),
CustomDropDown(
title: "variant",
dropdownOptions: dropdownVariantOptions,
selectedOption: selectedVariantOption,
onChanged: updateVariantSelectedOption,
),
],
),
),
);
}
}
35 changes: 35 additions & 0 deletions example/lib/widgets/storybook/widgets/alert_story.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import 'package:flutter/material.dart';
import 'package:gluestack_ui/gluestack_ui.dart';
import 'base_story_widget.dart';
import 'package:storybook_flutter/storybook_flutter.dart';

final List<Option<int>> actionOptions =
generateEnumOptions(GSAlertBoxActions.values);
final List<Option<int>> variantOptions =
generateEnumOptions(GSAlertBoxVariants.values);

final class AlertStory extends StoryWidget {
@override
Story createStoryWidget() {
return Story(
name: storyName,
builder: (context) => GSAlert(
icon: const GSAlertBoxIcon(
iconData: Icons.info_outline,
),
action: GSAlertBoxActions.values[context.knobs
.options(label: 'Action', initial: 0, options: actionOptions)],
variant: GSAlertBoxVariants.values[context.knobs
.options(label: 'Variant', initial: 0, options: variantOptions)],
style: GSStyle(),
description: const GSAlertText("Description of Alert!"),
),
);
}

@override
String get routePath => "alert-preview";

@override
String get storyName => "Alert";
}
2 changes: 2 additions & 0 deletions example/lib/widgets/storybook/widgets/public.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:gluestack_ui_example/widgets/storybook/widgets/alert_story.dart';
import 'package:gluestack_ui_example/widgets/storybook/widgets/header_story.dart';
import 'package:gluestack_ui_example/widgets/storybook/widgets/slider_story.dart';
import 'package:gluestack_ui_example/widgets/storybook/widgets/tab_story.dart';
Expand Down Expand Up @@ -37,6 +38,7 @@ import 'accordion_story.dart';

final List<StoryWidget> kStories = [
AlertDialogStory(),
AlertStory(),
AccordionStory(),
AvatarStory(),
BadgeStory(),
Expand Down
1 change: 1 addition & 0 deletions lib/gluestack_ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ export 'src/widgets/gs_tabs/public.dart';
export 'src/widgets/gs_layout/public.dart';
export 'src/widgets/gs_header/public.dart';
export 'src/widgets/gs_slider/public.dart';
export 'src/widgets/gs_alert/public.dart';
21 changes: 21 additions & 0 deletions lib/src/provider/gluestack_provider.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import 'package:gluestack_ui/src/theme/config/alert_box/alert_box.dart';
import 'package:gluestack_ui/src/theme/config/alert_box/alert_box_icon.dart';
import 'package:gluestack_ui/src/theme/config/alert_box/alert_box_text.dart';

import 'provider.dart';

final getIt = GetIt.instance;
Expand Down Expand Up @@ -146,6 +150,11 @@ class GluestackCustomConfig {
Map<String, dynamic>? sliderThumb;
Map<String, dynamic>? sliderFilledTrack;

// AlertBox
Map<String, dynamic>? alert;
Map<String, dynamic>? alertIcon;
Map<String, dynamic>? alertText;

//GS Layout
Map<String, dynamic>? layout;

Expand All @@ -156,6 +165,12 @@ class GluestackCustomConfig {
this.sliderTrack,
this.sliderThumb,
this.sliderFilledTrack,

// alertBox

this.alert,
this.alertIcon,
this.alertText,
//tabs
this.tabs,
this.tabsTab,
Expand Down Expand Up @@ -316,6 +331,12 @@ class GluestackCustomConfig {
sliderThumb = mergeConfigs(sliderThumbData, sliderThumb);
sliderFilledTrack = mergeConfigs(sliderFilledTrackData, sliderFilledTrack);

// alert box

alert = mergeConfigs(alertBoxData, alert);
alertText = mergeConfigs(alertBoxTextData, alertText);
alertIcon = mergeConfigs(alertBoxIconData, alertIcon);

//tabs
tabs = mergeConfigs(tabsData, tabs);
tabsTab = mergeConfigs(tabsTabData, tabsTab);
Expand Down
59 changes: 59 additions & 0 deletions lib/src/theme/config/alert_box/alert_box.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
const Map<String, dynamic> alertBoxData = {
'alignItems': 'center',
'p': '\$3',
'flexDirection': 'row',
'borderRadius': '\$sm',
'variants': {
'action': {
'error': {
'bg': '\$backgroundError',
'borderColor': '\$error300',
'_icon': {
'color': '\$error500',
},
},
'warning': {
'bg': '\$backgroundWarning',
'borderColor': '\$warning300',
'_icon': {
'color': '\$warning500',
},
},
'success': {
'bg': '\$backgroundSuccess',
'borderColor': '\$success300',
'_icon': {
'color': '\$success500',
},
},
'info': {
'bg': '\$backgroundInfo',
'borderColor': '\$info300',
'_icon': {
'color': '\$info500',
},
},
'muted': {
'bg': '\$backgroundMuted',
'borderColor': '\$secondary300',
'_icon': {
'color': '\$secondary500',
},
},
},
'variant': {
'solid': {},
'outline': {
'borderWidth': '\$1',
'bg': '\$white',
},
'accent': {
'borderLeftWidth': '\$4',
},
},
},
'defaultProps': {
'variant': 'solid',
'action': 'info',
},
};
59 changes: 59 additions & 0 deletions lib/src/theme/config/alert_box/alert_box_icon.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
const Map<String, dynamic> alertBoxIconData = {
"variants": {
"size": {
"2xs": {
"h": "\$3",
"w": "\$3",
"props": {
// @ts-ignore
"size": 12,
},
},
"xs": {
"h": "\$3.5",
"w": "\$3.5",
"props": {
// @ts-ignore
"size": 14,
},
},
"sm": {
"h": "\$4",
"w": "\$4",
"props": {
// @ts-ignore
"size": 16,
},
},
"md": {
"h": "\$4.5",
"w": "\$4.5",
"props": {
// @ts-ignore
"size": 18,
},
},
"lg": {
"h": "\$5",
"w": "\$5",
"props": {
// @ts-ignore
"size": 20,
},
},
"xl": {
"h": "\$6",
"w": "\$6",
"props": {
// @ts-ignore
"size": 24,
},
},
},
},
"props": {
"size": "md",
// @ts-ignore
"fill": "none",
},
};
Loading