Skip to content

Commit

Permalink
feat: Notification list item (#45)
Browse files Browse the repository at this point in the history
Authored-by: Osman <[email protected]>
  • Loading branch information
ahmed-osman3 authored and thelukewalton committed Jun 10, 2024
1 parent 1930723 commit a89c615
Show file tree
Hide file tree
Showing 10 changed files with 388 additions and 12 deletions.
2 changes: 2 additions & 0 deletions example/lib/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import 'package:zeta_example/pages/components/filter_selection_example.dart';
import 'package:zeta_example/pages/components/list_item_example.dart';
import 'package:zeta_example/pages/components/navigation_bar_example.dart';
import 'package:zeta_example/pages/components/navigation_rail_example.dart';
import 'package:zeta_example/pages/components/notification_list_example.dart';
import 'package:zeta_example/pages/components/phone_input_example.dart';
import 'package:zeta_example/pages/components/radio_example.dart';
import 'package:zeta_example/pages/components/screen_header_bar_example.dart';
Expand Down Expand Up @@ -68,6 +69,7 @@ final List<Component> components = [
Component(ContactItemExample.name, (context) => const ContactItemExample()),
Component(ListItemExample.name, (context) => const ListItemExample()),
Component(NavigationBarExample.name, (context) => const NavigationBarExample()),
Component(NotificationListItemExample.name, (context) => const NotificationListItemExample()),
Component(PaginationExample.name, (context) => const PaginationExample()),
Component(PasswordInputExample.name, (context) => const PasswordInputExample()),
Component(GroupHeaderExample.name, (context) => const GroupHeaderExample()),
Expand Down
65 changes: 65 additions & 0 deletions example/lib/pages/components/notification_list_example.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import 'package:flutter/material.dart';
import 'package:zeta_example/widgets.dart';
import 'package:zeta_flutter/zeta_flutter.dart';

class NotificationListItemExample extends StatefulWidget {
static const String name = 'NotificationListItem';

const NotificationListItemExample({super.key});

@override
State<NotificationListItemExample> createState() => _NotificationListItemExampleState();
}

class _NotificationListItemExampleState extends State<NotificationListItemExample> {
@override
Widget build(BuildContext context) {
return ExampleScaffold(
name: "NotificationListItem",
child: SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 400),
child: ZetaNotificationListItem(
body: Text(
"New urgent" * 300,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
title: 'Urgent Message',
leading: ZetaNotificationBadge.icon(icon: ZetaIcons.check_circle_round),
notificationTime: "Just now",
action: ZetaButton.negative(
label: "Remove",
onPressed: () {},
),
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 200),
child: ZetaNotificationListItem(
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"New urgent" * 300,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
ZetaButton.text(label: "label")
],
),
title: 'Urgent Message',
leading: ZetaNotificationBadge.icon(icon: ZetaIcons.check_circle_round),
notificationTime: "Just now",
action: ZetaButton.negative(
label: "Remove",
onPressed: () {},
),
),
),
].gap(ZetaSpacing.l))),
);
}
}
3 changes: 3 additions & 0 deletions example/widgetbook/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:zeta_flutter/zeta_flutter.dart';

import 'pages/assets/icon_widgetbook.dart';
import 'pages/components/accordion_widgetbook.dart';
import 'pages/components/notification_list_item_widgetbook.dart';
import 'pages/components/text_input_widgetbook.dart';
import 'pages/components/top_app_bar_widgetbook.dart';
import 'pages/components/avatar_widgetbook.dart';
Expand Down Expand Up @@ -140,6 +141,8 @@ class _HotReloadState extends State<HotReload> {
WidgetbookUseCase(name: 'Dial Pad', builder: (context) => dialPadUseCase(context)),
WidgetbookUseCase(name: 'Global Header', builder: (context) => globalHeaderUseCase(context)),
WidgetbookUseCase(name: 'List Item', builder: (context) => listItemUseCase(context)),
WidgetbookUseCase(
name: 'Notification List Item', builder: (context) => notificationListItemUseCase(context)),
WidgetbookUseCase(name: 'Navigation Bar', builder: (context) => navigationBarUseCase(context)),
WidgetbookUseCase(name: 'Pagination', builder: (context) => paginationUseCase(context)),
WidgetbookUseCase(name: 'Radio Button', builder: (context) => radioButtonUseCase(context)),
Expand Down
12 changes: 5 additions & 7 deletions example/widgetbook/pages/components/avatar_widgetbook.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Widget avatarUseCase(BuildContext context) {
widget: ZetaAvatar(
image: context.knobs.boolean(label: 'Image') ? image : null,
size: context.knobs.list(
label: 'Size',
options: ZetaAvatarSize.values,
labelBuilder: (value) => value.name.split('.').last.toUpperCase(),
),
label: 'Size',
options: ZetaAvatarSize.values,
labelBuilder: (value) => value.name.split('.').last.toUpperCase(),
initialOption: ZetaAvatarSize.m),
upperBadge: context.knobs.boolean(label: 'Status Badge', initialValue: false)
? ZetaAvatarBadge.icon(
icon: ZetaIcons.close_round,
Expand All @@ -33,9 +33,7 @@ Widget avatarUseCase(BuildContext context) {
)
: null,
initials: context.knobs.stringOrNull(label: 'Initials', initialValue: null),
backgroundColor: context.knobs.colorOrNull(
label: 'Background color',
),
backgroundColor: context.knobs.colorOrNull(label: 'Background color', initialValue: colors.purple.shade80),
),
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import 'package:flutter/material.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:zeta_flutter/zeta_flutter.dart';

import '../../test/test_components.dart';

Widget notificationListItemUseCase(BuildContext context) => WidgetbookTestWidget(
widget: Padding(
padding: EdgeInsets.symmetric(horizontal: context.knobs.list(label: "Size", options: [100, 200, 400])),
child: ZetaNotificationListItem(
body: context.knobs.boolean(label: "Include Link")
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"New urgent" * 300,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
ZetaButton.text(label: "label")
],
)
: Text(
"New urgent" * 300,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
title: context.knobs.string(label: "Title", initialValue: "Urgent Notification"),
notificationTime: context.knobs.stringOrNull(label: "Notification Time", initialValue: "Just Now"),
notificationRead: context.knobs.boolean(label: "Notification Read", initialValue: false),
leading: context.knobs.list(
label: 'Badge',
options: [
ZetaNotificationBadge.avatar(avatar: ZetaAvatar.initials(initials: "AO")),
ZetaNotificationBadge.icon(icon: ZetaIcons.check_circle_round),
ZetaNotificationBadge.image(
image: Image.network(
"https://www.google.com/url?sa=i&url=https%3A%2F%2Fgithub.com%2Fzebratechnologies&psig=AOvVaw0fBPVE5gUkkpFw8mVf6B8G&ust=1717073069230000&source=images&cd=vfe&opi=89978449&ved=0CBIQjRxqFwoTCPCwn-XxsoYDFQAAAAAdAAAAABAE"))
],
labelBuilder: (value) => value.avatar != null
? "Avatar"
: value.icon != null
? "Icon"
: "Image",
),
action: context.knobs.list(
label: "Action Buttons",
options: [
ZetaButton.negative(label: "Remove"),
ZetaButton.positive(label: "Add"),
ZetaButton.outline(label: "Action"),
],
labelBuilder: (value) {
final button = (value as ZetaButton);
return button.label == "Remove"
? "Negative"
: button.label == "Add"
? "Positive"
: "Netutral";
},
),
showDivider: context.knobs.booleanOrNull(label: "Has More"),
),
),
);
4 changes: 2 additions & 2 deletions lib/src/components/avatars/avatar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ class ZetaAvatarBadge extends StatelessWidget {
this.color,
this.icon = ZetaIcons.star_round,
this.iconColor,
this.size = ZetaAvatarSize.xxxl,
}) : value = null,
size = ZetaAvatarSize.xxxl,
type = ZetaAvatarBadgeType.icon;

/// Constructs [ZetaAvatarBadge] with notifications
Expand Down Expand Up @@ -407,7 +407,7 @@ class ZetaAvatarBadge extends StatelessWidget {
)
: null,
),
child: Center(child: innerContent),
child: innerContent,
);
}

Expand Down
12 changes: 10 additions & 2 deletions lib/src/components/badges/indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class ZetaIndicator extends StatelessWidget {
this.icon,
this.value,
this.inverse = false,
this.color,
});

/// Constructor for [ZetaIndicator] of type [ZetaIndicatorType.icon].
Expand All @@ -31,6 +32,7 @@ class ZetaIndicator extends StatelessWidget {
this.size = ZetaWidgetSize.large,
this.inverse = false,
this.icon,
this.color,
}) : type = ZetaIndicatorType.icon,
value = null;

Expand All @@ -41,6 +43,7 @@ class ZetaIndicator extends StatelessWidget {
this.inverse = false,
this.icon,
this.value,
this.color,
}) : type = ZetaIndicatorType.notification;

/// The type of the [ZetaIndicator] - icon or notification.
Expand All @@ -62,6 +65,9 @@ class ZetaIndicator extends StatelessWidget {
/// Value for the type `notification`.
final int? value;

/// Color for zeta indicator
final Color? color;

/// Creates a clone.
ZetaIndicator copyWith({
ZetaIndicatorType? type,
Expand All @@ -82,7 +88,8 @@ class ZetaIndicator extends StatelessWidget {
@override
Widget build(BuildContext context) {
final zetaColors = Zeta.of(context).colors;
final Color backgroundColor = (type == ZetaIndicatorType.icon ? zetaColors.blue : zetaColors.surfaceNegative);
final Color backgroundColor =
color ?? (type == ZetaIndicatorType.icon ? zetaColors.blue : zetaColors.surfaceNegative);
final Color foregroundColor = backgroundColor.onColor;
final sizePixels = _getSizePixels(size, type);

Expand Down Expand Up @@ -163,6 +170,7 @@ class ZetaIndicator extends StatelessWidget {
..add(DiagnosticsProperty<ZetaWidgetSize>('size', size))
..add(DiagnosticsProperty<int?>('value', value))
..add(DiagnosticsProperty<IconData?>('icon', icon))
..add(DiagnosticsProperty<bool>('inverseBorder', inverse));
..add(DiagnosticsProperty<bool>('inverseBorder', inverse))
..add(ColorProperty('color', color));
}
}
2 changes: 1 addition & 1 deletion lib/src/components/buttons/button_style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ButtonStyle buttonStyle(
return isSolid ? color.shade50 : colors.cool.shade20;
}
if (backgroundColor != null) return backgroundColor;
return isSolid ? color : Colors.transparent;
return isSolid ? color : colors.surfacePrimary;
},
),
foregroundColor: WidgetStateProperty.resolveWith<Color?>(
Expand Down
Loading

0 comments on commit a89c615

Please sign in to comment.