From 8a3a65c8c0340253beaba1c2e5687a000fa74789 Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Sun, 17 Jan 2021 14:08:46 -0500 Subject: [PATCH] gio-extras/*,x: rename gio-extras demos and change imports Signed-off-by: Chris Waldon --- go.mod | 14 ++-- go.sum | 72 +++++------------- {gio-extras => x}/colorpicker/main.go | 2 +- {gio-extras/materials => x/component}/main.go | 74 +++++++++---------- {gio-extras => x}/haptic/example.go | 2 +- {gio-extras => x}/haptic/example_android.go | 0 .../haptic/example_nonandroid.go | 0 {gio-extras/niotify => x/notify}/hello.go | 4 +- .../niotify => x/notify}/hello_macos.go | 0 .../outlay/fan/cribbage/cmd/crib.go | 2 +- .../outlay/fan/cribbage/cribbage.go | 2 +- {gio-extras => x}/outlay/fan/main.go | 8 +- {gio-extras => x}/outlay/fan/playing/card.go | 0 .../outlay/fan/widget/boring/cards.go | 4 +- .../outlay/fan/widget/boring/rect.go | 0 {gio-extras => x}/outlay/fan/widget/state.go | 0 {gio-extras => x}/outlay/grid/main.go | 2 +- {gio-extras => x}/scroll/main.go | 2 +- 18 files changed, 76 insertions(+), 112 deletions(-) rename {gio-extras => x}/colorpicker/main.go (98%) rename {gio-extras/materials => x/component}/main.go (92%) rename {gio-extras => x}/haptic/example.go (96%) rename {gio-extras => x}/haptic/example_android.go (100%) rename {gio-extras => x}/haptic/example_nonandroid.go (100%) rename {gio-extras/niotify => x/notify}/hello.go (96%) rename {gio-extras/niotify => x/notify}/hello_macos.go (100%) rename {gio-extras => x}/outlay/fan/cribbage/cmd/crib.go (85%) rename {gio-extras => x}/outlay/fan/cribbage/cribbage.go (98%) rename {gio-extras => x}/outlay/fan/main.go (95%) rename {gio-extras => x}/outlay/fan/playing/card.go (100%) rename {gio-extras => x}/outlay/fan/widget/boring/cards.go (96%) rename {gio-extras => x}/outlay/fan/widget/boring/rect.go (100%) rename {gio-extras => x}/outlay/fan/widget/state.go (100%) rename {gio-extras => x}/outlay/grid/main.go (99%) rename {gio-extras => x}/scroll/main.go (98%) diff --git a/go.mod b/go.mod index 57bd235..f47da50 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,15 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20201231162135-d23514fd5825 - git.sr.ht/~whereswaldon/colorpicker v0.0.0-20201207220634-905cd7cc7248 - git.sr.ht/~whereswaldon/haptic v0.0.0-20201207220958-78675dee81dd - git.sr.ht/~whereswaldon/materials v0.0.0-20201220015048-3f4fb49d1fd9 - git.sr.ht/~whereswaldon/niotify v0.0.3 - git.sr.ht/~whereswaldon/outlay v0.0.0-20201207220906-cbe824700857 - git.sr.ht/~whereswaldon/scroll v0.0.0-20201208022259-cc815a044b0b + gioui.org v0.0.0-20210116085804-99bfa6a33cdf + gioui.org/x v0.0.0-20210117184456-e8093455413a + gioui.org/x/haptic v0.0.0-20210117184456-e8093455413a + gioui.org/x/notify v0.0.0-20210117185607-25b1f7920092 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 github.com/google/go-github/v24 v24.0.1 - golang.org/x/exp v0.0.0-20201210212021-a20c86df00b4 + golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03 golang.org/x/image v0.0.0-20201208152932-35266b937fa6 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 gonum.org/v1/gonum v0.8.2 - gonum.org/v1/plot v0.8.1 ) diff --git a/go.sum b/go.sum index 72d531f..207aa61 100644 --- a/go.sum +++ b/go.sum @@ -1,49 +1,29 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200619180744-e2f3bbdfc367/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU= -gioui.org v0.0.0-20200628203458-851255f7a67b/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU= -gioui.org v0.0.0-20201206220452-acc3f704e478/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= -gioui.org v0.0.0-20201219144351-00c4a53036ad/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= -gioui.org v0.0.0-20201231162135-d23514fd5825 h1:k+PDfuxxrI4mNi9VrnVxOAGqg98zbKXazGh3X7Gk4Zg= -gioui.org v0.0.0-20201231162135-d23514fd5825/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= -git.sr.ht/~whereswaldon/colorpicker v0.0.0-20201207220634-905cd7cc7248 h1:sI70yHfHsuzyAL72ikrsOecjRT3dgQw9rCCbFd/goDA= -git.sr.ht/~whereswaldon/colorpicker v0.0.0-20201207220634-905cd7cc7248/go.mod h1:6dPWP8F87bsIhQuwg0l5hH0TSDyk414e1xe3q+8BUho= -git.sr.ht/~whereswaldon/haptic v0.0.0-20201207220958-78675dee81dd h1:xTijdESZL/kM3nS7v/N1yJ/X8eInbsyqDLOz9ZFHpsE= -git.sr.ht/~whereswaldon/haptic v0.0.0-20201207220958-78675dee81dd/go.mod h1:lFvegCF1P7IXfv5FpnnvKFdoAQWTgJZhx8aWOBgE0yg= -git.sr.ht/~whereswaldon/materials v0.0.0-20201220015048-3f4fb49d1fd9 h1:rb+UW4XloZFJvW022LJ++VyDRilIAcgEJbBLX3xtXd4= -git.sr.ht/~whereswaldon/materials v0.0.0-20201220015048-3f4fb49d1fd9/go.mod h1:evzscth58GGa3fzjGHmL2aR//0YLi52UfgfyTGFpMCM= -git.sr.ht/~whereswaldon/niotify v0.0.3 h1:EWRqPOzqTLU92A9h207LkS/U/nQxuawJ0PF7UEDApi0= -git.sr.ht/~whereswaldon/niotify v0.0.3/go.mod h1:itJ9vAQqq8+liURizx7mAdIY4o8gRDF6SAVfswYVg1U= -git.sr.ht/~whereswaldon/outlay v0.0.0-20201207220906-cbe824700857 h1:Sc+1cZRrwGyiBYgqIto5OlK+RTea1T7FYmZj+JC6RZI= -git.sr.ht/~whereswaldon/outlay v0.0.0-20201207220906-cbe824700857/go.mod h1:basiujMeRXbgNAivgbiWlxy+gsS0oO70suSRSZ96Nw4= -git.sr.ht/~whereswaldon/scroll v0.0.0-20201208022259-cc815a044b0b h1:KzG0qB0Vxr6X3kgvYV2HTSjZFbcIx6YiZvbxD+hZIAU= -git.sr.ht/~whereswaldon/scroll v0.0.0-20201208022259-cc815a044b0b/go.mod h1:/AM8KrZLPyehiTttCs4hYx+9NtV2EaQe4rBGyblqHGo= -git.wow.st/gmp/jni v0.0.0-20200619201040-d0d3f316ae09/go.mod h1:lfKZKu2afBKJODTFgDNIaBfhq6qmQS0xsS/phLO5Urk= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gioui.org v0.0.0-20210116085804-99bfa6a33cdf h1:BPm0FHRKpTbpoe4DY2vKIVzWWni+IHvmltECoYRUYWk= +gioui.org v0.0.0-20210116085804-99bfa6a33cdf/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= +gioui.org/x v0.0.0-20210117184456-e8093455413a h1:Xn/ygbHaEklU48ZR/nsPxzsjdhtrfEXjUAL4cZynUA4= +gioui.org/x v0.0.0-20210117184456-e8093455413a/go.mod h1:+CDNGkslHDIe1EK2Q4E0G98qRllCaQrL6qtjBhBjSAo= +gioui.org/x/haptic v0.0.0-20210117184456-e8093455413a h1:eX4dSyrY98nBhmtYD+p94V3XI0hBROETaQ9ippgCtEU= +gioui.org/x/haptic v0.0.0-20210117184456-e8093455413a/go.mod h1:8zNy+2M/H/zMZtZVh3ZSk7EuPqob+PNtVFzWstzT7ok= +gioui.org/x/notify v0.0.0-20210117185607-25b1f7920092 h1:XTPuGt90z7zE3eeGLfQh3nEjGVvt6Gl3/Xc5Mu5w4W4= +gioui.org/x/notify v0.0.0-20210117185607-25b1f7920092/go.mod h1:dkKYIeTwSxJG3MbNiA8nQ9CYu5wzWDIIeZ7eGRChECo= git.wow.st/gmp/jni v0.0.0-20200827154156-014cd5c7c4c0 h1:Ynp3h+TC8k1clvf45D28VFQlmy0bPx8M/MG5bB24Vj8= git.wow.st/gmp/jni v0.0.0-20200827154156-014cd5c7c4c0/go.mod h1:+axXBRUTIDlCeE73IKeD/os7LoEnTKdkp8/gQOFjqyo= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af h1:wVe6/Ea46ZMeNkQjjBW6xcqyQA/j5e0D6GytH95g0gQ= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/esiqveland/notify v0.9.1 h1:hX6ZD3FCQJXI46AzUM/iWekcMfnZ9TPE4uIu9Hrn1D4= github.com/esiqveland/notify v0.9.1/go.mod h1:63UbVSaeJwF0LVJARHFuPgUAoM7o1BEvCZyknsuonBc= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= -github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ= -github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-latex/latex v0.0.0-20200518072620-0806b477ea35 h1:uroDDLmuCK5Pz5J/Ef5vCL6F0sJmAtZFTm0/cF027F4= -github.com/go-latex/latex v0.0.0-20200518072620-0806b477ea35/go.mod h1:PNI+CcWytn/2Z/9f1SGOOYn0eILruVyp0v2/iAs8asQ= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -53,15 +33,7 @@ github.com/google/go-github/v24 v24.0.1 h1:KCt1LjMJEey1qvPXxa9SjaWxwTsCWSq6p2Ju5 github.com/google/go-github/v24 v24.0.1/go.mod h1:CRqaW1Uns1TCkP0wqTpxYyRxRjxwvKU/XSS44u6X74M= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= -github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= -github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -70,27 +42,28 @@ golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= -golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= -golang.org/x/exp v0.0.0-20201203231725-fa01524bc59d/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= -golang.org/x/exp v0.0.0-20201210212021-a20c86df00b4 h1:c0f5UxfZlsfpBf1TXaGk9aMJGMWvPQBf9FdM8pAYZok= -golang.org/x/exp v0.0.0-20201210212021-a20c86df00b4/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= +golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03 h1:XlAInxBYX5nBofPaY51uv/x9xmRgZGr/lDOsePd2AcE= +golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6 h1:nfeHNc1nAqecKCy2FCy4HY+soOOe5sDLJ/gZLbx6GYI= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -106,33 +79,28 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88 h1:KmZPnMocC93w341XZp26yTJg8Za7lhb2KhkYmixoeso= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY= +golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.8.1/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -gonum.org/v1/plot v0.8.1 h1:1oWyfw7tIDDtKb+t+SbR9RFruMmNJlsKiZUolHdys2I= -gonum.org/v1/plot v0.8.1/go.mod h1:3GH8dTfoceRTELDnv+4HNwbvM/eMfdDUGHFG2bo3NeE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/gio-extras/colorpicker/main.go b/x/colorpicker/main.go similarity index 98% rename from gio-extras/colorpicker/main.go rename to x/colorpicker/main.go index 4bb23be..76e3f97 100644 --- a/gio-extras/colorpicker/main.go +++ b/x/colorpicker/main.go @@ -14,7 +14,7 @@ import ( "gioui.org/op/clip" "gioui.org/op/paint" "gioui.org/widget/material" - "git.sr.ht/~whereswaldon/colorpicker" + "gioui.org/x/colorpicker" ) func main() { diff --git a/gio-extras/materials/main.go b/x/component/main.go similarity index 92% rename from gio-extras/materials/main.go rename to x/component/main.go index c2c195c..57d96c1 100644 --- a/gio-extras/materials/main.go +++ b/x/component/main.go @@ -19,7 +19,7 @@ import ( "gioui.org/widget/material" "golang.org/x/exp/shiny/materialdesign/icons" - "git.sr.ht/~whereswaldon/materials" + "gioui.org/x/component" ) type ( @@ -100,15 +100,15 @@ The controls below allow you to see the various features available in our App Ba layout.Flexed(settingDetailsColumnWidth, func(gtx C) D { if contextBtn.Clicked() { bar.SetContextualActions( - []materials.AppBarAction{ - materials.SimpleIconAction(th, &red, HeartIcon, - materials.OverflowAction{ + []component.AppBarAction{ + component.SimpleIconAction(th, &red, HeartIcon, + component.OverflowAction{ Name: "House", Tag: &red, }, ), }, - []materials.OverflowAction{ + []component.OverflowAction{ { Name: "foo", Tag: &blue, @@ -133,9 +133,9 @@ The controls below allow you to see the various features available in our App Ba layout.Flexed(settingDetailsColumnWidth, func(gtx C) D { if bottomBar.Changed() { if bottomBar.Value { - nav.Anchor = materials.Bottom + nav.Anchor = component.Bottom } else { - nav.Anchor = materials.Top + nav.Anchor = component.Top } } @@ -452,9 +452,9 @@ func LayoutTextFieldPage(gtx C) D { type Page struct { layout func(layout.Context) layout.Dimensions - materials.NavItem - Actions []materials.AppBarAction - Overflow []materials.OverflowAction + component.NavItem + Actions []component.AppBarAction + Overflow []component.OverflowAction // laying each page out within a layout.List enables scrolling for the page // content. @@ -466,15 +466,15 @@ var ( clipboardRequests = make(chan string, 1) // initialize modal layer to draw modal components - modal = materials.NewModal() - navAnim = materials.VisibilityAnimation{ + modal = component.NewModal() + navAnim = component.VisibilityAnimation{ Duration: time.Millisecond * 100, - State: materials.Invisible, + State: component.Invisible, } - nav = materials.NewNav("Navigation Drawer", "This is an example.") - modalNav = materials.ModalNavFrom(&nav, modal) + nav = component.NewNav("Navigation Drawer", "This is an example.") + modalNav = component.ModalNavFrom(&nav, modal) - bar = materials.NewAppBar(modal) + bar = component.NewAppBar(modal) inset = layout.UniformInset(unit.Dp(8)) th = material.NewTheme(gofont.Collection()) @@ -512,27 +512,27 @@ var ( favorited bool inputAlignment layout.Alignment inputAlignmentEnum widget.Enum - nameInput materials.TextField - addressInput materials.TextField - priceInput materials.TextField - tweetInput materials.TextField - numberInput materials.TextField + nameInput component.TextField + addressInput component.TextField + priceInput component.TextField + tweetInput component.TextField + numberInput component.TextField pages = []Page{ { - NavItem: materials.NavItem{ + NavItem: component.NavItem{ Name: "App Bar Features", Icon: HomeIcon, }, layout: LayoutAppBarPage, - Actions: []materials.AppBarAction{ + Actions: []component.AppBarAction{ { - OverflowAction: materials.OverflowAction{ + OverflowAction: component.OverflowAction{ Name: "Favorite", Tag: &heartBtn, }, Layout: func(gtx layout.Context, bg, fg color.NRGBA) layout.Dimensions { - btn := materials.SimpleIconButton(th, &heartBtn, HeartIcon) + btn := component.SimpleIconButton(th, &heartBtn, HeartIcon) btn.Background = bg if favorited { btn.Color = color.NRGBA{R: 200, A: 255} @@ -542,14 +542,14 @@ var ( return btn.Layout(gtx) }, }, - materials.SimpleIconAction(th, &plusBtn, PlusIcon, - materials.OverflowAction{ + component.SimpleIconAction(th, &plusBtn, PlusIcon, + component.OverflowAction{ Name: "Create", Tag: &plusBtn, }, ), }, - Overflow: []materials.OverflowAction{ + Overflow: []component.OverflowAction{ { Name: "Example 1", Tag: &exampleOverflowState, @@ -561,26 +561,26 @@ var ( }, }, { - NavItem: materials.NavItem{ + NavItem: component.NavItem{ Name: "Nav Drawer Features", Icon: SettingsIcon, }, layout: LayoutNavDrawerPage, }, { - NavItem: materials.NavItem{ + NavItem: component.NavItem{ Name: "Text Field Features", Icon: EditIcon, }, layout: LayoutTextFieldPage, }, { - NavItem: materials.NavItem{ + NavItem: component.NavItem{ Name: "About this library", Icon: OtherIcon, }, layout: LayoutAboutPage, - Actions: []materials.AppBarAction{}, + Actions: []component.AppBarAction{}, }, } ) @@ -590,8 +590,8 @@ func loop(w *app.Window) error { bar.NavigationIcon = MenuIcon if barOnBottom { - bar.Anchor = materials.Bottom - nav.Anchor = materials.Bottom + bar.Anchor = component.Bottom + nav.Anchor = component.Bottom } // assign navigation tags and configure navigation bar with all pages @@ -619,16 +619,16 @@ func loop(w *app.Window) error { gtx := layout.NewContext(&ops, e) for _, event := range bar.Events(gtx) { switch event := event.(type) { - case materials.AppBarNavigationClicked: + case component.AppBarNavigationClicked: if nonModalDrawer.Value { navAnim.ToggleVisibility(gtx.Now) } else { modalNav.Appear(gtx.Now) navAnim.Disappear(gtx.Now) } - case materials.AppBarContextMenuDismissed: + case component.AppBarContextMenuDismissed: log.Printf("Context menu dismissed: %v", event) - case materials.AppBarOverflowActionClicked: + case component.AppBarOverflowActionClicked: log.Printf("Overflow action selected: %v", event) } } diff --git a/gio-extras/haptic/example.go b/x/haptic/example.go similarity index 96% rename from gio-extras/haptic/example.go rename to x/haptic/example.go index cef5929..e2cb407 100644 --- a/gio-extras/haptic/example.go +++ b/x/haptic/example.go @@ -15,7 +15,7 @@ import ( "gioui.org/widget/material" "gioui.org/font/gofont" - "git.sr.ht/~whereswaldon/haptic" + "gioui.org/x/haptic" ) var buzzer *haptic.Buzzer diff --git a/gio-extras/haptic/example_android.go b/x/haptic/example_android.go similarity index 100% rename from gio-extras/haptic/example_android.go rename to x/haptic/example_android.go diff --git a/gio-extras/haptic/example_nonandroid.go b/x/haptic/example_nonandroid.go similarity index 100% rename from gio-extras/haptic/example_nonandroid.go rename to x/haptic/example_nonandroid.go diff --git a/gio-extras/niotify/hello.go b/x/notify/hello.go similarity index 96% rename from gio-extras/niotify/hello.go rename to x/notify/hello.go index 8d8a09d..744fbbf 100644 --- a/gio-extras/niotify/hello.go +++ b/x/notify/hello.go @@ -17,7 +17,7 @@ import ( // "gioui.org/text" "gioui.org/widget" "gioui.org/widget/material" - "git.sr.ht/~whereswaldon/niotify" + "gioui.org/x/notify" "gioui.org/font/gofont" ) @@ -73,7 +73,7 @@ func loop(w *app.Window) error { if first { first = false go func() { - mgr, e := niotify.NewManager() + mgr, e := notify.NewManager() if e != nil { log.Printf("manager creation failed: %v", e) err = e diff --git a/gio-extras/niotify/hello_macos.go b/x/notify/hello_macos.go similarity index 100% rename from gio-extras/niotify/hello_macos.go rename to x/notify/hello_macos.go diff --git a/gio-extras/outlay/fan/cribbage/cmd/crib.go b/x/outlay/fan/cribbage/cmd/crib.go similarity index 85% rename from gio-extras/outlay/fan/cribbage/cmd/crib.go rename to x/outlay/fan/cribbage/cmd/crib.go index 7fcb473..9ce8f4f 100644 --- a/gio-extras/outlay/fan/cribbage/cmd/crib.go +++ b/x/outlay/fan/cribbage/cmd/crib.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "gioui.org/example/gio-extras/outlay/fan/cribbage" + "gioui.org/example/x/outlay/fan/cribbage" ) func main() { diff --git a/gio-extras/outlay/fan/cribbage/cribbage.go b/x/outlay/fan/cribbage/cribbage.go similarity index 98% rename from gio-extras/outlay/fan/cribbage/cribbage.go rename to x/outlay/fan/cribbage/cribbage.go index e695743..b2cf4d7 100644 --- a/gio-extras/outlay/fan/cribbage/cribbage.go +++ b/x/outlay/fan/cribbage/cribbage.go @@ -4,7 +4,7 @@ import ( "fmt" "math/rand" - "gioui.org/example/gio-extras/outlay/fan/playing" + "gioui.org/example/x/outlay/fan/playing" ) type Phase uint8 diff --git a/gio-extras/outlay/fan/main.go b/x/outlay/fan/main.go similarity index 95% rename from gio-extras/outlay/fan/main.go rename to x/outlay/fan/main.go index 5175f80..a03a7e0 100644 --- a/gio-extras/outlay/fan/main.go +++ b/x/outlay/fan/main.go @@ -8,9 +8,9 @@ import ( "time" "gioui.org/app" - "gioui.org/example/gio-extras/outlay/fan/playing" - xwidget "gioui.org/example/gio-extras/outlay/fan/widget" - "gioui.org/example/gio-extras/outlay/fan/widget/boring" + "gioui.org/example/x/outlay/fan/playing" + xwidget "gioui.org/example/x/outlay/fan/widget" + "gioui.org/example/x/outlay/fan/widget/boring" "gioui.org/font/gofont" "gioui.org/io/system" "gioui.org/layout" @@ -18,7 +18,7 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - "git.sr.ht/~whereswaldon/outlay" + "gioui.org/x/outlay" ) type ( diff --git a/gio-extras/outlay/fan/playing/card.go b/x/outlay/fan/playing/card.go similarity index 100% rename from gio-extras/outlay/fan/playing/card.go rename to x/outlay/fan/playing/card.go diff --git a/gio-extras/outlay/fan/widget/boring/cards.go b/x/outlay/fan/widget/boring/cards.go similarity index 96% rename from gio-extras/outlay/fan/widget/boring/cards.go rename to x/outlay/fan/widget/boring/cards.go index f0b6843..beae4f7 100644 --- a/gio-extras/outlay/fan/widget/boring/cards.go +++ b/x/outlay/fan/widget/boring/cards.go @@ -4,8 +4,8 @@ import ( "image/color" "math" - "gioui.org/example/gio-extras/outlay/fan/playing" - xwidget "gioui.org/example/gio-extras/outlay/fan/widget" + "gioui.org/example/x/outlay/fan/playing" + xwidget "gioui.org/example/x/outlay/fan/widget" "gioui.org/f32" "gioui.org/layout" "gioui.org/op" diff --git a/gio-extras/outlay/fan/widget/boring/rect.go b/x/outlay/fan/widget/boring/rect.go similarity index 100% rename from gio-extras/outlay/fan/widget/boring/rect.go rename to x/outlay/fan/widget/boring/rect.go diff --git a/gio-extras/outlay/fan/widget/state.go b/x/outlay/fan/widget/state.go similarity index 100% rename from gio-extras/outlay/fan/widget/state.go rename to x/outlay/fan/widget/state.go diff --git a/gio-extras/outlay/grid/main.go b/x/outlay/grid/main.go similarity index 99% rename from gio-extras/outlay/grid/main.go rename to x/outlay/grid/main.go index 728ab0b..a688de3 100644 --- a/gio-extras/outlay/grid/main.go +++ b/x/outlay/grid/main.go @@ -20,7 +20,7 @@ import ( "gioui.org/widget" "gioui.org/widget/material" - "git.sr.ht/~whereswaldon/outlay" + "gioui.org/x/outlay" ) func main() { diff --git a/gio-extras/scroll/main.go b/x/scroll/main.go similarity index 98% rename from gio-extras/scroll/main.go rename to x/scroll/main.go index 37da2ca..861a110 100644 --- a/gio-extras/scroll/main.go +++ b/x/scroll/main.go @@ -15,7 +15,7 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - "git.sr.ht/~whereswaldon/scroll" + "gioui.org/x/scroll" "gioui.org/font/gofont" ) -- 2.30.2