Selaa lähdekoodia

chore: use theme.of(context) text theme in board (#1453)

Richard Shiue 2 vuotta sitten
vanhempi
commit
d7f14db6ab

+ 1 - 2
frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart

@@ -2,7 +2,6 @@ import 'package:app_flowy/plugins/board/application/card/board_text_cell_bloc.da
 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/presentation/widgets/cell/cell_builder.dart';
 import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';
 import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra/size.dart';
-import 'package:flowy_infra/text_style.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/style_widget/text.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';
@@ -153,7 +152,7 @@ class _BoardTextCellState extends State<BoardTextCell> {
         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!.size(FontSizes.s14),
         decoration: InputDecoration(
         decoration: InputDecoration(
           // Magic number 4 makes the textField take up the same space as FlowyText
           // Magic number 4 makes the textField take up the same space as FlowyText
           contentPadding: EdgeInsets.symmetric(
           contentPadding: EdgeInsets.symmetric(

+ 6 - 5
frontend/app_flowy/lib/plugins/board/presentation/card/board_url_cell.dart

@@ -1,7 +1,6 @@
 import 'package:app_flowy/plugins/board/application/card/board_url_cell_bloc.dart';
 import 'package:app_flowy/plugins/board/application/card/board_url_cell_bloc.dart';
 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: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:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:textstyle_extensions/textstyle_extensions.dart';
 import 'package:textstyle_extensions/textstyle_extensions.dart';
@@ -54,10 +53,12 @@ class _BoardUrlCellState extends State<BoardUrlCell> {
                   textAlign: TextAlign.left,
                   textAlign: TextAlign.left,
                   text: TextSpan(
                   text: TextSpan(
                     text: state.content,
                     text: state.content,
-                    style: TextStyles.general(
-                      fontSize: FontSizes.s14,
-                      color: Theme.of(context).colorScheme.onPrimaryContainer,
-                    ).underline,
+                    style: Theme.of(context)
+                        .textTheme
+                        .bodyMedium!
+                        .size(FontSizes.s14)
+                        .textColor(Theme.of(context).colorScheme.primary)
+                        .underline,
                   ),
                   ),
                 ),
                 ),
               ),
               ),