Skip to content

Commit

Permalink
fix: dependencies (#76)
Browse files Browse the repository at this point in the history
deps: Update intl
chore: Update licenses
  • Loading branch information
thelukewalton authored May 20, 2024
1 parent ce0b5d1 commit db8345a
Show file tree
Hide file tree
Showing 7 changed files with 202 additions and 26 deletions.
155 changes: 149 additions & 6 deletions LICENSE-3RD-PARTY
Original file line number Diff line number Diff line change
@@ -1,11 +1,154 @@
# THIRD PARTY LICENSES

---

### Flutter

Applies to:

- material_switch.dart

Copyright 2014 The Flutter Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

---

MIT
applies to:
- tinycolor
### tinycolor

SIL Open Font License, Version 1.1
applies to:
- IBMPlexSans
Applies to:

- color_extensions.dart

Copyright 2018 Foo Studio <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---

### IBM Plex Sans

Applies to:

- IBMPlexSans-light.otf
- IBMPlexSans-medium.otf
- IBMPlexSans-regular.otf

Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"

This Font Software is licensed under the SIL Open Font License, Version 1.1.

This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

---

## SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1. Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2. Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3. No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5. The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
2 changes: 1 addition & 1 deletion example/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec

Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
cached_network_image: ^3.3.1
flutter:
sdk: flutter
go_router: ^11.1.2
go_router: ^14.1.2
path_drawing: ^1.0.1
shared_preferences: ^2.2.2
zeta_flutter:
Expand Down
47 changes: 46 additions & 1 deletion lib/src/components/switch/material_switch.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
// ignore_for_file: prefer_asserts_with_message, diagnostic_describe_all_properties, public_member_api_docs
// ignore_for_file: prefer_asserts_with_message, public_member_api_docs

// The content of this file is taken from
// package:flutter/src/material/switch.dart
// Changes are commented with "Zeta change:"

// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-3RD-PARTY file.

import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -83,6 +88,39 @@ class MaterialSwitch extends StatefulWidget {

@override
State<StatefulWidget> createState() => _MaterialSwitchState();
@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
properties
..add(DiagnosticsProperty<bool>('value', value))
..add(ObjectFlagProperty<ValueChanged<bool>?>.has('onChanged', onChanged))
..add(ColorProperty('activeColor', activeColor))
..add(ColorProperty('activeTrackColor', activeTrackColor))
..add(ColorProperty('inactiveThumbColor', inactiveThumbColor))
..add(ColorProperty('inactiveTrackColor', inactiveTrackColor))
..add(DiagnosticsProperty<ImageProvider<Object>?>('activeThumbImage', activeThumbImage))
..add(ObjectFlagProperty<ImageErrorListener?>.has('onActiveThumbImageError', onActiveThumbImageError))
..add(DiagnosticsProperty<ImageProvider<Object>?>('inactiveThumbImage', inactiveThumbImage))
..add(ObjectFlagProperty<ImageErrorListener?>.has('onInactiveThumbImageError', onInactiveThumbImageError))
..add(DiagnosticsProperty<WidgetStateProperty<Color?>?>('thumbColor', thumbColor))
..add(DiagnosticsProperty<WidgetStateProperty<Color?>?>('trackColor', trackColor))
..add(DiagnosticsProperty<WidgetStateProperty<Color?>?>('trackOutlineColor', trackOutlineColor))
..add(DiagnosticsProperty<WidgetStateProperty<double?>?>('trackOutlineWidth', trackOutlineWidth))
..add(DiagnosticsProperty<WidgetStateProperty<Icon?>?>('thumbIcon', thumbIcon))
..add(EnumProperty<MaterialTapTargetSize?>('materialTapTargetSize', materialTapTargetSize))
..add(EnumProperty<DragStartBehavior>('dragStartBehavior', dragStartBehavior))
..add(DiagnosticsProperty<MouseCursor?>('mouseCursor', mouseCursor))
..add(ColorProperty('focusColor', focusColor))
..add(ColorProperty('hoverColor', hoverColor))
..add(DiagnosticsProperty<WidgetStateProperty<Color?>?>('overlayColor', overlayColor))
..add(DoubleProperty('splashRadius', splashRadius))
..add(DiagnosticsProperty<FocusNode?>('focusNode', focusNode))
..add(ObjectFlagProperty<ValueChanged<bool>?>.has('onFocusChange', onFocusChange))
..add(DiagnosticsProperty<bool>('autofocus', autofocus))
..add(DiagnosticsProperty<bool>('showHover', showHover))
..add(DiagnosticsProperty<Size?>('thumbSize', thumbSize))
..add(DiagnosticsProperty<Size>('size', size));
}
}

class _MaterialSwitchState extends State<MaterialSwitch> with TickerProviderStateMixin, ToggleableStateMixin {
Expand Down Expand Up @@ -1091,6 +1129,13 @@ class _SwitchDefaultsM3 extends SwitchThemeData {
// but not we use `size.height` for this.
@override
double get splashRadius => size.height / 2 + 8;
@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
properties
..add(DiagnosticsProperty<BuildContext>('context', context))
..add(DiagnosticsProperty<Size>('size', size));
}
}

class _SwitchConfigM3 with _SwitchConfig {
Expand Down
4 changes: 3 additions & 1 deletion lib/src/theme/color_extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import 'contrast.dart';
/// can get a shade for gradients.
///
/// Some of the extensions are rewrites of TinyColor's functions
/// https://pub.dev/packages/tinycolor. The TinyColor algorithms have also
/// https://pub.dev/packages/tinycolor. See LICENSE-3RD-PARTY.
///
/// The TinyColor algorithms have also
/// been modified to use Flutter's HSLColor class instead of the custom one in
/// the TinyColor lib. The functions from TinyColor re-implemented as Color
/// extensions here are [brighten], [lighten] and [darken]. They are used
Expand Down
14 changes: 0 additions & 14 deletions lib/src/utils/extensions.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';

import '../../zeta_flutter.dart';

Expand Down Expand Up @@ -111,16 +110,3 @@ extension StringExtensions on String? {
return '${this![0].toUpperCase()}${this!.substring(1).toLowerCase()}';
}
}

/// Extensions on [DateFormat]
extension DateFormatExtensions on DateFormat {
//NOTE: this function is a part of intl 0.19.0.
/// Parses a string to a DateTime
DateTime? tryParseStrict(String inputString) {
try {
return parseStrict(inputString);
} on FormatException {
return null;
}
}
}
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies:
flutter:
sdk: flutter
flutter_slidable: ^3.1.0
intl: ^0.18.1
intl: ^0.19.0
mask_text_input_formatter: ^2.9.0
web: ^0.5.0
web: ^0.5.1

dev_dependencies:
zds_analysis: ^1.0.0
Expand Down

0 comments on commit db8345a

Please sign in to comment.