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

Allow 2 lines for user name on intro screen #9931

Merged
merged 1 commit into from
Mar 1, 2020
Merged

Allow 2 lines for user name on intro screen #9931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/status_im/ui/screens/intro/styles.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,17 @@
(defn list-item [selected?]
{:flex-direction :row
:align-items :center
:justify-content :space-between
:padding-left 16
:padding-right 10
:background-color (if selected? colors/blue-light colors/white)
:padding-vertical 12})

(def list-item-body
{:flex-direction :row
:flex 1
:align-items :flex-start})

(def multiaccount-image
{:width 40
:height 40
Expand Down
48 changes: 24 additions & 24 deletions src/status_im/ui/screens/intro/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,40 +119,40 @@
:resize-mode :contain
:style {:width image-size :height image-size}}])])))

(defn choose-key [{:keys [multiaccounts selected-id view-height]}]
(defn choose-key [{:keys [multiaccounts selected-id]}]
[react/view
{:style {:flex 1
:justify-content :center}}
[react/view
{:style {:flex 1
:height 200
:max-height 338}}
[react/scroll-view
{:content-container-style {:justify-content :flex-start}}
(for [[acc accessibility-n] (map vector multiaccounts (range (count multiaccounts)))]
(let [selected? (= (:id acc) selected-id)
public-key (get-in acc [:derived constants/path-whisper-keyword :public-key])]
^{:key public-key}
[react/touchable-highlight
{:accessibility-label (keyword (str "select-account-button-" accessibility-n))
:on-press #(re-frame/dispatch [:intro-wizard/on-key-selected (:id acc)])}
[react/view {:style (styles/list-item selected?)}

[react/scroll-view
{:style {:max-height 410}
:content-container-style {:justify-content :flex-start}}
(for [[acc accessibility-n] (map vector multiaccounts (range (count multiaccounts)))]
(let [selected? (= (:id acc) selected-id)
public-key (get-in acc [:derived constants/path-whisper-keyword :public-key])]
^{:key public-key}
[react/touchable-highlight
{:accessibility-label (keyword (str "select-account-button-" accessibility-n))
:on-press #(re-frame/dispatch [:intro-wizard/on-key-selected (:id acc)])}
[react/view {:style (styles/list-item selected?)}
[react/view {:style styles/list-item-body}
[react/image {:source {:uri (identicon/identicon public-key)}
:resize-mode :cover
:style styles/multiaccount-image}]
[react/view {:style {:margin-horizontal 16 :flex 1 :justify-content :space-between}}
[react/text {:style (assoc styles/wizard-text :text-align :left
:color colors/black
:font-weight "500")
:number-of-lines 1
:ellipsize-mode :middle}
[react/view {:style {:padding-horizontal 16
:flex 1}}
[react/text {:style (assoc styles/wizard-text :text-align :left
:color colors/black
:line-height 22
:font-weight "500")
:number-of-lines 2
:ellipsize-mode :middle}
(gfy/generate-gfy public-key)]
[react/text {:style (assoc styles/wizard-text
:text-align :left
:line-height 22
:font-family "monospace")}
(utils/get-shortened-address public-key)]]
[radio/radio selected?]]]))]]])
(utils/get-shortened-address public-key)]]]
[radio/radio selected?]]]))]])

(defn storage-entry [{:keys [type icon icon-width icon-height
image image-selected image-width image-height
Expand Down