Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Line calendar #174

Merged
merged 46 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
18aaa5f
First draft
Daviiddoo Aug 12, 2024
7a8b228
fixed build issues
Daviiddoo Aug 14, 2024
ffb1889
styling done
Daviiddoo Aug 18, 2024
c7e5579
Update line_calendar.dart
Daviiddoo Aug 21, 2024
c46c04a
Ready for clean up and testing code
Daviiddoo Aug 21, 2024
7985653
Ready for review?
Daviiddoo Aug 29, 2024
e5f3c22
updated some documentations
Daviiddoo Aug 29, 2024
7b1e043
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Aug 29, 2024
efab2ba
Update line_calendar.dart
Daviiddoo Aug 29, 2024
b8aef00
Fixed some PR issues
Daviiddoo Aug 30, 2024
02ae910
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Aug 30, 2024
0383b1f
Fixed more pr issues
Daviiddoo Sep 1, 2024
d821272
Update installation guide (#197)
Pante Sep 19, 2024
bc7c786
Change button color when hovered over (#198)
Pante Sep 19, 2024
1ae4164
Testing new controller
Daviiddoo Sep 23, 2024
5c45be8
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Sep 23, 2024
90bc4c7
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Sep 29, 2024
3da742f
added controller
Daviiddoo Oct 18, 2024
3e18db8
fixed rebase issues
Daviiddoo Oct 20, 2024
251c6c2
Added lineCalendarController
Daviiddoo Oct 20, 2024
2ccb022
new lineCalendarController with scrollController
Daviiddoo Oct 20, 2024
15d0fb2
reverted to scroll controller with FCalendarController
Daviiddoo Oct 23, 2024
e43eb94
controller limited to FCalendarController.date
Daviiddoo Oct 27, 2024
472d8df
Need to complete Tests, FLineCalendarController removed
Daviiddoo Oct 28, 2024
3976d26
Fixed rebase issues
Daviiddoo Oct 30, 2024
e69f77d
Tests fixed
Daviiddoo Nov 4, 2024
cebf4f1
fixed dart analyser issues
Daviiddoo Nov 4, 2024
b648877
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 4, 2024
86f50e2
Update theme_data.dart
Daviiddoo Nov 4, 2024
35c4370
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 4, 2024
f53e623
Update theme_data.dart
Daviiddoo Nov 4, 2024
d12bfc0
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 4, 2024
4841ed8
fixing rebase issues
Daviiddoo Nov 4, 2024
7f47e31
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 4, 2024
8484992
Update sandbox.dart
Daviiddoo Nov 4, 2024
5e39e8f
Merge branch 'feature/line_calendar' of https://github.com/forus-labs…
Daviiddoo Nov 4, 2024
534bb3b
Update forui/lib/src/widgets/line_calendar/line_calendar.dart
Daviiddoo Nov 4, 2024
75f4e50
Update forui/lib/src/widgets/line_calendar/line_calendar.dart
Daviiddoo Nov 4, 2024
8c84d0c
Apply suggestions from code review
Daviiddoo Nov 4, 2024
a3a36bb
Update forui/lib/src/widgets/line_calendar/line_calendar.dart
Daviiddoo Nov 4, 2024
9d8e0bd
Made some changes
Daviiddoo Nov 5, 2024
59f3976
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 5, 2024
5143268
fixed PR issues
Daviiddoo Nov 7, 2024
f588d19
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Nov 7, 2024
089dc5b
Update line_calendar.dart
Daviiddoo Nov 7, 2024
750f70c
Merge branch 'main' into feature/line_calendar
Daviiddoo Nov 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/pages/docs/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ Forui provides a set of predefined themes that you can use out of the box.
In the example above, we used the `FThemes.zinc.light` theme, which is a light theme variant of the zinc color scheme.

Themes are a very powerful building block in Forui, allowing you to customize the look and feel of your app.
To learn more about themes, refer to the [Themes](/docs/themes) page.
To learn more about themes, refer to the [Themes](/docs/themes) page.
2 changes: 1 addition & 1 deletion forui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,4 @@ The minimum Flutter version has been increased from `3.19.0` to `3.24.0`.

## 0.1.0

* Initial release! 🚀
* Initial release! 🚀
56 changes: 28 additions & 28 deletions forui/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ packages:
dependency: transitive
description:
name: args
sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.5.0"
async:
dependency: transitive
description:
Expand Down Expand Up @@ -82,10 +82,10 @@ packages:
dependency: "direct dev"
description:
name: build_runner
sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
url: "https://pub.dev"
source: hosted
version: "2.4.13"
version: "2.4.12"
build_runner_core:
dependency: transitive
description:
Expand Down Expand Up @@ -154,18 +154,18 @@ packages:
dependency: transitive
description:
name: convert
sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
version: "3.1.1"
crypto:
dependency: transitive
description:
name: crypto
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
url: "https://pub.dev"
source: hosted
version: "3.0.6"
version: "3.0.5"
dart_style:
dependency: transitive
description:
Expand Down Expand Up @@ -202,18 +202,18 @@ packages:
dependency: transitive
description:
name: file
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev"
source: hosted
version: "7.0.1"
version: "7.0.0"
fixnum:
dependency: transitive
description:
name: fixnum
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.0"
flint:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -381,10 +381,10 @@ packages:
dependency: transitive
description:
name: logging
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.2.0"
macros:
dependency: transitive
description:
Expand Down Expand Up @@ -421,10 +421,10 @@ packages:
dependency: transitive
description:
name: mime
sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
version: "1.0.6"
mockito:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -501,10 +501,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
url: "https://pub.dev"
source: hosted
version: "2.2.12"
version: "2.2.10"
path_provider_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -549,10 +549,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
url: "https://pub.dev"
source: hosted
version: "3.1.6"
version: "3.1.5"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -690,10 +690,10 @@ packages:
dependency: transitive
description:
name: typed_data
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.3.2"
vector_graphics:
dependency: transitive
description:
Expand Down Expand Up @@ -762,10 +762,10 @@ packages:
dependency: transitive
description:
name: web
sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.0.0"
web_socket:
dependency: transitive
description:
Expand All @@ -786,18 +786,18 @@ packages:
dependency: transitive
description:
name: win32
sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2"
url: "https://pub.dev"
source: hosted
version: "5.7.0"
version: "5.8.0"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.0.4"
xml:
dependency: transitive
description:
Expand Down
11 changes: 11 additions & 0 deletions forui/lib/src/theme/theme_data.dart
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, would this be an issue if we release 0.7.0 and the line calendar field is left in? @kawaijoe

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:meta/meta.dart';

import 'package:forui/forui.dart';
import 'package:forui/src/theme/breakpoints.dart';
import 'package:forui/src/widgets/line_calendar/line_calendar.dart';

/// Defines the configuration of the overall visual [FTheme] for a widget subtree.
///
Expand Down Expand Up @@ -68,6 +69,9 @@ final class FThemeData with Diagnosticable {
/// The label styles.
final FLabelStyles labelStyles;

/// The line calendar style.
final FLineCalendarStyle lineCalendarStyle;

/// The popover's style.
final FPopoverStyle popoverStyle;

Expand Down Expand Up @@ -129,6 +133,7 @@ final class FThemeData with Diagnosticable {
required this.dividerStyles,
required this.headerStyle,
required this.labelStyles,
required this.lineCalendarStyle,
required this.popoverStyle,
required this.popoverMenuStyle,
required this.progressStyle,
Expand Down Expand Up @@ -171,6 +176,7 @@ final class FThemeData with Diagnosticable {
dividerStyles: FDividerStyles.inherit(colorScheme: colorScheme, style: style),
headerStyle: FHeaderStyles.inherit(colorScheme: colorScheme, typography: typography, style: style),
labelStyles: FLabelStyles.inherit(style: style),
lineCalendarStyle: FLineCalendarStyle.inherit(colorScheme: colorScheme, style: style, typography: typography),
popoverStyle: FPopoverStyle.inherit(colorScheme: colorScheme, style: style),
popoverMenuStyle: FPopoverMenuStyle.inherit(colorScheme: colorScheme, style: style, typography: typography),
progressStyle: FProgressStyle.inherit(colorScheme: colorScheme, style: style),
Expand Down Expand Up @@ -247,6 +253,7 @@ final class FThemeData with Diagnosticable {
FDividerStyles? dividerStyles,
FHeaderStyles? headerStyle,
FLabelStyles? labelStyles,
FLineCalendarStyle? lineCalendarStyle,
FPopoverStyle? popoverStyle,
FPopoverMenuStyle? popoverMenuStyle,
FProgressStyle? progressStyle,
Expand Down Expand Up @@ -278,6 +285,7 @@ final class FThemeData with Diagnosticable {
dividerStyles: dividerStyles ?? this.dividerStyles,
headerStyle: headerStyle ?? this.headerStyle,
labelStyles: labelStyles ?? this.labelStyles,
lineCalendarStyle: lineCalendarStyle ?? this.lineCalendarStyle,
popoverStyle: popoverStyle ?? this.popoverStyle,
popoverMenuStyle: popoverMenuStyle ?? this.popoverMenuStyle,
progressStyle: progressStyle ?? this.progressStyle,
Expand Down Expand Up @@ -314,6 +322,7 @@ final class FThemeData with Diagnosticable {
..add(DiagnosticsProperty('dividerStyles', dividerStyles, level: DiagnosticLevel.debug))
..add(DiagnosticsProperty('headerStyle', headerStyle, level: DiagnosticLevel.debug))
..add(DiagnosticsProperty('labelStyles', labelStyles, level: DiagnosticLevel.debug))
..add(DiagnosticsProperty('lineCalendarStyle', lineCalendarStyle))
..add(DiagnosticsProperty('popoverStyle', popoverStyle, level: DiagnosticLevel.debug))
..add(DiagnosticsProperty('popoverMenuStyle', popoverMenuStyle, level: DiagnosticLevel.debug))
..add(DiagnosticsProperty('progressStyle', progressStyle, level: DiagnosticLevel.debug))
Expand Down Expand Up @@ -351,6 +360,7 @@ final class FThemeData with Diagnosticable {
dividerStyles == other.dividerStyles &&
headerStyle == other.headerStyle &&
labelStyles == other.labelStyles &&
lineCalendarStyle == other.lineCalendarStyle &&
popoverStyle == other.popoverStyle &&
popoverMenuStyle == other.popoverMenuStyle &&
progressStyle == other.progressStyle &&
Expand Down Expand Up @@ -384,6 +394,7 @@ final class FThemeData with Diagnosticable {
dividerStyles.hashCode ^
headerStyle.hashCode ^
labelStyles.hashCode ^
lineCalendarStyle.hashCode ^
popoverStyle.hashCode ^
popoverMenuStyle.hashCode ^
progressStyle.hashCode ^
Expand Down
Loading
Loading