Skip to content

Commit 098ebc9

Browse files
committed
Merge branch 'main' into v1-flet-test
2 parents 4554fc3 + 62f0e01 commit 098ebc9

File tree

1,205 files changed

+14115
-5847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,205 files changed

+14115
-5847
lines changed

.fvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.35.5"
2+
"flutter": "3.38.2"
33
}

.github/workflows/macos-integration-tests.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,18 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
suite: [apps, examples, controls/core, controls/material, controls/cupertino, controls/theme, controls/types]
39+
suite:
40+
- apps
41+
- examples/apps
42+
- examples/core
43+
- examples/cupertino
44+
- examples/material
45+
- controls/core
46+
- controls/cupertino
47+
- controls/material
48+
- controls/theme
49+
- controls/types
50+
4051
name: ${{ matrix.suite }} Integration Tests
4152
steps:
4253
- name: Checkout repository
@@ -47,7 +58,6 @@ jobs:
4758

4859
- name: Setup Flutter
4960
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
50-
id: fvm-config-action
5161
with:
5262
path: '.fvmrc'
5363
cache: true

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Controls in Python are now defined as plain dataclasses
1414
* Unified diffing algorithm supports both imperative and declarative styles
1515
* Refactored Flutter layer using inherited widgets and `Provider`
16+
* Added a Shimmer control for building skeleton loaders and animated placeholders.
17+
* Added `FletApp.appErrorMessage` template to customize loading screen errors.
1618
* See the list of [breaking changes](https://github.com/flet-dev/flet/issues/5238)
1719

1820
## 0.28.3
@@ -703,7 +705,7 @@ from flet.auth.providers import GitHubOAuthProvider
703705
## 0.4.1
704706

705707
* Slider.round to round slider value on a label
706-
* Fix page.client_storage.get_keys() timeout
708+
* Fix page.client_storage.get_keys() timeout
707709
* Fix encode() import in PyInstaller integration
708710
* Fix "ConnectionAbortedError" error on Windows
709711
* Consistent licensing across the code - Apache 2.0
@@ -1115,4 +1117,4 @@ Fix ElevatedButton regression ([9540beb](https://github.com/flet-dev/flet/commit
11151117

11161118
## 0.1.4
11171119

1118-
* mkdir server/server/content
1120+
* mkdir server/server/content

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ flet run --web counter.py
132132
* [Website](https://flet.dev)
133133
* [Documentation](https://docs.flet.dev)
134134
* [Roadmap](https://flet.dev/roadmap)
135-
* [Apps Gallery](https://docs.flet.dev/gallery)
135+
* [Apps Gallery](https://flet.dev/gallery)
136136

137137
## Community
138138

client/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,4 @@ SPEC CHECKSUMS:
194194

195195
PODFILE CHECKSUM: 462a5b249f9f1900cbd87af7b6af48272dc2df5a
196196

197-
COCOAPODS: 1.14.3
197+
COCOAPODS: 1.16.2

client/lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ void main([List<String>? args]) async {
116116
errorsHandler: errorsHandler,
117117
showAppStartupScreen: true,
118118
appStartupScreenMessage: "Working...",
119+
appErrorMessage: "The application encountered an error: {message}",
119120
extensions: extensions,
120121
multiView: isMultiView(),
121122
tester: tester,

client/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import geolocator_apple
1212
import media_kit_libs_macos_video
1313
import media_kit_video
1414
import package_info_plus
15-
import path_provider_foundation
1615
import record_macos
1716
import rive_common
1817
import screen_retriever_macos
@@ -32,7 +31,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
3231
MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
3332
MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
3433
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
35-
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
3634
RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
3735
RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
3836
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))

0 commit comments

Comments
 (0)