status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX #1721] Disable sign-in button when no password has been entered

This commit is contained in:
Julien Eluard 2017-09-02 17:49:57 +02:00 committed by Roman Volosovskyi
parent c6daeaa1ee
commit bc73fbd83e
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/status_im/ui/screens/accounts/login/styles.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.ui.screens.accounts.login.styles (ns status-im.ui.screens.accounts.login.styles
(:require-macros [status-im.utils.styles :refer [defnstyle defstyle]]) (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]])
(:require [status-im.components.styles :as common])) (:require [status-im.components.styles :as st]))
(defstyle login-view (defstyle login-view
{:flex 1 {:flex 1
@ -25,8 +25,12 @@
:letter-spacing -0.2} :letter-spacing -0.2}
:android {:font-size 16}}) :android {:font-size 16}})
(def sign-it-disabled-text
(merge sign-it-text
{:color st/color-gray2}))
(defstyle sign-in-button (defstyle sign-in-button
{:background-color common/color-blue3 {:background-color st/color-blue3
:align-items :center :align-items :center
:justify-content :center :justify-content :center
:height 52 :height 52
@ -41,4 +45,4 @@
:left 0 :left 0
:align-items :center :align-items :center
:justify-content :center :justify-content :center
:background-color (str common/color-black "1A")}) :background-color (str st/color-black "1A")})

25
src/status_im/ui/screens/accounts/login/views.cljs
View File

@ -9,9 +9,7 @@
[status-im.components.toolbar-new.view :refer [toolbar]] [status-im.components.toolbar-new.view :refer [toolbar]]
[status-im.components.toolbar-new.actions :as act] [status-im.components.toolbar-new.actions :as act]
[status-im.ui.screens.accounts.login.styles :as st] [status-im.ui.screens.accounts.login.styles :as st]
[status-im.components.react :refer [view [status-im.components.react :as react]
text
touchable-highlight]]
[status-im.i18n :as i18n] [status-im.i18n :as i18n]
[status-im.components.react :as components])) [status-im.components.react :as components]))
@ -29,7 +27,7 @@
(dispatch [:login-account address password])) (dispatch [:login-account address password]))
(defn- error-key [error] (defn- error-key [error]
;; TODO Improved selection logic when status-go provide an error code ;; TODO Improve selection logic when status-go provide an error code
;; see https://github.com/status-im/status-go/issues/278 ;; see https://github.com/status-im/status-go/issues/278
(cond (cond
(string/starts-with? error "there is no running node") (string/starts-with? error "there is no running node")
@ -43,13 +41,13 @@
(defview login [] (defview login []
(letsubs [{:keys [address photo-path name password error processing]} [:get :accounts/login]] (letsubs [{:keys [address photo-path name password error processing]} [:get :accounts/login]]
[view ast/accounts-container [react/view ast/accounts-container
[status-bar {:type :transparent}] [status-bar {:type :transparent}]
[login-toolbar] [login-toolbar]
[view st/login-view [react/view st/login-view
[view st/login-badge-container [react/view st/login-badge-container
[account-badge address photo-path name] [account-badge address photo-path name]
[view {:height 8}] [react/view {:height 8}]
[text-input-with-label {:ref #(reset! password-text-input %) [text-input-with-label {:ref #(reset! password-text-input %)
:label (i18n/label :t/password) :label (i18n/label :t/password)
:auto-capitalize :none :auto-capitalize :none
@ -61,10 +59,11 @@
:auto-focus true :auto-focus true
:secure-text-entry true :secure-text-entry true
:error (when (pos? (count error)) (i18n/label (error-key error)))}]] :error (when (pos? (count error)) (i18n/label (error-key error)))}]]
[view {:margin-top 16} (let [enabled? (pos? (count password))]
[touchable-highlight {:on-press #(login-account password-text-input address password)} [react/view {:margin-top 16}
[view st/sign-in-button [react/touchable-highlight (if enabled? {:on-press #(login-account password-text-input address password)})
[text {:style st/sign-it-text} (i18n/label :t/sign-in)]]]]] [react/view st/sign-in-button
[react/text {:style (if enabled? st/sign-it-text st/sign-it-disabled-text)} (i18n/label :t/sign-in)]]]])]
(when processing (when processing
[view st/processing-view [react/view st/processing-view
[components/activity-indicator {:animating true}]])])) [components/activity-indicator {:animating true}]])]))