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

feat: cell border

Browse Source
This commit is contained in:
appflowy 2022-03-08 22:58:43 +08:00
parent 54cf451826
commit 808d848f62
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/cell_container.dart
View File

@ -1,5 +1,7 @@
import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';
import 'package:flowy_infra/theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class CellContainer extends StatelessWidget {
final Widget child;
@ -12,6 +14,9 @@ class CellContainer extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = context.watch<AppTheme>();
final borderSide = BorderSide(color: theme.shader4, width: 0.4);
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {},
@ -19,6 +24,9 @@ class CellContainer extends StatelessWidget {
constraints: BoxConstraints(
maxWidth: width,
),
decoration: BoxDecoration(
border: Border(right: borderSide, bottom: borderSide),
),
padding: EdgeInsets.symmetric(vertical: GridInsets.vertical, horizontal: GridInsets.horizontal),
child: Center(child: IntrinsicHeight(child: child)),
),

17
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_cell.dart
View File

@ -102,27 +102,14 @@ class RowLeading extends StatelessWidget {
return Row(
children: const [
CreateRowButton(),
DrawRowButton(),
],
);
}
return const Spacer();
return const SizedBox.expand();
},
);
// return GestureDetector(
// behavior: HitTestBehavior.translucent,
// onTap: () {},
// child: MouseHoverBuilder(
// builder: (_, isHovered) => Container(
// width: GridSize.startHeaderPadding,
// decoration: CellDecoration.box(
// color: isHovered ? Colors.red.withOpacity(.1) : Colors.white,
// ),
// padding: EdgeInsets.symmetric(vertical: GridInsets.vertical, horizontal: GridInsets.horizontal),
// ),
// ),
// );
}
}

3
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_row.dart
View File

@ -1,5 +1,6 @@
import 'package:app_flowy/startup/startup.dart';
import 'package:app_flowy/workspace/application/grid/prelude.dart';
import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';
import 'package:flowy_infra_ui/widget/mouse_hover_builder.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@ -41,7 +42,7 @@ class GridRowWidget extends StatelessWidget {
List<Widget> _buildCells() {
return [
RowLeading(rowId: data.row.id),
SizedBox(width: GridSize.startHeaderPadding, child: RowLeading(rowId: data.row.id)),
...data.fields.map(
(field) {
final cellData = data.cellMap[field.id];

4
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header.dart
View File

@ -40,9 +40,7 @@ class GridHeader extends StatelessWidget {
fields.asMap().forEach((index, field) {
final header = HeaderCellContainer(
width: field.width.toDouble(),
child: HeaderCell(
field,
),
child: HeaderCell(field),
);
//

38
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header_cell.dart
View File

@ -1,6 +1,10 @@
import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';
import 'package:flowy_infra/theme.dart';
import 'package:flowy_infra_ui/style_widget/button.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'constants.dart';
class HeaderCell extends StatelessWidget {
@ -9,10 +13,16 @@ class HeaderCell extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Text(
field.name,
style: const TextStyle(fontSize: 15.0, color: Colors.black),
final theme = context.watch<AppTheme>();
return FlowyButton(
text: FlowyText.medium(field.name),
hoverColor: theme.hover,
onTap: () {},
);
// return Text(
// field.name,
// style: const TextStyle(fontSize: 15.0, color: Colors.black),
// );
}
}
@ -23,18 +33,15 @@ class HeaderCellContainer extends StatelessWidget {
@override
Widget build(BuildContext context) {
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {},
child: Container(
width: width,
decoration: BoxDecoration(
border: Border.all(color: Colors.black26, width: 0.5),
color: GridHeaderConstants.backgroundColor,
),
padding: EdgeInsets.symmetric(vertical: GridInsets.vertical, horizontal: GridInsets.horizontal),
child: child,
final theme = context.watch<AppTheme>();
final borderSide = BorderSide(color: theme.shader4, width: 0.4);
return Container(
width: width,
decoration: BoxDecoration(
border: Border(top: borderSide, right: borderSide, bottom: borderSide),
),
padding: EdgeInsets.symmetric(vertical: GridInsets.vertical, horizontal: GridInsets.horizontal),
child: child,
);
}
}
@ -44,9 +51,8 @@ class HeaderCellLeading extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
return SizedBox(
width: GridSize.startHeaderPadding,
color: GridHeaderConstants.backgroundColor,
);
}
}