diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index 328d54a..4075bc2 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -1,32 +1,12 @@ -name: CI +name: Iconica Standard Component CI Workflow +# Workflow Caller version: 1.0.0 on: - push: - branches: [ master ] pull_request: - branches: - - master - - feature/* - - bugfix/* - - hotfix/* + workflow_dispatch: jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/wrapper - /opt/hostedtoolcache/flutter - key: ${{ runner.OS }}-flutter-install-cache - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - - name: Flutter pub get - run: flutter pub get - - name: Flutter format - run: dart format -o none --set-exit-if-changed . - - name: Flutter analyze - run: flutter analyze + call-global-iconica-workflow: + uses: Iconica-Development/.github/.github/workflows/component-ci.yml@master + secrets: inherit + permissions: write-all \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4365314..62a864e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,6 @@ migrate_working_dir/ .dart_tool/ .packages build/ +.metadata coverage/ \ No newline at end of file diff --git a/.metadata b/.metadata deleted file mode 100644 index 7b724eb..0000000 --- a/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - channel: stable - -project_type: package diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d5623..e43b237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.1.0] - 17 August 2023 + +- Updated flutter_timetable to version 1.1.0 +- Updated flutter_date_time_picker to XXX + ## [1.0.0] - 27 December 2022 * Added option for custom Widget when there are no events for a given day diff --git a/analysis_options.yaml b/analysis_options.yaml index 0530d9c..0ce240c 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -25,8 +25,6 @@ linter: empty_statements: true hash_and_equals: true invariant_booleans: true - iterable_contains_unrelated_type: true - list_remove_unrelated_type: true literal_only_boolean_expressions: true no_adjacent_strings_in_list: true no_duplicate_case_values: true @@ -206,7 +204,6 @@ linter: void_checks: true # pub rules depend_on_referenced_packages: true - lowercase_with_underscores: true secure_pubspec_urls: false sort_pub_dependencies: false diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index 0530d9c..0ce240c 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -25,8 +25,6 @@ linter: empty_statements: true hash_and_equals: true invariant_booleans: true - iterable_contains_unrelated_type: true - list_remove_unrelated_type: true literal_only_boolean_expressions: true no_adjacent_strings_in_list: true no_duplicate_case_values: true @@ -206,7 +204,6 @@ linter: void_checks: true # pub rules depend_on_referenced_packages: true - lowercase_with_underscores: true secure_pubspec_urls: false sort_pub_dependencies: false diff --git a/example/lib/main.dart b/example/lib/main.dart index 64880e3..001adb0 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -23,7 +23,7 @@ class AgendaDemo extends StatelessWidget { body: AgendaWidget( header: Text( 'Agenda', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), blockDimension: 50, highlightToday: false, diff --git a/example/pubspec.lock b/example/pubspec.lock index 95c1570..6901e39 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0" + version: "1.1.0" flutter_date_time_picker: dependency: transitive description: @@ -91,6 +91,15 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_timetable: + dependency: transitive + description: + path: "." + ref: "1.1.0" + resolved-ref: "528dc5c2408e12ffa641706aa4466ae650fc2275" + url: "https://github.com/Iconica-Development/flutter_timetable" + source: git + version: "1.1.0" intl: dependency: transitive description: @@ -99,14 +108,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.17.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" lints: dependency: transitive description: @@ -119,18 +120,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -156,10 +157,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -196,19 +197,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" - timetable: - dependency: transitive - description: - path: "." - ref: "1.0.0" - resolved-ref: dada4ea9a440bcfe58a235dfd93798e4d5ce857a - url: "https://github.com/Iconica-Development/flutter_timetable" - source: git - version: "0.0.2" + version: "0.6.0" vector_math: dependency: transitive description: @@ -217,6 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.0.0" diff --git a/lib/flutter_agenda.dart b/lib/flutter_agenda.dart index 0ff9740..5499ea6 100644 --- a/lib/flutter_agenda.dart +++ b/lib/flutter_agenda.dart @@ -8,4 +8,4 @@ export 'package:flutter_agenda/src/agenda.dart'; export 'package:flutter_agenda/src/models/agenda_event.dart'; export 'package:flutter_agenda/src/models/agenda_theme.dart'; -export 'package:timetable/timetable.dart'; +export 'package:flutter_timetable/timetable.dart'; diff --git a/lib/src/agenda.dart b/lib/src/agenda.dart index d1cf9ab..a0734e8 100644 --- a/lib/src/agenda.dart +++ b/lib/src/agenda.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_agenda/src/models/agenda_event.dart'; import 'package:flutter_agenda/src/models/agenda_theme.dart'; import 'package:flutter_date_time_picker/flutter_date_time_picker.dart'; -import 'package:timetable/timetable.dart'; +import 'package:flutter_timetable/timetable.dart'; class AgendaWidget extends StatefulWidget { /// [AgendaWidget] is a widget that displays a timetable with events. diff --git a/lib/src/models/agenda_theme.dart b/lib/src/models/agenda_theme.dart index a3e7d27..372866d 100644 --- a/lib/src/models/agenda_theme.dart +++ b/lib/src/models/agenda_theme.dart @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter_date_time_picker/flutter_date_time_picker.dart'; -import 'package:timetable/timetable.dart'; +import 'package:flutter_timetable/timetable.dart'; class AgendaTheme { /// [AgendaTheme] is a class that contains all styling options diff --git a/pubspec.yaml b/pubspec.yaml index f088a0d..6567f12 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_agenda description: Agenda widget with an underlying timetable included -version: 1.0.0 +version: 1.1.0 homepage: https://github.com/Iconica-Development/flutter_agenda publish_to: none @@ -16,10 +16,10 @@ dependencies: git: url: https://github.com/Iconica-Development/flutter_date_time_picker ref: 2.2.1 - timetable: + flutter_timetable: git: url: https://github.com/Iconica-Development/flutter_timetable - ref: 1.0.0 + ref: 1.1.0 dev_dependencies: flutter_test: