Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: kanban card icon not displaying (#5181)

Browse Source
This commit is contained in:
Richard Shiue 2024-04-29 09:30:51 +08:00 committed by GitHub
parent 044dad1d3e
commit 0b94e2b25d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
View File

@ -12,6 +12,7 @@ import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart'; import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart'; import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart';
import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart'; import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';
import 'package:appflowy/plugins/database/widgets/card/card_bloc.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dart'; import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dart';
import 'package:appflowy/plugins/database/widgets/row/row_detail.dart'; import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart'; import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';
@ -278,7 +279,7 @@ class _DesktopBoardContentState extends State<DesktopBoardContent> {
context: context, context: context,
databaseController: databaseController, databaseController: databaseController,
groupId: groupData.group.groupId, groupId: groupData.group.groupId,
rowMeta: rowMeta, rowMeta: context.read<CardBloc>().state.rowMeta,
), ),
styleConfiguration: RowCardStyleConfiguration( styleConfiguration: RowCardStyleConfiguration(
cellStyleMap: desktopBoardCardCellStyleMap(context), cellStyleMap: desktopBoardCardCellStyleMap(context),

36
frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart
View File

@ -5,6 +5,7 @@ import 'package:appflowy/plugins/database/application/cell/cell_controller_build
import 'package:appflowy/plugins/database/application/database_controller.dart'; import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart'; import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart'; import 'package:flowy_infra_ui/widget/flowy_tooltip.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';
@ -128,20 +129,17 @@ class _TextCellState extends State<TextCardCell> {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
final icon = _buildIcon(state, isTitle);
final child = state.enableEdit || focusWhenInit final child = state.enableEdit || focusWhenInit
? _buildTextField() ? _buildTextField()
: _buildText(state, isTitle); : _buildText(state, isTitle);
return Row( return Row(
children: [ children: [
if (isTitle && widget.showNotes) if (icon != null) ...[
FlowyTooltip( icon,
message: LocaleKeys.board_notesTooltip.tr(), const HSpace(4.0),
child: FlowySvg( ],
FlowySvgs.notes_s,
color: Theme.of(context).hintColor,
),
),
Expanded(child: child), Expanded(child: child),
], ],
); );
@ -158,6 +156,28 @@ class _TextCellState extends State<TextCardCell> {
super.dispose(); super.dispose();
} }
Widget? _buildIcon(TextCellState state, bool isTitle) {
if (!isTitle) {
return null;
}
if (state.emoji.isNotEmpty) {
return Text(
state.emoji,
style: widget.style.titleTextStyle,
);
}
if (widget.showNotes) {
return FlowyTooltip(
message: LocaleKeys.board_notesTooltip.tr(),
child: FlowySvg(
FlowySvgs.notes_s,
color: Theme.of(context).hintColor,
),
);
}
return null;
}
Widget _buildText(TextCellState state, bool isTitle) { Widget _buildText(TextCellState state, bool isTitle) {
final text = state.content.isEmpty final text = state.content.isEmpty
? isTitle ? isTitle