Skip to content

Commit 7b80839

Browse files
authored
Merge pull request #7 from Iconica-Development/1.1.0
1.1.0
2 parents 8f33c14 + 528dc5c commit 7b80839

13 files changed

Lines changed: 128 additions & 138 deletions

File tree

.github/workflows/flutter.yml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
1-
name: CI
1+
name: Iconica Standard Component CI Workflow
2+
# Workflow Caller version: 1.0.0
23

34
on:
4-
push:
5-
branches: [ master ]
65
pull_request:
7-
branches:
8-
- master
9-
- feature/*
10-
- bugfix/*
11-
- hotfix/*
6+
workflow_dispatch:
127

138
jobs:
14-
lint:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/cache@v3
19-
with:
20-
path: |
21-
~/.gradle/wrapper
22-
/opt/hostedtoolcache/flutter
23-
key: ${{ runner.OS }}-flutter-install-cache
24-
- uses: subosito/flutter-action@v2
25-
with:
26-
channel: 'stable'
27-
- name: Flutter pub get
28-
run: flutter pub get
29-
- name: Flutter format
30-
run: flutter format -o none --set-exit-if-changed .
31-
- name: Flutter analyze
32-
run: flutter analyze
9+
call-global-iconica-workflow:
10+
uses: Iconica-Development/.github/.github/workflows/component-ci.yml@master
11+
secrets: inherit
12+
permissions: write-all

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ migrate_working_dir/
2828
.dart_tool/
2929
.packages
3030
build/
31+
.metadata
3132

3233
example/android/
3334
example/ios/

.metadata

Lines changed: 0 additions & 10 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@
1010

1111
* Added horizontal variant
1212
* Adjustable size for the component
13+
14+
## [1.1.0] - 17 August 2023
15+
16+
* Set scrolling to the current time by default if there are no blocks

example/.metadata

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
8-
channel: stable
7+
revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
17-
base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
18-
- platform: ios
19-
create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
20-
base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
16+
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
17+
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
18+
- platform: web
19+
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
20+
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
2121

2222
# User provided section
2323

example/lib/main.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: BSD-3-Clause
44

55
import 'package:flutter/material.dart';
6-
import 'package:timetable/timetable.dart';
6+
import 'package:flutter_timetable/timetable.dart';
77

88
void main() {
99
runApp(const MaterialApp(home: TimetableDemo()));
@@ -27,8 +27,8 @@ class _TimetableDemoState extends State<TimetableDemo> {
2727
child: Container(
2828
color: Colors.red,
2929
child: const Padding(
30-
padding: const EdgeInsets.all(8.0),
31-
child: const Text(
30+
padding: EdgeInsets.all(8.0),
31+
child: Text(
3232
'Exercise',
3333
style: TextStyle(color: Colors.white),
3434
),
@@ -42,8 +42,8 @@ class _TimetableDemoState extends State<TimetableDemo> {
4242
child: Container(
4343
color: Colors.orange,
4444
child: const Padding(
45-
padding: const EdgeInsets.all(8.0),
46-
child: const Text(
45+
padding: EdgeInsets.all(8.0),
46+
child: Text(
4747
'Brunch',
4848
style: TextStyle(color: Colors.white),
4949
),

example/pubspec.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.10.0"
11+
version: "2.11.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
@@ -21,10 +21,10 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.2.1"
27+
version: "1.3.0"
2828
clock:
2929
dependency: transitive
3030
description:
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.0"
43+
version: "1.17.2"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -66,63 +66,62 @@ packages:
6666
dependency: "direct dev"
6767
description:
6868
name: flutter_lints
69-
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
69+
sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
7070
url: "https://pub.dev"
7171
source: hosted
72-
version: "2.0.1"
72+
version: "2.0.2"
7373
flutter_test:
7474
dependency: "direct dev"
7575
description: flutter
7676
source: sdk
7777
version: "0.0.0"
78-
js:
79-
dependency: transitive
78+
flutter_timetable:
79+
dependency: "direct main"
8080
description:
81-
name: js
82-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
83-
url: "https://pub.dev"
84-
source: hosted
85-
version: "0.6.5"
81+
path: ".."
82+
relative: true
83+
source: path
84+
version: "1.1.0"
8685
lints:
8786
dependency: transitive
8887
description:
8988
name: lints
90-
sha256: "5cfd6509652ff5e7fe149b6df4859e687fca9048437857cb2e65c8d780f396e3"
89+
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
9190
url: "https://pub.dev"
9291
source: hosted
93-
version: "2.0.0"
92+
version: "2.1.1"
9493
matcher:
9594
dependency: transitive
9695
description:
9796
name: matcher
98-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
97+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
9998
url: "https://pub.dev"
10099
source: hosted
101-
version: "0.12.13"
100+
version: "0.12.16"
102101
material_color_utilities:
103102
dependency: transitive
104103
description:
105104
name: material_color_utilities
106-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
105+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
107106
url: "https://pub.dev"
108107
source: hosted
109-
version: "0.2.0"
108+
version: "0.5.0"
110109
meta:
111110
dependency: transitive
112111
description:
113112
name: meta
114-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
113+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
115114
url: "https://pub.dev"
116115
source: hosted
117-
version: "1.8.0"
116+
version: "1.9.1"
118117
path:
119118
dependency: transitive
120119
description:
121120
name: path
122-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
121+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
123122
url: "https://pub.dev"
124123
source: hosted
125-
version: "1.8.2"
124+
version: "1.8.3"
126125
sky_engine:
127126
dependency: transitive
128127
description: flutter
@@ -132,10 +131,10 @@ packages:
132131
dependency: transitive
133132
description:
134133
name: source_span
135-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
134+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
136135
url: "https://pub.dev"
137136
source: hosted
138-
version: "1.9.1"
137+
version: "1.10.0"
139138
stack_trace:
140139
dependency: transitive
141140
description:
@@ -172,17 +171,10 @@ packages:
172171
dependency: transitive
173172
description:
174173
name: test_api
175-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
174+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
176175
url: "https://pub.dev"
177176
source: hosted
178-
version: "0.4.16"
179-
timetable:
180-
dependency: "direct main"
181-
description:
182-
path: ".."
183-
relative: true
184-
source: path
185-
version: "1.0.0"
177+
version: "0.6.0"
186178
vector_math:
187179
dependency: transitive
188180
description:
@@ -191,6 +183,14 @@ packages:
191183
url: "https://pub.dev"
192184
source: hosted
193185
version: "2.1.4"
186+
web:
187+
dependency: transitive
188+
description:
189+
name: web
190+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
191+
url: "https://pub.dev"
192+
source: hosted
193+
version: "0.1.4-beta"
194194
sdks:
195-
dart: ">=2.18.0 <3.0.0"
195+
dart: ">=3.1.0-185.0.dev <4.0.0"
196196
flutter: ">=1.17.0"

example/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ description: Timetable Widget
33

44
publish_to: 'none'
55

6-
version: 1.0.0+1
6+
version: 1.1.0+2
77

88
environment:
9-
sdk: ">=2.17.6 <3.0.0"
9+
sdk: ">=3.0.0 <4.0.0"
1010

1111
dependencies:
1212
flutter:
1313
sdk: flutter
1414

1515
cupertino_icons: ^1.0.2
16-
timetable:
16+
flutter_timetable:
1717
path: ../
1818

1919
dev_dependencies:

lib/src/block_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: BSD-3-Clause
44

55
import 'package:flutter/material.dart';
6-
import 'package:timetable/src/models/time_block.dart';
6+
import 'package:flutter_timetable/src/models/time_block.dart';
77

88
/// Combine blocks that have the same id and the same time.
99
List<TimeBlock> combineBlocksWithId(List<TimeBlock> blocks) {

0 commit comments

Comments
 (0)