Skip to content

Commit b1b200b

Browse files
GeertJohanGeertJohan
committed
Merge branch 'master' of https://github.com/tluyben/go-flutter into tluyben-master
2 parents 170af6c + 8b5b62d commit b1b200b

File tree

3 files changed

+46
-28
lines changed

3 files changed

+46
-28
lines changed

‎example/stocks/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
icudtl.dat
2+
main

‎example/stocks/flutter_project/stocks/pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2020
charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2121
collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
22-
convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
22+
convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2323
crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2424
csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2525
dart_style: 1.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -35,7 +35,7 @@ dependencies:
3535
path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3636
petitparser: 1.7.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3737
plugin: 0.2.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
38-
source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
38+
source_span: 1.5.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3939
stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4040
string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4141
typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -51,7 +51,7 @@ dev_dependencies:
5151
sdk: flutter
5252

5353
boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
54-
file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
54+
file: 5.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5555
http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5656
io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5757
js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -62,15 +62,15 @@ dev_dependencies:
6262
package_resolver: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6363
pool: 1.3.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6464
pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
65-
quiver: 2.0.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
65+
quiver: 2.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6666
shelf: 0.7.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6767
shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6868
shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6969
shelf_web_socket: 0.2.2+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7070
source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7171
source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7272
stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
73-
term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
73+
term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7474
test: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7575
vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7676
web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

‎example/stocks/main.go

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,16 @@ import (
55
_ "image/png"
66
"log"
77
"os"
8+
"path"
9+
"runtime"
810

9-
gutter "github.com/go-flutter-desktop/go-flutter"
11+
"github.com/go-flutter-desktop/go-flutter"
1012
)
1113

12-
func main() {
13-
var (
14-
err error
15-
)
16-
17-
options := []gutter.Option{
18-
gutter.ProjectAssetPath("flutter_project/stocks/build/flutter_assets"),
19-
gutter.OptionICUDataPath("/opt/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"), // Linux (arch)
20-
// gutter.OptionICUDataPath("./FlutterEmbedder.framework/Resources/icudtl.dat"), // OSX
21-
gutter.OptionWindowDimension(800, 600),
22-
gutter.WindowIcon(iconProvider),
23-
gutter.OptionPixelRatio(1.2),
24-
gutter.OptionVMArguments([]string{"--dart-non-checked-mode", "--observatory-port=50300"}),
25-
}
26-
27-
if err = gutter.Run(options...); err != nil {
28-
log.Fatalln(err)
29-
}
30-
31-
}
32-
3314
func iconProvider() ([]image.Image, error) {
34-
imgFile, err := os.Open("assets/icon.png")
15+
_, currentFilePath, _, _ := runtime.Caller(0)
16+
dir := path.Dir(currentFilePath)
17+
imgFile, err := os.Open(dir + "/assets/icon.png")
3518
if err != nil {
3619
return nil, err
3720
}
@@ -43,3 +26,36 @@ func iconProvider() ([]image.Image, error) {
4326

4427
return []image.Image{img}, nil
4528
}
29+
30+
func main() {
31+
32+
_, currentFilePath, _, _ := runtime.Caller(0)
33+
dir := path.Dir(currentFilePath)
34+
35+
initialApplicationHeight := 600
36+
initialApplicationWidth := 800
37+
38+
options := []flutter.Option{
39+
flutter.ProjectAssetsPath(dir + "/flutter_project/stocks/build/flutter_assets"),
40+
41+
// This path should not be changed. icudtl.dat is handled by engineDownloader.go
42+
flutter.ApplicationICUDataPath(dir + "/icudtl.dat"),
43+
44+
flutter.ApplicationWindowDimension(initialApplicationWidth, initialApplicationHeight),
45+
flutter.WindowIcon(iconProvider),
46+
flutter.OptionVMArguments([]string{
47+
// "--disable-dart-asserts", // release mode flag
48+
// "--disable-observatory",
49+
"--observatory-port=50300",
50+
}),
51+
52+
// Default keyboard is Qwerty, if you want to change it, you can check keyboard.go in gutter package.
53+
// Otherwise you can create your own by usinng `KeyboardShortcuts` struct.
54+
//flutter.OptionKeyboardLayout(flutter.KeyboardAzertyLayout),
55+
}
56+
57+
if err := flutter.Run(options...); err != nil {
58+
log.Fatalln(err)
59+
}
60+
61+
}

0 commit comments

Comments
 (0)