Skip to content

Commit

Permalink
Add fingerprint/notifications screens; UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaliy Vlasov committed Jun 4, 2019
1 parent b78315e commit a0f851f
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 67 deletions.
5 changes: 5 additions & 0 deletions resources/icons/main/bell.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/icons/main/fingerprint.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/icons/main/keycard-logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 17 additions & 3 deletions src/status_im/accounts/create/core.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[status-im.utils.identicon :as identicon]
[status-im.utils.signing-phrase.core :as signing-phrase]
[status-im.utils.types :as types]
[status-im.utils.utils :as utils]
[taoensso.timbre :as log]
[status-im.utils.fx :as fx]
[status-im.node.core :as node]
Expand Down Expand Up @@ -154,14 +155,16 @@
(fx/merge {:db (cond-> (assoc-in db [:intro-wizard :step] (dec step))
(#{4 5} step)
(assoc-in [:intro-wizard :key-code] nil)
(= step 4)
(assoc-in [:intro-wizard :encrypt-with-password?] false)
(= step 5)
(assoc-in [:intro-wizard :confirm-failure?] false))}
(navigation/navigate-to-cofx :intro-wizard nil))

(fx/merge {:db (dissoc db :intro-wizard)}
(navigation/navigate-to-clean :intro nil)))))

(fx/defn intro-step-forward [{:keys [db] :as cofx}]
(fx/defn intro-step-forward [{:keys [db] :as cofx} {:keys [skip?] :as opts}]
(let [step (get-in db [:intro-wizard :step])]

(cond (= step 7)
Expand All @@ -176,7 +179,9 @@
(assoc-in [:intro-wizard :stored-key-code] (get-in db [:intro-wizard :key-code]))
(assoc-in [:intro-wizard :key-code] nil)
(assoc-in [:intro-wizard :step] 5))}
:else (fx/merge {:db (assoc-in db [:intro-wizard :step] (inc step))} (navigation/navigate-to-cofx :intro-wizard nil)))))
:else (fx/merge {:db (assoc-in db [:intro-wizard :step]
(inc step))}
(navigation/navigate-to-cofx :intro-wizard nil)))))
(re-frame/reg-fx
:intro-wizard/new-onboarding
(fn [{:keys [n mnemonic-length]}]
Expand Down Expand Up @@ -204,6 +209,9 @@
(log/info "#on-key-storage-selected" storage-type)
{:db (assoc-in db [:intro-wizard :selected-storage-type] storage-type)})

(fx/defn on-encrypt-with-password-pressed [{:keys [db] :as cofx}]
{:db (assoc-in db [:intro-wizard :encrypt-with-password?] true)})

(fx/defn on-learn-more-pressed [{:keys [db] :as cofx}]
{:db (assoc-in db [:intro-wizard :show-learn-more?] true)})

Expand All @@ -223,12 +231,18 @@
confirm-failure? (and (= step 5)
(= (count new-key-code) 6)
(not= new-key-code stored-key-code))]
(when confirm-failure?
(utils/vibrate))
(fx/merge {:db (-> db
(assoc-in [:intro-wizard :key-code] new-key-code)
(assoc-in [:intro-wizard :confirm-failure?] confirm-failure?))}
(when (and (= (count new-key-code) 6)
(not confirm-failure?))
intro-step-forward))))
(intro-step-forward {})))))

(fx/defn password-symbol-pressed [{:keys [db] :as cofx} symbol]
{:db (update-in db [:intro-wizard :password] str symbol)})

;;;; COFX

(re-frame/reg-cofx
Expand Down
14 changes: 12 additions & 2 deletions src/status_im/events.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@

(handlers/register-handler-fx
:intro-wizard/step-forward-pressed
(fn [cofx _]
(accounts.create/intro-step-forward cofx)))
(fn [cofx [_ opts]]
(accounts.create/intro-step-forward cofx opts)))

(handlers/register-handler-fx
:intro-wizard/code-digit-pressed
Expand All @@ -298,6 +298,16 @@
:intro-wizard/on-learn-more-pressed
(fn [cofx _]
(accounts.create/on-learn-more-pressed cofx)))

(handlers/register-handler-fx
:intro-wizard/on-encrypt-with-password-pressed
(fn [cofx _]
(accounts.create/on-encrypt-with-password-pressed cofx)))

(handlers/register-handler-fx
:intro-wizard/password-symbol-pressed
(fn [cofx [_ symbol]]
(accounts.create/password-symbol-pressed cofx symbol)))
;; accounts recover module

(handlers/register-handler-fx
Expand Down
6 changes: 6 additions & 0 deletions src/status_im/ui/components/icons/vector_icons.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
:main-icons/arrow-up (js/require "./resources/icons/main/arrow_up.svg")
:main-icons/back (js/require "./resources/icons/main/back.svg")
:main-icons/backspace (js/require "./resources/icons/main/backspace.svg")
:main-icons/bell (js/require "./resources/icons/main/bell.svg")
:main-icons/browser (js/require "./resources/icons/main/browser.svg")
:main-icons/browser-home (js/require "./resources/icons/main/browser_home.svg")
:main-icons/camera (js/require "./resources/icons/main/camera.svg")
Expand All @@ -56,6 +57,7 @@
:main-icons/dropdown-up (js/require "./resources/icons/main/dropdown_up.svg")
:main-icons/edit (js/require "./resources/icons/main/edit.svg")
:main-icons/filter (js/require "./resources/icons/main/filter.svg")
:main-icons/fingerprint (js/require "./resources/icons/main/fingerprint.svg")
:main-icons/flash-active (js/require "./resources/icons/main/flash_active.svg")
:main-icons/flash-inactive (js/require "./resources/icons/main/flash_inactive.svg")
:main-icons/fleet (js/require "./resources/icons/main/mailserver.svg")
Expand All @@ -66,6 +68,7 @@
:main-icons/in-contacts (js/require "./resources/icons/main/in_contacts.svg")
:main-icons/info (js/require "./resources/icons/main/info.svg")
:main-icons/keycard (js/require "./resources/icons/main/keycard.svg")
:main-icons/keycard-logo (js/require "./resources/icons/main/keycard-logo.svg")
:main-icons/language (js/require "./resources/icons/main/language.svg")
:main-icons/link (js/require "./resources/icons/main/link.svg")
:main-icons/log-level (js/require "./resources/icons/main/mailserver.svg")
Expand Down Expand Up @@ -138,6 +141,7 @@
:main-icons/arrow-up (components.svg/slurp-svg "./resources/icons/main/arrow_up.svg")
:main-icons/back (components.svg/slurp-svg "./resources/icons/main/back.svg")
:main-icons/backspace (components.svg/slurp-svg "./resources/icons/main/backspace.svg")
:main-icons/bell (components.svg/slurp-svg "./resources/icons/main/bell.svg")
:main-icons/browser (components.svg/slurp-svg "./resources/icons/main/browser.svg")
:main-icons/browser-home (components.svg/slurp-svg "./resources/icons/main/browser_home.svg")
:main-icons/camera (components.svg/slurp-svg "./resources/icons/main/camera.svg")
Expand All @@ -154,6 +158,7 @@
:main-icons/dropdown-up (components.svg/slurp-svg "./resources/icons/main/dropdown_up.svg")
:main-icons/edit (components.svg/slurp-svg "./resources/icons/main/edit.svg")
:main-icons/filter (components.svg/slurp-svg "./resources/icons/main/filter.svg")
:main-icons/fingerprint (components.svg/slurp-svg "./resources/icons/main/fingerprint.svg")
:main-icons/flash-active (components.svg/slurp-svg "./resources/icons/main/flash_active.svg")
:main-icons/flash-inactive (components.svg/slurp-svg "./resources/icons/main/flash_inactive.svg")
:main-icons/fleet (components.svg/slurp-svg "./resources/icons/main/mailserver.svg")
Expand All @@ -164,6 +169,7 @@
:main-icons/in-contacts (components.svg/slurp-svg "./resources/icons/main/in_contacts.svg")
:main-icons/info (components.svg/slurp-svg "./resources/icons/main/info.svg")
:main-icons/keycard (components.svg/slurp-svg "./resources/icons/main/keycard.svg")
:main-icons/keycard-logo (components.svg/slurp-svg "./resources/icons/main/keycard-logo.svg")
:main-icons/language (components.svg/slurp-svg "./resources/icons/main/language.svg")
:main-icons/link (components.svg/slurp-svg "./resources/icons/main/link.svg")
:main-icons/log-level (components.svg/slurp-svg "./resources/icons/main/mailserver.svg")
Expand Down
4 changes: 2 additions & 2 deletions src/status_im/ui/components/numpad/styles.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
:min-height 292
:max-height 328})

(def number-container
(defn number-container [hide-container?]
{:width 64
:height 64
:border-radius 32
:justify-content :center
:align-items :center
:background-color colors/blue-light})
:background-color (if hide-container? colors/white colors/blue-light)})

21 changes: 14 additions & 7 deletions src/status_im/ui/components/numpad/views.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
[status-im.ui.components.react :as react]))

(defn number-view
[numpad-symbol {:keys [on-press]}]
[(react/touchable-opacity)
{:on-press #(on-press numpad-symbol)}
[react/view {:style styles/number-container}
(if (= numpad-symbol :remove)
[icons/icon :main-icons/backspace {:color colors/blue}]
[react/text {:style styles/number} numpad-symbol])]])
[numpad-symbol {:keys [on-press hide-dot?]}]
(let [hide-container? (and (= numpad-symbol ".") hide-dot?)
number-container
[react/view {:style (styles/number-container hide-container?)}
(cond (= numpad-symbol :remove)
[icons/icon :main-icons/backspace {:color colors/blue}]
hide-container?
nil
:else [react/text {:style styles/number} numpad-symbol])]]
(if hide-container?
number-container
[(react/touchable-opacity)
{:on-press #(on-press numpad-symbol)}
number-container])))

(defn number-row
[[left middle right] opts]
Expand Down
Loading

0 comments on commit a0f851f

Please sign in to comment.