Skip to content

Refactor/use geist from google fonts #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nank1ro wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Refactor/use geist from google fonts #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
90ed087
refactor: use geist from google fonts
nank1ro Jan 21, 2026
de618cb
remove print
nank1ro Jan 21, 2026
eee028a
revert main
nank1ro Jan 21, 2026
00e40df
update imports
nank1ro Jan 21, 2026
8d0bfef
use appropriate font family
nank1ro Jan 21, 2026
e852a1e
updates
nank1ro Jan 21, 2026
36bc19d
fix: tests
nank1ro Jan 22, 2026
bd2b54d
chore: bump version
nank1ro Jan 22, 2026
b487cfd
chore: bump min dark sdk version
nank1ro Jan 22, 2026
972b853
Merge branch 'main' into refactor/use-geist-from-google-fonts
nank1ro Jan 22, 2026
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
1 change: 1 addition & 0 deletions .pubignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ macos
web
linux
fonts.zip
test/fonts
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

# Find and display pubspec.yaml content
find . -name "pubspec.yaml" -type f | head -5

Repository: nank1ro/flutter-shadcn-ui

Length of output: 151

🏁 Script executed:

# Also check .pubignore file
find . -name ".pubignore" -type f

Repository: nank1ro/flutter-shadcn-ui

Length of output: 81

🏁 Script executed:

cat -n ./pubspec.yaml

Repository: nank1ro/flutter-shadcn-ui

Length of output: 3149

🏁 Script executed:

cat -n ./.pubignore

Repository: nank1ro/flutter-shadcn-ui

Length of output: 220

Don't ignore assets that are declared in pubspec.yaml.

test/fonts is listed under flutter.assets and the font files are declared in flutter.fonts in pubspec.yaml (lines 45-87). Adding it to .pubignore will exclude these font files from the published package, but the font declarations will remain. This causes missing-asset failures for consumers at runtime.

Either keep the fonts in the published package or remove both the asset declarations and font definitions from pubspec.yaml if they're only for internal testing.

💡 Proposed fix (keep fonts published) 
- test/fonts
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
test/fonts
🤖 Prompt for AI Agents 
In @.pubignore at line 11, Remove the entry "test/fonts" from .pubignore or
alternatively remove the matching asset and font declarations from pubspec.yaml
(the flutter.assets and flutter.fonts sections) so published packages don’t
reference assets that are excluded; specifically either delete "test/fonts" from
.pubignore to ensure the font files declared in pubspec.yaml are included in the
package, or remove the test font asset lines under flutter.assets and the
corresponding flutter.fonts entries in pubspec.yaml so no missing-asset
references remain.

5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.44.0

- **BREAKING CHANGE**: Remove `Geist` and `GeistMono` fonts from the package, now the font is retrieved at runtime using the `google_fonts` package. If your app doesn't have internet access, consider bundling it from your app.
- **CHORE**: Bump min Dart SDK version to `3.9.0` to support `google_fonts` properly.

## 0.43.4

- **FIX**: `ShadForm` scroll to form fields without an associated `id`.
Expand Down
4 changes: 4 additions & 0 deletions docs/src/content/docs/packages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ The intl package provides internationalization and localization facilities, incl
### [universal_image](https://pub.dev/packages/universal_image)

Support multiple image formats. Used by the [ShadAvatar](../components/avatar) component.

### [google_fonts](https://pub.dev/packages/google_fonts)

The google_fonts package allows you to easily use any of the fonts from fonts.google.com in your Flutter app.
Binary file added example/fonts/UbuntuMono-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added example/fonts/UbuntuMono-Regular.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion example/lib/pages/typography.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:shadcn_ui/shadcn_ui.dart';
// Example of extension on ShadTextTheme with a custom style.
// which can be retrieved with `ShadTheme.of(context).textTheme.myCustomStyle`.
extension CustomStyleExtension on ShadTextTheme {
TextStyle get myCustomStyle => custom['myCustomStyle']!;
TextStyle? get myCustomStyle => custom['myCustomStyle'];
}

class TypographyPage extends StatelessWidget {
Expand Down
7 changes: 6 additions & 1 deletion example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies:
path: ..
flutter_solidart: ^2.1.0
awesome_flutter_extensions: ^2.0.1
google_fonts: 6.3.2
collection: ^1.18.0
get: ^4.6.6
boxy: ^2.2.1
Expand All @@ -28,5 +27,11 @@ dev_dependencies:

flutter:
uses-material-design: true
fonts:
- family: UbuntuMono
fonts:
- asset: fonts/UbuntuMono-Regular.ttf
- asset: fonts/UbuntuMono-Bold.ttf
weight: 700
assets:
- assets/
1 change: 1 addition & 0 deletions lib/shadcn_ui.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export 'package:boxy/utils.dart';
export 'package:flutter_animate/flutter_animate.dart' hide Effect;
// External libraries
export 'package:flutter_svg/flutter_svg.dart';
export 'package:google_fonts/google_fonts.dart';
export 'package:intl/intl.dart' hide TextDirection;
export 'package:lucide_icons_flutter/lucide_icons.dart';
export 'package:two_dimensional_scrollables/two_dimensional_scrollables.dart';
Expand Down
20 changes: 8 additions & 12 deletions lib/src/components/input_otp.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:shadcn_ui/src/components/disabled.dart';
import 'package:shadcn_ui/src/components/input.dart';
import 'package:shadcn_ui/src/theme/components/decorator.dart';
import 'package:shadcn_ui/src/theme/text_theme/text_styles_default.dart';
import 'package:shadcn_ui/src/theme/text_theme/theme.dart';
import 'package:shadcn_ui/src/theme/theme.dart';
import 'package:shadcn_ui/src/utils/border.dart';
import 'package:shadcn_ui/src/utils/provider.dart';
Expand Down Expand Up @@ -299,13 +300,7 @@ class ShadInputOTPSlot extends StatefulWidget {
final TextInputType? keyboardType;

/// {@template ShadInputOTPSlot.style}
/// The style for the input of the slot, defaults to
/// ```dart
/// textTheme.muted.copyWith(
/// color: theme.colorScheme.foreground,
/// fontFamily: kDefaultFontFamilyMono,
/// )
/// ```
/// The style for the input of the slot.
/// {@endtemplate}
final TextStyle? style;

Expand Down Expand Up @@ -425,10 +420,11 @@ class _ShadInputOTPSlotState extends State<ShadInputOTPSlot> {
final defaultStyle =
widget.style ??
theme.inputOTPTheme.style ??
theme.textTheme.muted.copyWith(
color: theme.colorScheme.foreground,
fontFamily: kDefaultFontFamilyMono,
);
GoogleFonts.geistMono()
.merge(theme.textTheme.muted.omitFamilyAndPackage)
.copyWith(
color: theme.colorScheme.foreground,
);

final firstRadius =
widget.firstRadius ??
Expand Down
135 changes: 42 additions & 93 deletions lib/src/theme/text_theme/text_styles_default.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,214 +1,163 @@
import 'package:flutter/widgets.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:shadcn_ui/src/utils/extensions/text_style.dart';

const kDefaultFontFamily = 'packages/shadcn_ui/Geist';
const kDefaultFontFamilyMono = 'packages/shadcn_ui/GeistMono';
const kDefaultFontFamily = 'Geist';

abstract class ShadTextDefaultTheme {
static TextStyle h1Large({
required String family,
}) {
return TextStyle(
static TextStyle h1Large() {
return GoogleFonts.geist(
fontSize: 48,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w800,
height: 48 / 48,
letterSpacing: -0.4,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle h1({
required String family,
}) {
return TextStyle(
static TextStyle h1() {
return GoogleFonts.geist(
fontSize: 36,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w800,
height: 40 / 36,
letterSpacing: -0.4,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle h2({
required String family,
}) {
return TextStyle(
static TextStyle h2() {
return GoogleFonts.geist(
fontSize: 30,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w600,
height: 36 / 30,
letterSpacing: -0.4,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle h3({
required String family,
}) {
return TextStyle(
static TextStyle h3() {
return GoogleFonts.geist(
fontSize: 24,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w600,
height: 32 / 24,
letterSpacing: -0.4,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle h4({
required String family,
}) {
return TextStyle(
static TextStyle h4() {
return GoogleFonts.geist(
fontSize: 20,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w600,
height: 28 / 20,
letterSpacing: -0.4,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle p({
required String family,
}) {
return TextStyle(
static TextStyle p() {
return GoogleFonts.geist(
fontSize: 16,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
height: 28 / 16,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle blockquote({
required String family,
}) {
return TextStyle(
static TextStyle blockquote() {
return GoogleFonts.geist(
fontSize: 16,
decoration: TextDecoration.none,
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w400,
height: 24 / 16,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle table({
required String family,
}) {
return TextStyle(
static TextStyle table() {
return GoogleFonts.geist(
fontSize: 16,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w700,
height: 24 / 16,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle list({
required String family,
}) {
return TextStyle(
static TextStyle list() {
return GoogleFonts.geist(
fontSize: 16,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
height: 24 / 16,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle lead({
required String family,
}) {
return TextStyle(
static TextStyle lead() {
return GoogleFonts.geist(
fontSize: 20,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
height: 28 / 20,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle large({
required String family,
}) {
return TextStyle(
static TextStyle large() {
return GoogleFonts.geist(
fontSize: 18,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w600,
height: 28 / 18,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle small({
required String family,
}) {
return TextStyle(
static TextStyle small() {
return GoogleFonts.geist(
fontSize: 14,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w500,
height: 14 / 14,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}

static TextStyle muted({
required String family,
}) {
return TextStyle(
static TextStyle muted() {
return GoogleFonts.geist(
fontSize: 14,
decoration: TextDecoration.none,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
height: 20 / 14,
letterSpacing: 0,
fontFamily: family,
textBaseline: TextBaseline.alphabetic,
leadingDistribution: TextLeadingDistribution.even,
);
).fallback(leadingDistribution: TextLeadingDistribution.even);
}
}
Loading