diff --git a/assets/fonts/Helvetica-Bold.ttf b/assets/fonts/Helvetica-Bold.ttf deleted file mode 100644 index 15e9bd6..0000000 Binary files a/assets/fonts/Helvetica-Bold.ttf and /dev/null differ diff --git a/assets/fonts/Helvetica-Medium.ttf b/assets/fonts/Helvetica-Medium.ttf deleted file mode 100644 index 0a45729..0000000 Binary files a/assets/fonts/Helvetica-Medium.ttf and /dev/null differ diff --git a/assets/fonts/HelveticaNeue.ttf b/assets/fonts/HelveticaNeue.ttf new file mode 100644 index 0000000..db3ad30 Binary files /dev/null and b/assets/fonts/HelveticaNeue.ttf differ diff --git a/assets/fonts/HelveticaNeue400.ttf b/assets/fonts/HelveticaNeue400.ttf new file mode 100644 index 0000000..5250b69 Binary files /dev/null and b/assets/fonts/HelveticaNeue400.ttf differ diff --git a/assets/fonts/HelveticaNeue500.ttf b/assets/fonts/HelveticaNeue500.ttf new file mode 100644 index 0000000..7e9b412 Binary files /dev/null and b/assets/fonts/HelveticaNeue500.ttf differ diff --git a/assets/fonts/HelveticaNeue600.ttf b/assets/fonts/HelveticaNeue600.ttf new file mode 100644 index 0000000..373e545 Binary files /dev/null and b/assets/fonts/HelveticaNeue600.ttf differ diff --git a/assets/fonts/HelveticaNeue700.ttf b/assets/fonts/HelveticaNeue700.ttf new file mode 100644 index 0000000..772ab3d Binary files /dev/null and b/assets/fonts/HelveticaNeue700.ttf differ diff --git a/assets/fonts/HelveticaNeue800.ttf b/assets/fonts/HelveticaNeue800.ttf new file mode 100644 index 0000000..28b1ffc Binary files /dev/null and b/assets/fonts/HelveticaNeue800.ttf differ diff --git a/assets/fonts/HelveticaNeue900.ttf b/assets/fonts/HelveticaNeue900.ttf new file mode 100644 index 0000000..5c55810 Binary files /dev/null and b/assets/fonts/HelveticaNeue900.ttf differ diff --git a/assets/fonts/HelveticaNeueIt.ttf b/assets/fonts/HelveticaNeueIt.ttf new file mode 100644 index 0000000..f0de745 Binary files /dev/null and b/assets/fonts/HelveticaNeueIt.ttf differ diff --git a/assets/fonts/icons.ttf b/assets/fonts/icons.ttf new file mode 100644 index 0000000..e0692d8 Binary files /dev/null and b/assets/fonts/icons.ttf differ diff --git a/lib/main.dart b/lib/main.dart index 02efec4..d4f6e3a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:twitter_clone/common/common.dart'; import 'package:twitter_clone/features/auth/controller/auth_controller.dart'; import 'package:twitter_clone/features/auth/view/landing_view.dart'; import 'package:twitter_clone/features/home/view/home_view.dart'; import 'package:twitter_clone/theme/app_theme.dart'; +import 'package:twitter_clone/theme/pallete.dart'; void main() { runApp(const ProviderScope(child: MyApp())); @@ -18,7 +20,19 @@ class MyApp extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return MaterialApp( title: 'Twitter', - theme: AppTheme.theme, + theme: AppTheme.theme.copyWith( + textTheme: GoogleFonts.mulishTextTheme( + Theme.of(context).textTheme.copyWith( + // Set the default text color to white + bodyText1: Theme.of(context).textTheme.bodyText1!.copyWith( + color: Colors.white, + ), + bodyText2: Theme.of(context).textTheme.bodyText2!.copyWith( + color: Colors.white, + ), + ), + ), + ), debugShowCheckedModeBanner: false, home: ref.watch(currentUserAccountProvider).when( diff --git a/lib/theme/app_theme.dart b/lib/theme/app_theme.dart index bc9ac0d..ef2a996 100644 --- a/lib/theme/app_theme.dart +++ b/lib/theme/app_theme.dart @@ -4,9 +4,9 @@ import 'package:twitter_clone/theme/pallete.dart'; class AppTheme { static ThemeData theme = ThemeData.dark(useMaterial3: true).copyWith( scaffoldBackgroundColor: Pallete.backgroundColor, - // textTheme: ThemeData.dark().textTheme.apply( - // fontFamily: 'Helvetica', - // ), + // textTheme: GoogleFonts.mulishTextTheme( + // Theme.of(context).textTheme, + // ), appBarTheme: const AppBarTheme( backgroundColor: Pallete.backgroundColor, elevation: 0, diff --git a/pubspec.lock b/pubspec.lock index 91ea24e..02c9748 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -280,6 +280,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 + url: "https://pub.dev" + source: hosted + version: "6.1.0" html: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2ab309f..90ef2eb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,6 +38,7 @@ dependencies: flutter_svg: ^2.0.9 fluttertoast: ^8.2.4 fpdart: ^1.1.0 + google_fonts: ^6.1.0 image_picker: ^1.0.7 like_button: ^2.0.5 mime: ^1.0.5 @@ -72,11 +73,23 @@ flutter: # list giving the asset and other descriptors for the font. For # example: fonts: - - family: Helvetica + - family: HelveticaNeue fonts: - - asset: assets/fonts/Helvetica-Medium.ttf - - asset: assets/fonts/Helvetica-Medium.ttf + - asset: assets/fonts/HelveticaNeue.ttf + - asset: assets/fonts/HelveticaNeue400.ttf + weight: 400 + - asset: assets/fonts/HelveticaNeue500.ttf + weight: 500 + - asset: assets/fonts/HelveticaNeue600.ttf + weight: 600 + - asset: assets/fonts/HelveticaNeue700.ttf weight: 700 + - asset: assets/fonts/HelveticaNeue800.ttf + weight: 800 + - asset: assets/fonts/HelveticaNeue900.ttf + weight: 900 + - asset: assets/fonts/HelveticaNeueIt.ttf + style: italic # - family: Trajan Pro # fonts: # - asset: fonts/TrajanPro.ttf