From aa483556b4d5a524631adb03647c29ec49812aea Mon Sep 17 00:00:00 2001 From: marchellodev Date: Thu, 25 Jun 2020 12:58:38 +0300 Subject: [PATCH] updated dependencies --- go/.gitignore | 1 + go/cmd/options.go | 2 -- go/go.mod | 11 ++++--- go/go.sum | 68 +++++++++++++++++++------------------------- lib/main.dart | 41 +++++++++++++------------- lib/pages/share.dart | 4 +-- pubspec.yaml | 29 ++++++++++--------- 7 files changed, 72 insertions(+), 84 deletions(-) diff --git a/go/.gitignore b/go/.gitignore index e507dc6..fd0e2eb 100644 --- a/go/.gitignore +++ b/go/.gitignore @@ -1,2 +1,3 @@ build .last_goflutter_check +.last_go-flutter_check diff --git a/go/cmd/options.go b/go/cmd/options.go index 5c093ac..a6b72d8 100644 --- a/go/cmd/options.go +++ b/go/cmd/options.go @@ -5,7 +5,6 @@ import ( "github.com/go-flutter-desktop/plugins/package_info" "github.com/go-flutter-desktop/plugins/path_provider" "github.com/go-flutter-desktop/plugins/url_launcher" - "github.com/marchellodev/go_flutter_clipboard_manager" filePicker "github.com/miguelpruivo/flutter_file_picker/go" ) @@ -21,6 +20,5 @@ var options = []flutter.Option{ flutter.AddPlugin(&filePicker.FilePickerPlugin{}), flutter.AddPlugin(&url_launcher.UrlLauncherPlugin{}), - flutter.AddPlugin(&clipboard_manager.ClipboardManagerPlugin{}), flutter.AddPlugin(&package_info.PackageInfoPlugin{}), } diff --git a/go/go.mod b/go/go.mod index 1e605a3..b47a591 100644 --- a/go/go.mod +++ b/go/go.mod @@ -3,13 +3,12 @@ module sharik/go go 1.14 require ( - github.com/go-flutter-desktop/go-flutter v0.38.0 - github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200422150015-9effb8413185 + github.com/Xuanwo/go-locale v0.3.0 // indirect + github.com/go-flutter-desktop/go-flutter v0.41.1 + github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200616110009-f14e935f2815 github.com/go-flutter-desktop/plugins/path_provider v0.4.0 github.com/go-flutter-desktop/plugins/url_launcher v0.1.2 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e // indirect - github.com/marchellodev/go_flutter_clipboard_manager v0.0.0-20200307200206-e6c577512b18 - github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200419230604-d94aaaac30af + github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200604215027-87ee48b7f3f6 github.com/pkg/errors v0.9.1 - golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f // indirect + golang.org/x/text v0.3.3 // indirect ) diff --git a/go/go.sum b/go/go.sum index 7ab5d78..97740e5 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1,23 +1,22 @@ +github.com/Xuanwo/go-locale v0.2.0 h1:1N8SGG2VNpLl6VVa8ueZm3Nm+dxvk8ffY9aviKHl4IE= +github.com/Xuanwo/go-locale v0.2.0/go.mod h1:6qbT9M726OJgyiGZro2YwPmx63wQzlH+VvtjJWQoftw= +github.com/Xuanwo/go-locale v0.3.0 h1:clHbJN2GT4xGZ8BqcIJr42Yfoe06iYzI36LIxBnQ6DY= +github.com/Xuanwo/go-locale v0.3.0/go.mod h1:6qbT9M726OJgyiGZro2YwPmx63wQzlH+VvtjJWQoftw= github.com/adrg/xdg v0.2.1 h1:VSVdnH7cQ7V+B33qSJHTCRlNgra1607Q8PzEmnvb2Ic= github.com/adrg/xdg v0.2.1/go.mod h1:ZuOshBmzV4Ta+s23hdfFZnBsdzmoR3US0d7ErpqSbTQ= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/cubiest/jibberjabber v0.0.0-20200222172555-1351aa3fb4de h1:T/+z9EyfuAur9RtvpyY2bnidbgRR1rklpKjkypTaumY= -github.com/cubiest/jibberjabber v0.0.0-20200222172555-1351aa3fb4de/go.mod h1:KwsZfRYrxgmPSgdFdORzlShUdTV5/Ri6XBMVT7TVCJY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gen2brain/dlgs v0.0.0-20190708095831-3854608588f7 h1:qA8Mdjwrlv/r/aMqArqO0IMHUiy6ApdW4+8DtKr7PvA= github.com/gen2brain/dlgs v0.0.0-20190708095831-3854608588f7/go.mod h1:/eFcjDXaU2THSOOqLxOPETIbHETnamk8FA/hMjhg/gU= github.com/go-flutter-desktop/go-flutter v0.30.0/go.mod h1:NCryd/AqiRbYSd8pMzQldYkgH1tZIFGt2ToUghZcWGA= github.com/go-flutter-desktop/go-flutter v0.37.0/go.mod h1:8tjt3yZ3lTNLqgzWeH90f1uhCR9BL68LFoiy/n0aw/w= -github.com/go-flutter-desktop/go-flutter v0.38.0 h1:tDXc6tDnaokkUCFgEOqspRy4nLw8Z2is+d4r8kPl6wk= -github.com/go-flutter-desktop/go-flutter v0.38.0/go.mod h1:Hd8GsspJNE2oq5MPw3T85TlLiQ3rMeWYSe5QXqNdb+s= -github.com/go-flutter-desktop/plugins v0.0.0-20200422150015-9effb8413185 h1:5fk8pv3NvS0/zDdEV06RGBe8iRI+x6LaAL2Aniqxh4E= -github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200422150015-9effb8413185 h1:JpGF7ew0Wh9sOVtBQ9o8FiL+Ew6YVRVXQuGSk/cYUPU= -github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200422150015-9effb8413185/go.mod h1:klQIPSM7WNI4hsnqHAhynhP8hGRgAt8NZAAkNNXS6j0= +github.com/go-flutter-desktop/go-flutter v0.41.1 h1:wo75ueMj+QWP20c9KhycmZrxY6xdV//Whz309TX9hEQ= +github.com/go-flutter-desktop/go-flutter v0.41.1/go.mod h1:ndc520E8nO/tbWkKL4IT/Zvjxcl5t/2sz6zpGEwKv30= +github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200616110009-f14e935f2815 h1:y5g1pRNwgpowr7KixQGss3Cxhk14sWjRsCpNbUSiuhM= +github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200616110009-f14e935f2815/go.mod h1:yKc8U6f/3+XxJx7SyUWJnn87Q6UrJYcYwvNROtxNahM= github.com/go-flutter-desktop/plugins/path_provider v0.4.0 h1:LhYqOJjwuRjf9MzmbvkejCtLqrEEeBzrsCWkVONG6uw= github.com/go-flutter-desktop/plugins/path_provider v0.4.0/go.mod h1:e0aUP0dqcGaw5EZpCYzlK7M/T6X0ueWYJXImrE25vb4= github.com/go-flutter-desktop/plugins/url_launcher v0.1.2 h1:oFiIJjotMQvF8rfKWVJrf+1/JgTXShEIsibkiXrQnUw= @@ -30,51 +29,44 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e h1:8ywu4ELC/6owgOZlZx75CyYS5AYwUT2L+hzPModKvag= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f h1:TyqzGm2z1h3AGhjOoRYyeLcW4WlW81MDQkWa+rx/000= github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/marchellodev/go_flutter_clipboard_manager v0.0.0-20200307200206-e6c577512b18 h1:BJXYDkWmj6MlRy2m52aZvajyfb1R2lEAbj6AMz76Cco= github.com/marchellodev/go_flutter_clipboard_manager v0.0.0-20200307200206-e6c577512b18/go.mod h1:jmGpYRPZfzbY/Y9u3T+xaIlor16wDE/i9iKp4eDS51s= -github.com/miguelpruivo/flutter_file_picker v1.4.3 h1:4no+PtzEL9ooQXXVI7lVKgva4/nZYKEPWlcVesmZdbk= -github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200419230604-d94aaaac30af h1:fJr0SKozFP++ai/RXovWXITzCkYfoWG0UhESdFdPUlg= -github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200419230604-d94aaaac30af/go.mod h1:csuW+TFyYKtiUwNvcvhcpyX4quPI7Pvv0SUogdqCW4I= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200604215027-87ee48b7f3f6 h1:3KjDn35LWBOQ3nX6ba3ws+bzSNxWolozaqVXts/+n2g= +github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200604215027-87ee48b7f3f6/go.mod h1:csuW+TFyYKtiUwNvcvhcpyX4quPI7Pvv0SUogdqCW4I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20200121082415-34d275377bf9 h1:N19i1HjUnR7TF7rMt8O4p3dLvqvmYyzB6ifMFmrbY50= -golang.org/x/sys v0.0.0-20200121082415-34d275377bf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= +github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/main.dart b/lib/main.dart index 9253eeb..5ceb31e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -22,6 +22,7 @@ import 'pages/share.dart'; //todo: android icon void main() async { + try { Hive.registerAdapter(LocaleModelAdapter()); Hive.registerAdapter(FileTypeModelAdapter()); @@ -45,8 +46,8 @@ void main() async { runApp(MaterialApp( home: Scaffold( body: Center( - child: Text('Sharik is already running'), - )))); + child: Text('Sharik is already running'), + )))); } } @@ -58,10 +59,7 @@ void analytics() async { print(Platform.operatingSystemVersion); await http.read( - 'https://marchello.cf/shas/analytics?package=${info - .packageName}&version=$v&platform=${Platform - .operatingSystem}&platform_version=${Uri.encodeComponent( - Platform.operatingSystemVersion)}'); + 'https://marchello.cf/shas/analytics?package=${info.packageName}&version=$v&platform=${Platform.operatingSystem}&platform_version=${Uri.encodeComponent(Platform.operatingSystemVersion)}'); } catch (e) { print('analytics error'); print(e); @@ -101,7 +99,7 @@ class AppState extends State with TickerProviderStateMixin { children: [ Container( margin: - EdgeInsets.symmetric(vertical: 24, horizontal: 12), + EdgeInsets.symmetric(vertical: 24, horizontal: 12), child: SharikLogo()), LanguagePage(), ], @@ -113,7 +111,7 @@ class AppState extends State with TickerProviderStateMixin { SafeArea( child: Container( margin: - EdgeInsets.symmetric(vertical: 24, horizontal: 12), + EdgeInsets.symmetric(vertical: 24, horizontal: 12), child: Stack( alignment: Alignment.centerLeft, children: [ @@ -138,20 +136,19 @@ class AppState extends State with TickerProviderStateMixin { physics: NeverScrollableScrollPhysics(), controller: _pagerHome, children: [ - Builder( - builder: (context) => HomePage(), - ), - WillPopScope( - onWillPop: () async { - if (model.getPage() == PageModel.sharing) { - setState(() => - model.setPage(PageModel.home)); - _removeTemporaryDir(); - } - return false; - }, - child: SharePage()), - ])) + Builder( + builder: (context) => HomePage(), + ), + WillPopScope( + onWillPop: () async { + if (model.getPage() == PageModel.sharing) { + setState(() => model.setPage(PageModel.home)); + _removeTemporaryDir(); + } + return false; + }, + child: SharePage()), + ])) ], ) ]); diff --git a/lib/pages/share.dart b/lib/pages/share.dart index 6b87510..15b1c22 100644 --- a/lib/pages/share.dart +++ b/lib/pages/share.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'dart:io'; import 'dart:math'; -import 'package:clipboard_manager/clipboard_manager.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:package_info/package_info.dart'; @@ -414,7 +414,7 @@ class ShareState extends State with TickerProviderStateMixin { child: InkWell( borderRadius: BorderRadius.circular(12), onTap: () { - ClipboardManager.copyToClipBoard(ip).then((result) { + Clipboard.setData(ClipboardData(text: ip)).then((result) { final snackBar = SnackBar( backgroundColor: Colors.deepPurple[500], duration: Duration(seconds: 1), diff --git a/pubspec.yaml b/pubspec.yaml index fb97f66..74f71b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,26 +15,25 @@ dependencies: flutter: sdk: flutter - flutter_svg: ^0.17.4 - google_fonts: ^1.0.0 - intro_slider: ^2.2.9 + flutter_svg: ^0.18.0 + google_fonts: ^1.1.0 + intro_slider: ^2.3.1 # for android (https://github.com/miguelpruivo/flutter_file_picker/issues/223) - file_picker: 1.4.3+2 +# file_picker: 1.4.3+2 # for desktop -# file_picker: ^1.7.0 + file_picker: ^1.12.0 - url_launcher: ^5.4.5 + url_launcher: ^5.4.11 wifi_iot: ^0.1.1 - clipboard_manager: ^0.0.4 - path_provider: ^1.6.7 + path_provider: ^1.6.11 hive: ^1.4.1+1 hive_flutter: ^0.3.0+2 - device_apps: ^1.0.9 - provider: ^4.0.5 - http: ^0.12.0+4 - package_info: ^0.4.0+17 + device_apps: ^1.0.10 + provider: ^4.1.3 + http: ^0.12.1 + package_info: ^0.4.1 ping_discover_network: ^0.2.0+1 @@ -42,8 +41,8 @@ dependencies: dev_dependencies: - hive_generator: ^0.7.0+2 - build_runner: ^1.9.0 + hive_generator: any + build_runner: ^1.10.0 pedantic: ^1.9.0 @@ -57,3 +56,5 @@ flutter: - family: JetBrainsMono fonts: - asset: fonts/JetBrainsMono-Regular.ttf + + uses-material-design: false \ No newline at end of file