diff --git a/README.md b/README.md
index 5f18c90..b059938 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
# Steampunk Clock for Flutter Clock contest
-This project is **one of the winning submissions** in **Google's & Lenovo** dev/design contest, called "***Flutter Clock***" (with **over 850** valid entries from around the world). You can read more about this contest here: [flutter.dev/clock](https://flutter.dev/clock)
+This project is **one of the winning submissions** in **Google & Lenovo** dev/design contest, called "***Flutter Clock***" (with **over 850** valid entries from around the world). You can read more about this contest here: [flutter.dev/clock](https://flutter.dev/clock).
diff --git a/analog_clock/README.md b/analog_clock/README.md
index e58dd2b..743e242 100644
--- a/analog_clock/README.md
+++ b/analog_clock/README.md
@@ -15,7 +15,7 @@
## Description
-Here you will find a code base of this Steampunk Flutter Clock project and it’s guided by the contest rules, you can read more about this rules here: [flutter.dev/clock](https://flutter.dev/clock).
+Here you will find a code base of this Steampunk Flutter Clock project (with 100% test coverage) that was guided by the contest rules, you can read more about this rules here: [flutter.dev/clock](https://flutter.dev/clock).
## Licenses
diff --git a/analog_clock/coverage/html/gcov.css b/analog_clock/coverage/html/gcov.css
index bfd0a83..0fcdff1 100644
--- a/analog_clock/coverage/html/gcov.css
+++ b/analog_clock/coverage/html/gcov.css
@@ -2,27 +2,27 @@
body
{
color: #000000;
- background-color: #FFFFFF;
+ background-color: #ffffff;
}
/* All views: standard link format*/
a:link
{
- color: #284FA8;
+ color: #284fa8;
text-decoration: underline;
}
/* All views: standard link - visited format */
a:visited
{
- color: #00CB40;
+ color: #00cb40;
text-decoration: underline;
}
/* All views: standard link - activated format */
a:active
{
- color: #FF0040;
+ color: #ff0040;
text-decoration: underline;
}
@@ -52,7 +52,7 @@ td.headerItem
td.headerValue
{
text-align: left;
- color: #284FA8;
+ color: #284fa8;
font-family: sans-serif;
font-weight: bold;
white-space: nowrap;
@@ -74,13 +74,13 @@ td.headerCovTableHead
td.headerCovTableEntry
{
text-align: right;
- color: #284FA8;
+ color: #284fa8;
font-family: sans-serif;
font-weight: bold;
white-space: nowrap;
padding-left: 12px;
padding-right: 4px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
}
/* All views: header item coverage table entry for high coverage rate */
@@ -93,7 +93,7 @@ td.headerCovTableEntryHi
white-space: nowrap;
padding-left: 12px;
padding-right: 4px;
- background-color: #A7FC9D;
+ background-color: #a7fc9d;
}
/* All views: header item coverage table entry for medium coverage rate */
@@ -106,7 +106,7 @@ td.headerCovTableEntryMed
white-space: nowrap;
padding-left: 12px;
padding-right: 4px;
- background-color: #FFEA20;
+ background-color: #ffea20;
}
/* All views: header item coverage table entry for ow coverage rate */
@@ -119,7 +119,7 @@ td.headerCovTableEntryLo
white-space: nowrap;
padding-left: 12px;
padding-right: 4px;
- background-color: #FF0000;
+ background-color: #ff0000;
}
/* All views: header legend value for legend entry */
@@ -136,7 +136,7 @@ td.headerValueLeg
/* All views: color of horizontal ruler */
td.ruler
{
- background-color: #6688D4;
+ background-color: #6688d4;
}
/* All views: version string format */
@@ -153,8 +153,8 @@ td.versionInfo
td.tableHead
{
text-align: center;
- color: #FFFFFF;
- background-color: #6688D4;
+ color: #ffffff;
+ background-color: #6688d4;
font-family: sans-serif;
font-size: 120%;
font-weight: bold;
@@ -174,8 +174,8 @@ td.coverFile
text-align: left;
padding-left: 10px;
padding-right: 20px;
- color: #284FA8;
- background-color: #DAE7FE;
+ color: #284fa8;
+ background-color: #dae7fe;
font-family: monospace;
}
@@ -184,7 +184,7 @@ td.coverBar
{
padding-left: 10px;
padding-right: 10px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
}
/* Directory view/File view (all): bar-graph outline color */
@@ -200,7 +200,7 @@ td.coverPerHi
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #A7FC9D;
+ background-color: #a7fc9d;
font-weight: bold;
font-family: sans-serif;
}
@@ -212,7 +212,7 @@ td.coverNumHi
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #A7FC9D;
+ background-color: #a7fc9d;
white-space: nowrap;
font-family: sans-serif;
}
@@ -224,7 +224,7 @@ td.coverPerMed
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #FFEA20;
+ background-color: #ffea20;
font-weight: bold;
font-family: sans-serif;
}
@@ -236,7 +236,7 @@ td.coverNumMed
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #FFEA20;
+ background-color: #ffea20;
white-space: nowrap;
font-family: sans-serif;
}
@@ -248,7 +248,7 @@ td.coverPerLo
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #FF0000;
+ background-color: #ff0000;
font-weight: bold;
font-family: sans-serif;
}
@@ -260,7 +260,7 @@ td.coverNumLo
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #FF0000;
+ background-color: #ff0000;
white-space: nowrap;
font-family: sans-serif;
}
@@ -282,7 +282,7 @@ a.detail:visited
/* File view (all): "show/hide details" link - activated format */
a.detail:active
{
- color: #FFFFFF;
+ color: #ffffff;
font-size:80%;
}
@@ -291,7 +291,7 @@ td.testName
{
text-align: right;
padding-right: 10px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
font-family: sans-serif;
}
@@ -301,7 +301,7 @@ td.testPer
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
font-family: sans-serif;
}
@@ -311,7 +311,7 @@ td.testNum
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
font-family: sans-serif;
}
@@ -329,7 +329,7 @@ td.testDescription
padding-left: 30px;
padding-bottom: 10px;
padding-right: 30px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
}
/* Source code view: function entry */
@@ -338,8 +338,8 @@ td.coverFn
text-align: left;
padding-left: 10px;
padding-right: 20px;
- color: #284FA8;
- background-color: #DAE7FE;
+ color: #284fa8;
+ background-color: #dae7fe;
font-family: monospace;
}
@@ -349,7 +349,7 @@ td.coverFnLo
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #FF0000;
+ background-color: #ff0000;
font-weight: bold;
font-family: sans-serif;
}
@@ -360,7 +360,7 @@ td.coverFnHi
text-align: right;
padding-left: 10px;
padding-right: 10px;
- background-color: #DAE7FE;
+ background-color: #dae7fe;
font-weight: bold;
font-family: sans-serif;
}
@@ -376,14 +376,14 @@ pre.source
/* Source code view: line number format */
span.lineNum
{
- background-color: #EFE383;
+ background-color: #efe383;
}
/* Source code view: format for lines which were executed */
td.lineCov,
span.lineCov
{
- background-color: #CAD7FE;
+ background-color: #cad7fe;
}
/* Source code view: format for Cov legend */
@@ -392,14 +392,14 @@ span.coverLegendCov
padding-left: 10px;
padding-right: 10px;
padding-bottom: 2px;
- background-color: #CAD7FE;
+ background-color: #cad7fe;
}
/* Source code view: format for lines which were not executed */
td.lineNoCov,
span.lineNoCov
{
- background-color: #FF6230;
+ background-color: #ff6230;
}
/* Source code view: format for NoCov legend */
@@ -408,14 +408,14 @@ span.coverLegendNoCov
padding-left: 10px;
padding-right: 10px;
padding-bottom: 2px;
- background-color: #FF6230;
+ background-color: #ff6230;
}
/* Source code view (function table): standard link - visited format */
td.lineNoCov > a:visited,
td.lineCov > a:visited
{
- color: black;
+ color: #000000;
text-decoration: underline;
}
@@ -423,27 +423,27 @@ td.lineCov > a:visited
previous version */
span.lineDiffCov
{
- background-color: #B5F7AF;
+ background-color: #b5f7af;
}
/* Source code view: format for branches which were executed
* and taken */
span.branchCov
{
- background-color: #CAD7FE;
+ background-color: #cad7fe;
}
/* Source code view: format for branches which were executed
* but not taken */
span.branchNoCov
{
- background-color: #FF6230;
+ background-color: #ff6230;
}
/* Source code view: format for branches which were not executed */
span.branchNoExec
{
- background-color: #FF6230;
+ background-color: #ff6230;
}
/* Source code view: format for the source code heading line */
@@ -463,7 +463,7 @@ td.headerValueLegL
white-space: nowrap;
padding-left: 4px;
padding-right: 2px;
- background-color: #FF0000;
+ background-color: #ff0000;
font-size: 80%;
}
@@ -475,7 +475,7 @@ td.headerValueLegM
white-space: nowrap;
padding-left: 2px;
padding-right: 2px;
- background-color: #FFEA20;
+ background-color: #ffea20;
font-size: 80%;
}
@@ -487,7 +487,7 @@ td.headerValueLegH
white-space: nowrap;
padding-left: 2px;
padding-right: 4px;
- background-color: #A7FC9D;
+ background-color: #a7fc9d;
font-size: 80%;
}
@@ -497,7 +497,7 @@ span.coverLegendCovLo
padding-left: 10px;
padding-right: 10px;
padding-top: 2px;
- background-color: #FF0000;
+ background-color: #ff0000;
}
/* All views except source code view: legend format for med coverage */
@@ -506,7 +506,7 @@ span.coverLegendCovMed
padding-left: 10px;
padding-right: 10px;
padding-top: 2px;
- background-color: #FFEA20;
+ background-color: #ffea20;
}
/* All views except source code view: legend format for hi coverage */
@@ -515,5 +515,5 @@ span.coverLegendCovHi
padding-left: 10px;
padding-right: 10px;
padding-top: 2px;
- background-color: #A7FC9D;
+ background-color: #a7fc9d;
}
diff --git a/analog_clock/coverage/html/index-sort-f.html b/analog_clock/coverage/html/index-sort-f.html
index 9a1e795..7b5b6f1 100644
--- a/analog_clock/coverage/html/index-sort-f.html
+++ b/analog_clock/coverage/html/index-sort-f.html
@@ -37,7 +37,7 @@
-
+
|
@@ -85,7 +85,7 @@
diff --git a/analog_clock/coverage/html/index-sort-l.html b/analog_clock/coverage/html/index-sort-l.html
index cf03302..320c6de 100644
--- a/analog_clock/coverage/html/index-sort-l.html
+++ b/analog_clock/coverage/html/index-sort-l.html
@@ -37,7 +37,7 @@
-
+
|
@@ -85,7 +85,7 @@
diff --git a/analog_clock/coverage/html/index.html b/analog_clock/coverage/html/index.html
index f8b399f..0604e03 100644
--- a/analog_clock/coverage/html/index.html
+++ b/analog_clock/coverage/html/index.html
@@ -37,7 +37,7 @@
-
+
|
@@ -85,7 +85,7 @@
diff --git a/analog_clock/coverage/html/lib/analog_clock.dart.func-sort-c.html b/analog_clock/coverage/html/lib/analog_clock.dart.func-sort-c.html
index eb8947b..7858abc 100644
--- a/analog_clock/coverage/html/lib/analog_clock.dart.func-sort-c.html
+++ b/analog_clock/coverage/html/lib/analog_clock.dart.func-sort-c.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/analog_clock.dart.func.html b/analog_clock/coverage/html/lib/analog_clock.dart.func.html
index 478d8df..8635878 100644
--- a/analog_clock/coverage/html/lib/analog_clock.dart.func.html
+++ b/analog_clock/coverage/html/lib/analog_clock.dart.func.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/analog_clock.dart.gcov.html b/analog_clock/coverage/html/lib/analog_clock.dart.gcov.html
index 60ec103..5ab3ac9 100644
--- a/analog_clock/coverage/html/lib/analog_clock.dart.gcov.html
+++ b/analog_clock/coverage/html/lib/analog_clock.dart.gcov.html
@@ -37,7 +37,7 @@
-
+
|
@@ -124,7 +124,7 @@
diff --git a/analog_clock/coverage/html/lib/index-sort-f.html b/analog_clock/coverage/html/lib/index-sort-f.html
index 8ac7c1d..6dd51ad 100644
--- a/analog_clock/coverage/html/lib/index-sort-f.html
+++ b/analog_clock/coverage/html/lib/index-sort-f.html
@@ -37,7 +37,7 @@
-
+
|
@@ -70,32 +70,32 @@
Functions  |
- | time_animation_controller.dart |
+ analog_clock.dart |
|
100.0 % |
- 26 / 26 |
+ 15 / 15 |
- |
0 / 0 |
- | analog_clock.dart |
+ temperature_converter.dart |
|
100.0 % |
- 15 / 15 |
+ 4 / 4 |
- |
0 / 0 |
- | temperature_converter.dart |
+ time_animation_controller.dart |
|
100.0 % |
- 4 / 4 |
+ 26 / 26 |
- |
0 / 0 |
@@ -115,7 +115,7 @@
diff --git a/analog_clock/coverage/html/lib/index-sort-l.html b/analog_clock/coverage/html/lib/index-sort-l.html
index e5e16f2..98cb4f1 100644
--- a/analog_clock/coverage/html/lib/index-sort-l.html
+++ b/analog_clock/coverage/html/lib/index-sort-l.html
@@ -37,7 +37,7 @@
-
+
|
@@ -115,7 +115,7 @@
diff --git a/analog_clock/coverage/html/lib/index.html b/analog_clock/coverage/html/lib/index.html
index 718b5ea..5189c31 100644
--- a/analog_clock/coverage/html/lib/index.html
+++ b/analog_clock/coverage/html/lib/index.html
@@ -37,7 +37,7 @@
-
+
|
@@ -115,7 +115,7 @@
diff --git a/analog_clock/coverage/html/lib/main.dart.func-sort-c.html b/analog_clock/coverage/html/lib/main.dart.func-sort-c.html
index a6ffd56..39ecabc 100644
--- a/analog_clock/coverage/html/lib/main.dart.func-sort-c.html
+++ b/analog_clock/coverage/html/lib/main.dart.func-sort-c.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/main.dart.func.html b/analog_clock/coverage/html/lib/main.dart.func.html
index cb6d0b8..1c2f8ce 100644
--- a/analog_clock/coverage/html/lib/main.dart.func.html
+++ b/analog_clock/coverage/html/lib/main.dart.func.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/main.dart.gcov.html b/analog_clock/coverage/html/lib/main.dart.gcov.html
index e2437a1..8c15e7c 100644
--- a/analog_clock/coverage/html/lib/main.dart.gcov.html
+++ b/analog_clock/coverage/html/lib/main.dart.gcov.html
@@ -37,7 +37,7 @@
-
+
|
@@ -84,13 +84,13 @@
22 :
23 : /// Warm the animation cache up so we can return it later,
24 : /// for testing purposes only.
- 25 6 : final cache = await cachedActor(assetProvider);
+ 25 4 : final cache = await cachedActor(assetProvider);
26 :
27 : /// Run clock in full-screen mode.
- 28 4 : await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+ 28 2 : await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
29 :
30 : /// Run clock in landscape mode.
- 31 4 : await SystemChrome.setPreferredOrientations(
+ 31 2 : await SystemChrome.setPreferredOrientations(
32 2 : [DeviceOrientation.landscapeRight, DeviceOrientation.landscapeLeft],
33 : );
34 :
@@ -112,7 +112,7 @@
diff --git a/analog_clock/coverage/html/lib/temperature_converter.dart.func-sort-c.html b/analog_clock/coverage/html/lib/temperature_converter.dart.func-sort-c.html
index eaec3fb..0eed8a5 100644
--- a/analog_clock/coverage/html/lib/temperature_converter.dart.func-sort-c.html
+++ b/analog_clock/coverage/html/lib/temperature_converter.dart.func-sort-c.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/temperature_converter.dart.func.html b/analog_clock/coverage/html/lib/temperature_converter.dart.func.html
index 53a8fa4..f06c856 100644
--- a/analog_clock/coverage/html/lib/temperature_converter.dart.func.html
+++ b/analog_clock/coverage/html/lib/temperature_converter.dart.func.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/temperature_converter.dart.gcov.html b/analog_clock/coverage/html/lib/temperature_converter.dart.gcov.html
index 5039b87..360350f 100644
--- a/analog_clock/coverage/html/lib/temperature_converter.dart.gcov.html
+++ b/analog_clock/coverage/html/lib/temperature_converter.dart.gcov.html
@@ -37,7 +37,7 @@
-
+
|
@@ -91,7 +91,7 @@
diff --git a/analog_clock/coverage/html/lib/time_animation_controller.dart.func-sort-c.html b/analog_clock/coverage/html/lib/time_animation_controller.dart.func-sort-c.html
index 04ca11f..89a7475 100644
--- a/analog_clock/coverage/html/lib/time_animation_controller.dart.func-sort-c.html
+++ b/analog_clock/coverage/html/lib/time_animation_controller.dart.func-sort-c.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/time_animation_controller.dart.func.html b/analog_clock/coverage/html/lib/time_animation_controller.dart.func.html
index 9297f9b..bbd9492 100644
--- a/analog_clock/coverage/html/lib/time_animation_controller.dart.func.html
+++ b/analog_clock/coverage/html/lib/time_animation_controller.dart.func.html
@@ -37,7 +37,7 @@
-
+
|
@@ -64,7 +64,7 @@
diff --git a/analog_clock/coverage/html/lib/time_animation_controller.dart.gcov.html b/analog_clock/coverage/html/lib/time_animation_controller.dart.gcov.html
index da9eed0..96c078d 100644
--- a/analog_clock/coverage/html/lib/time_animation_controller.dart.gcov.html
+++ b/analog_clock/coverage/html/lib/time_animation_controller.dart.gcov.html
@@ -37,7 +37,7 @@
-
+
|
@@ -170,7 +170,7 @@
diff --git a/analog_clock/coverage/lcov.info b/analog_clock/coverage/lcov.info
index 8c48fe3..b809b28 100644
--- a/analog_clock/coverage/lcov.info
+++ b/analog_clock/coverage/lcov.info
@@ -6,17 +6,6 @@ DA:22,12
LF:4
LH:4
end_of_record
-SF:lib/main.dart
-DA:14,2
-DA:17,2
-DA:25,6
-DA:28,4
-DA:31,4
-DA:32,2
-DA:41,2
-LF:7
-LH:7
-end_of_record
SF:lib/analog_clock.dart
DA:16,6
DA:18,2
@@ -66,3 +55,14 @@ DA:100,2
LF:26
LH:26
end_of_record
+SF:lib/main.dart
+DA:14,2
+DA:17,2
+DA:25,4
+DA:28,2
+DA:31,2
+DA:32,2
+DA:41,2
+LF:7
+LH:7
+end_of_record
diff --git a/analog_clock/lib/time_animation_controller.dart b/analog_clock/lib/time_animation_controller.dart
index f04cbe9..f72e70b 100644
--- a/analog_clock/lib/time_animation_controller.dart
+++ b/analog_clock/lib/time_animation_controller.dart
@@ -21,6 +21,7 @@ class TimeAnimationController extends FlareController {
/// Other animations are pretty simple, we can control them by some real data.
late final ActorAnimation? _time;
+ // ignore: unused_field, because it's false positive.
late ActorAnimation? _weather;
/// Animations not mixing together here. Declaring human readable variable.
diff --git a/analog_clock/linux/flutter/generated_plugins.cmake b/analog_clock/linux/flutter/generated_plugins.cmake
index 51436ae..2e1de87 100644
--- a/analog_clock/linux/flutter/generated_plugins.cmake
+++ b/analog_clock/linux/flutter/generated_plugins.cmake
@@ -5,6 +5,9 @@
list(APPEND FLUTTER_PLUGIN_LIST
)
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+ add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+ list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/analog_clock/pubspec.lock b/analog_clock/pubspec.lock
index 7cafc1e..3e6c327 100644
--- a/analog_clock/pubspec.lock
+++ b/analog_clock/pubspec.lock
@@ -7,21 +7,21 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
- version: "36.0.0"
+ version: "46.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "3.3.1"
+ version: "4.6.0"
analyzer_plugin:
dependency: transitive
description:
name: analyzer_plugin
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.0"
+ version: "0.11.1"
ansicolor:
dependency: transitive
description:
@@ -42,7 +42,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.2"
+ version: "2.9.0"
boolean_selector:
dependency: transitive
description:
@@ -56,28 +56,21 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
+ version: "1.2.1"
clock:
dependency: "direct main"
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0"
+ version: "1.16.0"
convert:
dependency: transitive
description:
@@ -112,21 +105,21 @@ packages:
name: dart_code_metrics
url: "https://pub.dartlang.org"
source: hosted
- version: "4.13.0"
+ version: "4.18.0-dev.2"
dart_style:
dependency: transitive
description:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.2"
+ version: "2.2.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.1"
file:
dependency: transitive
description:
@@ -137,9 +130,11 @@ packages:
flare_flutter:
dependency: "direct main"
description:
- name: flare_flutter
- url: "https://pub.dartlang.org"
- source: hosted
+ path: flare_flutter
+ ref: HEAD
+ resolved-ref: e90219f457602c61afee0b5f6cec2d66bd395e01
+ url: "https://github.com/tsinis/Flare-Flutter"
+ source: git
version: "3.0.2"
flutter:
dependency: "direct main"
@@ -172,20 +167,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.15.0"
- http:
- dependency: transitive
- description:
- name: http
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.13.4"
- http_parser:
- dependency: transitive
- description:
- name: http_parser
- url: "https://pub.dartlang.org"
- source: hosted
- version: "4.0.0"
intl:
dependency: transitive
description:
@@ -193,34 +174,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.0"
- linter:
- dependency: "direct dev"
- description:
- name: linter
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.21.2"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.11"
+ version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.3"
+ version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.8.0"
package_config:
dependency: transitive
description:
@@ -234,7 +208,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0"
+ version: "1.8.2"
petitparser:
dependency: transitive
description:
@@ -260,7 +234,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.1"
+ version: "1.9.0"
stack_trace:
dependency: transitive
description:
@@ -281,21 +255,21 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.8"
+ version: "0.4.12"
typed_data:
dependency: transitive
description:
@@ -309,7 +283,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.1"
+ version: "2.1.2"
watcher:
dependency: transitive
description:
@@ -332,4 +306,4 @@ packages:
source: hosted
version: "3.1.0"
sdks:
- dart: ">=2.16.0 <3.0.0"
+ dart: ">=2.18.0 <3.0.0"
diff --git a/analog_clock/pubspec.yaml b/analog_clock/pubspec.yaml
index b7d5a2a..74a3ae3 100644
--- a/analog_clock/pubspec.yaml
+++ b/analog_clock/pubspec.yaml
@@ -2,31 +2,30 @@ name: analog_clock
description: Awarded steampunk like, analog clock for Flutter Clock contest.
version: 1.0.0+1
repository: https://github.com/tsinis/flutter_clock
-issue_tracker: https://github.com/tsinis/flutter_clock/issues
maintainer: Roman Cinis
publish_to: none
environment:
- sdk: ">=2.16.0 <3.0.0"
+ sdk: ">=2.18.0 <3.0.0"
dependencies:
- clock: ^1.1.0
- flare_flutter: ^3.0.2
+ clock: ^1.1.1
+ flare_flutter:
+ git:
+ url: https://github.com/tsinis/Flare-Flutter
+ path: flare_flutter/
flutter:
sdk: flutter
flutter_clock_helper:
path: ../flutter_clock_helper
dev_dependencies:
-
- dart_code_metrics: ^4.13.0
+ dart_code_metrics: ^4.18.0-dev.2
flutter_test:
sdk: flutter
- linter: ^1.21.2
-
flutter:
uses-material-design: true
assets:
- - assets/FlutterClock.flr
\ No newline at end of file
+ - assets/FlutterClock.flr
diff --git a/analog_clock/windows/flutter/generated_plugins.cmake b/analog_clock/windows/flutter/generated_plugins.cmake
index 4d10c25..b93c4c3 100644
--- a/analog_clock/windows/flutter/generated_plugins.cmake
+++ b/analog_clock/windows/flutter/generated_plugins.cmake
@@ -5,6 +5,9 @@
list(APPEND FLUTTER_PLUGIN_LIST
)
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+ add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+ list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/flutter_clock_helper/pubspec.yaml b/flutter_clock_helper/pubspec.yaml
index 224644e..7e990cc 100644
--- a/flutter_clock_helper/pubspec.yaml
+++ b/flutter_clock_helper/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
sdk: flutter
intl: ^0.17.0
- cupertino_icons: ^1.0.4
+ cupertino_icons: ^1.0.5
dev_dependencies:
flutter_test:
