Merge pull request #89 from gluestack/development

Development

Author: geekruchika

example/lib/kitchensink-gluestack-example/lib/components/list_your_place_modal/content1.dart

@@ -14,6 +14,9 @@ class _ListYourPlaceModalContent1State
     extends State<ListYourPlaceModalContent1> {
   bool isSellSelected = true;
   List<bool> selectedPropertyType = List.generate(4, (index) => false);
+  GSStyle buttonTextStyle = GSStyle(
+    dark: GSStyle(textStyle: TextStyle(color: $GSColors.textLight200)),
+  );
   @override
   Widget build(BuildContext context) {
     return GSVStack(
@@ -26,8 +29,7 @@ class _ListYourPlaceModalContent1State
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const GSText(
-                bold: true, size: GSSizes.$sm, text: "I want to..."),
+            const GSText(bold: true, size: GSSizes.$sm, text: "I want to..."),
             GSHStack(
               space: GSSpaces.$md,
               children: [
@@ -37,7 +39,7 @@ class _ListYourPlaceModalContent1State
                       isSellSelected ? GSActions.primary : GSActions.secondary,
                   variant: GSVariants.outline,
                   style: GSStyle(borderRadius: $GSRadii.full),
-                  child: const GSButtonText(text: "Sell"),
+                  child: GSButtonText(text: "Sell", style: buttonTextStyle,),
                   onPressed: () {
                     setState(() {
                       isSellSelected = true;
@@ -50,7 +52,7 @@ class _ListYourPlaceModalContent1State
                       !isSellSelected ? GSActions.primary : GSActions.secondary,
                   variant: GSVariants.outline,
                   style: GSStyle(borderRadius: $GSRadii.full),
-                  child: const GSButtonText(text: "Rent/Lease"),
+                  child: GSButtonText(text: "Rent/Lease", style: buttonTextStyle,),
                   onPressed: () {
                     setState(() {
                       isSellSelected = false;
@@ -113,7 +115,7 @@ class _ListYourPlaceModalContent1State
                   : GSActions.secondary,
               variant: GSVariants.outline,
               style: GSStyle(borderRadius: $GSRadii.full),
-              child: const GSButtonText(text: 'flat/apartment'),
+              child: GSButtonText(text: 'flat/apartment', style: buttonTextStyle,),
               onPressed: () {
                 setState(() {
                   selectedPropertyType[0] = !selectedPropertyType[0];
@@ -127,7 +129,7 @@ class _ListYourPlaceModalContent1State
                   : GSActions.secondary,
               variant: GSVariants.outline,
               style: GSStyle(borderRadius: $GSRadii.full),
-              child: const GSButtonText(text: 'independent house/villa'),
+              child: GSButtonText(text: 'independent house/villa', style: buttonTextStyle,),
               onPressed: () {
                 setState(() {
                   selectedPropertyType[1] = !selectedPropertyType[1];
@@ -147,7 +149,7 @@ class _ListYourPlaceModalContent1State
               variant: GSVariants.outline,
               style: GSStyle(borderRadius: $GSRadii.full),
               child:
-                  const GSButtonText(text: 'independent floor/building floor'),
+                   GSButtonText(text: 'independent floor/building floor', style: buttonTextStyle,),
               onPressed: () {
                 setState(() {
                   selectedPropertyType[2] = !selectedPropertyType[2];
@@ -161,7 +163,7 @@ class _ListYourPlaceModalContent1State
                   : GSActions.secondary,
               variant: GSVariants.outline,
               style: GSStyle(borderRadius: $GSRadii.full),
-              child: const GSButtonText(text: 'Plot/Land'),
+              child:  GSButtonText(text: 'Plot/Land', style: buttonTextStyle,),
               onPressed: () {
                 setState(() {
                   selectedPropertyType[3] = !selectedPropertyType[3];

example/lib/kitchensink-gluestack-example/lib/components/main_component.dart

@@ -64,14 +64,26 @@ class KSMainComponent extends StatelessWidget {
               child: GSButton(
                 variant: GSVariants.outline,
                 action: GSActions.secondary,
-                child: const GSHStack(
+                child: GSHStack(
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
-                      GSButtonIcon(
-                        icon: Icons.list,
-                        iconSize: GSSizes.$xl,
+                      GSBox(
+                        style:
+                            GSStyle(padding: const EdgeInsets.only(right: 5)),
+                        child: GSButtonIcon(
+                          icon: Icons.list,
+                          iconSize: GSSizes.$2xl,
+                          style: GSStyle(
+                            dark: GSStyle(color: $GSColors.textLight200),
+                          ),
+                        ),
                       ),
                       GSButtonText(
+                        style: GSStyle(
+                          dark: GSStyle(
+                              textStyle:
+                                  TextStyle(color: $GSColors.textLight200)),
+                        ),
                         text: 'List your place',
                       ),
                     ]),

example/lib/kitchensink-gluestack-example/lib/main.dart

@@ -134,7 +134,7 @@ class KitchenSink extends StatelessWidget {
           data: ThemeData(useMaterial3: false),
           child: FloatingActionButton(
             onPressed: toggleTheme,
-            backgroundColor: Colors.pink,
+            backgroundColor: const Color(0xffE11D48),
             child: Transform.rotate(
                 angle: -7,
                 child: Icon(
@@ -171,7 +171,9 @@ class KitchenSink extends StatelessWidget {
                         ),
                         child: ClipOval(
                           child: GSBox(
-                            style: GSStyle(color: $GSColors.red500),
+                            style: GSStyle(
+                              color: const Color(0xffE11D48),
+                            ),
                             child: const Icon(
                               Icons.search,
                               color: Colors.white,
@@ -183,7 +185,8 @@ class KitchenSink extends StatelessWidget {
                       style: GSStyle(
                           borderRadius: 99,
                           onFocus: GSStyle(
-                              borderColor: Colors.pink, borderWidth: 2)),
+                              borderColor: const Color(0xffE11D48),
+                              borderWidth: 2)),
                       hintText: 'Anywhere • Any week • Add guests',
                       hintStyle: TextStyle(
                           fontWeight: FontWeight.w300,

lib/src/widgets/gs_radio/gs_radio_text.dart

@@ -23,17 +23,16 @@ class GSRadioText<T> extends StatelessWidget {
     final fontSize = GSRadioTextStyle
         .size[ancestorTextStyles?.props?.size]?.textStyle?.fontSize;
 
-
     GSStyle styler = resolveStyles(
       variantStyle: radioLabelStyle,
       context,
       inlineStyle: value.style,
     )!;
 
-    final fontColor = isChecked ? styler.checked?.color : styler.color;
+    final fontColor = isChecked ? styler.checked?.textStyle?.color : styler.color;
 
     final currentHoverColor =
-        isChecked ? styler.checked?.onHover?.color : styler.onHover?.color;
+        isChecked ? styler.onHover?.textStyle?.color : styler.checked?.onHover?.color;
     final isHovered = GSFocusableActionDetectorProvider.isHovered(context);
     final currentTextStyle = TextStyle(
       fontSize: textStyle?.fontSize ?? fontSize,

lib/src/widgets/gs_text/gs_text.dart

@@ -71,9 +71,9 @@ class GSText extends StatelessWidget {
           highlight ? styler.bg : styler.textStyle?.backgroundColor,
       overflow:
           isTruncated ? TextOverflow.ellipsis : styler.textStyle?.overflow,
+      color: styler.textStyle?.color ?? gstextStyle.textStyle?.color,
     );
 
-
     return Text(
       text,
       style: currentTextStyle,