chore: port more const textstyles to theme provider styles (#1477)

* chore: port more const textstyles to theme provider styles

* style: unnecessary or use shared text fontSizes

* fix: build error from merging main

Co-authored-by: Nathan.fooo <86001920+appflowy@users.noreply.github.com>
This commit is contained in:
Richard Shiue 2022-11-30 15:11:32 +08:00 committed by GitHub
parent 3b3b61e67c
commit aa85970b0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 21 additions and 46 deletions

View file

@ -338,12 +338,11 @@ class RowCountBadge extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
FlowyText.regular( FlowyText.medium(
'${LocaleKeys.grid_row_count.tr()} : ', '${LocaleKeys.grid_row_count.tr()} : ',
fontSize: 13,
color: Theme.of(context).hintColor, color: Theme.of(context).hintColor,
), ),
FlowyText.regular(rowCount.toString(), fontSize: 13), FlowyText.medium(rowCount.toString()),
], ],
), ),
); );

View file

@ -1,6 +1,5 @@
import 'package:flowy_infra/color_extension.dart'; import 'package:flowy_infra/color_extension.dart';
import 'package:flowy_infra/image.dart'; import 'package:flowy_infra/image.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart'; import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -73,7 +72,7 @@ class _PrimaryCellAccessoryState extends State<PrimaryCellAccessory>
} else { } else {
return Tooltip( return Tooltip(
message: LocaleKeys.tooltip_openAsPage.tr(), message: LocaleKeys.tooltip_openAsPage.tr(),
textStyle: TextStyles.caption.textColor(Colors.white), textStyle: AFThemeExtension.of(context).caption.textColor(Colors.white),
child: svgWidget( child: svgWidget(
"grid/expander", "grid/expander",
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.primary,

View file

@ -1,11 +1,8 @@
import 'dart:async'; import 'dart:async';
import 'package:app_flowy/startup/startup.dart'; import 'package:app_flowy/startup/startup.dart';
import 'package:app_flowy/plugins/grid/application/prelude.dart'; import 'package:app_flowy/plugins/grid/application/prelude.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:textstyle_extensions/textstyle_extensions.dart';
import '../../layout/sizes.dart'; import '../../layout/sizes.dart';
import 'cell_builder.dart'; import 'cell_builder.dart';
@ -57,7 +54,7 @@ class _NumberCellState extends GridFocusNodeCellState<GridNumberCell> {
onEditingComplete: () => focusNode.unfocus(), onEditingComplete: () => focusNode.unfocus(),
onSubmitted: (_) => focusNode.unfocus(), onSubmitted: (_) => focusNode.unfocus(),
maxLines: 1, maxLines: 1,
style: TextStyles.body1.size(FontSizes.s14), style: Theme.of(context).textTheme.bodyMedium,
textInputAction: TextInputAction.done, textInputAction: TextInputAction.done,
decoration: const InputDecoration( decoration: const InputDecoration(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,

View file

@ -206,7 +206,6 @@ class _SelectOptionWrapState extends State<SelectOptionWrap> {
if (widget.selectOptions.isEmpty && widget.cellStyle != null) { if (widget.selectOptions.isEmpty && widget.cellStyle != null) {
child = FlowyText.medium( child = FlowyText.medium(
widget.cellStyle!.placeholder, widget.cellStyle!.placeholder,
fontSize: 14,
color: Theme.of(context).hintColor, color: Theme.of(context).hintColor,
); );
} else { } else {

View file

@ -1,13 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'package:app_flowy/plugins/grid/presentation/widgets/cell/prelude.dart'; import 'package:app_flowy/plugins/grid/presentation/widgets/cell/prelude.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:app_flowy/startup/startup.dart'; import 'package:app_flowy/startup/startup.dart';
import 'package:app_flowy/plugins/grid/application/prelude.dart'; import 'package:app_flowy/plugins/grid/application/prelude.dart';
import '../../layout/sizes.dart'; import '../../layout/sizes.dart';
import 'package:textstyle_extensions/textstyle_extensions.dart';
import 'cell_builder.dart'; import 'cell_builder.dart';
class GridTextCellStyle extends GridCellStyle { class GridTextCellStyle extends GridCellStyle {
@ -72,7 +69,7 @@ class _GridTextCellState extends GridFocusNodeCellState<GridTextCell> {
onChanged: (value) => focusChanged(), onChanged: (value) => focusChanged(),
onEditingComplete: () => focusNode.unfocus(), onEditingComplete: () => focusNode.unfocus(),
maxLines: null, maxLines: null,
style: TextStyles.body1.size(FontSizes.s14), style: Theme.of(context).textTheme.bodyMedium,
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: EdgeInsets.only( contentPadding: EdgeInsets.only(
top: GridSize.cellContentInsets.top, top: GridSize.cellContentInsets.top,

View file

@ -1,12 +1,9 @@
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart'; import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';
import 'package:app_flowy/plugins/grid/application/cell/url_cell_editor_bloc.dart'; import 'package:app_flowy/plugins/grid/application/cell/url_cell_editor_bloc.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dart:async'; import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:textstyle_extensions/textstyle_extensions.dart';
class URLCellEditor extends StatefulWidget { class URLCellEditor extends StatefulWidget {
final GridURLCellController cellController; final GridURLCellController cellController;
@ -45,7 +42,7 @@ class _URLCellEditorState extends State<URLCellEditor> {
controller: _controller, controller: _controller,
onChanged: (value) => focusChanged(), onChanged: (value) => focusChanged(),
maxLines: null, maxLines: null,
style: TextStyles.body1.size(FontSizes.s14), style: Theme.of(context).textTheme.bodyMedium,
decoration: const InputDecoration( decoration: const InputDecoration(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
border: InputBorder.none, border: InputBorder.none,

View file

@ -5,14 +5,12 @@ import 'package:app_flowy/workspace/presentation/home/toast.dart';
import 'package:appflowy_popover/appflowy_popover.dart'; import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/image.dart'; import 'package:flowy_infra/image.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:app_flowy/plugins/grid/application/prelude.dart'; import 'package:app_flowy/plugins/grid/application/prelude.dart';
import 'package:textstyle_extensions/textstyle_extensions.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../../layout/sizes.dart'; import '../../../layout/sizes.dart';
import '../cell_accessory.dart'; import '../cell_accessory.dart';
@ -119,15 +117,10 @@ class _GridURLCellState extends GridCellState<GridURLCell> {
builder: (context, state) { builder: (context, state) {
final richText = Padding( final richText = Padding(
padding: GridSize.cellContentInsets, padding: GridSize.cellContentInsets,
child: RichText( child: FlowyText.medium(
textAlign: TextAlign.left, state.content,
text: TextSpan( color: Theme.of(context).colorScheme.primary,
text: state.content, decoration: TextDecoration.underline,
style: TextStyles.general(
fontSize: FontSizes.s14,
color: Theme.of(context).colorScheme.primaryContainer,
).underline,
),
), ),
); );

View file

@ -37,7 +37,7 @@ class ChoiceChipButton extends StatelessWidget {
child: FlowyButton( child: FlowyButton(
decoration: decoration, decoration: decoration,
useIntrinsicWidth: true, useIntrinsicWidth: true,
text: FlowyText(filterInfo.fieldInfo.name, fontSize: 12), text: FlowyText(filterInfo.fieldInfo.name),
margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
radius: const BorderRadius.all(Radius.circular(14)), radius: const BorderRadius.all(Radius.circular(14)),
leftIcon: svgWidget( leftIcon: svgWidget(

View file

@ -157,7 +157,7 @@ class _FilterPropertyCell extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FlowyButton( return FlowyButton(
text: FlowyText.medium(fieldInfo.name, fontSize: 12), text: FlowyText.medium(fieldInfo.name),
onTap: () => onTap(fieldInfo), onTap: () => onTap(fieldInfo),
leftIcon: svgWidget( leftIcon: svgWidget(
fieldInfo.fieldType.iconName(), fieldInfo.fieldType.iconName(),

View file

@ -99,10 +99,7 @@ class _AddFilterButtonState extends State<AddFilterButton> {
SizedBox( SizedBox(
height: 28, height: 28,
child: FlowyButton( child: FlowyButton(
text: FlowyText( text: FlowyText(LocaleKeys.grid_settings_addFilter.tr()),
LocaleKeys.grid_settings_addFilter.tr(),
fontSize: 12,
),
useIntrinsicWidth: true, useIntrinsicWidth: true,
hoverColor: AFThemeExtension.of(context).lightGreyHover, hoverColor: AFThemeExtension.of(context).lightGreyHover,
leftIcon: svgWidget( leftIcon: svgWidget(

View file

@ -1,7 +1,5 @@
import 'package:flowy_infra/size.dart'; import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:textstyle_extensions/textstyle_extensions.dart';
class FilterTextField extends StatefulWidget { class FilterTextField extends StatefulWidget {
final String hintText; final String hintText;
@ -51,7 +49,7 @@ class FilterTextFieldState extends State<FilterTextField> {
widget.onSubmitted?.call(text); widget.onSubmitted?.call(text);
}, },
maxLines: 1, maxLines: 1,
style: TextStyles.body1.size(FontSizes.s12), style: Theme.of(context).textTheme.bodyMedium,
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: const EdgeInsets.all(10), contentPadding: const EdgeInsets.all(10),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(

View file

@ -14,7 +14,7 @@ class GridAddRowButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FlowyButton( return FlowyButton(
text: FlowyText.medium(LocaleKeys.grid_row_newRow.tr(), fontSize: 12), text: FlowyText.medium(LocaleKeys.grid_row_newRow.tr()),
hoverColor: AFThemeExtension.of(context).lightGreyHover, hoverColor: AFThemeExtension.of(context).lightGreyHover,
onTap: () => context.read<GridBloc>().add(const GridEvent.createRow()), onTap: () => context.read<GridBloc>().add(const GridEvent.createRow()),
leftIcon: svgWidget( leftIcon: svgWidget(

View file

@ -4,7 +4,6 @@ import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';
import 'package:appflowy_popover/appflowy_popover.dart'; import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:dartz/dartz.dart' show none; import 'package:dartz/dartz.dart' show none;
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/text_style.dart';
import 'package:flowy_infra_ui/style_widget/button.dart'; import 'package:flowy_infra_ui/style_widget/button.dart';
import 'package:flowy_infra_ui/style_widget/text.dart'; import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/rounded_input_field.dart'; import 'package:flowy_infra_ui/widget/rounded_input_field.dart';
@ -186,9 +185,7 @@ class _FieldNameTextFieldState extends State<_FieldNameTextField> {
return RoundedInputField( return RoundedInputField(
height: 36, height: 36,
focusNode: focusNode, focusNode: focusNode,
style: TextStyles.general( style: Theme.of(context).textTheme.bodyMedium,
fontSize: 13,
),
controller: controller, controller: controller,
errorText: context.read<FieldEditorBloc>().state.errorText, errorText: context.read<FieldEditorBloc>().state.errorText,
onChanged: (newName) { onChanged: (newName) {

View file

@ -3,6 +3,7 @@ import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart'
import 'package:appflowy_popover/appflowy_popover.dart'; import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/color_extension.dart'; import 'package:flowy_infra/color_extension.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/button.dart'; import 'package:flowy_infra_ui/style_widget/button.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -34,7 +35,7 @@ class _FilterButtonState extends State<FilterButton> {
height: 26, height: 26,
child: FlowyTextButton( child: FlowyTextButton(
LocaleKeys.grid_settings_filter.tr(), LocaleKeys.grid_settings_filter.tr(),
fontSize: 14, fontSize: FontSizes.s14,
fontColor: textColor, fontColor: textColor,
fillColor: Colors.transparent, fillColor: Colors.transparent,
hoverColor: AFThemeExtension.of(context).lightGreyHover, hoverColor: AFThemeExtension.of(context).lightGreyHover,

View file

@ -4,6 +4,7 @@ import 'package:app_flowy/plugins/grid/application/setting/setting_bloc.dart';
import 'package:appflowy_popover/appflowy_popover.dart'; import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/color_extension.dart'; import 'package:flowy_infra/color_extension.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/button.dart'; import 'package:flowy_infra_ui/style_widget/button.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -49,7 +50,7 @@ class _SettingButtonState extends State<SettingButton> {
triggerActions: PopoverTriggerFlags.none, triggerActions: PopoverTriggerFlags.none,
child: FlowyTextButton( child: FlowyTextButton(
LocaleKeys.settings_title.tr(), LocaleKeys.settings_title.tr(),
fontSize: 14, fontSize: FontSizes.s14,
fillColor: Colors.transparent, fillColor: Colors.transparent,
hoverColor: AFThemeExtension.of(context).lightGreyHover, hoverColor: AFThemeExtension.of(context).lightGreyHover,
padding: const EdgeInsets.symmetric(vertical: 2, horizontal: 6), padding: const EdgeInsets.symmetric(vertical: 2, horizontal: 6),