Adds editor icons #677
Merged
Adds editor icons #677
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AdimekweEbuka
force-pushed
the
Adds_EditorIcons
branch
from
58edce0
to
3a292f8
Compare
AdimekweEbuka
force-pushed
the
Adds_EditorIcons
branch
from
3a292f8
to
2a308d3
Compare
dreacot
requested changes
Oct 27, 2021
ui/decredmaterial/editor.go
Outdated
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| package decredmaterial | |||
|
|
|||
| // | |||
ui/decredmaterial/editor.go
Outdated
| @@ -43,10 +44,12 @@ type Editor struct { | |||
| Bordered bool | |||
| //IsPassword if true, displays the show and hide button. | |||
There was a problem hiding this comment.
All comments should start with a space after the slash, and should use the correct capitalization, here the 'i' in isPassword should be small letters, apply these changes for all other comments
Suggested change
| //IsPassword if true, displays the show and hide button. | |
| // isPassword if true, displays the show and hide button. |
ui/decredmaterial/editor.go
Outdated
| @@ -73,6 +77,14 @@ func (t *Theme) RestoreEditor(editor *widget.Editor, hint string, title string) | |||
| } | |||
| } | |||
|
|
|||
| //CREATES AN EDITOR WIDGET WITH ICON OF CHOICE. | |||
There was a problem hiding this comment.
- Comments should not be in all caps
- For exported functions, the comment should start with the exported function name
ui/decredmaterial/editor.go
Outdated
| @@ -247,7 +267,7 @@ func (e Editor) editor(gtx layout.Context) layout.Dimensions { | |||
| } | |||
|
|
|||
| func (e Editor) handleEvents() { | |||
| if e.showHidePassword.Button.Clicked() { | |||
| if e.editorIconButton.Button.Clicked() { | |||
There was a problem hiding this comment.
Currently the icons all does the same thing when clicked, the click event should be customizable
dreacot
requested changes
Oct 28, 2021
ui/decredmaterial/editor.go
Outdated
Comment on lines
39
to
43
| // Bordered if true makes the adds a border around the editor. | ||
| HasCustomButton bool | ||
| CustomButton Button | ||
|
|
||
| Bordered bool |
There was a problem hiding this comment.
Suggested change
| // Bordered if true makes the adds a border around the editor. | |
| HasCustomButton bool | |
| CustomButton Button | |
| Bordered bool | |
| HasCustomButton bool | |
| CustomButton Button | |
| // Bordered if true makes the adds a border around the editor. | |
| Bordered bool |
ui/decredmaterial/editor.go
Outdated
| @@ -73,6 +79,15 @@ func (t *Theme) RestoreEditor(editor *widget.Editor, hint string, title string) | |||
| } | |||
| } | |||
|
|
|||
| // IconEditor func creates an editor widget with icon of choice | |||
There was a problem hiding this comment.
Suggested change
| // IconEditor func creates an editor widget with icon of choice | |
| // IconEditor creates an editor widget with icon of choice |
ui/decredmaterial/editor.go
Outdated
| @@ -73,6 +79,15 @@ func (t *Theme) RestoreEditor(editor *widget.Editor, hint string, title string) | |||
| } | |||
| } | |||
|
|
|||
| // IconEditor func creates an editor widget with icon of choice | |||
| func (t *Theme) IconEditor(editor *widget.Editor, hint string, editorIcon []byte, showEditorIcon bool, editorIconEvent func()) Editor { | |||
There was a problem hiding this comment.
for icons that shouldn't be clickable, trying to pass an empty event , e.g emptyEvent := func(), crashes the app when the icon is clicked.
we can try passing a boolean argument to allow buttons to either be clickable or not
dreacot
requested changes
Oct 29, 2021
ui/decredmaterial/editor.go
Outdated
| e := t.Editor(editor, hint) | ||
| e.showEditorIcon = showEditorIcon | ||
| e.isEditorButtonClickable = clickableIcon | ||
| e.editorIcon = *NewIcon(MustIcon(widget.NewIcon(editorIcon))) |
There was a problem hiding this comment.
Suggested change
| e.editorIcon = *NewIcon(MustIcon(widget.NewIcon(editorIcon))) | |
| e.editorIcon.Icon = MustIcon(widget.NewIcon(editorIcon)) |
ui/decredmaterial/editor.go
Outdated
| @@ -100,6 +123,17 @@ func (t *Theme) Editor(editor *widget.Editor, hint string) Editor { | |||
| m2: unit.Dp(2), | |||
| m5: unit.Dp(5), | |||
|
|
|||
| editorIcon: *NewIcon(MustIcon(widget.NewIcon(icons.AVAVTimer))), | |||
There was a problem hiding this comment.
Suggested change
| editorIcon: *NewIcon(MustIcon(widget.NewIcon(icons.AVAVTimer))), |
I don't see a use for this line
ui/decredmaterial/editor.go
Outdated
| editorIcon: *NewIcon(MustIcon(widget.NewIcon(icons.AVAVTimer))), | ||
| editorIconButton: IconButton{ | ||
| material.IconButtonStyle{ | ||
| Icon: MustIcon(widget.NewIcon(icons.ActionVisibilityOff)), |
There was a problem hiding this comment.
Suggested change
| Icon: MustIcon(widget.NewIcon(icons.ActionVisibilityOff)), |
This doesn't need to be initialized here
ui/modal/create_password_modal.go
Outdated
Comment on lines
70
to
77
| //PLEASE UNCOMMENT TO SEE AN EXAMPLE OF THE ICONEDITOR FUNCTION USED ON THE WALLET NAME EDITOR | ||
| showEditorIcon := true | ||
| editorIcon := icons.AVArtTrack | ||
| clickableIcon := false | ||
| emptyfunc := func() {} | ||
| cm.walletName = l.Theme.IconEditor(new(widget.Editor), "Wallet Name", editorIcon, showEditorIcon, clickableIcon, emptyfunc) | ||
| cm.walletName.Editor.SingleLine, cm.walletName.Editor.Submit = true, true | ||
|
|
There was a problem hiding this comment.
Suggested change
| //PLEASE UNCOMMENT TO SEE AN EXAMPLE OF THE ICONEDITOR FUNCTION USED ON THE WALLET NAME EDITOR | |
| showEditorIcon := true | |
| editorIcon := icons.AVArtTrack | |
| clickableIcon := false | |
| emptyfunc := func() {} | |
| cm.walletName = l.Theme.IconEditor(new(widget.Editor), "Wallet Name", editorIcon, showEditorIcon, clickableIcon, emptyfunc) | |
| cm.walletName.Editor.SingleLine, cm.walletName.Editor.Submit = true, true |
This can be deleted
ui/modal/create_password_modal.go
Outdated
Comment on lines
90
to
98
| //PLEASE UNCOMMENT TO SEE AN EXAMPLE OF THE ICONEDITOR FUNCTION USED ON THE WALLET NAME EDITOR | ||
| // func (cm *CreatePasswordModal) walletNameEvent() { | ||
| // // info := NewInfoModal(cm.Load). | ||
| // // Title("Set up startup password"). | ||
| // // Body("Startup password helps protect your wallet from unauthorized access."). | ||
| // // PositiveButton("Got it", func() {}) | ||
| // // cm.ShowModal(info) | ||
| // } | ||
|
|
There was a problem hiding this comment.
Suggested change
| //PLEASE UNCOMMENT TO SEE AN EXAMPLE OF THE ICONEDITOR FUNCTION USED ON THE WALLET NAME EDITOR | |
| // func (cm *CreatePasswordModal) walletNameEvent() { | |
| // // info := NewInfoModal(cm.Load). | |
| // // Title("Set up startup password"). | |
| // // Body("Startup password helps protect your wallet from unauthorized access."). | |
| // // PositiveButton("Got it", func() {}) | |
| // // cm.ShowModal(info) | |
| // } |
This can be deleted
dreacot
approved these changes
Oct 29, 2021
song50119
pushed a commit
to song50119/godcr
that referenced
this pull request
Apr 24, 2022
* Adds dynamic Icons to Editor Widget * fix lint * Adds support for editor widget Icon buttons * fix lint * Creates customizable click events for icons * Adds a boolean that selects between a clickable icon button and regular icon * fix lint * Cleans up unused code, comments and spaces
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This draft PR creates a function that supports dynamic Icons when creating editor widgets.
A Test was done on the wallet name Editor to show how the function works. Screenshots attached.
Closes #673