Skip to content

Commit

Permalink
Landing Page View (#7)
Browse files Browse the repository at this point in the history
* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* fix crash on wifi option display and set maximum with for navigation drawer (planetdecred#410)

* display no transactions text on overview/history pages when appropriate (planetdecred#412)

* Pin pass tab fix (planetdecred#414)

* Fixed issue 384

- Added border color key/value attribute to password & pin tabs on storyboard
- added code to change border width on tab activation

* deleted decred_wallet.xcworkspace

- deleted decred_wallet.xcworkspace

* Updated PIN/Password tab

- set PIN & Password tab buttons to custom Button class and checked it can be used in storyboard OK
- set the button border color

* Fixed issue 384

- Added border color key/value attribute to password & pin tabs on storyboard
- added code to change border width on tab activation

* deleted decred_wallet.xcworkspace

- deleted decred_wallet.xcworkspace

* Updated PIN/Password tab

- set PIN & Password tab buttons to custom Button class and checked it can be used in storyboard OK
- set the button border color

* Fixed PIN/Password Tab accessibility

- added border to bottom and right or left
- created function extending projects Button class to add or remove borders accordingly

* refactor

* cleanup

* Settings page cleanup (planetdecred#418)

* remove unused testnet switch, remove save/cancel buttons

* cleanup

* change Incoming Transaction Notification setting option layout

* set compression resistance priority to make label shrink first

* delete irrelevant entries from gitignore

* correct status for new tx in overview/history, correct pin/pass tab borders (planetdecred#425)

* Set password field as first responder (planetdecred#428)

* Set password field as first responder

* add self on button call

* fix typo in comment

* Remove dark background when PIN confirm button is clicked (planetdecred#427)

* send page refactor and bug fixes (planetdecred#413)

* new send page in progress

* done with page validations

* send refactor complete

* cleanup

* send confirm - return toproceed

* send confirm - return to proceed

* more cleanup

* move files around

* fix send max

* ok and view buttons on send success

* use single instance of send page to retain view state

* don't hide exchange rate label when re-fetching

* don't hide usd amount field when re-fetching

* correct send amount verification, make amount reduce font size if necessary

* resolve send max issues

* unset exchange rate value if setting is changed to no exchange rate

* punctuate error message

* punctuate error message

* capitalize exchange rate text in error display, add punctuation

* updates to support latest sync changes on dcrlibwallet/master (planetdecred#433)

* updates to support latest sync changes on dcrlibwallet/master

* ignore sync listener add error

* fix network lost/app sleep coincidence

* Settings view cleanup (planetdecred#429)

* change spend unconfirm fund Text

* disable user interaction on wallet log

* add copy button to copy wallet log

* enable user interaction and disable editing

* Remove Show debug messages on settings

* refactor settings

* hide delete button from settings, undo changes to main.storyboard

* undo changes to main.storyboard

* correct file paths

* fixing file arrangements

* move all settings-related files to Features/Settings

* remove settings and related vcs from main.storyboard

* cleanup settings

* show nav back button when settings is opened from splash screen

* cleanup wallet log copy function

* clean up security menu UI (planetdecred#426)

* clean up security menu UI

* refactor security menu

* configure security menu storyboard

* fix project.pbxproj errors with file listings

* Remove security menu VC from main storyboard

* fix file listing error

* Navigation drawer fix (planetdecred#438)

* adjust spacing on drawer

* clean up nav bar

* align syn status label to center

* Rename security menu icon and removed redundant background color set

* Implement delete wallet function (planetdecred#439)

* implement delete wallet function

* cleanup modal

* correct delete wallet modal title

* remove splash logo double tap action

* move scrolling focus down to 2/3 of the screen (planetdecred#442)

* move scrolling focus to 2/3 of the screen

* scroll to bottom only if next row is not already visible

* fix send max button to exhibit consistent behaviour (planetdecred#435)

* fix send max button to exhibit consistent behaviour

* further improvements to send max behaviour

* refactor send page to use new dcrlibwallet functions

* build after rebase

* clear tx summary on amount clear, fix . as amount crash

* improve amount validation

* ignore max amount values and display error

* sync related adjustments from dcrlibwallet/master

* re-calculate send max amount if source account is changed

* Restore double tap splash screen logo to show settings. Prevent settings crash if wallet is not opened. (planetdecred#447)

* restore double tap splash screen logo to show settings

* tap gesture on logo region instead of logo

* hide wallet options when wallet is not open

* hide rescan blockchain and delete wallet option in settings (planetdecred#448)

* update project files

* Delete wallet fix (planetdecred#444)

* invalidate sync timer

* fix changes requested

* add empty line to differ code

* update code to work with dcrlibwallet shutdown wallet fix

* Implement Settings -> Rescan Blockchain (planetdecred#445)

* implement block rescan

* do not treat rescan progress as active sync->rescan progress

* do not update nav menu labels during rescan

* don't rescan if sync is in progress

* allow updating balance during rescan

* show delete wallet and rescan blocchain settings options if wallet is opened

* Settings: add button to show open source license (planetdecred#450)

* License show in settings

* add disclosure indicator to button, connection link and fix contraint

* fix text wrap and spacing

* fix text color and delete generated viewDidLoD comment

* dark gray color used for license text

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* pin setup view - show as many dots as possible (planetdecred#452)

* Use different app display names for testnet and mainnet (planetdecred#453)

* Fix mainnet logo on navigation drawer (planetdecred#463)

* Overview, history pages: blink for new transactions (planetdecred#464)

* overview blink on new txs and incoming tx, history blink on new txs

* implement incoming tx notification listener for history

* Send page improvements: hide account dropdowns when leaving page, properly handle invalid passphrase error (planetdecred#466)

* hide dropdown when leaving send page

* send page: show retry dialog on incorrect passphrase

* Settings: Use constants for preference keys (planetdecred#465)

* Use constants for preference keys

* fix changes requested on PR

* Renamed variable names

* further moving userdefault to settings

* fix changes and refactor

* add accountHeader file

* fix indent

* Security: Increase start up password field height and display keyboard on load (planetdecred#467)

* Increase password field height and display keyboard on load

* resize textfield height and font

* restart sync if it stalls for 30 seconds (planetdecred#472)

* dont show receive address during wallet restore (planetdecred#473)

* dont show receive address during wallet restore

* alowing the receive menu content when its the first wallet set up

* PR changes and code refactor

* refactor work and renaming of functions to be more readable

* if else statement

* removal of un needed check

* hiding the bar items when in sync

* security page: restyle tab for pass/pin (planetdecred#469)

* Restyle tab for pass/pin

* remove white space

* remove white space

* Add highlighted background on button

* clean up and refactor

* fix changes requested in PR

* fix changes requested in PR

* ipod icons stretch fix (planetdecred#474)

* update dcrlibwallet GetTransaction method usage (planetdecred#480)

* App Localization and Translation(Russia) (planetdecred#470)

* Restyle tab for pass/pin

* remove white space

* remove white space

* Internationalize app and extract strings from views(storyboard,xib and cells)

* Move and centralize view controller string

* Cont: move,format and centralize view controller string

* fix crash caused by encoding

* Finalize: move,format and centralize view controller string

* delete multiple strings files from views and storyboard

* fix cliping error on components for localozable screen

* link all string UI component  to single file, fix cliping components and clean up files

* changing the strings to match android,implement russian translation and fix displaced view

* delete redundant files

* fix text string links

* Remove changes meant for a diffrent PR

* delete unused string

* revert tab color code

* delete duplicate string

* localize string update from recent PR

* Remove developer team from build

* Place localized string in struct for easy readability and usage

* link all strings from struct to app

* fix copyright header and delete unused singleInstance.swift file

* fix changes requested

* PR changes requested: create UILable for localized string

* clean up multiple strings

* fix changes requested in PR

* fix settings link with localizedkey

* Rename incorrectSecurityInfo key

* Remove developer team

* Remove extra period from UILabel name

* fix typo in spelling

* fix changes requested on dummy Text and spacing

* delete unused controller and storyboard and few string changes

* Remove unused code in label extension

* Remove devloper team

* new wallet->verify seed: fix seed word selection scrambling on page scroll (planetdecred#483)

* new wallet->verify seed: fix seed word selection scrambling on page scroll

* remove test/dev print code

* Seed Verify: Auto scroll up to show confirm button (planetdecred#485)

* auto scroll up to show confirm button

* show confirm button on scroll end, not before

* IPodTouch: Fix chopped off text UI on overview and security page (planetdecred#487)

* Fix chopped off UI on overview and security page

* fix dropdown image into button

* Remove developer team

* fix cancel image on button in security page

* change device id

* delete unused label

* change overview device

* change line break to truncate tail

* don't restart sync due to delayed updates (stalling) if sync was already completed (planetdecred#489)

* refactor stalled sync restart code (planetdecred#490)

* adopt dcrlibwallet RestartSpvSync method to fix app restart sync issues on a synced wallet (planetdecred#491)

* fix crash on ipad when sharing address (planetdecred#494)

* fix crash on ipad when sharing address

* fix popup view to the right of barButton

* fix link to view on mainnet explorer (planetdecred#496)

* App translation and string rearrangement: zh (planetdecred#482)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Fix syntax error

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* Account details : Fix overlapping text (planetdecred#501)

* fix overlapping text on account details

* fix overlapping text on key row

* App Translation:Pt-br (planetdecred#497)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Copy strings from dcrandroid to implement portuguese(Brazil) translation

* Fix syntax error

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* App Translation:Vi (planetdecred#498)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Fix syntax error

* Copy strings from dcrandroid to implement Vietnamese translation

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* App Translation: Spanish (planetdecred#500)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Fix syntax error

* Copy strings from dcrandroid to implement spanish translation

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Finished start screen

* removed unused variables and strings

* switched remote branch

* switched remote branch

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* display no transactions text on overview/history pages when appropriate (planetdecred#412)

* Pin pass tab fix (planetdecred#414)

* Fixed issue 384

- Added border color key/value attribute to password & pin tabs on storyboard
- added code to change border width on tab activation

* deleted decred_wallet.xcworkspace

- deleted decred_wallet.xcworkspace

* Updated PIN/Password tab

- set PIN & Password tab buttons to custom Button class and checked it can be used in storyboard OK
- set the button border color

* Fixed issue 384

- Added border color key/value attribute to password & pin tabs on storyboard
- added code to change border width on tab activation

* deleted decred_wallet.xcworkspace

- deleted decred_wallet.xcworkspace

* Updated PIN/Password tab

- set PIN & Password tab buttons to custom Button class and checked it can be used in storyboard OK
- set the button border color

* Fixed PIN/Password Tab accessibility

- added border to bottom and right or left
- created function extending projects Button class to add or remove borders accordingly

* refactor

* cleanup

* Settings page cleanup (planetdecred#418)

* remove unused testnet switch, remove save/cancel buttons

* cleanup

* change Incoming Transaction Notification setting option layout

* set compression resistance priority to make label shrink first

* delete irrelevant entries from gitignore

* correct status for new tx in overview/history, correct pin/pass tab borders (planetdecred#425)

* send page refactor and bug fixes (planetdecred#413)

* new send page in progress

* done with page validations

* send refactor complete

* cleanup

* send confirm - return toproceed

* send confirm - return to proceed

* more cleanup

* move files around

* fix send max

* ok and view buttons on send success

* use single instance of send page to retain view state

* don't hide exchange rate label when re-fetching

* don't hide usd amount field when re-fetching

* correct send amount verification, make amount reduce font size if necessary

* resolve send max issues

* unset exchange rate value if setting is changed to no exchange rate

* punctuate error message

* punctuate error message

* capitalize exchange rate text in error display, add punctuation

* Settings view cleanup (planetdecred#429)

* change spend unconfirm fund Text

* disable user interaction on wallet log

* add copy button to copy wallet log

* enable user interaction and disable editing

* Remove Show debug messages on settings

* refactor settings

* hide delete button from settings, undo changes to main.storyboard

* undo changes to main.storyboard

* correct file paths

* fixing file arrangements

* move all settings-related files to Features/Settings

* remove settings and related vcs from main.storyboard

* cleanup settings

* show nav back button when settings is opened from splash screen

* cleanup wallet log copy function

* clean up security menu UI (planetdecred#426)

* clean up security menu UI

* refactor security menu

* configure security menu storyboard

* fix project.pbxproj errors with file listings

* Remove security menu VC from main storyboard

* fix file listing error

* Navigation drawer fix (planetdecred#438)

* adjust spacing on drawer

* clean up nav bar

* align syn status label to center

* Rename security menu icon and removed redundant background color set

* Implement delete wallet function (planetdecred#439)

* implement delete wallet function

* cleanup modal

* correct delete wallet modal title

* remove splash logo double tap action

* move scrolling focus down to 2/3 of the screen (planetdecred#442)

* move scrolling focus to 2/3 of the screen

* scroll to bottom only if next row is not already visible

* fix send max button to exhibit consistent behaviour (planetdecred#435)

* fix send max button to exhibit consistent behaviour

* further improvements to send max behaviour

* refactor send page to use new dcrlibwallet functions

* build after rebase

* clear tx summary on amount clear, fix . as amount crash

* improve amount validation

* ignore max amount values and display error

* sync related adjustments from dcrlibwallet/master

* re-calculate send max amount if source account is changed

* Restore double tap splash screen logo to show settings. Prevent settings crash if wallet is not opened. (planetdecred#447)

* restore double tap splash screen logo to show settings

* tap gesture on logo region instead of logo

* hide wallet options when wallet is not open

* hide rescan blockchain and delete wallet option in settings (planetdecred#448)

* update project files

* Delete wallet fix (planetdecred#444)

* invalidate sync timer

* fix changes requested

* add empty line to differ code

* update code to work with dcrlibwallet shutdown wallet fix

* Implement Settings -> Rescan Blockchain (planetdecred#445)

* implement block rescan

* do not treat rescan progress as active sync->rescan progress

* do not update nav menu labels during rescan

* don't rescan if sync is in progress

* allow updating balance during rescan

* show delete wallet and rescan blocchain settings options if wallet is opened

* Settings: add button to show open source license (planetdecred#450)

* License show in settings

* add disclosure indicator to button, connection link and fix contraint

* fix text wrap and spacing

* fix text color and delete generated viewDidLoD comment

* dark gray color used for license text

* pin setup view - show as many dots as possible (planetdecred#452)

* Use different app display names for testnet and mainnet (planetdecred#453)

* Fix mainnet logo on navigation drawer (planetdecred#463)

* Overview, history pages: blink for new transactions (planetdecred#464)

* overview blink on new txs and incoming tx, history blink on new txs

* implement incoming tx notification listener for history

* Send page improvements: hide account dropdowns when leaving page, properly handle invalid passphrase error (planetdecred#466)

* hide dropdown when leaving send page

* send page: show retry dialog on incorrect passphrase

* Settings: Use constants for preference keys (planetdecred#465)

* Use constants for preference keys

* fix changes requested on PR

* Renamed variable names

* further moving userdefault to settings

* fix changes and refactor

* add accountHeader file

* fix indent

* Security: Increase start up password field height and display keyboard on load (planetdecred#467)

* Increase password field height and display keyboard on load

* resize textfield height and font

* restart sync if it stalls for 30 seconds (planetdecred#472)

* dont show receive address during wallet restore (planetdecred#473)

* dont show receive address during wallet restore

* alowing the receive menu content when its the first wallet set up

* PR changes and code refactor

* refactor work and renaming of functions to be more readable

* if else statement

* removal of un needed check

* hiding the bar items when in sync

* security page: restyle tab for pass/pin (planetdecred#469)

* Restyle tab for pass/pin

* remove white space

* remove white space

* Add highlighted background on button

* clean up and refactor

* fix changes requested in PR

* fix changes requested in PR

* ipod icons stretch fix (planetdecred#474)

* update dcrlibwallet GetTransaction method usage (planetdecred#480)

* App Localization and Translation(Russia) (planetdecred#470)

* Restyle tab for pass/pin

* remove white space

* remove white space

* Internationalize app and extract strings from views(storyboard,xib and cells)

* Move and centralize view controller string

* Cont: move,format and centralize view controller string

* fix crash caused by encoding

* Finalize: move,format and centralize view controller string

* delete multiple strings files from views and storyboard

* fix cliping error on components for localozable screen

* link all string UI component  to single file, fix cliping components and clean up files

* changing the strings to match android,implement russian translation and fix displaced view

* delete redundant files

* fix text string links

* Remove changes meant for a diffrent PR

* delete unused string

* revert tab color code

* delete duplicate string

* localize string update from recent PR

* Remove developer team from build

* Place localized string in struct for easy readability and usage

* link all strings from struct to app

* fix copyright header and delete unused singleInstance.swift file

* fix changes requested

* PR changes requested: create UILable for localized string

* clean up multiple strings

* fix changes requested in PR

* fix settings link with localizedkey

* Rename incorrectSecurityInfo key

* Remove developer team

* Remove extra period from UILabel name

* fix typo in spelling

* fix changes requested on dummy Text and spacing

* delete unused controller and storyboard and few string changes

* Remove unused code in label extension

* Remove devloper team

* new wallet->verify seed: fix seed word selection scrambling on page scroll (planetdecred#483)

* new wallet->verify seed: fix seed word selection scrambling on page scroll

* remove test/dev print code

* Seed Verify: Auto scroll up to show confirm button (planetdecred#485)

* auto scroll up to show confirm button

* show confirm button on scroll end, not before

* IPodTouch: Fix chopped off text UI on overview and security page (planetdecred#487)

* Fix chopped off UI on overview and security page

* fix dropdown image into button

* Remove developer team

* fix cancel image on button in security page

* change device id

* delete unused label

* change overview device

* change line break to truncate tail

* don't restart sync due to delayed updates (stalling) if sync was already completed (planetdecred#489)

* refactor stalled sync restart code (planetdecred#490)

* adopt dcrlibwallet RestartSpvSync method to fix app restart sync issues on a synced wallet (planetdecred#491)

* App translation and string rearrangement: zh (planetdecred#482)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Fix syntax error

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* Account details : Fix overlapping text (planetdecred#501)

* fix overlapping text on account details

* fix overlapping text on key row

* App Translation:Vi (planetdecred#498)

* translation: zh

* Fix string id changes from master and other changes related to strings

* Rearrange all string files according to app launch

* Fix syntax error

* Copy strings from dcrandroid to implement Vietnamese translation

* move localized string into Decred Wallet directory

* Rename PasswordDoNotMatch ID

* Fixed issue 358

- Fixed bug where app crashed once input went beyond 5 characters by setting maximum characters to 5
- Resolved PIn strength meter issue by toggling its visibility on PIN commit button action.

* made changes suggested

Changes suggested on review of Pull request #2
- Updated Cocoapods
- fixed typos
- removed unneccesary spaces

* Fixed issue 372

- changed maximum Int to LONG_MAX
- Moved layer clear block to draw function
- remove unneccessary type casting on pin lable to improve performance
- changed remove from superview block to use an array map style instead

* refactored commit #e4174d51aed804a470b8d42f08229756f8993915

* refactored commit d097f90

- Removed unwanted comments
- Added comments to lines needing clarification.
- refactored drawPinLabel to accept an argument containing label bounds

* Fixed app crash on 6> digit PIN delete

- moved subview removal to before didSetDisplay() block

* Fixed issue 384

- Added border around active tab on selection
- Remove border around inactive tab on selection of other tab

* Finished start screen

* removed unused variables and strings

* switched remote branch

* switched remote branch
  • Loading branch information
quacklabs authored and itswisdomagain committed Aug 21, 2019
1 parent 90f3e85 commit a14fb92
Show file tree
Hide file tree
Showing 25 changed files with 420 additions and 407 deletions.
120 changes: 79 additions & 41 deletions Decred Wallet.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions Decred Wallet/Assets.xcassets/icon-eye.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-eye.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-eye@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "icon-eye@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Decred Wallet/Assets.xcassets/icon-plus.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-plus.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-plus@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "icon-plus@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Decred Wallet/Assets.xcassets/icon-restart.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-restart.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-restart@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "icon-restart@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 Decred Wallet/Extensions/UIColor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ extension UIColor {
static let thinGray = UIColor.init(hex: "#a4abb1")
static let darkGray = UIColor.init(hex: "#4e5f70")
static let transparentThinGray = UIColor.init(hex: "#a4abb1", alpha: 0.3)
static let textDark = UIColor.init(hex: "#596d81")
}

convenience init(hex: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import UIKit
import Dcrlibwallet


class SyncProgressViewController: UIViewController {
@IBOutlet weak var syncHeaderLabel: UILabel!
@IBOutlet weak var generalSyncProgressBar: UIProgressView!
Expand Down
14 changes: 12 additions & 2 deletions Decred Wallet/Features/Security/PasswordSetupViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,24 @@
import UIKit

class PasswordSetupViewController: SecurityBaseViewController, UITextFieldDelegate {
@IBOutlet weak var headerText: UILabel!
@IBOutlet weak var tfPassword: UITextField!
@IBOutlet weak var tfConfirmPassword: UITextField!
@IBOutlet weak var lbMatchIndicator: UILabel!
@IBOutlet weak var pbPasswordStrength: UIProgressView!

@IBOutlet weak var passwordCount: UILabel!
@IBOutlet weak var passwordLabel: UILabel!


var securityFor: String = "" // expects "Spending", "Startup" or other security section
var onUserEnteredPassword: ((_ password: String) -> Void)?

override func viewDidLoad() {
super.viewDidLoad()
self.hideKeyboardOnTapAround()

self.setupInterface()

// calculate password strength when password changes; and check if password matches
self.tfPassword.addTarget(self, action: #selector(self.passwordTextFieldChange), for: .editingChanged)
// add editing changed target to check if password matches
Expand All @@ -34,7 +39,7 @@ class PasswordSetupViewController: SecurityBaseViewController, UITextFieldDelega
self.tfPassword.delegate = self
self.tfConfirmPassword.delegate = self

self.headerText.text = String(format: LocalizedStrings.createPassword, self.securityFor)
// self.headerText.text = String(format: LocalizedStrings.createPassword, self.securityFor)
self.lbMatchIndicator.text = " " // use empty space so label height isn't reduced
}

Expand Down Expand Up @@ -99,4 +104,9 @@ class PasswordSetupViewController: SecurityBaseViewController, UITextFieldDelega
self.onUserEnteredPassword?(self.tfPassword.text!)
return true
}

private func setupInterface(){
tfPassword.layer.cornerRadius = 7
tfConfirmPassword.layer.cornerRadius = 7
}
}
18 changes: 9 additions & 9 deletions Decred Wallet/Features/Security/PinInputView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ class PinInputView: UIView {
static let spacingBetweenPinCircles: CGFloat = 10.0
static let circleBorderSizeFactor: CGFloat = 0.15
static let defaultCircleDiameter: CGFloat = 30.0
static let maxNumberOfPinCircles: Int = 6

var maxNumberOfDigits: Int = Int(LONG_MAX)


var pin: String = "" {
didSet {
self.subviews.forEach{ $0.removeFromSuperview() }
Expand Down Expand Up @@ -55,22 +57,21 @@ class PinInputView: UIView {
}

func drawCells(in frame: CGRect) {
if self.totalWidthRequiredToDisplayAllPinCircles > frame.width {
self.drawPinLabel(in: frame)
if (pin.count > PinInputView.maxNumberOfPinCircles) {
self.drawPinLabel(frame: frame)
} else {
self.drawPinCircles(in: frame)
}
}

func drawPinLabel(in frame: CGRect) {
// Set the label bounds to resolve any ambiguity. Using UILabel() without proper bounds causes the app to crash.
let pinLabel = UILabel(frame: frame)

pinLabel.text = String(pin.count)
func drawPinLabel(frame: CGRect) {
let pinDigitsCount = String(pin.count)
let pinLabel = UILabel(frame: frame) // Set the label bounds to resolve any ambiguity. Using UILabel() without proper bounds causes the app to crash as the label is unaware of where it should be positioned or what it should look like.
pinLabel.translatesAutoresizingMaskIntoConstraints = false // Neccesarry to prevent autolayout constraints from setting conflicting attributes to the label
pinLabel.text = pinDigitsCount
pinLabel.textAlignment = .center
pinLabel.textColor = #colorLiteral(red: 0.2537069321, green: 0.8615272641, blue: 0.7028611302, alpha: 1)
pinLabel.font = pinLabel.font.withSize(25)

self.addSubview(pinLabel)
}

Expand Down Expand Up @@ -99,7 +100,6 @@ class PinInputView: UIView {
circleShape.fillColor = #colorLiteral(red: 0.2537069321, green: 0.8615272641, blue: 0.7028611302, alpha: 1).cgColor
circleShape.strokeColor = UIColor.white.cgColor
circleShape.lineWidth = diameter * PinInputView.circleBorderSizeFactor

self.layer.addSublayer(circleShape)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class RequestPinViewController: SecurityBaseViewController {
var onUserEnteredPin: ((_ pin: String) -> Void)?

var requestPinConfirmation = false

var pinToConfirm: String = ""

@IBOutlet weak var cancelBtn: UIButton!
Expand Down Expand Up @@ -84,11 +85,11 @@ class RequestPinViewController: SecurityBaseViewController {
}
else if requestPinConfirmation && pinToConfirm != pinInputView.pin {
self.pinToConfirm = ""
self.headerText.text = LocalizedStrings.pinsDidNotMatch
self.headerText.text = "PINs did not match. Try again"

// Reset the input
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
self.headerText.text = String(format: LocalizedStrings.createPIN, self.securityFor)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
self.headerText.text = "Create \(self.securityFor) PIN"
self.pinInputView.clear()
self.prgsPinStrength.progress = 0

Expand Down
Loading

0 comments on commit a14fb92

Please sign in to comment.