Skip to content

Commit

Permalink
chore:rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@J-Son89
J-Son89 committed Jul 31, 2023
1 parent 73088f2 commit 945afe9
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/quo2/components/drawers/documentation_drawers/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
[button/button
{:size 24
:type :outline
:background (when shell? :blur)
:background (when shell? :blur)
:on-press on-press-button
:accessibility-label :documentation-drawer-button
:icon-right button-icon}
:icon-right button-icon}
button-label])]])

(def view (quo.theme/with-theme view-internal))
10 changes: 5 additions & 5 deletions src/status_im2/contexts/onboarding/common/navigation_bar/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
[quo/page-nav
{:align-mid? true
:mid-section {:type :text-only :main-text ""}
:left-section {:type :grey
:left-section {:type :grey
:icon-background :blur
:icon :i/arrow-left
:on-press (fn []
(when-not disable-back-button?
(rf/dispatch back-event)))}
:icon :i/arrow-left
:on-press (fn []
(when-not disable-back-button?
(rf/dispatch back-event)))}
:right-section-buttons right-section-buttons}]]))
8 changes: 4 additions & 4 deletions src/status_im2/contexts/onboarding/create_password/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@
[navigation-bar/navigation-bar
{:stack-id :new-to-status
:top top
:right-section-buttons [{:type :blur-bg
:icon :i/info
:icon-override-theme :dark
:on-press on-press-info}]}]
:right-section-buttons [{:type :grey
:icon-background :blur
:icon :i/info
:on-press on-press-info}]}]
[password-form]
[rn/view {:style {:height (if-not @keyboard-shown? bottom 0)}}]]]]]
(finally
Expand Down
11 changes: 6 additions & 5 deletions src/status_im2/contexts/onboarding/new_to_status/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,13 @@
[quo/page-nav
{:align-mid? true
:mid-section {:type :text-only :main-text ""}
:left-section {:type :blur-bg
:icon :i/arrow-left
:icon-override-theme :dark
:on-press navigate-back}
:right-section-buttons [{:type :blur-bg
:left-section {:type :grey
:icon-background :blur
:icon :i/arrow-left
:on-press navigate-back}
:right-section-buttons [{:type :grey
:icon :i/info
:icon-background :blur
:icon-override-theme :dark
:on-press #(rf/dispatch
[:show-bottom-sheet
Expand Down
2 changes: 1 addition & 1 deletion src/status_im2/contexts/onboarding/syncing/results/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

(defn continue-button
[on-press]
(let [profile-color (:color (rf/sub [:onboarding-2/profile]))]
(let [profile-color (rf/sub [:profile/customization-color])]
[quo/button
{:on-press (fn []
(when on-press
Expand Down
4 changes: 2 additions & 2 deletions src/status_im2/contexts/quo_preview/navigation/top_nav.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
:value "Default"}
{:key :blur-bg
:value "Blurred BG"}
{:key :shell
:value "Shell"}]}
{:key :black
:value "Black"}]}
{:label "New Notifications?"
:key :new-notifications?
:type :boolean}
Expand Down
4 changes: 2 additions & 2 deletions src/status_im2/contexts/shell/activity_center/header/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
[rn/view
[rn/view {:style style/header-container}
[quo/button
{:icon-only? true
{:icon-only? true
:type :grey
:size 32
:accessibility-label :close-activity-center
:on-press #(rf/dispatch [:navigate-back])}
:i/close]
[quo/button
{:icon-only? true
{:icon-only? true
:type :grey
:size 32
:accessibility-label :activity-center-open-more
Expand Down
3 changes: 2 additions & 1 deletion src/status_im2/contexts/shell/share/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
[:<>
[quo/button
{:icon-only? true
:type :blur-bg
:type :grey
:background :blur
:size 32
:accessibility-label :close-shell-share-tab
:container-style style/header-button
Expand Down
2 changes: 1 addition & 1 deletion src/status_im2/contexts/syncing/scan_sync_code/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
:background :blur
:size style/flash-button-size
:accessibility-label :camera-flash
:contanier-style (style/camera-flash-button @qr-view-finder)
:container-style (style/camera-flash-button @qr-view-finder)
:on-press #(swap! torch? not)}
flashlight-icon])]]))))

Expand Down
2 changes: 1 addition & 1 deletion src/status_im2/contexts/syncing/setup_syncing/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

(defn view
[]
(let [profile-color (:color (rf/sub [:onboarding-2/profile]))
(let [profile-color (rf/sub [:profile/customization-color])
valid-for-ms (reagent/atom code-valid-for-ms)
code (reagent/atom nil)
delay (reagent/atom nil)
Expand Down
10 changes: 5 additions & 5 deletions src/status_im2/contexts/syncing/syncing_devices_list/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
[quo/page-nav
{:align-mid? true
:mid-section {:type :text-only :main-text ""}
:left-section {:type :blur-bg

:icon :i/arrow-left
:on-press #(rf/dispatch [:navigate-back])}}]])
:left-section {:type :photo
:icon-background :blur
:icon :i/arrow-left
:on-press #(rf/dispatch [:navigate-back])}}]])

(defn view
[]
(let [devices (rf/sub [:pairing/installations])
devices-with-button (map #(assoc % :show-button? true) devices)
user-device (first devices-with-button)
other-devices (rest devices-with-button)
profile-color (:color (rf/sub [:onboarding-2/profile]))
profile-color (rf/sub [:profile/customization-color])
{:keys [paired-devices unpaired-devices]} (group-by
#(if (:enabled? %) :paired-devices :unpaired-devices)
other-devices)]
Expand Down

0 comments on commit 945afe9

Please sign in to comment.