Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fyne History Page Implementation #439

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open

Fyne History Page Implementation #439

Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
f1dcdfd
added transaction filter popup
Sirmorrison Nov 5, 2019
eae10b8
fixed dropdown selection issues
Sirmorrison Nov 6, 2019
d347c73
added table.go, and table header
Sirmorrison Nov 9, 2019
6af6f32
added table.go, and fetched table data into the table
Sirmorrison Nov 11, 2019
a8a6c51
bug fix with tablefilter
Sirmorrison Nov 13, 2019
cf1a818
implemented txtable filtering
Sirmorrison Nov 15, 2019
0f3fa0c
added pagination
Sirmorrison Nov 16, 2019
2c1c538
added transaction details page, improved table.go, removed pagination…
Sirmorrison Nov 19, 2019
d19d5f8
removed txdetails.go
Sirmorrison Nov 19, 2019
95100e2
added errorhandling, split function into table header and table conte…
Sirmorrison Nov 23, 2019
4bd5f6d
added copy txhash copy functionality for txdetails page, aligned txde…
Sirmorrison Nov 25, 2019
c70253a
added modal popup collapse icon, made txdetail pop a modal popup, add…
Sirmorrison Nov 28, 2019
a241b45
hint tip
Sirmorrison Nov 29, 2019
60ad5d1
renamed variables, remoeved commentedline and un used lines ofcode
Sirmorrison Dec 1, 2019
c35e1ba
fixed ssues with tx table not scrolling and returning to the table to…
Sirmorrison Dec 3, 2019
3463275
fixed panic issue with error handlers for txdetails page and txdropdo…
Sirmorrison Dec 4, 2019
1e8334c
fixed error handler panic for tx, added txsort dropdown to history page
Sirmorrison Dec 4, 2019
c328cb1
fixe issues with txdetails popup
Sirmorrison Dec 4, 2019
6278f21
un-did changes
Sirmorrison Dec 4, 2019
7540cf9
rebased pr
Sirmorrison Dec 5, 2019
b5c41bd
added transaction filter popup
Sirmorrison Nov 5, 2019
f3057c6
fixed dropdown selection issues
Sirmorrison Nov 6, 2019
b9b10ab
added table.go, and table header
Sirmorrison Nov 9, 2019
b6de20b
added table.go, and fetched table data into the table
Sirmorrison Nov 11, 2019
1a72ea4
bug fix with tablefilter
Sirmorrison Nov 13, 2019
e17a827
implemented txtable filtering
Sirmorrison Nov 15, 2019
f8d90cc
added pagination
Sirmorrison Nov 16, 2019
49f45bb
added transaction details page, improved table.go, removed pagination…
Sirmorrison Nov 19, 2019
433720d
removed txdetails.go
Sirmorrison Nov 19, 2019
c3f4dad
added errorhandling, split function into table header and table conte…
Sirmorrison Nov 23, 2019
55fece0
added copy txhash copy functionality for txdetails page, aligned txde…
Sirmorrison Nov 25, 2019
9f7f4f2
added modal popup collapse icon, made txdetail pop a modal popup, add…
Sirmorrison Nov 28, 2019
321d755
hint tip
Sirmorrison Nov 29, 2019
df594a1
renamed variables, remoeved commentedline and un used lines ofcode
Sirmorrison Dec 1, 2019
f203132
fixed ssues with tx table not scrolling and returning to the table to…
Sirmorrison Dec 3, 2019
4b9f4a1
fixed panic issue with error handlers for txdetails page and txdropdo…
Sirmorrison Dec 4, 2019
452c58f
fixed error handler panic for tx, added txsort dropdown to history page
Sirmorrison Dec 4, 2019
7c42b02
fixe issues with txdetails popup
Sirmorrison Dec 4, 2019
0475626
un-did changes
Sirmorrison Dec 4, 2019
a6ab7d9
fixing history page
Sirmorrison Dec 6, 2019
aa8fde1
implemented multiwallet feature
Sirmorrison Dec 8, 2019
578a185
added selected wallet line
Sirmorrison Dec 9, 2019
39010fc
fixed issues with txDetailsPopup
Sirmorrison Dec 11, 2019
5804ef8
hide filter popup when there re no tx in wallet
Sirmorrison Dec 11, 2019
86fe1b5
fixed issues with txSort dropdown
Sirmorrison Dec 12, 2019
e2fe7aa
added info popup and cleaned up code
Sirmorrison Dec 12, 2019
8a838e4
added txdirection icon to tx table
Sirmorrison Dec 13, 2019
77776e1
fixed issues with history table when a diiferent wallet is selected
Sirmorrison Dec 18, 2019
ffbc339
fixed issues with txDropdown and txSort Labels not reflecting the cur…
Sirmorrison Dec 19, 2019
e78054f
fixed panic when there is an error, changed wallet list to a dropdown…
Sirmorrison Dec 20, 2019
e7c6888
cleaned up code
Sirmorrison Dec 20, 2019
fc7fa45
removed repeated codes, rebased pr and cleaned up code
Sirmorrison Dec 20, 2019
f076174
optimzed txupdate
Sirmorrison Dec 20, 2019
f70be2e
added redirect to dcrdata feature
Sirmorrison Dec 20, 2019
00b4208
added section seperators
Sirmorrison Dec 21, 2019
6cc7353
removed file
Sirmorrison Dec 21, 2019
19e6a96
rebased PR
Sirmorrison Dec 21, 2019
6a52d76
fixed broken page after rebase due to fyne update
Sirmorrison Dec 21, 2019
5463d00
undid changes
Sirmorrison Dec 21, 2019
ef81d88
added scroll feature to wallet dropdown
Sirmorrison Dec 22, 2019
9f4ce43
implemented @metaclips review
Sirmorrison Dec 23, 2019
a8cab7a
removed unrelated file
Sirmorrison Dec 24, 2019
06b6a8b
removed unrelated file
Sirmorrison Dec 24, 2019
3bc6ba6
minor mod
Sirmorrison Dec 24, 2019
a7a406b
Merge branch 'fyneHistoryPage' of https://github.com/Sirmorrison/godc…
Sirmorrison Dec 24, 2019
c868cab
reduced table width, removed horizontal scroll, removed type column
Sirmorrison Dec 25, 2019
0d86a52
fixed issues with no transaction in wallet message not showing
Sirmorrison Dec 25, 2019
7e63a18
removed direction label and added #column
Sirmorrison Dec 25, 2019
c72a35a
fixed issues with txdetails popup being larger than the screensize, u…
Sirmorrison Dec 28, 2019
1303925
trimmed long string and optimized code
Sirmorrison Dec 28, 2019
a50dcd4
aligned info icon to the right and reduced popup size, aligned table …
Sirmorrison Dec 28, 2019
8b9d018
used form widget for txdetails data
Sirmorrison Dec 28, 2019
08c678b
cleaned up code and fixed issues with txtable content alignment
Sirmorrison Dec 29, 2019
2fb8d2e
fixed pagination
Sirmorrison Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions cli/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,10 @@ github.com/dgraph-io/badger v1.5.4/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMT
github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f h1:dDxpBYafY/GYpcl+LS4Bn3ziLPuEdGRkRjYAbSlWxSA=
github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
github.com/gdamore/tcell v1.1.1 h1:U73YL+jMem2XfhvaIUfPO6MpJawaG92B2funXVb9qLs=
github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
github.com/go-gl/gl v0.0.0-20181026044259-55b76b7df9d2/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
github.com/go-gl/glfw v0.0.0-20181213070059-819e8ce5125f/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
Expand Down Expand Up @@ -214,8 +215,13 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.2/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY=
github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand All @@ -225,13 +231,16 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
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/raedahgroup/dcrlibwallet v1.0.1-0.20190807181808-37b6666fe764 h1:arCUsqsYbfYPNlNjP6H0ylKJS8H31t/AfFfKd/VHzKY=
github.com/raedahgroup/dcrlibwallet v1.0.1-0.20190807181808-37b6666fe764/go.mod h1:7BxsN3VU3KWUt9R8eHgrBI88kE7/WWSfN0yl0vU1SM8=
github.com/raedahgroup/dcrlibwallet v1.1.0 h1:UeOqLi3h9oQGUlhwwmCspJlEAPD2IfrHdu5EPtph54w=
github.com/raedahgroup/dcrlibwallet v1.1.0/go.mod h1:szxgNhCQ/GRyFpmkfYi3T3ZkXPx9Hm9j0EnjaBfJK/o=
github.com/raedahgroup/godcr v0.0.0-20190904090857-0b0e4e4d418e h1:COoahDOspffo0n+E/x9dzHMu6pI9clopPa4jWQA+MLw=
github.com/raedahgroup/godcr v0.0.0-20190904090857-0b0e4e4d418e/go.mod h1:pn/6eTayjXPhIzbVYMPuwRzRcjszh9W+NL/T0VZ4VwI=
github.com/raedahgroup/dcrlibwallet v1.1.1-0.20190928085114-bcc6e6b7769a h1:BvFVstGjzuNeFsNTmAZCfPxK2u51EGQVAdFKCauqaNE=
github.com/raedahgroup/dcrlibwallet v1.1.1-0.20190928085114-bcc6e6b7769a/go.mod h1:6AGgglq9BB0twJnZnHvfH8hIQrbw6yBJSPp9QI+hBk0=
github.com/rivo/tview v0.0.0-20190113120821-e5e361b9d790 h1:yt1AZgiBi8RcCo0PoyU4gSFwKjlbkSGRFVZGz7R6oB0=
github.com/rivo/tview v0.0.0-20190113120821-e5e361b9d790/go.mod h1:J4W+hErFfITUbyFAEXizpmkuxX7ZN56dopxHB4XQhMw=
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
Expand Down
2 changes: 1 addition & 1 deletion cmd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/decred/slog v1.0.0
github.com/jessevdk/go-flags v1.4.0
github.com/jrick/logrotate v1.0.0
github.com/raedahgroup/dcrlibwallet v1.1.1-0.20190928085114-bcc6e6b7769a // indirect
Sirmorrison marked this conversation as resolved.
Show resolved Hide resolved
github.com/raedahgroup/godcr/app v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/cli v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/nuklear v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/terminal v0.0.0-00010101000000-000000000000 // indirect
Sirmorrison marked this conversation as resolved.
Show resolved Hide resolved
github.com/raedahgroup/godcr/web v0.0.0-00010101000000-000000000000
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/godcr-fyne/fyne.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ var defaultAppDataDir = dcrutil.AppDataDir("godcr", false)

func main() {
fyne.LaunchUserInterface(appDisplayName, defaultAppDataDir, "testnet3")
}
}
2 changes: 1 addition & 1 deletion cmd/godcr-fyne/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,4 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
6 changes: 3 additions & 3 deletions fyne/assets/icons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const (
MoreIcon = "more.png"
InfoIcon = "info.png"
ReceiveAccountIcon = "receiveAccount.png"

CollapseDropdown = "collapseDropdown.png"
ExpandDropdown = "expandDropdown.png"
CollapseDropdown = "collapseDropdown.png"
ExpandDropdown = "expandDropdown.png"
RedirectIcon = "redirect.png"
)

var imageBox = packr.New("icons", "../assets")
Expand Down
Binary file added fyne/assets/redirect.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fyne/assets/share.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions fyne/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.13

require (
fyne.io/fyne v1.2.0
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
github.com/decred/dcrd/dcrutil v1.4.0
github.com/decred/slog v1.0.0
github.com/gen2brain/beeep v0.0.0-20190719094215-ece0cb67ca77
Expand Down
24 changes: 24 additions & 0 deletions fyne/helpers/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package helpers

import (
"fyne.io/fyne/widget"
"github.com/raedahgroup/godcr/fyne/assets"
)

func TxDirectionIcon(direction int32) string {
switch direction {
case 0:
return assets.SendIcon
case 1:
return assets.ReceiveIcon
case 2:
return assets.ReceiveIcon
default:
return assets.InfoIcon
}
}

func ErrorHandler(err string, errorLabel *widget.Label) {
errorLabel.SetText(err)
errorLabel.Show()
}
2 changes: 1 addition & 1 deletion fyne/pages/display.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (app *AppInterface) setupNavigationMenu() {
case 0:
newPageContent = overviewPageContent(app)
case 1:
newPageContent = historyPageContent()
newPageContent = historyPageContent(app)
case 2:
newPageContent = sendPageContent(app.MultiWallet, app.Window)
case 3:
Expand Down
1 change: 1 addition & 0 deletions fyne/pages/handler/values/colors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ var (
Green = color.RGBA{65, 190, 83, 255}
NilAmountColor = color.RGBA{137, 151, 165, 255}
ConfirmationPageStrippedColor = color.RGBA{237, 239, 241, 255}
TxdetailsLineColor = color.RGBA{0xe0, 0xe0, 0xe0, 0xff}
)
3 changes: 3 additions & 0 deletions fyne/pages/handler/values/strings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ const (
GenerateNewAddress = "Generate new address"
ReceivePageInfo = "Each time you request a \npayment, a new address is \ncreated to protect your privacy."

// History Page
PageHint = "- Tap Hash to view Transaction details.\n\n- Tap Blue Text to Copy."

// Error Messages
AmountDecimalPlaceErr = "Amount has more than 8 decimal places"
AccountSelectorIconErr = "Could not retrieve account selector icons"
Expand Down
Loading