Merge pull request #3 from GDG-W/feature/set-up

conference app setup
GDG-W · Sep 4, 2024 · 0df3e95 · 0df3e95
2 parents 7d003e5 + 5625c5f
commit 0df3e95
Show file tree

Hide file tree

Showing 60 changed files with 1,393 additions and 152 deletions.
diff --git a/packages/catalog/lib/main.dart b/packages/catalog/lib/main.dart
@@ -47,7 +47,7 @@ class WidgetbookApp extends StatelessWidget {
                 extensions: <ThemeExtension<dynamic>>[
                   /// Use the below format for raw theme data
                   /// DevFestTheme(textTheme: DevfestTextTheme()),
-                  DevFestTheme.light(),
+                  DevFestThemeData.light(),
                 ],
               ),
             ),
@@ -64,7 +64,7 @@ class WidgetbookApp extends StatelessWidget {
                 extensions: <ThemeExtension<dynamic>>[
                   /// Use the below format for raw theme data
                   /// DevFestTheme(textTheme: DevfestTextTheme()),
-                  DevFestTheme.dark(),
+                  DevFestThemeData.dark(),
                 ],
               ),
             ),
@@ -80,7 +80,7 @@ class WidgetbookApp extends StatelessWidget {
                   debugShowCheckedModeBanner: false,
                   theme: theme.copyWith(
                     extensions: [
-                      isDark ? DevFestTheme.dark() : DevFestTheme.light()
+                      isDark ? DevFestThemeData.dark() : DevFestThemeData.light()
                     ],
                   ),
                   home: Material(child: child),

diff --git a/packages/catalog/lib/usecases/bottom_nav.dart b/packages/catalog/lib/usecases/bottom_nav.dart
@@ -10,7 +10,7 @@ Widget devfestBottomNav(BuildContext context) {
   int index = 0;
   return StatefulBuilder(builder: (context, setState) {
     return Scaffold(
-      backgroundColor: DevFestTheme.of(context).backgroundColor,
+      backgroundColor: DevfestTheme.of(context).backgroundColor,
       bottomNavigationBar: DevfestBottomNav(
         index: index,
         items: const [

diff --git a/packages/catalog/lib/usecases/buttons.dart b/packages/catalog/lib/usecases/buttons.dart
@@ -5,7 +5,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 @widgetbook.UseCase(name: 'Filled Button', type: DevfestFilledButton)
 Widget devfestFilledButton(BuildContext context) {
   return Material(
-    color: DevFestTheme.of(context).backgroundColor,
+    color: DevfestTheme.of(context).backgroundColor,
     child: Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -46,7 +46,7 @@ Widget devfestFilledButton(BuildContext context) {
 @widgetbook.UseCase(name: 'Outlined Button', type: DevfestOutlinedButton)
 Widget devfestOutlinedButton(BuildContext context) {
   return Material(
-    color: DevFestTheme.of(context).backgroundColor,
+    color: DevfestTheme.of(context).backgroundColor,
     child: Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.stretch,

diff --git a/packages/catalog/lib/usecases/text_field.dart b/packages/catalog/lib/usecases/text_field.dart
@@ -9,7 +9,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 Widget devfestTextField(BuildContext context) {
   return StatefulBuilder(builder: (context, setState) {
     return Scaffold(
-      backgroundColor: DevFestTheme.of(context).backgroundColor,
+      backgroundColor: DevfestTheme.of(context).backgroundColor,
       body: Center(
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0),

diff --git a/packages/cave/lib/themes/theme_data.dart b/packages/cave/lib/themes/theme_data.dart
@@ -6,7 +6,7 @@ import 'colors.dart';
 import 'text_field_theme.dart';
 import 'typography.dart';
 
-class DevFestTheme extends ThemeExtension<DevFestTheme> {
+class DevFestThemeData extends ThemeExtension<DevFestThemeData> {
   /// Create and register new themes here
   final DevfestTextTheme? textTheme;
   final DevfestButtonTheme? buttonTheme;
@@ -15,10 +15,7 @@ class DevFestTheme extends ThemeExtension<DevFestTheme> {
   final DevfestTextFieldTheme? textFieldTheme;
   final Color? backgroundColor;
 
-  static DevFestTheme of(BuildContext context) =>
-      Theme.of(context).extension<DevFestTheme>()!;
-
-  const DevFestTheme({
+  const DevFestThemeData({
     this.textTheme,
     this.backgroundColor,
     this.bottomNavTheme,
@@ -27,19 +24,19 @@ class DevFestTheme extends ThemeExtension<DevFestTheme> {
     this.textFieldTheme,
   });
 
-  DevFestTheme.light()
+  DevFestThemeData.light()
       : this(
-          textTheme: const DevfestTextTheme.responsive(),
-          backgroundColor: DevfestColors.backgroundLight,
+          textTheme: DevfestTextTheme.light(),
+          backgroundColor: DevfestColors.primariesYellow100,
           buttonTheme: const DevfestButtonTheme.light(),
           outlinedButtonTheme: const DevfestOutlinedButtonTheme.light(),
           bottomNavTheme: const DevfestBottomNavTheme.light(),
           textFieldTheme: DevfestTextFieldTheme.light(),
         );
 
-  DevFestTheme.dark()
+  DevFestThemeData.dark()
       : this(
-          textTheme: const DevfestTextTheme.responsive(),
+          textTheme: DevfestTextTheme.dark(),
           backgroundColor: DevfestColors.backgroundDark,
           textFieldTheme: DevfestTextFieldTheme.dark(),
           buttonTheme: const DevfestButtonTheme.dark(),
@@ -48,13 +45,13 @@ class DevFestTheme extends ThemeExtension<DevFestTheme> {
         );
 
   @override
-  DevFestTheme copyWith({
+  DevFestThemeData copyWith({
     DevfestTextTheme? textTheme,
     DevfestButtonTheme? buttonTheme,
     DevfestOutlinedButtonTheme? outlinedButtonTheme,
     DevfestBottomNavTheme? bottomNavTheme,
   }) {
-    return DevFestTheme(
+    return DevFestThemeData(
       textTheme: textTheme ?? this.textTheme,
       buttonTheme: buttonTheme ?? this.buttonTheme,
       outlinedButtonTheme: outlinedButtonTheme ?? this.outlinedButtonTheme,
@@ -63,9 +60,9 @@ class DevFestTheme extends ThemeExtension<DevFestTheme> {
   }
 
   @override
-  DevFestTheme lerp(DevFestTheme? other, double t) {
-    if (other is! DevFestTheme) return this;
-    return DevFestTheme(
+  DevFestThemeData lerp(DevFestThemeData? other, double t) {
+    if (other is! DevFestThemeData) return this;
+    return DevFestThemeData(
       textTheme: textTheme?.lerp(other.textTheme, t),
       backgroundColor: Color.lerp(backgroundColor, other.backgroundColor, t),
       buttonTheme: buttonTheme?.lerp(other.buttonTheme, t),

diff --git a/packages/cave/lib/themes/theme_widget.dart b/packages/cave/lib/themes/theme_widget.dart
@@ -2,7 +2,7 @@ import 'theme_data.dart';
 import 'package:flutter/material.dart';
 
 class DevfestTheme extends StatelessWidget {
-  final DevFestTheme data;
+  final DevFestThemeData data;
   final Widget child;
 
   const DevfestTheme({
@@ -11,12 +11,15 @@ class DevfestTheme extends StatelessWidget {
     required this.child,
   });
 
+  static DevFestThemeData of(BuildContext context) =>
+      Theme.of(context).extension<DevFestThemeData>()!;
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final themeExtensions = Map<Object, ThemeExtension>.from(theme.extensions);
 
-    themeExtensions[DevFestTheme] = data;
+    themeExtensions[DevFestThemeData] = data;
     return Theme(
       data: theme.copyWith(extensions: themeExtensions.values),
       child: child,