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

fix flutter version 3.27 compatible #71

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions example/lib/theme_page.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:timelines/timelines.dart';

Expand Down Expand Up @@ -74,7 +73,7 @@ class _ThemePageState extends State<ThemePage> {
children: [
Text(
'TimelineTheme',
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
),
_ThemeDropdown(
title: 'Direction',
Expand Down Expand Up @@ -140,7 +139,7 @@ class _ThemePageState extends State<ThemePage> {
children: [
Text(
'IndicatorTheme',
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
),
_ThemeDropdown<Color?>(
title: 'Color',
Expand Down Expand Up @@ -192,7 +191,7 @@ class _ThemePageState extends State<ThemePage> {
children: [
Text(
'ConnectorTheme',
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
),
_ThemeDropdown<Color?>(
title: 'Color',
Expand Down
2 changes: 1 addition & 1 deletion example/lib/widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class NavigationCard extends StatelessWidget with NavigateMixin {
}
}

class TitleAppBar extends StatelessWidget with PreferredSizeWidget {
class TitleAppBar extends StatelessWidget implements PreferredSizeWidget {
TitleAppBar(
this.title, {
Key? key,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/connector_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class ConnectorThemeData with Diagnosticable {

@override
int get hashCode {
return hashValues(
return Object.hash(
color,
space,
thickness,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/indicator_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class IndicatorThemeData with Diagnosticable {
}

@override
int get hashCode => hashValues(color, size, position);
int get hashCode => Object.hash(color, size, position);

@override
bool operator ==(Object other) {
Expand Down
3 changes: 1 addition & 2 deletions lib/src/timeline_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:ui';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

import 'connector_theme.dart';
import 'indicator_theme.dart';
Expand Down Expand Up @@ -343,7 +342,7 @@ class TimelineThemeData with Diagnosticable {
indicatorTheme,
connectorTheme,
];
return hashList(values);
return Object.hashAll(values);
}

@override
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/chulwoo-park/timelines/
issue_tracker: https://github.com/chulwoo-park/timelines/issues

environment:
sdk: '>=2.12.0 <3.0.0'
sdk: '>=2.14.0 <3.0.0'
flutter: '>=1.17.0'

dependencies:
Expand Down