Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: grid theming to bottom row count number (#3510)

Lakhan Bahetifd4088aed060
diff --git a/frontend/appflowy_flutter/integration_test/util/database_test_op.dart b/frontend/appflowy_flutter/integration_test/util/database_test_op.dart
index 3ae390fa62..7505bd88a9 100644
--- a/frontend/appflowy_flutter/integration_test/util/database_test_op.dart
+++ b/frontend/appflowy_flutter/integration_test/util/database_test_op.dart
@@ -899,9 +899,7 @@ extension AppFlowyDatabaseTest on WidgetTester {
}
Future<void> assertRowCountInGridPage(int num) async {
- final text = find.byWidgetPredicate(
- (widget) => widget is FlowyText && widget.text == rowCountString(num),
- );
+ final text = find.text('${rowCountString()} $num',findRichText: true);
expect(text, findsOneWidget);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart
index 8546ca3d96..09da116783 100755
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart
@@ -5,10 +5,10 @@ import 'package:appflowy/plugins/database_view/tar_bar/setting_menu.dart';
import 'package:appflowy/plugins/database_view/widgets/row/cell_builder.dart';
import 'package:appflowy_backend/log.dart';
import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui_web.dart';
import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';
import 'package:flowy_infra_ui/style_widget/scrolling/styled_scrollview.dart';
-import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/error_page.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -410,14 +410,21 @@ class _GridFooter extends StatelessWidget {
builder: (context, rowCount) {
return Padding(
padding: GridSize.contentInsets,
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- children: [
- FlowyText.medium(
- rowCountString(rowCount),
- color: Theme.of(context).hintColor,
- ),
- ],
+ child: RichText(
+ text: TextSpan(
+ text: rowCountString(),
+ style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+ color: Theme.of(context).hintColor,
+ ),
+ children: [
+ TextSpan(
+ text: ' $rowCount',
+ style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+ color: AFThemeExtension.of(context).gridRowCountColor,
+ ),
+ ),
+ ],
+ ),
),
);
},
@@ -425,6 +432,6 @@ class _GridFooter extends StatelessWidget {
}
}
-String rowCountString(int count) {
- return '${LocaleKeys.grid_row_count.tr()} : $count';
+String rowCountString() {
+ return '${LocaleKeys.grid_row_count.tr()} :';
}
diff --git a/frontend/appflowy_flutter/lib/workspace/application/appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
index 9ea685c99c..926cdb4d09 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
@@ -434,6 +434,7 @@ class AppearanceSettingsState with _$AppearanceSettingsState {
progressBarBGColor: theme.progressBarBGColor,
toggleButtonBGColor: theme.toggleButtonBGColor,
calendarWeekendBGColor: theme.calendarWeekendBGColor,
+ gridRowCountColor: theme.gridRowCountColor,
code: _getFontStyle(
fontFamily: monospaceFontFamily,
fontColor: theme.shader3,
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
index b51b671514..0319a2108e 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
@@ -86,6 +86,8 @@ class FlowyColorScheme {
final Color toolbarColor;
final Color toggleButtonBGColor;
final Color calendarWeekendBGColor;
+ //grid bottom count color
+ final Color gridRowCountColor;
const FlowyColorScheme({
required this.surface,
@@ -135,6 +137,7 @@ class FlowyColorScheme {
required this.toolbarColor,
required this.toggleButtonBGColor,
required this.calendarWeekendBGColor,
+ required this.gridRowCountColor,
});
factory FlowyColorScheme.fromJson(Map<String, dynamic> json) =>
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
index 73bd257e33..ff420d955f 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
@@ -73,6 +73,7 @@ class DandelionColorScheme extends FlowyColorScheme {
toolbarColor: _lightShader1,
toggleButtonBGColor: _lightShader5,
calendarWeekendBGColor: const Color(0xFFFBFBFC),
+ gridRowCountColor: _black,
);
const DandelionColorScheme.dark()
@@ -124,5 +125,6 @@ class DandelionColorScheme extends FlowyColorScheme {
toolbarColor: _darkInput,
toggleButtonBGColor: _darkShader1,
calendarWeekendBGColor: const Color(0xff121212),
+ gridRowCountColor: _darkMain1,
);
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
index c965766a12..408fb08eda 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
@@ -71,6 +71,7 @@ class DefaultColorScheme extends FlowyColorScheme {
toolbarColor: _lightShader1,
toggleButtonBGColor: _lightShader5,
calendarWeekendBGColor: const Color(0xFFFBFBFC),
+ gridRowCountColor: const Color(0xff000000),
);
const DefaultColorScheme.dark()
@@ -122,5 +123,6 @@ class DefaultColorScheme extends FlowyColorScheme {
toolbarColor: _darkInput,
toggleButtonBGColor: _darkShader1,
calendarWeekendBGColor: const Color(0xff121212),
+ gridRowCountColor: _darkMain1,
);
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dart
index 1de275192d..90debfb47a 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dart
@@ -74,6 +74,7 @@ class LavenderColorScheme extends FlowyColorScheme {
toolbarColor: _lightShader1,
toggleButtonBGColor: _lightSelector,
calendarWeekendBGColor: const Color(0xFFFBFBFC),
+ gridRowCountColor: _black,
);
const LavenderColorScheme.dark()
@@ -125,5 +126,6 @@ class LavenderColorScheme extends FlowyColorScheme {
toolbarColor: _darkInput,
toggleButtonBGColor: _darkShader1,
calendarWeekendBGColor: const Color(0xff121212),
+ gridRowCountColor: _darkMain1,
);
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dart
index 089c33b057..fa0bb264a7 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dart
@@ -25,6 +25,7 @@ class AFThemeExtension extends ThemeExtension<AFThemeExtension> {
final Color calloutBGColor;
final Color tableCellBGColor;
final Color calendarWeekendBGColor;
+ final Color gridRowCountColor;
final TextStyle code;
final TextStyle callout;
@@ -55,6 +56,7 @@ class AFThemeExtension extends ThemeExtension<AFThemeExtension> {
required this.caption,
required this.progressBarBGColor,
required this.toggleButtonBGColor,
+ required this.gridRowCountColor,
});
static AFThemeExtension of(BuildContext context) {
@@ -84,6 +86,7 @@ class AFThemeExtension extends ThemeExtension<AFThemeExtension> {
Color? progressBarBGColor,
Color? toggleButtonBGColor,
Color? calendarWeekendBGColor,
+ Color? gridRowCountColor,
TextStyle? code,
TextStyle? callout,
TextStyle? caption,
@@ -111,6 +114,7 @@ class AFThemeExtension extends ThemeExtension<AFThemeExtension> {
toggleButtonBGColor: toggleButtonBGColor ?? this.toggleButtonBGColor,
calendarWeekendBGColor:
calendarWeekendBGColor ?? this.calendarWeekendBGColor,
+ gridRowCountColor: gridRowCountColor ?? this.gridRowCountColor,
code: code ?? this.code,
callout: callout ?? this.callout,
caption: caption ?? this.caption,
@@ -149,6 +153,8 @@ class AFThemeExtension extends ThemeExtension<AFThemeExtension> {
Color.lerp(toggleButtonBGColor, other.toggleButtonBGColor, t)!,
calendarWeekendBGColor:
Color.lerp(calendarWeekendBGColor, other.calendarWeekendBGColor, t)!,
+ gridRowCountColor: Color.lerp(
+ gridRowCountColor, other.gridRowCountColor, t)!,
code: other.code,
callout: other.callout,
caption: other.caption,