Skip to content

Commit

Permalink
Merge branch 'master' into Fix-auto-fit-column-issue-88
Browse files Browse the repository at this point in the history
  • Loading branch information
stan-at-work committed Jan 11, 2025
2 parents bf47ce7 + 894ede9 commit b905ee2
Show file tree
Hide file tree
Showing 22 changed files with 1,109 additions and 927 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Tests
on:
pull_request:
branches:
- master
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Install Flutter Dependencies
run: flutter pub get
- name: Run Flutter Tests
run: flutter test
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dart.lineLength": 80,
}
1 change: 1 addition & 0 deletions demo/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
debugShowCheckedModeBanner: false,
initialRoute:
kReleaseMode ? HomeScreen.routeName : DevelopmentScreen.routeName,
routes: {
Expand Down
15 changes: 13 additions & 2 deletions demo/lib/screen/home_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:math';

import 'package:demo/screen/empty_screen.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';

Expand Down Expand Up @@ -114,7 +115,8 @@ class HomeScreen extends StatelessWidget {
icon: const FaIcon(FontAwesomeIcons.link),
color: Colors.white,
onPressed: () {
launchUrl('https://pub.dev/packages/pluto_grid_plus');
launchUrl(
'https://pub.dev/packages/pluto_grid_plus');
},
),
const Text(
Expand Down Expand Up @@ -145,7 +147,8 @@ class HomeScreen extends StatelessWidget {
icon: const FaIcon(FontAwesomeIcons.github),
color: Colors.white,
onPressed: () {
launchUrl('https://github.com/doonfrs/pluto_grid_plus');
launchUrl(
'https://github.com/doonfrs/pluto_grid_plus');
},
),
const Text(
Expand Down Expand Up @@ -489,6 +492,14 @@ class PlutoFeatures extends StatelessWidget {
Navigator.pushNamed(context, DarkModeScreen.routeName);
},
),
PlutoListTile.amber(
title: 'Empty',
description:
'This screen is used during development, this is a template to test issues',
onTapLiveDemo: () {
Navigator.pushNamed(context, EmptyScreen.routeName);
},
),
PlutoListTile.amber(
title: 'Development',
description:
Expand Down
174 changes: 88 additions & 86 deletions demo/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,86 +1,88 @@
name: demo
description: PlutoGrid demo app.

# The following line prevents the package from being accidentally published to
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

# The following defines the version and build number for your application.
# A version number is three numbers separated by dots, like 1.2.43
# followed by an optional build number separated by a +.
# Both the version and the builder number may be overridden in flutter
# build by specifying --build-name and --build-number, respectively.
# In Android, build-name is used as versionName while build-number used as versionCode.
# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.0+1

environment:
sdk: ^3.0.0

dependencies:
flutter:
sdk: flutter
pluto_grid_plus: 8.4.3
faker: ^2.1.0
url_launcher: ^6.2.1
font_awesome_flutter: ^10.6.0
rainbow_color: ^2.0.1
pluto_menu_bar: ^3.0.1
file_saver: ^0.2.10
pluto_grid_plus_export: 1.0.5
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

# The following section is specific to Flutter.
flutter:

# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.
uses-material-design: true

# To add assets to your application, add an assets section, like this:
assets:
- assets/images/

fonts:
- family: OpenSans
fonts:
- asset: assets/fonts/open_sans/OpenSans-ExtraBold.ttf
weight: 800
- asset: assets/fonts/open_sans/OpenSans-ExtraBoldItalic.ttf
weight: 800
style: italic
- asset: assets/fonts/open_sans/OpenSans-Bold.ttf
weight: 700
- asset: assets/fonts/open_sans/OpenSans-BoldItalic.ttf
weight: 700
style: italic
- asset: assets/fonts/open_sans/OpenSans-SemiBold.ttf
weight: 600
- asset: assets/fonts/open_sans/OpenSans-SemiBoldItalic.ttf
weight: 600
style: italic
- asset: assets/fonts/open_sans/OpenSans-Regular.ttf
weight: 400
- asset: assets/fonts/open_sans/OpenSans-Italic.ttf
weight: 400
style: italic
- asset: assets/fonts/open_sans/OpenSans-Light.ttf
weight: 300
- asset: assets/fonts/open_sans/OpenSans-LightItalic.ttf
weight: 300
style: italic

name: demo
description: PlutoGrid demo app.

# The following line prevents the package from being accidentally published to
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

# The following defines the version and build number for your application.
# A version number is three numbers separated by dots, like 1.2.43
# followed by an optional build number separated by a +.
# Both the version and the builder number may be overridden in flutter
# build by specifying --build-name and --build-number, respectively.
# In Android, build-name is used as versionName while build-number used as versionCode.
# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.0+1

environment:
sdk: ^3.0.0

dependency_overrides:
pluto_grid_plus:
path: ../

dependencies:
flutter:
sdk: flutter
pluto_grid_plus: 8.4.3
faker: ^2.1.0
url_launcher: ^6.2.1
font_awesome_flutter: ^10.6.0
rainbow_color: ^2.0.1
pluto_menu_bar: ^3.0.1
file_saver: ^0.2.10
pluto_grid_plus_export: 1.0.5
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

# The following section is specific to Flutter.
flutter:
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.
uses-material-design: true

# To add assets to your application, add an assets section, like this:
assets:
- assets/images/

fonts:
- family: OpenSans
fonts:
- asset: assets/fonts/open_sans/OpenSans-ExtraBold.ttf
weight: 800
- asset: assets/fonts/open_sans/OpenSans-ExtraBoldItalic.ttf
weight: 800
style: italic
- asset: assets/fonts/open_sans/OpenSans-Bold.ttf
weight: 700
- asset: assets/fonts/open_sans/OpenSans-BoldItalic.ttf
weight: 700
style: italic
- asset: assets/fonts/open_sans/OpenSans-SemiBold.ttf
weight: 600
- asset: assets/fonts/open_sans/OpenSans-SemiBoldItalic.ttf
weight: 600
style: italic
- asset: assets/fonts/open_sans/OpenSans-Regular.ttf
weight: 400
- asset: assets/fonts/open_sans/OpenSans-Italic.ttf
weight: 400
style: italic
- asset: assets/fonts/open_sans/OpenSans-Light.ttf
weight: 300
- asset: assets/fonts/open_sans/OpenSans-LightItalic.ttf
weight: 300
style: italic
1 change: 1 addition & 0 deletions lib/pluto_grid_plus.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export './src/manager/event/pluto_grid_cannot_move_current_cell_event.dart';
export './src/manager/event/pluto_grid_cell_gesture_event.dart';
export './src/manager/event/pluto_grid_change_column_filter_event.dart';
export './src/manager/event/pluto_grid_change_column_sort_event.dart';
export './src/manager/event/pluto_grid_clear_columns_filter_event.dart';
export './src/manager/event/pluto_grid_drag_rows_event.dart';
export './src/manager/event/pluto_grid_event.dart';
export './src/manager/event/pluto_grid_scroll_update_event.dart';
Expand Down
Loading

0 comments on commit b905ee2

Please sign in to comment.