Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions lib/screens/main_app_widgets/fav_page.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_component_ui/provider/favorite_provider.dart';
import 'package:flutter_component_ui/theme/theme.dart';

import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';

Expand Down Expand Up @@ -65,7 +65,10 @@ class _FavPageState extends State<FavPage> {
child: Text(
"Favourite",
style: TextStyle(
color: MyTheme.lightBluishColor,
color: Theme.of(context).brightness == Brightness.dark
? Colors.white
: const Color.fromRGBO(55, 80, 206, 1),

fontSize: 24,
fontFamily: GoogleFonts.dmSans(
fontWeight: FontWeight.w700,
Expand Down
4 changes: 3 additions & 1 deletion lib/screens/main_app_widgets/search_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ class _SearchPageState extends State<SearchPage> {
child: Text(
"Search",
style: TextStyle(
color: MyTheme.lightBluishColor,
color: Theme.of(context).brightness == Brightness.dark
? Colors.white
: const Color.fromRGBO(55, 80, 206, 1),
fontSize: 24,
fontFamily: GoogleFonts.dmSans(
fontWeight: FontWeight.w700,
Expand Down
15 changes: 13 additions & 2 deletions lib/theme/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ class MyTheme {
snackBarTheme: const SnackBarThemeData(
backgroundColor: Colors.black,
contentTextStyle: TextStyle(color: Colors.white)),
textTheme: GoogleFonts.poppinsTextTheme(ThemeData.light().textTheme),
textTheme:TextTheme(
displayLarge: GoogleFonts.poppins(
color: MyTheme.lightBluishColor,
fontSize: 20,
fontWeight: FontWeight.w600,
)),
appBarTheme: const AppBarTheme(
color: Colors.white,
elevation: 0.0,
Expand All @@ -32,7 +37,13 @@ class MyTheme {
snackBarTheme: const SnackBarThemeData(
backgroundColor: Colors.white,
contentTextStyle: TextStyle(color: Colors.black)),
textTheme: GoogleFonts.poppinsTextTheme(ThemeData.dark().textTheme),
textTheme: TextTheme(
displayLarge: GoogleFonts.poppins(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
appBarTheme: const AppBarTheme(
color: Colors.white,
elevation: 0.0,
Expand Down
15 changes: 3 additions & 12 deletions lib/ui_components/alerts/alerts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ class _AlertScreenState extends State<AlertScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Coloured Alerts",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge,),
)),
Wrap(
direction: Axis.horizontal,
Expand Down Expand Up @@ -121,10 +118,7 @@ class _AlertScreenState extends State<AlertScreen> {
padding: const EdgeInsets.all(8.0),
child: Text(
"Simple Alerts",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor),
style: Theme.of(context).textTheme.displayLarge,
),
)),
Wrap(
Expand Down Expand Up @@ -178,10 +172,7 @@ class _AlertScreenState extends State<AlertScreen> {
padding: const EdgeInsets.all(8.0),
child: Text(
"Dark Mode Alerts",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor),
style: Theme.of(context).textTheme.displayLarge,
),
)),
Wrap(
Expand Down
15 changes: 3 additions & 12 deletions lib/ui_components/avatars/all_avatars/avatars.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ class _AvatarScreenState extends State<AvatarScreen> {
Align(
alignment: Alignment.centerLeft,
child: Text("Text Avatars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor))),
style: Theme.of(context).textTheme.displayLarge)),
Wrap(
direction: Axis.horizontal,
children: List.generate(
Expand Down Expand Up @@ -121,10 +118,7 @@ class _AvatarScreenState extends State<AvatarScreen> {
Align(
alignment: Alignment.centerLeft,
child: Text("Image Avatars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor))),
style: Theme.of(context).textTheme.displayLarge)),
Wrap(
direction: Axis.horizontal,
children: List.generate(
Expand Down Expand Up @@ -172,10 +166,7 @@ class _AvatarScreenState extends State<AvatarScreen> {
Align(
alignment: Alignment.centerLeft,
child: Text("Icon Avatars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor))),
style: Theme.of(context).textTheme.displayLarge)),
Wrap(
direction: Axis.horizontal,
children: List.generate(
Expand Down
15 changes: 3 additions & 12 deletions lib/ui_components/bottom_navbars/bottom_navbars.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ class BottomNavBarScreenState extends State<BottomNavBarScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Basic Bottom Nav-Bars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -113,10 +110,7 @@ class BottomNavBarScreenState extends State<BottomNavBarScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Animated Bottom Nav-Bars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -178,10 +172,7 @@ class BottomNavBarScreenState extends State<BottomNavBarScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("FAB Bottom Nav-Bars",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down
22 changes: 5 additions & 17 deletions lib/ui_components/buttons/buttons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ class _ButtonScreenState extends State<ButtonScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Elevated Buttons",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -125,11 +122,8 @@ class _ButtonScreenState extends State<ButtonScreen> {
alignment: Alignment.centerLeft,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Ouline Buttons",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
child: Text("Outline Buttons",
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -184,10 +178,7 @@ class _ButtonScreenState extends State<ButtonScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Text Buttons",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -242,10 +233,7 @@ class _ButtonScreenState extends State<ButtonScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Animated Buttons",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down
20 changes: 4 additions & 16 deletions lib/ui_components/cards/cards.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ class _CardScreenState extends State<CardScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Blog Cards",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -113,10 +110,7 @@ class _CardScreenState extends State<CardScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Social Cards",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -171,10 +165,7 @@ class _CardScreenState extends State<CardScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Blog Cards Dark Mode",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -229,10 +220,7 @@ class _CardScreenState extends State<CardScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Social Cards Dark Mode",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down
10 changes: 2 additions & 8 deletions lib/ui_components/input_fields/input_fields.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ class _InputFieldScreenState extends State<InputFieldScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Input Fields",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down Expand Up @@ -133,10 +130,7 @@ class _InputFieldScreenState extends State<InputFieldScreen> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Text Areas",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor)),
style: Theme.of(context).textTheme.displayLarge),
),
),
Wrap(
Expand Down
10 changes: 2 additions & 8 deletions lib/ui_components/messages/messages.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ class _MessageScreenState extends State<MessageScreen> {
padding: const EdgeInsets.only(left: 12.0, top: 20),
child: Text(
"Bubble Chat",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor),
style: Theme.of(context).textTheme.displayLarge
),
),
),
Expand Down Expand Up @@ -135,10 +132,7 @@ class _MessageScreenState extends State<MessageScreen> {
padding: const EdgeInsets.only(left: 12.0, top: 20),
child: Text(
"Inbox Messages",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor),
style: Theme.of(context).textTheme.displayLarge
),
),
),
Expand Down
5 changes: 1 addition & 4 deletions lib/ui_components/pricing_cards/pricing_cards.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ class _PricingCardScreenState extends State<PricingCardScreen> {
alignment: Alignment.centerLeft,
child: Text(
"Pricing Cards",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor),
style: Theme.of(context).textTheme.displayLarge,
),
),
const SizedBox(height: 10),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import '../../../theme/theme.dart';


class BasicRadioButton extends StatefulWidget {
const BasicRadioButton({super.key});
Expand All @@ -21,11 +21,7 @@ class _BasicRadioButtonState extends State<BasicRadioButton> {
padding: const EdgeInsets.only(left: 20, top: 20),
child: Text(
"Basic Radio Button",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor,
),
style: Theme.of(context).textTheme.displayLarge
),
),
const SizedBox(height: 10),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import '../../../theme/theme.dart';


class RadioButtonwithCustomColor extends StatefulWidget {
const RadioButtonwithCustomColor({super.key});
Expand All @@ -23,11 +23,7 @@ class _RadioButtonwithCustomColorState
padding: const EdgeInsets.only(left: 20, top: 20),
child: Text(
"Radio Button with Custom Colors",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor,
),
style: Theme.of(context).textTheme.displayLarge
),
),
const SizedBox(height: 10),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import '../../../theme/theme.dart';


class RadioButtonwithHorizontalLayout extends StatefulWidget {
const RadioButtonwithHorizontalLayout({super.key});
Expand All @@ -22,11 +22,7 @@ class _RadioButtonwithHorizontalLayoutState
padding: const EdgeInsets.only(left: 20, top: 20),
child: Text(
"Radio Button with Horizontal Layout",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: MyTheme.lightBluishColor,
),
style: Theme.of(context).textTheme.displayLarge
),
),
const SizedBox(height: 10),
Expand Down
Loading