updates

.clj-kondo/config.edn

@@ -14,13 +14,6 @@
                                               clojure.set     set
                                               clojure.walk    walk
                                               taoensso.timbre log}}
-                :shadowed-var      {:level   :error
-                                    ;; We temporarily use :include to define an
-                                    ;; allowlist of core Clojure vars. In the
-                                    ;; future, as we progressively fix shadowed
-                                    ;; vars, we should be able to delete this
-                                    ;; option and lint all vars.
-                                    :include [count iter key time]}
                 :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
                 ;; TODO remove number when this is fixed
                 ;; https://github.com/borkdude/clj-kondo/issues/867

.github/ISSUE_TEMPLATE.md

@@ -43,4 +43,4 @@ As a <user|developer|...>, I want to <task> so that <goal>.
 [comment]: # (if on Android please replicate bug whilst running adb logcat)
 ```
 ...
-```
+```

Makefile

@@ -14,17 +14,17 @@ WHITE  := $(shell tput -Txterm setaf 7)
 YELLOW := $(shell tput -Txterm setaf 3)
 RESET  := $(shell tput -Txterm sgr0)
 HELP_FUN = \
-			 %help; \
-			 while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
-			 print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
-			 for (sort keys %help) { \
-				 print "${WHITE}$$_:${RESET}\n"; \
-				 for (@{$$help{$$_}}) { \
-					 $$sep = " " x (32 - length $$_->[0]); \
-					 print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
-				 }; \
-				 print "\n"; \
-			 }
+		   %help; \
+		   while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
+		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
+		   for (sort keys %help) { \
+			   print "${WHITE}$$_:${RESET}\n"; \
+			   for (@{$$help{$$_}}) { \
+				   $$sep = " " x (32 - length $$_->[0]); \
+				   print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
+			   }; \
+			   print "\n"; \
+		   }
 HOST_OS := $(shell uname | tr '[:upper:]' '[:lower:]')
 
 # This can come from Jenkins
@@ -307,7 +307,6 @@ lint: ##@test Run code style checks
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint-trailing-newline.sh && \
 	yarn prettier
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
@@ -316,9 +315,9 @@ lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	sh scripts/lint-trailing-newline.sh --fix && \
 	yarn prettier
 
+
 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
 	yarn shadow-cljs server

app.json

@@ -1,4 +1,4 @@
 {
   "name": "StatusIm",
   "displayName": "StatusIm"
-}
+}

ci/tests/Jenkinsfile.e2e-nightly

@@ -74,7 +74,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 6 \
+                --numprocesses 4 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \

ci/tests/Jenkinsfile.e2e-prs

@@ -123,7 +123,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 6 \
+                --numprocesses 4 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -k \"${params.KEYWORD_EXPRESSION}\" \

doc/README.md

@@ -24,7 +24,6 @@
 
 [Patching](patching.md)
 
-[Creating a pixel perfect UI](pixel-perfection.md)
 
 ## Testing
 

doc/decisions/0012-using-pivotal-tracker.md

@@ -45,4 +45,4 @@ The `State` field in the Pivotal story is used to track the progress of a Pivota
   | 5 points | 2 - 3 days       |
   | 8 points | ~1 week          |
 
-  We should avoid 8 point stories by breaking them down into smaller stories as much as possible.
+  We should avoid 8 point stories by breaking them down into smaller stories as much as possible.

doc/git-etiquette.md

@@ -1,65 +0,0 @@
-# Git Etiquette Guide
-
-To ensure smooth collaboration, we've outlined the following Git etiquette guide. This guide will help in writing concise commit messages, managing git branches, pull request descriptions, and other best practices.
-
-## 1. Commit Messages
-
-Your commit message should provide clear context about the change. This allows others (and future you) to understand why a particular change was made.
-
-Here are the guidelines to write concise and meaningful commit messages:
-
-- **Use the Imperative Mood**: Commit messages should be written in the present tense and imperative mood ("Add feature" not "Added feature" or "Adds feature").
-- **First Line Should Be Summary**: The first line of your commit message should be a brief summary of the changes, kept under 50 characters whenever possible.
-- **Body**: Follow this summary line with a blank line, then a more detailed explanation is always helpful but not necessary. This is often useful when the commit has significant importance or complexity.
-- **Consider Including the 'Why'**: If the commit resolves an issue or bug, mention the issue number and provide a brief explanation of how the changes fix the issue.
-
-Here's a good commit message example:
-
-```
-Fix off-by-one error in loop (issue #123)
-
-This commit fixes an off-by-one error in the list iteration function. 
-This was causing an index out of bounds exception when processing the last item in the list. 
-Tests have been updated to catch this in the future.
-```
-
-## 2. Branch Management
-
-Git branches should be concise and focused on a single feature, fix, or improvement. Here are a few practices:
-
-- **Branch Name**: The branch name should be descriptive of the change and follow a specific format such as `type/description`. Example: `feature/login-system`.
-- **Please don't accept branch recommendation by Github UI**: The branch name recommendation by Github UI will in most cases be a very long branch name concatenated with the issue number, which often results in branch names like this one : 
-`feature/Merge_yada_and_yada_yada_into_one_yada_yada_status-lol_#199021` 
-- **Keep Branches Short-lived**: The longer a branch lives separate from the `main` or `master` branch, the higher the possibility of merge conflicts. Aim to merge branches as soon as the work is complete and has been tested.
-- **Rebase Frequently**: If your branch lives longer, rebase it frequently on top of the main branch.
-
-## 3. Pull Requests
-
-Pull requests (PRs) are how your changes get incorporated into the project. Here are a few key points:
-
-- **Link PR to an Issue**: Your PR should link to the issue it resolves. This helps track the resolution of bugs or addition of features.
-- **PR Description**: The PR description should outline what changes have been made and why. This should be a summary of your commits.
-- **Small and Focused PRs**: Aim to keep PRs small and focused. It's easier to understand and review a PR with a handful of related changes than one with multiple unrelated changes.
-
-Example PR description:
-
-```
-## Description
-This PR implements a login system (issue #456). It adds a login and logout button, as well as an authentication system. This will allow users to create an account and sign in.
-
-## Changes
-- Add login button component
-- Add logout button component
-- Add authentication API integration
-
-## Issue Related
-This PR closes #456
-```
-
-## 4. Other Best Practices
-
-- **Stay Updated**: Keep your local copy up to date with the upstream regularly.
-- **Test Before Pushing**: Always test your code and make sure all tests pass before you push.
-
-Following these guidelines ensures a smoother collaboration and maintains a clean, manageable project history. Thanks for your contributions!
-

doc/new-guidelines.md

@@ -80,52 +80,6 @@ This mistake mostly happens with functional components
 
 it's important to name functional components with `f-` prefix
 
-### Component props and API scheme to match Figma as closely as possible
-
-Ideally, the prop names for components (particularly in quo2 Design System) should match the Figma properties as best as possible. This makes it easier for the developer using that component to configure it correctly for the screen it is being used on and avoids unnecessary overwrites and adjustments being made.
-
-#### Avoid unnecessarily grouping categories to reduce the number of props
-For example in Figma if there is a component and it has the following variants:
-
-|theme: "light" blur: "False"|theme: "dark" blur: "False"|theme: "light" blur: "True"|theme: "dark"  blur: "True"|
-|----------------------------|---------------------------|---------------------------|---------------------------|
-| type :neutral label "ABC"  | type :neutral label "ABC" |                           |                           |
-| type :active  label "ABC"  | type :active  label "ABC" |                           |                           |
-| type :danger  label "ABC"  | type :danger  label "ABC" | type :danger label "ABC"  | type :danger label "ABC"  |
-
-```clojure
-;; bad
-"theme - :light or :dark
-type - can be :neutral :active :danger :danger-blur"
-(defn my-component [{:keys [theme type]} label])
-
-;; good
-"theme - :light or :dark
- type - can be :neutral :active :danger
- blur? - boolean
-"
-(defn my-component [{:keys [theme blur? type]} label])
-```
-
-Please note this is only for the external API of the component and there should be no restriction of how the component manages its internal API as that will not affect the developer using the component with the issues described above.
-
-In some cases this is not always possible or does not make sense. However the thought process should be how easy will it be for another developer to use this component with the correct configuration given the screen designs for Figma.
-
-#### Avoid unnecessarily renaming props 
-In general it can be helpful to avoid renaming props from their counterpart in Figma.
-
-For example if Figma has sizes `:small`, `:medium` and `:large`
-
-```clojure
-;; bad
-":size - :little, :default or :big"
-(defn my-component [{:keys [size]}])
-
-;; good
-":size - :small, :medium or :large"
-(defn my-component [{:keys [size]}])
-```
-
 ### Component styles
 
 Prefer to define styles in a separate file named `style.cljs`, colocated with

doc/pixel-perfection.md

@@ -1,17 +0,0 @@
-# Pixel Perfection
-The Status Mobile team aims to align the design implementation perfectly according to a given screens respective Figma design spec.
-
-Currently the Figma Designs match up with an "iPhone 11 Pro" screen size. 
-
-To test your implementation is correct you can take the following steps
-
-- Open a new Figma file so that you have write privileges. 
-- Copy in the component or screen from the Figma file.
-
-- Using the "iPhone 11 Pro" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.
-
-- To get the right size, set your screenshot to width 375px
-
-![](images/pixel-perfection/layer-width.png)
-
-- Lower the opacity so you can see it sitting on top of the Figma mock ups. 

ios/StatusIm/Images.xcassets/Contents.json

@@ -3,4 +3,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

modules/react-native-status/nodejs/status.cpp

@@ -833,37 +833,6 @@ void _SaveAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _CreateAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for SaveAccountAndLogin")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'settingsJSON'")));
-		return;
-	}
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = CreateAccountAndLogin(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-}
-
 void _GenerateAlias(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1960,7 +1929,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
 	NODE_SET_METHOD(exports, "resetChainData", _ResetChainData);
 	NODE_SET_METHOD(exports, "saveAccountAndLogin", _SaveAccountAndLogin);
-	NODE_SET_METHOD(exports, "createAccountAndLogin", _CreateAccountAndLogin);
 	NODE_SET_METHOD(exports, "generateAlias", _GenerateAlias);
 	NODE_SET_METHOD(exports, "validateMnemonic", _ValidateMnemonic);
 	NODE_SET_METHOD(exports, "multiformatSerializePublicKey", _MultiformatSerializePublicKey);

modules/react-native-status/package.json

@@ -18,4 +18,4 @@
     "url": "https://github.com/status-im/react-native-status/issues"
   },
   "homepage": "https://github.com/status-im/react-native-status#readme"
-}
+}

resources/config/fleets.json

@@ -194,4 +194,4 @@
             }
         }
     }
-}
+}

scripts/lint-trailing-newline.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -eof pipefail
-
-FILES=$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep --ignore-case -E '\.(java|cpp|nix|json|sh|md|js|clj|cljs|cljc|edn)$')
-N_FILES=$(echo "$FILES" | wc -l)
-LINT_SHOULD_FIX=0
-
-if [[ -n $1 && $1 != '--fix' ]]; then
-    echo "Unknown option '$1'" >&2
-    exit 1
-elif [[ $1 == '--fix' ]]; then
-    LINT_SHOULD_FIX=1
-fi
-
-echo "Checking ${N_FILES} files for missing trailing newlines."
-
-# Do not process the whole file and only check the last character. Ignore empty
-# files. Taken from https://stackoverflow.com/a/10082466.
-for file in $FILES; do
-    if [ -s "$file" ] && [ "$(tail -c1 "$file"; echo x)" != $'\nx' ]; then
-        if [[ $LINT_SHOULD_FIX -eq 1 ]]; then
-            echo "" >>"$file"
-        else
-            LINT_ERROR=1
-            echo "No trailing newline: $file" >&2
-        fi
-    fi
-done
-
-if [[ $LINT_ERROR -eq 1 ]]; then
-    exit 1
-fi

src/js/worklets/shell/constants.js

@@ -1,18 +1,18 @@
 import { Easing } from 'react-native-reanimated';
 
 // Home Stack States
-export const CLOSE_WITHOUT_ANIMATION = 0;
-export const OPEN_WITHOUT_ANIMATION = 1;
-export const CLOSE_WITH_ANIMATION = 2;
-export const OPEN_WITH_ANIMATION = 3;
+export const CLOSE_WITH_ANIMATION = 0;
+export const OPEN_WITH_ANIMATION = 1;
+export const CLOSE_WITHOUT_ANIMATION = 2;
+export const OPEN_WITHOUT_ANIMATION = 3;
 
 // Floating Screen States
-export const CLOSE_SCREEN_WITHOUT_ANIMATION = 0;
-export const OPEN_SCREEN_WITHOUT_ANIMATION = 1;
-export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 2;
-export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 3;
-export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 4;
-export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 5;
+export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 0;
+export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 1;
+export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 2;
+export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 3;
+export const CLOSE_SCREEN_WITHOUT_ANIMATION = 4;
+export const OPEN_SCREEN_WITHOUT_ANIMATION = 5;
 
 export const SHELL_ANIMATION_TIME = 200;
 

src/native_module/core.cljs

@@ -287,11 +287,11 @@
   and then compressed. Example input/output :
   input key  = zQ3shTAten2v9CwyQD1Kc7VXAqNPDcHZAMsfbLHCZEx6nFqk9 and
   output key = 0x025596a7ff87da36860a84b0908191ce60a504afc94aac93c1abd774f182967ce6"
-  [input-key callback]
+  [key callback]
   (log/info "[native-module] Deserializing and then compressing public key"
             {:fn  :deserialize-and-compress-key
-             :key input-key})
-  (.deserializeAndCompressKey ^js (status) input-key callback))
+             :key key})
+  (.deserializeAndCompressKey ^js (status) key callback))
 
 (defn compressed-key->public-key
   "Provides compressed key to status-go and gets back the uncompressed public key via deserialization"

src/quo/animated.cljs

@@ -235,6 +235,31 @@
   [value velocity snap-points]
   (.snapPoint ^js redash value velocity (to-array snap-points)))
 
+(defn cancelable-loop
+  [{:keys [clock duration finished on-reach]}]
+  (let [time       (value 0)
+        frame-time (value 0)
+        position   (value 0)
+        to-value   (value 1)
+        state      {:time      time
+                    :frameTime frame-time
+                    :finished  finished
+                    :position  position}
+        config     {:toValue  to-value
+                    :duration duration
+                    :easing   (:linear easings)}]
+    (block
+     [(timing clock state config)
+      (cond* (and* finished
+                   (eq position to-value))
+             (call* [] on-reach))
+      (cond* finished
+             [(set finished 0)
+              (set time 0)
+              (set frame-time 0)
+              (set position 0)])
+      position])))
+
 (defn with-easing
   [{val   :value
     :keys [snap-points velocity offset state easing duration

src/quo/previews/icons.cljs

@@ -11,4 +11,4 @@
    (for [i (keys icons/icons)]
      [rn/view {:flex-direction :row}
       [icons/icon (keyword i)]
-      [rn/text i]])])
+      [rn/text i]])])

src/quo/previews/preview.clj

@@ -1,5 +1,12 @@
 (ns quo.previews.preview)
 
+(defn descriptor->values
+  [{:keys [key options type]}]
+  {key (case type
+         :boolean [false true]
+         :text    [nil "Just simple text"] ; NOTE(Ferossgp): add example with long text?
+         :select  (mapv :key options))})
+
 (defmacro list-comp
   [[binding seq-expr & bindings] body-expr]
   (cond (not binding)

src/quo/previews/preview.cljs

@@ -68,8 +68,8 @@
    :background-color   (:ui-background @colors/theme)})
 
 (defn customizer-boolean
-  [{:keys [label state] :as args}]
-  (let [state* (reagent/cursor state [(:key args)])]
+  [{:keys [label key state]}]
+  (let [state* (reagent/cursor state [key])]
     [rn/view {:style container}
      [label-view state label]
      [rn/view
@@ -95,8 +95,8 @@
         "False"]]]]))
 
 (defn customizer-text
-  [{:keys [label state] :as args}]
-  (let [state* (reagent/cursor state [(:key args)])]
+  [{:keys [label key state]}]
+  (let [state* (reagent/cursor state [key])]
     [rn/view {:style container}
      [label-view state label]
      [rn/view {:style {:flex 0.6}}
@@ -117,8 +117,8 @@
 (defn customizer-select
   []
   (let [open (reagent/atom nil)]
-    (fn [{:keys [label state options] :as args}]
-      (let [state*   (reagent/cursor state [(:key args)])
+    (fn [{:keys [label key state options]}]
+      (let [state*   (reagent/cursor state [key])
             selected (value-for-key @state* options)]
         [rn/view {:style container}
          [label-view state label]
@@ -133,15 +133,15 @@
             [rn/view {:style (modal-view)}
              [rn/scroll-view
               (doall
-               (for [{k :key v :value} options]
-                 ^{:key k}
+               (for [{:keys [key value]} options]
+                 ^{:key key}
                  [rn/touchable-opacity
-                  {:style    (select-option-style (= @state* k))
+                  {:style    (select-option-style (= @state* key))
                    :on-press #(do
                                 (reset! open false)
-                                (reset! state* k))}
-                  [quo/text {:color (if (= @state* k) :link :secondary)}
-                   v]]))
+                                (reset! state* key))}
+                  [quo/text {:color (if (= @state* key) :link :secondary)}
+                   value]]))
               [rn/view {:flex-direction :row}
                [rn/touchable-opacity
                 {:style    (select-option-style false)
@@ -175,15 +175,17 @@
    {:style              {:flex 1}
     :padding-horizontal 16}
    (doall
-    (for [desc descriptors
-          :let [descriptor (merge desc {:state state})]]
-      ^{:key (:key desc)}
+    (for [{:keys [key type]
+           :as   desc}
+          descriptors
+          :let [descriptor (merge desc
+                                  {:state state})]]
+      ^{:key key}
       [:<>
-       (case (:type desc)
+       (case type
          :boolean [customizer-boolean descriptor]
          :text    [customizer-text descriptor]
-         :select  [customizer-select descriptor]
-         nil)]))])
+         :select  [customizer-select descriptor])]))])
 
 (comment
   [{:label "Show error:"

src/quo2/components/avatars/channel_avatar.cljs

@@ -0,0 +1,50 @@
+(ns quo2.components.avatars.channel-avatar
+  (:require [quo2.components.icon :as icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
+            [react-native.core :as rn]))
+
+(defn channel-avatar
+  [{:keys [big? locked? emoji-background-color emoji]}]
+  (let [lock-exists? locked?
+        dark?        (theme/dark?)]
+    [rn/view
+     {:style {:width            (if big? 32 24)
+              :height           (if big? 32 24)
+              :border-radius    (if big? 32 24)
+              :justify-content  :center
+              :align-items      :center
+              :background-color emoji-background-color}}
+     [rn/view
+      {:style {:display         :flex
+               :justify-content :center
+               :align-items     :center}}
+      [text/text
+       {:size (if big?
+                :paragraph-1
+                :label)} emoji]
+      (when lock-exists?
+        [rn/view
+         {:style {:position         :absolute
+                  :left             (if big?
+                                      14
+                                      8)
+                  :top              (if big?
+                                      15
+                                      8)
+                  :background-color (if dark?
+                                      colors/neutral-90
+                                      colors/white)
+                  :border-radius    15
+                  :padding          2}}
+         [icons/icon
+          (if locked?
+            :main-icons/locked
+            :main-icons/unlocked)
+          {:color           (if dark?
+                              colors/neutral-40
+                              colors/neutral-50)
+           :container-style {:width  12
+                             :height 12}
+           :size            12}]])]]))

src/quo2/components/avatars/channel_avatar/component_spec.cljs

@@ -1,35 +0,0 @@
-(ns quo2.components.avatars.channel-avatar.component-spec
-  (:require [quo2.components.avatars.channel-avatar.view :as component]
-            [test-helpers.component :as h]))
-
-(h/describe "Channel Avatar"
-  (h/test "default render"
-    (h/render [component/view])
-    (h/is-truthy (h/query-by-label-text :initials))
-    (h/is-null (h/query-by-label-text :emoji))
-    (h/is-null (h/query-by-label-text :lock)))
-
-  (h/test "with emoji, no lock set, large size"
-    (let [emoji "🍓"]
-      (h/render [component/view {:emoji emoji :size :size/l}])
-      (h/is-null (h/query-by-label-text :initials))
-      (h/is-truthy (h/query-by-text emoji))
-      (h/is-null (h/query-by-label-text :lock))))
-
-  (h/test "locked"
-    (h/render [component/view {:locked? true}])
-    (h/is-truthy (h/query-by-label-text :lock)))
-
-  (h/test "unlocked"
-    (h/render [component/view {:locked? false}])
-    (h/is-truthy (h/query-by-label-text :lock)))
-
-  (h/test "no emoji, smaller size"
-    (h/render [component/view {:full-name "Status Mobile"}])
-    (h/is-truthy (h/query-by-text "S")))
-
-  (h/test "no emoji, large size"
-    (h/render [component/view
-               {:full-name "Status Mobile"
-                :size      :size/l}])
-    (h/is-truthy (h/query-by-text "SM"))))

src/quo2/components/avatars/channel_avatar/style.cljs

@@ -1,28 +0,0 @@
-(ns quo2.components.avatars.channel-avatar.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def lock-icon-size 12)
-
-(defn outer-container
-  [{:keys [size color]}]
-  (let [size (if (= size :size/l) 32 24)]
-    {:width            size
-     :height           size
-     :border-radius    size
-     :justify-content  :center
-     :align-items      :center
-     :background-color (colors/theme-alpha color 0.1 0.1)}))
-
-(defn lock-container
-  [size]
-  (let [distance (if (= size :size/l) 20 12)]
-    {:position         :absolute
-     :left             distance
-     :top              distance
-     :background-color (colors/theme-colors colors/white colors/neutral-95)
-     :border-radius    (* 2 lock-icon-size)
-     :padding          2}))
-
-(def lock-icon
-  {:width  lock-icon-size
-   :height lock-icon-size})

src/quo2/components/avatars/channel_avatar/view.cljs

@@ -1,60 +0,0 @@
-(ns quo2.components.avatars.channel-avatar.view
-  (:require [clojure.string :as string]
-            [quo2.components.avatars.channel-avatar.style :as style]
-            [quo2.components.icon :as icons]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            utils.string))
-
-(defn- initials
-  [full-name size color]
-  (let [amount-initials (if (= size :size/l) 2 1)]
-    [text/text
-     {:accessibility-label :initials
-      :size                :paragraph-2
-      :weight              :semi-bold
-      :style               {:color color}}
-     (utils.string/get-initials full-name amount-initials)]))
-
-(defn- lock
-  [locked? size]
-  ;; When `locked?` is nil, we must not display the unlocked icon.
-  (when (boolean? locked?)
-    [rn/view
-     {:accessibility-label :lock
-      :style               (style/lock-container size)}
-     [icons/icon (if locked? :i/locked :i/unlocked)
-      {:color           (colors/theme-colors colors/neutral-50 colors/neutral-40)
-       :container-style style/lock-icon
-       :size            12}]]))
-
-(defn view
-  "Options:
-
-  :size - keyword (default nil) - Container size, for the moment,
-  only :size/l (meaning large) is supported.
-
-  :emoji - string (default nil)
-
-  :customization-color - color (default nil) If the component is used for a
-  community channel, then the default color should be the community custom
-  color.
-
-  :locked? - nil/bool (default nil) - When true/false display a locked/unlocked
-  icon respectively. When nil does not show icon.
-
-  :full-name - string (default nil) - When :emoji is blank, this value will be
-  used to extract the initials.
-  "
-  [{:keys [size emoji customization-color locked? full-name]}]
-  [rn/view
-   {:accessibility-label :channel-avatar
-    :style               (style/outer-container {:size size :color customization-color})}
-   (if (string/blank? emoji)
-     [initials full-name size customization-color]
-     [text/text
-      {:accessibility-label :emoji
-       :size                (if (= size :size/l) :paragraph-1 :label)}
-      (string/trim emoji)])
-   [lock locked? size]])

src/quo2/components/avatars/user_avatar/view.cljs

@@ -1,9 +1,22 @@
 (ns quo2.components.avatars.user-avatar.view
-  (:require [quo2.components.avatars.user-avatar.style :as style]
+  (:require [clojure.string :as string]
+            [quo2.components.avatars.user-avatar.style :as style]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
-            utils.string))
+            [react-native.fast-image :as fast-image]))
+
+(defn trim-whitespace [s] (string/join " " (string/split (string/trim s) #"\s+")))
+
+(defn- extract-initials
+  [full-name amount-initials]
+  (let [upper-case-first-letter (comp string/upper-case first)
+        names-list              (string/split (trim-whitespace full-name) " ")]
+    (if (= (first names-list) "")
+      ""
+      (->> names-list
+           (map upper-case-first-letter)
+           (take amount-initials)
+           (string/join)))))
 
 (defn initials-avatar
   [{:keys [full-name size draw-ring? customization-color]}]
@@ -16,7 +29,7 @@
       {:style  style/initials-avatar-text
        :size   font-size
        :weight :semi-bold}
-      (utils.string/get-initials full-name amount-initials)]]))
+      (extract-initials full-name amount-initials)]]))
 
 (def valid-ring-sizes #{:big :medium :small})
 

src/quo2/components/buttons/__tests__/buttons_component_spec.cljs

@@ -0,0 +1,28 @@
+(ns quo2.components.buttons.--tests--.buttons-component-spec
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.buttons.button :as button]
+            [reagent.core :as reagent]))
+
+(defn render-button
+  ([options label]
+   (rtl/render (reagent/as-element [button/button options label]))))
+
+(js/global.test "default render of button component"
+  (fn []
+    (render-button {:accessibility-label "test-button"} "")
+    (-> (js/expect (rtl/screen.getByLabelText "test-button"))
+        (.toBeTruthy))))
+
+(js/global.test "button renders with a label"
+  (fn []
+    (render-button {} "test-label")
+    (-> (js/expect (rtl/screen.getByText "test-label"))
+        (.toBeTruthy))))
+
+(js/global.test "button on-press works"
+  (let [event (js/jest.fn)]
+    (fn []
+      (render-button {:on-press event} "test-label")
+      (rtl/fireEvent.press (rtl/screen.getByText "test-label"))
+      (-> (js/expect event)
+          (.toHaveBeenCalledTimes 1)))))

src/quo2/components/buttons/button.cljs

@@ -1,46 +1,12 @@
-(ns quo2.components.buttons.button.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def blur-view
-  {:position :absolute
-   :top      0
-   :left     0
-   :right    0
-   :bottom   0})
-
-(defn before-icon-style
-  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
-           icon-size]}]
-  (merge
-   {:margin-left     (or (get override-margins :left)
-                         (if (= size 40) 12 8))
-    :margin-right    (or (get override-margins :right) 4)
-    :align-items     :center
-    :justify-content :center}
-   (when icon-container-size
-     {:width  icon-container-size
-      :height icon-container-size})
-   (when icon-background-color
-     {:background-color icon-background-color})
-   (when icon-container-rounded?
-     {:border-radius (/ (or icon-container-size icon-size) 2)})))
-
-(defn after-icon-style
-  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
-           icon-size]}]
-  (merge
-   {:margin-left     (or (get override-margins :left) 4)
-    :margin-right    (or (get override-margins :right)
-                         (if (= size 40) 12 8))
-    :align-items     :center
-    :justify-content :center}
-   (when icon-container-size
-     {:width  icon-container-size
-      :height icon-container-size})
-   (when icon-background-color
-     {:background-color icon-background-color})
-   (when icon-container-rounded?
-     {:border-radius (/ (or icon-container-size icon-size) 2)})))
+(ns quo2.components.buttons.button
+  (:require [quo2.components.icon :as quo2.icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
+            [react-native.core :as rn]
+            [react-native.blur :as blur]
+            [reagent.core :as reagent]
+            [quo2.components.buttons.style :as style]))
 
 (defn themes
   [customization-color]
@@ -213,7 +179,7 @@
                       24 8))})
 
 (defn style-container
-  [{:keys [type size disabled background-color border-color icon above width before after blur-active?]}]
+  [type size disabled background-color border-color icon above width before after blur-active?]
   (merge {:height             size
           :align-items        :center
           :justify-content    :center
@@ -262,3 +228,132 @@
             :border-width 1})
          (when disabled
            {:opacity 0.3})))
+
+(defn- button-internal
+  "with label
+   [button opts \"label\"]
+   opts
+   {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
+            :danger/:photo-bg/:blur-bg/:blur-bg-outline/:shell/:community
+    :size   40 [default] /32/24
+    :icon   true/false
+    :community-color '#FFFFFF'
+    :community-text-color '#000000'
+    :before :icon-keyword
+    :after  :icon-keyword}
+
+   only icon
+   [button {:icon true} :i/close-circle]"
+  [_ _]
+  (let [pressed-in (reagent/atom false)]
+    (fn
+      [{:keys [on-press disabled type size before after above icon-secondary-no-color
+               width customization-color theme override-background-color pressed
+               on-long-press accessibility-label icon icon-no-color style inner-style test-ID
+               blur-active? override-before-margins override-after-margins icon-size icon-container-size
+               icon-container-rounded?]
+        :or   {type                :primary
+               size                40
+               customization-color :primary
+               blur-active?        true}}
+       children]
+      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color blur-type
+                    blur-overlay-color icon-background-color]}
+            (get-in (themes customization-color)
+                    [theme type])
+            state (cond disabled                 :disabled
+                        (or @pressed-in pressed) :pressed
+                        :else                    :default)
+            blur-state (if blur-active? :blurred :default)
+            icon-size (or icon-size (when (= 24 size) 12))
+            icon-secondary-color (or icon-secondary-color icon-color)]
+        [rn/touchable-without-feedback
+         (merge {:test-ID             test-ID
+                 :disabled            disabled
+                 :accessibility-label accessibility-label
+                 :on-press-in         #(reset! pressed-in true)
+                 :on-press-out        #(reset! pressed-in nil)}
+                (when on-press
+                  {:on-press on-press})
+                (when on-long-press
+                  {:on-long-press on-long-press}))
+         [rn/view
+          {:style (merge
+                   (shape-style-container type icon size)
+                   {:width width}
+                   style)}
+          [rn/view
+           {:style (merge
+                    (style-container
+                     type
+                     size
+                     disabled
+                     (or override-background-color (get background-color state))
+                     (get border-color state)
+                     icon
+                     above
+                     width
+                     before
+                     after
+                     blur-active?)
+                    (when (= state :pressed) {:opacity 0.9})
+                    inner-style)}
+           (when (and (= type :blurred)
+                      blur-active?)
+             [blur/view
+              {:blur-radius   20
+               :blur-type     blur-type
+               :overlay-color blur-overlay-color
+               :style         style/blur-view}])
+           (when above
+             [rn/view
+              [quo2.icons/icon above
+               {:container-style {:margin-bottom 2}
+                :color           icon-secondary-color
+                :size            icon-size}]])
+           (when before
+             [rn/view
+              {:style (style/before-icon-style
+                       {:override-margins        override-before-margins
+                        :size                    size
+                        :icon-container-size     icon-container-size
+                        :icon-background-color   (get icon-background-color blur-state)
+                        :icon-container-rounded? icon-container-rounded?
+                        :icon-size               icon-size})}
+              [quo2.icons/icon before
+               {:color icon-secondary-color
+                :size  icon-size}]])
+           [rn/view
+            (cond
+              (or icon icon-no-color)
+              [quo2.icons/icon children
+               {:color    icon-color
+                :no-color icon-no-color
+                :size     icon-size}]
+
+              (string? children)
+              [text/text
+               {:size            (when (#{56 24} size) :paragraph-2)
+                :weight          :medium
+                :number-of-lines 1
+                :style           {:color label-color}}
+
+               children]
+
+              (vector? children)
+              children)]
+           (when after
+             [rn/view
+              {:style (style/after-icon-style
+                       {:override-margins        override-after-margins
+                        :size                    size
+                        :icon-container-size     icon-container-size
+                        :icon-background-color   (get icon-background-color blur-state)
+                        :icon-container-rounded? icon-container-rounded?
+                        :icon-size               icon-size})}
+              [quo2.icons/icon after
+               {:no-color icon-secondary-no-color
+                :color    icon-secondary-color
+                :size     icon-size}]])]]]))))
+
+(def button (theme/with-theme button-internal))

src/quo2/components/buttons/button/component_spec.cljs

@@ -1,18 +0,0 @@
-(ns quo2.components.buttons.button.component-spec
-  (:require [quo2.components.buttons.button.view :as button]
-            [test-helpers.component :as h]))
-
-(h/describe "button tests"
-  (h/test "default render of button component"
-    (h/render [button/button {:accessibility-label "test-button"} ""])
-    (h/is-truthy (h/get-by-label-text "test-button")))
-
-  (h/test "button renders with a label"
-    (h/render [button/button {} "test-label"])
-    (h/is-truthy (h/get-by-text "test-label")))
-
-  (h/test "button on-press works"
-    (let [event (h/mock-fn)]
-      (h/render [button/button {:on-press event} "test-label"])
-      (h/fire-event :press (h/get-by-text "test-label"))
-      (h/was-called event))))

src/quo2/components/buttons/button/view.cljs

@@ -1,138 +0,0 @@
-(ns quo2.components.buttons.button.view
-  (:require [quo2.components.icon :as quo2.icons]
-            [quo2.components.markdown.text :as text]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]
-            [react-native.blur :as blur]
-            [reagent.core :as reagent]
-            [quo2.components.buttons.button.style :as style]))
-
-(defn- button-internal
-  "with label
-   [button opts \"label\"]
-   opts
-   {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
-            :danger/:photo-bg/:blur-bg/:blur-bg-outline/:shell/:community
-    :size   40 [default] /32/24
-    :icon   true/false
-    :community-color '#FFFFFF'
-    :community-text-color '#000000'
-    :before :icon-keyword
-    :after  :icon-keyword}
-
-   only icon
-   [button {:icon true} :i/close-circle]"
-  [_ _]
-  (let [pressed-in (reagent/atom false)]
-    (fn
-      [{:keys [on-press disabled type size before after above icon-secondary-no-color
-               width customization-color theme override-background-color pressed
-               on-long-press accessibility-label icon icon-no-color style inner-style test-ID
-               blur-active? override-before-margins override-after-margins icon-size icon-container-size
-               icon-container-rounded?]
-        :or   {type                :primary
-               size                40
-               customization-color :primary
-               blur-active?        true}}
-       children]
-      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color blur-type
-                    blur-overlay-color icon-background-color]}
-            (get-in (style/themes customization-color)
-                    [theme type])
-            state (cond disabled                 :disabled
-                        (or @pressed-in pressed) :pressed
-                        :else                    :default)
-            blur-state (if blur-active? :blurred :default)
-            icon-size (or icon-size (when (= 24 size) 12))
-            icon-secondary-color (or icon-secondary-color icon-color)]
-        [rn/touchable-without-feedback
-         (merge {:test-ID             test-ID
-                 :disabled            disabled
-                 :accessibility-label accessibility-label
-                 :on-press-in         #(reset! pressed-in true)
-                 :on-press-out        #(reset! pressed-in nil)}
-                (when on-press
-                  {:on-press on-press})
-                (when on-long-press
-                  {:on-long-press on-long-press}))
-         [rn/view
-          {:style (merge
-                   (style/shape-style-container type icon size)
-                   {:width width}
-                   style)}
-          [rn/view
-           {:style (merge
-                    (style/style-container {:type type
-                                            :size size
-                                            :disabled disabled
-                                            :background-color
-                                            (or override-background-color (get background-color state))
-                                            :border-color
-                                            (get border-color state)
-                                            :icon icon
-                                            :above above
-                                            :width width
-                                            :before before
-                                            :after after
-                                            :blur-active? blur-active?})
-                    (when (= state :pressed) {:opacity 0.9})
-                    inner-style)}
-           (when (and (= type :blurred)
-                      blur-active?)
-             [blur/view
-              {:blur-radius   20
-               :blur-type     blur-type
-               :overlay-color blur-overlay-color
-               :style         style/blur-view}])
-           (when above
-             [rn/view
-              [quo2.icons/icon above
-               {:container-style {:margin-bottom 2}
-                :color           icon-secondary-color
-                :size            icon-size}]])
-           (when before
-             [rn/view
-              {:style (style/before-icon-style
-                       {:override-margins        override-before-margins
-                        :size                    size
-                        :icon-container-size     icon-container-size
-                        :icon-background-color   (get icon-background-color blur-state)
-                        :icon-container-rounded? icon-container-rounded?
-                        :icon-size               icon-size})}
-              [quo2.icons/icon before
-               {:color icon-secondary-color
-                :size  icon-size}]])
-           [rn/view
-            (cond
-              (or icon icon-no-color)
-              [quo2.icons/icon children
-               {:color    icon-color
-                :no-color icon-no-color
-                :size     icon-size}]
-
-              (string? children)
-              [text/text
-               {:size            (when (#{56 24} size) :paragraph-2)
-                :weight          :medium
-                :number-of-lines 1
-                :style           {:color label-color}}
-
-               children]
-
-              (vector? children)
-              children)]
-           (when after
-             [rn/view
-              {:style (style/after-icon-style
-                       {:override-margins        override-after-margins
-                        :size                    size
-                        :icon-container-size     icon-container-size
-                        :icon-background-color   (get icon-background-color blur-state)
-                        :icon-container-rounded? icon-container-rounded?
-                        :icon-size               icon-size})}
-              [quo2.icons/icon after
-               {:no-color icon-secondary-no-color
-                :color    icon-secondary-color
-                :size     icon-size}]])]]]))))
-
-(def button (theme/with-theme button-internal))

src/quo2/components/buttons/dynamic_button.cljs

@@ -62,7 +62,7 @@
     :customization-color customize jump-to and mention button color}"
   [_]
   (let [pressed? (reagent/atom false)]
-    (fn [{:keys [type label on-press customization-color style] :as args}]
+    (fn [{:keys [type label on-press count customization-color style]}]
       [rn/touchable-opacity
        {:on-press-in         #(reset! pressed? true)
         :on-press-out        #(reset! pressed? false)
@@ -102,6 +102,6 @@
            (case type
              :jump-to                                       label
              :search-with-label                             label
-             (:mention :notification-down :notification-up) (str (:count args)))])
+             (:mention :notification-down :notification-up) (str count))])
         (when (#{:jump-to :notification-down :notification-up} type)
           [icon-view type])]])))

src/quo2/components/buttons/predictive_keyboard/view.cljs

@@ -2,10 +2,9 @@
   (:require [react-native.core :as rn]
             [quo2.components.buttons.predictive-keyboard.style :as style]
             [quo2.components.info.info-message :as info-message]
-            [quo2.theme :as theme]
             [react-native.linear-gradient :as linear-gradient]
             [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.button.view :as button]))
+            [quo2.components.buttons.button :as button]))
 
 (def ^:private gradients
   {:light [(colors/alpha colors/neutral-40 0.05) (colors/alpha colors/neutral-40 0)]
@@ -13,33 +12,32 @@
    :blur  [colors/white-opa-5 colors/white-opa-0]})
 
 (defn- word-component
-  [word _ _ {:keys [on-press]}]
+  [word _ _ {:keys [blur? on-press]}]
   [button/button
-   {:type     :blur-bg
-    :size     32
-    :on-press #(on-press word)}
-
+   (merge {:type     :blur-bg
+           :size     32
+           :on-press #(on-press word)}
+          (when blur? {:override-theme :dark}))
    word])
 
 (defn- separator
   []
   [rn/view {:style {:width 8}}])
 
-(defn- view-internal
+(defn view
   "Options
    - `type` `:words`/`:error`/`:info`/`:empty`.
    - `blur?` Boolean to enable blur background support.
    - `text`  error/info text.
    - `words` List of words to display in the keyboard.
-   - `on-press` Callback called when a word is pressed `(fn [word])`
-   - `theme` :light or :dark, received from with-theme HOC."
-  [{:keys [type blur? text words on-press theme]}]
+   - `on-press` Callback called when a word is pressed `(fn [word])`."
+  [{:keys [type blur? text words on-press]}]
   [linear-gradient/linear-gradient
    {:style               {:flex-direction :row}
     :accessibility-label :predictive-keyboard
     :colors              (if blur?
                            (gradients :blur)
-                           (colors/theme-colors (gradients :light) (gradients :dark) theme))}
+                           (colors/theme-colors (gradients :light) (gradients :dark)))}
    [rn/view {:style (style/wrapper type)}
     (case type
       :words
@@ -48,7 +46,8 @@
         :data                              words
         :content-container-style           style/word-list
         :render-fn                         word-component
-        :render-data                       {:on-press on-press}
+        :render-data                       {:blur?    blur?
+                                            :on-press on-press}
         :shows-horizontal-scroll-indicator false
         :separator                         [separator]
         :horizontal                        true
@@ -71,5 +70,3 @@
                  :icon-color colors/white-opa-70}))
        text]
       nil)]])
-
-(def view (theme/with-theme view-internal))

src/quo2/components/buttons/style.cljs

@@ -0,0 +1,42 @@
+(ns quo2.components.buttons.style)
+
+(def blur-view
+  {:position :absolute
+   :top      0
+   :left     0
+   :right    0
+   :bottom   0})
+
+(defn before-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (merge
+   {:margin-left     (or (get override-margins :left)
+                         (if (= size 40) 12 8))
+    :margin-right    (or (get override-margins :right) 4)
+    :align-items     :center
+    :justify-content :center}
+   (when icon-container-size
+     {:width  icon-container-size
+      :height icon-container-size})
+   (when icon-background-color
+     {:background-color icon-background-color})
+   (when icon-container-rounded?
+     {:border-radius (/ (or icon-container-size icon-size) 2)})))
+
+(defn after-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (merge
+   {:margin-left     (or (get override-margins :left) 4)
+    :margin-right    (or (get override-margins :right)
+                         (if (= size 40) 12 8))
+    :align-items     :center
+    :justify-content :center}
+   (when icon-container-size
+     {:width  icon-container-size
+      :height icon-container-size})
+   (when icon-background-color
+     {:background-color icon-background-color})
+   (when icon-container-rounded?
+     {:border-radius (/ (or icon-container-size icon-size) 2)})))

src/quo2/components/code/snippet.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.code.snippet
   (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.code.code.style :as style]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]

src/quo2/components/community/community_list_view.cljs

@@ -29,6 +29,52 @@
     unread-messages?
     [unread-grey-dot :unviewed-messages-public]))
 
+(defn communities-list-view-item
+  [props
+   {:keys [name
+           locked?
+           status
+           muted?
+           unread-messages?
+           unread-mentions-count
+           community-icon
+           tokens]}]
+  [rn/view
+   {:style (merge (style/community-card 16)
+                  {:margin-bottom 12})}
+   [rn/touchable-highlight
+    (merge {:style {:height        56
+                    :border-radius 16}}
+           props)
+    [rn/view {:style style/detail-container}
+     [rn/view (style/list-info-container)
+      [community-icon/community-icon
+       {:images community-icon} 32]
+      [rn/view
+       {:flex              1
+        :margin-horizontal 12}
+       [text/text
+        {:weight              :semi-bold
+         :size                :paragraph-1
+         :accessibility-label :community-name-text
+         :number-of-lines     1
+         :ellipsize-mode      :tail
+         :style               {:color (when muted?
+                                        (colors/theme-colors
+                                         colors/neutral-40
+                                         colors/neutral-60))}}
+        name]
+       [community-view/community-stats-column
+        {:type :list-view}]]
+      (if (= status :gated)
+        [community-view/permission-tag-container
+         {:locked? locked?
+          :tokens  tokens}]
+        [notification-view
+         {:muted?                muted?
+          :unread-mentions-count unread-mentions-count
+          :unread-messages?      unread-messages?}])]]]])
+
 (defn communities-membership-list-item
   [props
    {:keys [name

src/quo2/components/community/community_view.cljs

@@ -5,17 +5,13 @@
             [quo2.components.tags.permission-tag :as permission]
             [quo2.components.tags.tag :as tag]
             [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]
-            [react-native.gesture :as gesture]
-            utils.money))
+            [quo.gesture-handler :as gesture-handler] ;;TODO move to quo2
+            [react-native.core :as rn]))
 
 (defn community-stats
-  [{:keys [icon members-count icon-color accessibility-label]}]
-  [rn/view
-   {:accessibility-label accessibility-label
-    :style               (style/stats-count-container)}
-   [rn/view {:margin-right 2}
+  [{:keys [icon members-count icon-color]}]
+  [rn/view (style/stats-count-container)
+   [rn/view {:margin-right 4}
     [icons/icon icon
      {:container-style {:align-items     :center
                         :justify-content :center}
@@ -24,32 +20,29 @@
       :color           icon-color}]]
    [text/text
     {:weight :regular
-     :size   :paragraph-2}
+     :size   :paragraph-1}
     members-count]])
 
 (defn community-stats-column
-  [{:keys [type theme blur? members-count active-count]}]
-  (let [icon-color (if (and (= :dark theme) blur?)
-                     colors/white-opa-40
-                     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))]
+  [{:keys [type]}]
+  (let [icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
     [rn/view
      (if (= type :card-view)
        (style/card-stats-container)
        (style/list-stats-container))
      [community-stats
-      {:accessibility-label :stats-members-count
-       :icon                :i/group
-       :members-count       (utils.money/format-amount members-count)
-       :icon-color          icon-color}]
+      {:icon          :i/group
+       :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from
+                               ;;outside this component
+       :icon-color    icon-color}]
      [community-stats
-      {:accessibility-label :stats-active-count
-       :icon                :i/active-members
-       :members-count       (utils.money/format-amount active-count)
-       :icon-color          icon-color}]]))
+      {:icon          :i/lightning
+       :members-count "112.1K"
+       :icon-color    icon-color}]]))
 
 (defn community-tags
   [{:keys [tags container-style last-item-style]}]
-  [gesture/scroll-view
+  [gesture-handler/scroll-view
    {:shows-horizontal-scroll-indicator false
     :horizontal                        true
     :style                             container-style}
@@ -91,16 +84,13 @@
        :style               {:margin-top (if (= size :large) 8 2)}}
       description])])
 
-(defn- permission-tag-container-internal
-  [{:keys [locked? blur? tokens on-press theme]}]
+(defn permission-tag-container
+  [{:keys [locked? tokens on-press]}]
   [permission/tag
-   {:accessibility-label :permission-tag
-    :background-color    (if (and (= :dark theme) blur?)
-                           colors/white-opa-10
-                           (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
-    :locked?             locked?
-    :tokens              tokens
-    :size                24
-    :on-press            on-press}])
-
-(def permission-tag-container (theme/with-theme permission-tag-container-internal))
+   {:background-color (colors/theme-colors
+                       colors/neutral-10
+                       colors/neutral-80)
+    :locked?          locked?
+    :tokens           tokens
+    :size             24
+    :on-press         on-press}])

src/quo2/components/counter/counter.cljs

@@ -17,8 +17,8 @@
            :outline   colors/neutral-70}})
 
 (defn get-color
-  [k]
-  (get-in themes [(theme/get-theme) k]))
+  [key]
+  (get-in themes [(theme/get-theme) key]))
 
 (defn counter
   [{:keys [type override-text-color override-bg-color style accessibility-label max-value]

src/quo2/components/counter/step/style.cljs

@@ -14,11 +14,11 @@
     (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-10 theme)
     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)))
 
-(defn active-background-color [customization-color] (colors/custom-color customization-color 50 10))
-(defn complete-background-color [customization-color] (colors/custom-color customization-color 50))
+(def active-background-color (colors/custom-color :blue 50 10))
+(def complete-background-color (colors/custom-color :blue 50))
 
 (defn container
-  [{:keys [size type in-blur-view? theme customization-color]}]
+  [size type in-blur-view? theme]
   (cond-> container-base
     (#{1 2} size) (assoc :width 20)
     (= size 3) (assoc :width 28)
@@ -28,10 +28,10 @@
            :border-color (neutral-border-color in-blur-view? theme))
 
     (= type :active)
-    (assoc :background-color (active-background-color customization-color))
+    (assoc :background-color active-background-color)
 
     (= type :complete)
-    (assoc :background-color (complete-background-color customization-color))))
+    (assoc :background-color complete-background-color)))
 
 (defn text-color
   ([type] (text-color type nil))

src/quo2/components/counter/step/view.cljs

@@ -6,8 +6,8 @@
     [react-native.core :as rn]
     [utils.number]))
 
-(defn step-internal
-  [{:keys [type accessibility-label theme in-blur-view? customization-color]} value]
+(defn themed-step
+  [{:keys [type accessibility-label theme in-blur-view?]} value]
   (let [type  (or type :neutral)
         value (utils.number/parse-int value)
         label (str value)
@@ -15,14 +15,10 @@
     [rn/view
      {:accessible          true
       :accessibility-label (or accessibility-label :step-counter)
-      :style               (style/container {:size                size
-                                             :type                type
-                                             :in-blur-view?       in-blur-view?
-                                             :theme               theme
-                                             :customization-color customization-color})}
+      :style               (style/container size type in-blur-view? theme)}
      [text/text
       {:weight :medium
        :size   :label
        :style  {:color (style/text-color type theme)}} label]]))
 
-(def step (theme/with-theme step-internal))
+(def step (theme/with-theme themed-step))

src/quo2/components/dividers/date.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.dividers.date
   (:require [quo2.components.markdown.text :as text]
-            [quo2.components.common.separator.view :as separator]
+            [quo2.components.separator :as separator]
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn]))
 

src/quo2/components/dividers/divider_label.cljs

@@ -1,8 +1,8 @@
 (ns quo2.components.dividers.divider-label
-  (:require [quo2.components.icon :as icons]
+  (:require [quo2.theme :as theme]
+            [quo2.components.icon :as icons]
             [quo2.components.markdown.text :as markdown.text]
             [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
             [react-native.core :as rn]))
 
 (def chevron-icon-container-width 20)
@@ -36,18 +36,18 @@
         padding-top                 (if increase-padding-top? 16 8)
         text-and-icon-color         (if dark? colors/neutral-40 colors/neutral-50)
         counter-text-color          (if dark? colors/white colors/neutral-100)]
-    [rn/touchable-without-feedback {:on-press on-press}
+    [rn/touchable-without-feedback
+     {:on-press on-press}
      [rn/view
       {:accessible          true
        :accessibility-label :divider-label
-       :style               (merge {:border-top-width 1
-                                    :border-top-color border-and-counter-bg-color
-                                    :padding-top      padding-top
-                                    :padding-bottom   padding-bottom
-                                    :padding-left     16
-                                    :padding-right    16
-                                    :align-items      :center
-                                    :flex-direction   :row}
+       :style               (merge {:border-top-width   1
+                                    :border-top-color   border-and-counter-bg-color
+                                    :padding-top        padding-top
+                                    :padding-bottom     padding-bottom
+                                    :padding-horizontal 16
+                                    :align-items        :center
+                                    :flex-direction     :row}
                                    container-style)}
       (when (= chevron-position :left)
         [rn/view

src/quo2/components/drawers/documentation_drawers/style.cljs

@@ -1,10 +1,4 @@
-(ns quo2.components.drawers.documentation-drawers.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.safe-area :as safe-area]))
-
-(def outer-container
-  ;; Margin negative to fill the bottom-sheet container where this component is used
-  {:margin-bottom (- (+ (safe-area/get-bottom) 8))})
+(ns quo2.components.drawers.documentation-drawers.style)
 
 (def container
   {:align-items        :flex-start
@@ -12,10 +6,4 @@
 
 (def content
   {:margin-top    8
-   :margin-bottom (+ (safe-area/get-bottom) 8)})
-
-(defn title
-  [shell?]
-  {:color (colors/theme-colors colors/neutral-100
-                               colors/white
-                               (when shell? :dark))})
+   :margin-bottom 16})

src/quo2/components/drawers/documentation_drawers/view.cljs

@@ -1,9 +1,10 @@
 (ns quo2.components.drawers.documentation-drawers.view
-  (:require [quo2.components.buttons.button.view :as button]
+  (:require [quo2.components.markdown.text :as text]
             [quo2.components.drawers.documentation-drawers.style :as style]
-            [quo2.components.markdown.text :as text]
             [react-native.core :as rn]
-            [react-native.gesture :as gesture]))
+            [react-native.gesture :as gesture]
+            [quo2.components.buttons.button :as button]
+            [quo2.foundations.colors :as colors]))
 
 (defn view
   "Options
@@ -13,18 +14,18 @@
    - `button-icon` button icon
    - `on-press-button` On press handler for the button
    - `shell?` use shell theme
+
    `content` Content of the drawer
    "
   [{:keys [title show-button? on-press-button button-label button-icon shell?]} content]
   [gesture/scroll-view
-   {:style                             style/outer-container
-    :always-bounce-vertical            false
-    :content-inset-adjustment-behavior :never}
    [rn/view {:style style/container}
     [text/text
      {:size                :heading-2
       :accessibility-label :documentation-drawer-title
-      :style               (style/title shell?)
+      :style               {:color (colors/theme-colors colors/neutral-100
+                                                        colors/white
+                                                        (when shell? :dark))}
       :weight              :semi-bold}
      title]
     [rn/view {:style style/content :accessibility-label :documentation-drawer-content}

src/quo2/components/drawers/drawer_buttons/component_spec.cljs

@@ -1,19 +1,9 @@
 (ns quo2.components.drawers.drawer-buttons.component-spec
   (:require [quo2.components.drawers.drawer-buttons.view :as drawer-buttons]
             [react-native.core :as rn]
-            [test-helpers.component :as h]
-            [react-native.safe-area :as safe-area]))
+            [test-helpers.component :as h]))
 
 (h/describe "drawer-buttons"
-  (h/before-each
-   (fn []
-     (h/use-fake-timers)))
-
-  (h/after-each
-   (fn []
-     (h/clear-all-timers)
-     (h/use-real-timers)))
-
   (h/test "the top heading and subheading render"
     (h/render [drawer-buttons/view
                {:top-card    {:heading :top-heading}
@@ -39,16 +29,15 @@
 
   (h/test "it clicks the top card"
     (let [event (h/mock-fn)]
-      (with-redefs [safe-area/get-top (fn [] 10)]
-        (h/render [drawer-buttons/view
-                   {:top-card    {:on-press event
-                                  :heading  :top-heading}
-                    :bottom-card {:heading :bottom-heading}}
-                   :top-sub-heading
-                   :bottom-sub-heading])
-        (h/fire-event :press (h/get-by-text "top-heading"))
-        (-> (js/expect event)
-            (.toHaveBeenCalled)))))
+      (h/render [drawer-buttons/view
+                 {:top-card    {:on-press event
+                                :heading  :top-heading}
+                  :bottom-card {:heading :bottom-heading}}
+                 :top-sub-heading
+                 :bottom-sub-heading])
+      (h/fire-event :press (h/get-by-text "top-heading"))
+      (-> (js/expect event)
+          (.toHaveBeenCalled))))
 
   (h/test "it clicks the bottom card"
     (let [event (h/mock-fn)]

src/quo2/components/drawers/drawer_buttons/style.cljs

@@ -1,20 +1,11 @@
 (ns quo2.components.drawers.drawer-buttons.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.reanimated :as reanimated]))
+  (:require [quo2.foundations.colors :as colors]))
 
-(defn outer-container
-  [height border-radius container-style]
-  (reanimated/apply-animations-to-style
-   {:height                  height
-    :border-top-left-radius  border-radius
-    :border-top-right-radius border-radius}
-   (assoc
-    container-style
-    :position :absolute
-    :left     0
-    :right    0
-    :bottom   0
-    :overflow :hidden)))
+(def outer-container
+  {:height                  216
+   :border-top-left-radius  20
+   :border-top-right-radius 20
+   :overflow                :hidden})
 
 (def top-card
   {:flex                    1
@@ -26,6 +17,7 @@
 
 (def bottom-card
   {:position                :absolute
+   :top                     80
    :left                    0
    :right                   0
    :bottom                  0
@@ -49,20 +41,6 @@
    :align-items     :center
    :border-color    colors/white-opa-5})
 
-(def blur-view-style
-  {:flex                    1
-   :border-top-left-radius  20
-   :border-top-right-radius 20})
-
-(def blur-content-style
-  {:flex             1
-   :background-color :transparent
-   :position         :absolute
-   :top              0
-   :left             0
-   :right            0
-   :bottom           0})
-
 (def bottom-text
   {:flex  1
    :color colors/white-70-blur})
@@ -73,4 +51,4 @@
 (defn heading-text
   [gap]
   {:color         colors/white
-   :margin-bottom gap})
+   :margin-bottom gap})

src/quo2/components/drawers/drawer_buttons/view.cljs

@@ -4,12 +4,7 @@
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
             [react-native.blur :as blur]
-            [quo2.components.drawers.drawer-buttons.style :as style]
-            [react-native.reanimated :as reanimated]
-            [react-native.platform :as platform]
-            [react-native.safe-area :as safe-area]))
-
-(def default-height 216)
+            [quo2.components.drawers.drawer-buttons.style :as style]))
 
 (defn render-bottom
   [children]
@@ -34,74 +29,35 @@
       children]]
     [render-bottom children]))
 
-(defn- f-render-children-top
-  [children top-children-opacity]
-  (let [scale        (reanimated/interpolate top-children-opacity [1 0] [1 1.1])
-        padding-left (reanimated/interpolate scale [1 1.1] [0 14])]
-    [reanimated/view
-     {:style (reanimated/apply-animations-to-style
-              {:opacity   top-children-opacity
-               :transform [{:scale scale}
-                           {:translate-x padding-left}]}
-              {})}
-     (if (label? children)
-       [text/text
-        {:size   :paragraph-2
-         :style  style/top-text
-         :weight :semi-bold}
-        children]
-       children)]))
+(defn render-children-top
+  [children]
+  (if (label? children)
+    [text/text
+     {:size   :paragraph-2
+      :style  style/top-text
+      :weight :semi-bold}
+     children]
+    children))
 
-(defn- f-card
-  [{:keys [on-press default-on-press style heading gap accessibility-label top? top-title-opacity
-           top-children-opacity
-           animated-heading]
-    :or   {top-title-opacity (reanimated/use-shared-value 1)}}
-   children]
+(defn card
+  [{:keys [on-press style heading gap accessibility-label top?]} children]
   [rn/touchable-highlight
    {:accessibility-label accessibility-label
-    :on-press            (fn []
-                           (when on-press
-                             (on-press))
-                           (when default-on-press
-                             (default-on-press)))
+    :on-press            on-press
     :border-radius       20
     :style               style
     :underlay-color      (:background-color style)}
    [rn/view
-    [reanimated/view
-     {:style (reanimated/apply-animations-to-style
-              {:opacity top-title-opacity}
-              {})}
-     [text/text
-      {:size   :heading-1
-       :style  (style/heading-text gap)
-       :weight :semi-bold}
-      heading]]
-    (when animated-heading
-      (let [animated-heading-opacity (reanimated/interpolate top-children-opacity [1 0] [0 1])]
-        [reanimated/view
-         {:style (reanimated/apply-animations-to-style
-                  {:opacity top-title-opacity}
-                  {:position :absolute})}
-         [reanimated/view
-          {:style (reanimated/apply-animations-to-style
-                   {:opacity animated-heading-opacity}
-                   {})}
-          [text/text
-           {:size   :heading-1
-            :style  (style/heading-text gap)
-            :weight :semi-bold}
-           animated-heading]]]))
+    [text/text
+     {:size   :heading-1
+      :style  (style/heading-text gap)
+      :weight :semi-bold}
+     heading]
     (if top?
-      [:f> f-render-children-top children top-children-opacity]
+      [render-children-top children]
       [render-children-bottom children])]])
 
-(defn card
-  [props children]
-  [:f> f-card props children])
-
-(defn f-view
+(defn view
   "[view opts]
    opts
    {:container-style  style-object
@@ -114,101 +70,29 @@
     child-1           string, keyword or hiccup
     child-2           string, keyword or hiccup
    "
-  [{:keys [container-style top-card bottom-card on-init animations-duration animations-delay]}
-   child-1
-   child-2]
-  (let [max-height           (+ (:height (rn/get-window)) (if platform/android? (safe-area/get-top) 0))
-        height               (reanimated/use-shared-value default-height)
-        top-padding          (reanimated/use-shared-value 12)
-        border-radius        (reanimated/use-shared-value 20)
-        bottom-view-top      (reanimated/use-shared-value 80)
-        top-title-opacity    (reanimated/use-shared-value 1)
-        top-children-opacity (reanimated/use-shared-value 1)
-        animations-delay     (/ animations-delay 1.4)
-        start-top-animation  (fn []
-                               (reanimated/animate-shared-value-with-delay bottom-view-top
-                                                                           (:height (rn/get-screen))
-                                                                           animations-duration
-                                                                           :easing4
-                                                                           animations-delay)
-                               (reanimated/animate-shared-value-with-delay
-                                height
-                                max-height
-                                animations-duration
-                                :easing4
-                                animations-delay)
-                               (reanimated/animate-shared-value-with-delay
-                                top-padding
-                                (+ 68 (safe-area/get-top))
-                                animations-duration
-                                :easing4
-                                animations-delay)
-                               (reanimated/animate-shared-value-with-delay
-                                top-children-opacity
-                                0
-                                animations-duration
-                                :easing4 animations-delay)
-                               (reanimated/animate-shared-value-with-delay
-                                top-title-opacity
-                                0
-                                0
-                                :linear
-                                (+ animations-delay animations-duration 500)))
-        reset-top-animation  (fn []
-                               (reanimated/set-shared-value top-title-opacity 1)
-                               (reanimated/animate-shared-value-with-delay bottom-view-top
-                                                                           80
-                                                                           animations-duration
-                                                                           :easing4
-                                                                           50)
-                               (reanimated/animate-shared-value-with-timing
-                                height
-                                default-height
-                                animations-duration
-                                :easing4)
-                               (reanimated/animate-shared-value-with-timing
-                                top-padding
-                                12
-                                animations-duration
-                                :easing4)
-                               (reanimated/animate-shared-value-with-timing
-                                top-children-opacity
-                                1
-                                animations-duration
-                                :easing4))]
-    (rn/use-effect (fn []
-                     (when on-init
-                       (on-init reset-top-animation))))
-    [reanimated/view {:style (style/outer-container height border-radius container-style)}
-     [blur/view
-      {:blur-type   :dark
-       :blur-amount 10
-       :style       style/blur-view-style}
-      [rn/view
-       {:style style/blur-content-style}
-       [reanimated/view
-        {:style (reanimated/apply-animations-to-style
-                 {:padding-top top-padding}
-                 style/top-card)}
-        [card
-         (merge {:gap                  4
-                 :top?                 true
-                 :style                {:flex 1}
-                 :top-children-opacity top-children-opacity
-                 :top-title-opacity    top-title-opacity
-                 :default-on-press     start-top-animation}
-                top-card)
-         child-1]]
-       [reanimated/view
-        {:style (reanimated/apply-animations-to-style
-                 {:top bottom-view-top}
-                 style/bottom-card)}
-        [card
-         (merge {:style {:flex 1}
-                 :gap   10}
-                bottom-card)
-         child-2]]]]]))
-
-(defn view
-  [props child-1 child-2]
-  [:f> f-view props child-1 child-2])
+  [{:keys [container-style top-card bottom-card]} child-1 child-2]
+  [rn/view
+   {:style (merge container-style style/outer-container)}
+   [blur/view
+    {:blur-type   :dark
+     :blur-amount 10
+     :style       {:flex                    1
+                   :border-top-left-radius  20
+                   :border-top-right-radius 20}}]
+   [rn/view
+    {:style {:flex             1
+             :background-color :transparent
+             :position         :absolute
+             :top              0
+             :left             0
+             :right            0
+             :bottom           0}}
+    [card
+     (merge {:gap   4
+             :top?  true
+             :style style/top-card}
+            top-card) child-1]
+    [card
+     (merge {:style style/bottom-card
+             :gap   20}
+            bottom-card) child-2]]])

src/quo2/components/dropdowns/dropdown.cljs

@@ -1,5 +1,5 @@
 (ns quo2.components.dropdowns.dropdown
-  (:require [quo2.components.buttons.button.view :as button]))
+  (:require [quo2.components.buttons.button :as button]))
 
 (defn dropdown
   [_ _]

src/quo2/components/empty_state/empty_state/view.cljs

@@ -1,12 +1,11 @@
 (ns quo2.components.empty-state.empty-state.view
-  (:require [quo2.components.buttons.button.view :as button]
+  (:require [quo2.components.buttons.button :as button]
             [quo2.components.empty-state.empty-state.styles :as styles]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
-            [quo2.theme :as theme]))
+            [react-native.fast-image :as fast-image]))
 
-(defn- empty-state-internal
+(defn empty-state
   [{:keys        [customization-color image title description blur?]
     upper-button :upper-button
     lower-button :lower-button
@@ -33,18 +32,19 @@
                upper-button-on-press :on-press} upper-button]
      [rn/view {:style styles/button-container}
       [button/button
-       {:type                      :primary
-        :size                      32
-        :override-background-color (styles/upper-button-color customization-color)
-        :on-press                  upper-button-on-press}
+       (cond-> {:type                      :primary
+                :size                      32
+                :override-background-color (styles/upper-button-color customization-color)
+                :on-press                  upper-button-on-press}
+         blur? (assoc :override-theme :dark))
        upper-button-text]
+
       (when-let [{lower-button-text     :text
                   lower-button-on-press :on-press} lower-button]
         [button/button
-         {:style    {:margin-top 12}
-          :size     32
-          :type     :blur-bg
-          :on-press lower-button-on-press}
+         (cond-> {:style    {:margin-top 12}
+                  :size     32
+                  :type     :blur-bg
+                  :on-press lower-button-on-press}
+           blur? (assoc :override-theme :dark))
          lower-button-text])])])
-
-(def empty-state (theme/with-theme empty-state-internal))

src/quo2/components/header.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.header
   (:require [oops.core :refer [oget]]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn]

src/quo2/components/info/info_message.cljs

@@ -14,8 +14,8 @@
            :error   colors/danger-60}})
 
 (defn get-color
-  [k]
-  (get-in themes [(theme/get-theme) k]))
+  [key]
+  (get-in themes [(theme/get-theme) key]))
 
 (defn info-message
   "[info-message opts \"message\"]

src/quo2/components/info/information_box/style.cljs

@@ -30,12 +30,12 @@
            :close-button colors/white}})
 
 (defn get-color
-  [theme k]
-  (get-in themes [theme k]))
+  [theme key]
+  (get-in themes [theme key]))
 
 (defn get-color-by-type
-  [theme type k]
-  (get-in themes [theme type k]))
+  [theme type key]
+  (get-in themes [theme type key]))
 
 (defn container
   [{:keys [theme type include-button?]}]

src/quo2/components/info/information_box/view.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.info.information-box.view
   (:require [clojure.string :as string]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.icon :as icons]
             [quo2.components.info.information-box.style :as style]
             [quo2.components.markdown.text :as text]

src/quo2/components/inputs/profile_input/view.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.inputs.profile-input.view
   (:require
-    [quo2.components.buttons.button.view :as buttons]
+    [quo2.components.buttons.button :as buttons]
     [quo2.components.avatars.user-avatar.view :as user-avatar]
     [quo2.components.inputs.profile-input.style :as style]
     [quo2.components.inputs.title-input.view :as title-input]
@@ -37,6 +37,7 @@
     [buttons/button
      {:accessibility-label       :select-profile-picture-button
       :type                      :grey
+      :override-theme            :dark
       :override-background-color (colors/alpha colors/white 0.05)
       :on-press                  on-press
       :icon-size                 20
@@ -49,5 +50,6 @@
     [title-input/title-input
      (merge title-input-props
             {:blur?               true
+             :override-theme      :dark
              :placeholder         placeholder
              :customization-color customization-color})]]])

src/quo2/components/inputs/title_input/style.cljs

@@ -3,50 +3,50 @@
             [react-native.platform :as platform]))
 
 (defn get-focused-placeholder-color
-  [blur? theme]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 theme))
+    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
+    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme))
 )
 
 (defn get-placeholder-color
-  [blur? theme]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn- get-disabled-color
-  [blur? theme]
+  [blur? override-theme]
   (if blur?
     (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn- get-char-count-color
-  [blur? theme]
+  [blur? override-theme]
   (if blur?
     (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn get-selection-color
-  [customization-color blur? theme]
+  [customization-color blur? override-theme]
   (colors/alpha (if blur?
-                  (colors/theme-colors colors/neutral-100 colors/white theme)
+                  (colors/theme-colors colors/neutral-100 colors/white override-theme)
                   (colors/custom-color customization-color
-                                       (if (or (= :dark theme) colors/dark?) 60 50)))
+                                       (if (or (= :dark override-theme) colors/dark?) 60 50)))
                 (if platform/ios? 1 0.2)))
 
 (def text-input-container {:flex 1})
 
 (defn title-text
-  [disabled? blur? theme]
+  [disabled? blur? override-theme]
   {:text-align-vertical :bottom
    :color               (if disabled?
-                          (get-disabled-color blur? theme)
-                          (colors/theme-colors colors/neutral-100 colors/white theme))})
+                          (get-disabled-color blur? override-theme)
+                          (colors/theme-colors colors/neutral-100 colors/white override-theme))})
 
 (defn char-count
-  [blur? theme]
-  {:color (get-char-count-color blur? theme)})
+  [blur? override-theme]
+  {:color (get-char-count-color blur? override-theme)})
 
 (def container
   {:flex-direction  :row

src/quo2/components/inputs/title_input/view.cljs

@@ -12,14 +12,14 @@
     (str 0 value)
     value))
 
-(defn- title-input-internal
+(defn title-input
   [{:keys [blur?
            on-change-text
            auto-focus
            placeholder
            max-length
            default-value
-           theme]
+           override-theme]
     :or   {max-length    0
            auto-focus    false
            default-value ""}}]
@@ -38,10 +38,10 @@
           (text/text-style
            {:size   :heading-2
             :weight :semi-bold
-            :style  (style/title-text disabled? blur? theme)})
+            :style  (style/title-text disabled? blur? override-theme)})
           :default-value default-value
           :accessibility-label :profile-title-input
-          :keyboard-appearance (theme/theme-value :light :dark theme)
+          :keyboard-appearance (theme/theme-value :light :dark override-theme)
           :on-focus #(swap! focused? (constantly true))
           :on-blur #(swap! focused? (constantly false))
           :auto-focus auto-focus
@@ -50,24 +50,22 @@
           :editable (not disabled?)
           :max-length max-length
           :placeholder placeholder
-          :selection-color (style/get-selection-color customization-color blur? theme)
+          :selection-color (style/get-selection-color customization-color blur? override-theme)
           :placeholder-text-color (if @focused?
-                                    (style/get-focused-placeholder-color blur? theme)
-                                    (style/get-placeholder-color blur? theme))}]]
+                                    (style/get-focused-placeholder-color blur? override-theme)
+                                    (style/get-placeholder-color blur? override-theme))}]]
        [rn/view
         {:style style/counter-container}
         [text/text
          [text/text
-          {:style (style/char-count blur? theme)
+          {:style (style/char-count blur? override-theme)
            :size  :paragraph-2}
           (pad-0
            (str
             (count @value)))]
          [text/text
-          {:style (style/char-count blur? theme)
+          {:style (style/char-count blur? override-theme)
            :size  :paragraph-2}
           (str "/"
                (pad-0
                 (str max-length)))]]]])))
-
-(def title-input (theme/with-theme title-input-internal))

src/quo2/components/links/link_preview/view.cljs

@@ -1,5 +1,5 @@
 (ns quo2.components.links.link-preview.view
-  (:require [quo2.components.buttons.button.view :as button]
+  (:require [quo2.components.buttons.button :as button]
             [quo2.components.links.link-preview.style :as style]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]))

src/quo2/components/list_items/channel.cljs

@@ -1,11 +1,12 @@
 (ns quo2.components.list-items.channel
-  (:require [quo2.components.avatars.channel-avatar.view :as channel-avatar]
-            [quo2.components.common.unread-grey-dot.view :as unread-grey-dot]
+  (:require [quo2.components.avatars.channel-avatar :as channel-avatar]
             [quo2.components.counter.counter :as quo2.counter]
             [quo2.components.icon :as quo2.icons]
             [quo2.components.markdown.text :as quo2.text]
             [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]))
+            [quo2.theme :as theme]
+            [react-native.core :as rn]
+            [quo2.components.common.unread-grey-dot.view :refer [unread-grey-dot]]))
 
 (def ^:private custom-props
   [:name :locked? :mentions-count :unread-messages?
@@ -13,56 +14,61 @@
 
 (defn list-item
   [{:keys [locked? mentions-count unread-messages?
-           muted? is-active-channel? emoji channel-color
-           default-color]
+           muted? is-active-channel? emoji channel-color]
+    :or   {channel-color colors/primary-50}
     :as   props}]
-  (let [channel-color  (or channel-color default-color)
-        standard-props (apply dissoc props custom-props)
+  (let [standard-props (apply dissoc props custom-props)
         name-text      (:name props)]
     [rn/touchable-opacity standard-props
      [rn/view
-      {:style (cond-> {:height          48
-                       :border-radius   12
-                       :flex-direction  :row
-                       :justify-content :space-between
-                       :align-items     :center
-                       :width           "100%"
-                       :padding-left    12
-                       :padding-right   12}
-                is-active-channel? (assoc :background-color
-                                          (colors/theme-alpha channel-color 0.05 0.05)))}
+      {:style (merge {:height          48
+                      :display         :flex
+                      :border-radius   12
+                      :flex-direction  :row
+                      :justify-content :space-between
+                      :align-items     :center
+                      :width           "100%"
+                      :padding-left    12
+                      :padding-right   12}
+                     (when is-active-channel?
+                       {:background-color (colors/theme-alpha channel-color 0.05 0.05)}))}
       [rn/view
-       {:style               {:flex-direction  :row
-                              :justify-content :flex-start
-                              :align-items     :center}
+       {:display             :flex
+        :flex-direction      :row
+        :justify-content     :flex-start
+        :align-items         :center
         :accessible          true
         :accessibility-label :chat-name-text}
-       [channel-avatar/view
-        {:size                :size/l
-         :locked?             locked?
-         :full-name           (:name props)
-         :customization-color channel-color
-         :emoji               emoji}]
+       [channel-avatar/channel-avatar
+        {:big?                   true
+         :locked?                locked?
+         :emoji-background-color (colors/theme-alpha channel-color 0.1 0.1)
+         :emoji                  emoji}]
        [quo2.text/text
-        {:style  (cond-> {:margin-left 12}
-                   (and (not locked?) muted?)
-                   (assoc :color (colors/theme-colors colors/neutral-40 colors/neutral-60)))
+        {:style  (merge {:margin-left 12}
+                        (when (and (not locked?) muted?)
+                          {:color (if (theme/dark?) colors/neutral-60 colors/neutral-40)}))
          :weight :medium
-         :size   :paragraph-1}
-        (str "# " name-text)]]
-      (when-not locked?
-        [rn/view {:style {:height 20 :justify-content :center}}
-         (cond
-           muted?
-           [quo2.icons/icon :i/muted
-            {:size            20
-             :color           colors/neutral-40
-             :container-style {:margin-right 1 :margin-top 2}}]
-
-           (pos? (int mentions-count))
-           [rn/view {:style {:margin-right 2 :margin-top 2}}
-            [quo2.counter/counter {:override-bg-color channel-color}
-             mentions-count]]
-
-           unread-messages?
-           [unread-grey-dot/unread-grey-dot :unviewed-messages-public])])]]))
+         :size   :paragraph-1} (str "# " name-text)]]
+      [rn/view
+       {:style {:height          20
+                :justify-content :center}}
+       (when (and (not locked?)
+                  muted?)
+         [quo2.icons/icon :i/muted
+          {:size            20
+           :color           colors/neutral-40
+           :container-style {:margin-right 1
+                             :margin-top   2}}])
+       (when (and (not locked?)
+                  (not muted?)
+                  (pos? (int mentions-count)))
+         [rn/view
+          {:style {:margin-right 2
+                   :margin-top   2}}
+          [quo2.counter/counter {:override-bg-color channel-color} mentions-count]])
+       (when (and (not locked?)
+                  (not muted?)
+                  (not (pos? (int mentions-count)))
+                  unread-messages?)
+         [unread-grey-dot :unviewed-messages-public])]]]))

src/quo2/components/list_items/community/component_spec.cljs

@@ -1,70 +0,0 @@
-(ns quo2.components.list-items.community.component-spec
-  (:require [quo2.components.list-items.community.view :as component]
-            [test-helpers.component :as h]))
-
-(h/describe "Community list"
-  (h/test "default render"
-    (h/render [component/view {}])
-    (h/is-truthy (h/get-by-label-text :community-item-title))
-    (h/is-null (h/query-by-label-text :community-item-info)))
-
-  (h/describe "type share"
-    (h/test "renders"
-      (h/render [component/view
-                 {:type     :share
-                  :title    "Title"
-                  :subtitle "Subtitle"}])
-      (h/is-truthy (h/get-by-text "# Title"))
-      (h/is-truthy (h/get-by-text "Subtitle"))
-      (h/is-null (h/query-by-label-text :community-item-info))))
-
-  (h/describe "type engage"
-    (h/test "default, no info"
-      (h/render [component/view {:type :engage}])
-      (h/is-null (h/query-by-label-text :community-item-info)))
-
-    (h/test "info is :navigation"
-      (h/render [component/view {:type :engage :info :navigation}])
-      (h/is-truthy (h/get-by-label-text :info-navigation)))
-
-    (h/test "info is :token-gated"
-      (h/render [component/view {:type :engage :info :token-gated}])
-      (h/is-truthy (h/get-by-label-text :info-token-gated)))
-
-    (h/test "info is :muted"
-      (h/render [component/view {:type :engage :info :muted}])
-      (h/is-truthy (h/get-by-label-text :info-muted)))
-
-    (h/test "info is :notification"
-      (h/render [component/view {:type :engage :info :notification}])
-      (h/is-truthy (h/get-by-label-text :info-notification-dot)))
-
-    (h/test "info is :mention"
-      (h/render [component/view
-                 {:type         :engage
-                  :info         :mention
-                  :unread-count 9000}])
-      (h/is-truthy (h/get-by-text "99+"))))
-
-  (h/describe "type discover"
-    (h/test "default, no info, no member stats"
-      (h/render [component/view {:type :discover}])
-      (h/is-null (h/query-by-label-text :stats-members-count))
-      (h/is-null (h/query-by-label-text :community-item-info)))
-
-    (h/test "info is :token-gated, show member stats"
-      (let [on-press-info (h/mock-fn)]
-        (h/render [component/view
-                   {:type          :discover
-                    :info          :token-gated
-                    :locked?       true
-                    :blur?         false
-                    :on-press-info on-press-info
-                    :members       {:members-count 9876 :active-count 1350}
-                    :tokens        [{:id 1 :group [{:id 1}]}]}])
-        (h/is-truthy (h/get-by-label-text :community-item-info))
-        (h/is-truthy (h/get-by-label-text :permission-tag))
-        (h/is-truthy (h/get-by-label-text :stats-members-count))
-        (h/is-truthy (h/get-by-label-text :stats-active-count))
-        (h/fire-event :press (h/get-by-label-text :permission-tag))
-        (h/was-called on-press-info)))))

src/quo2/components/list_items/community/style.cljs

@@ -1,65 +0,0 @@
-(ns quo2.components.list-items.community.style
-  (:require [quo2.foundations.colors :as colors]
-            [quo2.foundations.shadows :as shadows]))
-
-(def logo
-  {:border-radius 50
-   :border-width  0
-   :width         32
-   :height        32
-   :margin-right  10})
-
-(defn notification-dot
-  [blur? theme]
-  {:width            8
-   :height           8
-   :border-radius    4
-   :background-color (if (and (= :dark theme) blur?)
-                       colors/white-opa-40
-                       (colors/theme-colors colors/neutral-40 colors/neutral-60 theme))})
-
-(defn title
-  [{:keys [type info blur? theme]}]
-  {:color (cond
-            (and (= type :engage) (= info :muted))
-            (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)
-
-            (and (= type :engage) (= info :default) (not blur?))
-            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-
-            (and (= type :engage) (= info :default) (= :dark theme) blur?)
-            colors/white-70-blur
-
-            :else
-            (colors/theme-colors colors/neutral-100 colors/white theme))})
-
-(defn subtitle
-  [blur? theme]
-  {:color (if (and (= :dark theme) blur?)
-            colors/white-opa-40
-            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))})
-
-(defn container
-  [{:keys [type pressed? blur? customization-color theme info]}]
-  (merge {:padding-vertical   8
-          :padding-horizontal 12
-          :border-radius      12
-          :flex-direction     :row
-          :align-items        :center
-          :background-color   (cond
-                                (and pressed? (= type :engage) (= info :default) (= :dark theme) blur?)
-                                colors/white-opa-5
-
-                                (and pressed? (#{:engage :share} type))
-                                (colors/theme-alpha customization-color 0.05 0.05)
-
-                                (and (not pressed?) (= type :discover) (not blur?))
-                                (colors/theme-colors colors/white colors/neutral-90 theme)
-
-                                (and (not pressed?) (= type :discover) (= :dark theme) blur?)
-                                colors/white-opa-5
-
-                                (and pressed? (= type :discover))
-                                (colors/theme-colors colors/white :transparent theme))}
-         (when (and (= type :discover) (not pressed?))
-           (shadows/get 3))))

src/quo2/components/list_items/community/view.cljs

@@ -1,165 +0,0 @@
-(ns quo2.components.list-items.community.view
-  (:require [quo2.components.community.community-view :as community-view]
-            [quo2.components.counter.counter :as counter]
-            [quo2.components.icon :as icons]
-            [quo2.components.list-items.community.style :as style]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as quo.theme]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
-
-(defn- logo-component
-  [logo]
-  [rn/image {:source logo :style style/logo}])
-
-(defn- title-component
-  [{:keys [title type] :as props}]
-  [text/text
-   {:weight              :semi-bold
-    :size                :paragraph-1
-    :accessibility-label :community-item-title
-    :number-of-lines     1
-    :ellipsize-mode      :tail
-    :style               (style/title props)}
-   (if (= type :share)
-     (str "# " title)
-     title)])
-
-(defn- subtitle-component
-  [subtitle blur? theme]
-  [text/text
-   {:size                :paragraph-2
-    :number-of-lines     1
-    :accessibility-label :community-item-subtitle
-    :style               (style/subtitle blur? theme)}
-   subtitle])
-
-(defn- notification-dot
-  [blur? theme]
-  [rn/view
-   {:style               (style/notification-dot blur? theme)
-    :accessibility-label :info-notification-dot}])
-
-(defn- info-component
-  [{:keys [customization-color info type blur? locked? on-press-info theme tokens unread-count]}]
-  (let [component
-        (cond
-          (and (= type :discover) (= info :token-gated) (seq tokens))
-          [community-view/permission-tag-container
-           {:locked?  locked?
-            :tokens   tokens
-            :on-press on-press-info
-            :theme    theme
-            :blur?    blur?}]
-
-          (and (= type :engage) (= info :mention) (pos? unread-count))
-          [counter/counter
-           {:type              :default
-            :override-bg-color customization-color}
-           unread-count]
-
-          (and (= type :engage) (= info :notification))
-          [notification-dot blur? theme]
-
-          (and (= type :engage) (= info :muted))
-          [icons/icon :i/muted
-           {:accessibility-label :info-muted
-            :color               (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)}]
-
-          (and (= type :engage) (= info :token-gated))
-          [icons/icon (if locked? :i/locked :i/unlocked)
-           {:accessibility-label :info-token-gated
-            :color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
-
-          (and (= type :engage) (= info :navigation))
-          [icons/icon :i/chevron-right
-           {:accessibility-label :info-navigation
-            :color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}])]
-    (when component
-      [rn/view
-       {:accessibility-label :community-item-info
-        :style               {:margin-left 10}}
-       component])))
-
-(defn- view-internal
-  "Options:
-
-  :type - :discover/engage/share
-  :info - keyword - Acceptable values vary based on the :type option.
-
-  :title - string
-  :logo - image resource
-  :theme - :light/dark
-
-  :container-style - style map - Override styles in top-level view component.
-
-  :members - {:members-count number, :active-count number} - When non-nil, the
-  statistics component will be shown.
-
-  :tokens - A sequence of maps, e.g. [{:id 1 :group [{:id 1 :token-icon an-icon}]}].
-
-  :locked? - boolean - When true, the permission-tag icon or the token gated
-  icon will appear as closed.
-
-  :blur? - boolean - It will be taken into account when true and dark mode is
-  enabled.
-
-  :customization-color - color - It will be passed down to components that
-  should vary based on a custom color.
-
-  :on-press/:on-long-press - fn - Used by the top-level pressable component.
-
-  :on-press-info - fn - Will be called when the info component is pressed.
-
-  :unread-count - number - When the info is :mention, it will be used to show
-  the number of unread mentions.
-  "
-  []
-  (let [pressed? (reagent/atom false)]
-    (fn [{:keys [members type info tokens locked? title subtitle
-                 logo blur? customization-color
-                 on-press on-long-press on-press-info
-                 container-style unread-count theme]}]
-      [rn/pressable
-       {:accessibility-label :container
-        :on-press-in         (fn [] (reset! pressed? true))
-        :on-press            on-press
-        :on-long-press       on-long-press
-        :on-press-out        (fn [] (reset! pressed? false))
-        :style               (merge (style/container {:blur?               blur?
-                                                      :customization-color customization-color
-                                                      :info                info
-                                                      :type                type
-                                                      :pressed?            @pressed?
-                                                      :theme               theme})
-                                    container-style)}
-       [logo-component logo]
-       [rn/view {:style {:flex 1}}
-        [title-component
-         {:blur? blur?
-          :info  info
-          :theme theme
-          :title title
-          :type  type}]
-        (when (and (= type :share) subtitle)
-          [subtitle-component subtitle blur? theme])
-        (when (and members (= type :discover))
-          [community-view/community-stats-column
-           {:type          :list-view
-            :theme         theme
-            :blur?         blur?
-            :members-count (:members-count members)
-            :active-count  (:active-count members)}])]
-       [info-component
-        {:blur?               blur?
-         :customization-color customization-color
-         :info                info
-         :type                type
-         :locked?             locked?
-         :on-press-info       on-press-info
-         :theme               theme
-         :tokens              tokens
-         :unread-count        unread-count}]])))
-
-(def view (quo.theme/with-theme view-internal))

src/quo2/components/loaders/skeleton/constants.cljs

@@ -1,95 +0,0 @@
-(ns quo2.components.loaders.skeleton.constants)
-
-(def ^:const layout-dimensions
-  {:messages      {:height      56
-                   :padding-top 12}
-   :list-items    {:height      56
-                   :padding-top 12}
-   :notifications {:height      90
-                   :padding-top 8}})
-
-(def ^:const content-dimensions
-  {:messages      {0 {:author  {:width         112
-                                :height        8
-                                :margin-bottom 8}
-                      :message {:width         144
-                                :height        16
-                                :margin-bottom 0}}
-                   1 {:author  {:width         96
-                                :height        8
-                                :margin-bottom 8}
-                      :message {:width         212
-                                :height        16
-                                :margin-bottom 0}}
-                   2 {:author  {:width         80
-                                :height        8
-                                :margin-bottom 8}
-                      :message {:width         249
-                                :height        16
-                                :margin-bottom 0}}
-                   3 {:author  {:width         124
-                                :height        8
-                                :margin-bottom 8}
-                      :message {:width         156
-                                :height        16
-                                :margin-bottom 0}}}
-   :list-items    {0 {:author  {:width         112
-                                :height        8
-                                :margin-bottom 0}
-                      :message {:width         144
-                                :height        16
-                                :margin-bottom 8}}
-                   1 {:author  {:width         96
-                                :height        8
-                                :margin-bottom 0}
-                      :message {:width         212
-                                :height        16
-                                :margin-bottom 8}}
-                   2 {:author  {:width         80
-                                :height        8
-                                :margin-bottom 0}
-                      :message {:width         249
-                                :height        16
-                                :margin-bottom 8}}
-                   3 {:author  {:width         124
-                                :height        8
-                                :margin-bottom 0}
-                      :message {:width         156
-                                :height        16
-                                :margin-bottom 8}}}
-   :notifications {0 {:author   {:width         109
-                                 :height        8
-                                 :margin-bottom 8}
-                      :message  {:width         167
-                                 :height        16
-                                 :margin-bottom 8}
-                      :message2 {:width         242
-                                 :height        30
-                                 :margin-bottom 0}}
-                   1 {:author   {:width         165
-                                 :height        8
-                                 :margin-bottom 8}
-                      :message  {:width         112
-                                 :height        16
-                                 :margin-bottom 8}
-                      :message2 {:width         294
-                                 :height        30
-                                 :margin-bottom 0}}
-                   2 {:author   {:width         136
-                                 :height        8
-                                 :margin-bottom 8}
-                      :message  {:width         178
-                                 :height        16
-                                 :margin-bottom 8}
-                      :message2 {:width         178
-                                 :height        30
-                                 :margin-bottom 0}}
-                   3 {:author   {:width         136
-                                 :height        8
-                                 :margin-bottom 8}
-                      :message  {:width         166
-                                 :height        16
-                                 :margin-bottom 8}
-                      :message2 {:width         256
-                                 :height        30
-                                 :margin-bottom 0}}}})

src/quo2/components/loaders/skeleton/style.cljs

@@ -1,29 +0,0 @@
-(ns quo2.components.loaders.skeleton.style
-  (:require [quo2.components.loaders.skeleton.constants :as constants]))
-
-(defn container
-  [content]
-  {:flex-direction :row
-   :padding        12
-   :padding-top    (get-in constants/layout-dimensions [content :padding-top])
-   :height         (get-in constants/layout-dimensions [content :height])})
-
-(defn avatar
-  [color]
-  {:height           32
-   :width            32
-   :border-radius    16
-   :background-color color})
-
-(def content-container
-  {:padding-left 8})
-
-(defn content-view
-  [{:keys [type index content color]}]
-  (let [{:keys [width height margin-bottom]}
-        (get-in constants/content-dimensions [content index type])]
-    {:height           height
-     :width            width
-     :border-radius    6
-     :background-color color
-     :margin-bottom    margin-bottom}))

src/quo2/components/loaders/skeleton/view.cljs

@@ -1,46 +0,0 @@
-(ns quo2.components.loaders.skeleton.view
-  (:require [quo2.theme :as theme]
-            [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.loaders.skeleton.style :as style]
-            [quo2.components.loaders.skeleton.constants :as constants]))
-
-(defn- skeleton-item
-  [index content color]
-  [rn/view {:style (style/container content)}
-   [rn/view {:style (style/avatar color)}]
-   [rn/view {:style style/content-container}
-    [rn/view
-     {:style (style/content-view
-              {:type    (if (= content :list-items) :message :author)
-               :index   index
-               :content content
-               :color   color})}]
-    [rn/view
-     {:style (style/content-view
-              {:type    (if (= content :list-items) :author :message)
-               :index   index
-               :content content
-               :color   color})}]
-    (when (= content :notifications)
-      [rn/view
-       {:style (style/content-view {:type    :message2
-                                    :index   index
-                                    :content content
-                                    :color   color})}])]])
-
-(defn- internal-view
-  [{:keys [content theme blur? parent-height]}]
-  (let [skeleton-height     (get-in constants/layout-dimensions [content :height])
-        number-of-skeletons (int (Math/ceil (/ parent-height skeleton-height)))
-        color               (cond
-                              blur?           colors/white-opa-5
-                              (= theme :dark) colors/neutral-90
-                              :else           colors/neutral-5)]
-    [rn/view {:style {:padding 8}}
-     (doall
-      (for [index (range number-of-skeletons)]
-        ^{:key index}
-        [skeleton-item (mod index 4) content color]))]))
-
-(def view (theme/with-theme internal-view))

src/quo2/components/markdown/list/component_spec.cljs

@@ -1,38 +0,0 @@
-(ns quo2.components.markdown.list.component-spec
-  (:require [quo2.components.markdown.list.view :as list]
-            [test-helpers.component :as h]))
-
-(h/describe "tests for markdown/list component"
-  (h/test "renders component with title"
-    (h/render [list/view {:title "test title"}])
-    (h/is-truthy (h/get-by-text "test title")))
-
-  (h/test "renders component with description"
-    (h/render [list/view
-               {:title       "test title"
-                :description "test description"}])
-    (h/is-truthy (h/get-by-text "test description")))
-
-  (h/test "renders component with title and description"
-    (h/render [list/view
-               {:title       "test title"
-                :description "test description"}])
-    (h/is-truthy (h/get-by-text "test title"))
-    (h/is-truthy (h/get-by-text "test description")))
-
-  (h/test "renders step component when step-number is valid and type is step"
-    (h/render [list/view
-               {:type        :step
-                :step-number 1}])
-    (h/is-truthy (h/get-by-label-text :step-counter)))
-
-  (h/test "renders decription with a context tag component and description after the tag"
-    (h/render [list/view
-               {:step-number           1
-                :description           "Lorem ipsum "
-                :tag-name              "dolor"
-                :description-after-tag "text after tag"}])
-    (h/is-truthy (h/get-by-text "Lorem ipsum"))
-    (h/is-truthy (h/get-by-label-text :user-avatar))
-    (h/is-truthy (h/get-by-text "dolor"))
-    (h/is-truthy (h/get-by-text "text after tag"))))

src/quo2/components/markdown/list/style.cljs

@@ -1,15 +0,0 @@
-(ns quo2.components.markdown.list.style)
-
-(defn container
-  [container-style]
-  (merge container-style
-         {:flex-direction :row
-          :flex           1
-          :align-items    :flex-start}))
-
-(def index
-  {:margin-left 5})
-
-(def text-container
-  {:margin-left 8
-   :flex        1})

src/quo2/components/markdown/list/view.cljs

@@ -1,65 +0,0 @@
-(ns quo2.components.markdown.list.view
-  (:require [react-native.core :as rn]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.counter.step.view :as step]
-            [quo2.components.markdown.list.style :as style]
-            [quo2.components.icon :as icon]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [quo2.components.tags.context-tag.view :as context-tag]))
-
-(defn get-colors
-  [theme blur?]
-  (cond (and blur? (= theme :dark)) colors/white-opa-40
-        (= theme :dark)             colors/neutral-50
-        :else                       colors/neutral-40))
-
-(defn description-text
-  [{:keys [description tag-name tag-picture description-after-tag blur?]}]
-  (if-not tag-name
-    [text/text
-     {:accessibility-label :list-item-description
-      :size                :paragraph-2}
-     description]
-    [rn/view {:style {:flex-direction :row :align-items :center}}
-     [text/text
-      {:accessibility-label :list-item-description
-       :size                :paragraph-2}
-      description]
-     [rn/view {:style {:margin-left 4}}
-      [context-tag/context-tag {:blur? blur?} tag-picture tag-name]]
-     [text/text
-      {:style               {:margin-left 4}
-       :accessibility-label :list-item-description-after-tag
-       :size                :paragraph-2}
-      description-after-tag]]))
-
-(defn- internal-view
-  [{:keys [theme title description tag-picture tag-name description-after-tag step-number
-           customization-color type blur? container-style]
-    :or   {type :bullet}}]
-  [rn/view {:style (style/container container-style)}
-   [rn/view {:style style/index}
-    (if (= type :step)
-      [step/step
-       {:in-blur-view?       blur?
-        :customization-color customization-color
-        :type                (if customization-color :complete :neutral)} step-number]
-      [icon/icon :i/bullet {:color (get-colors theme blur?)}])]
-   [rn/view {:style style/text-container}
-    (when title
-      [text/text
-       {:accessibility-label :list-item-title
-        :weight              :semi-bold
-        :size                :paragraph-2}
-       title])
-    (when description
-      [rn/view (when title {:style {:margin-top 0}})
-       [description-text
-        {:description           description
-         :tag-name              tag-name
-         :tag-picture           tag-picture
-         :description-after-tag description-after-tag
-         :blur?                 blur?}]])]])
-
-(def view (theme/with-theme internal-view))

src/quo2/components/messages/gap.cljs

@@ -17,8 +17,8 @@
            :background colors/neutral-95}})
 
 (defn get-color
-  [k]
-  (get-in themes [(theme/get-theme) k]))
+  [key]
+  (get-in themes [(theme/get-theme) key]))
 
 (def ui-images
   {:light {:horizontal (js/require "../resources/images/ui/message-gap-hborder-light.png")
@@ -28,8 +28,8 @@
            :circles    (js/require "../resources/images/ui/message-gap-circle-bg-dark.png")}})
 
 (defn get-image
-  [k]
-  (get-in ui-images [(theme/get-theme) k]))
+  [key]
+  (get-in ui-images [(theme/get-theme) key]))
 
 ;;; components
 ;;;; borders

src/quo2/components/navigation/floating_shell_button.cljs

@@ -5,12 +5,12 @@
 
 (defn dynamic-button-view
   [type dynamic-buttons style]
-  (when-let [{:keys [on-press customization-color label] :as props} (get dynamic-buttons type)]
+  (when-let [{:keys [count on-press customization-color label]} (get dynamic-buttons type)]
     [dynamic-button/dynamic-button
      {:type                type
       :label               label
       :on-press            on-press
-      :count               (:count props)
+      :count               count
       :style               style
       :customization-color customization-color}]))
 

src/quo2/components/navigation/page_nav.cljs

@@ -1,12 +1,11 @@
 (ns quo2.components.navigation.page-nav
   (:require [clojure.string :as string]
             [quo2.components.avatars.user-avatar.view :as user-avatar]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.icon :as icons]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [quo2.theme :as theme]))
+            [react-native.core :as rn]))
 
 (def ^:private centrify-style
   {:display         :flex
@@ -31,7 +30,7 @@
            {:no-color true})))
 
 (defn left-section-view
-  [{:keys [on-press icon accessibility-label type icon-background-color]
+  [{:keys [on-press icon accessibility-label type icon-background-color icon-override-theme]
     :or   {type :grey}}
    put-middle-section-on-left?]
   [rn/view {:style (when put-middle-section-on-left? {:margin-right 5})}
@@ -41,6 +40,7 @@
      :type                      type
      :size                      32
      :accessibility-label       accessibility-label
+     :override-theme            icon-override-theme
      :override-background-color icon-background-color}
     icon]])
 
@@ -87,10 +87,10 @@
 
 (defn- mid-section-view
   [{:keys [horizontal-description? one-icon-align-left? type left-align?
-           main-text right-icon main-text-icon-color left-icon on-press avatar theme]
+           main-text right-icon main-text-icon-color left-icon on-press avatar]
     :as   props}]
-  (let [text-color           (colors/theme-colors colors/neutral-95 colors/neutral-5 theme)
-        text-secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+  (let [text-color           (if (colors/dark?) colors/neutral-5 colors/neutral-95)
+        text-secondary-color (if (colors/dark?) colors/neutral-40 colors/neutral-50)
         component-instance   [mid-section-comp (assoc props :text-secondary-color text-secondary-color)]]
     [rn/touchable-opacity {:on-press on-press}
      [rn/view
@@ -152,7 +152,7 @@
                   :justify-content :flex-end)}
    (let [last-icon-index (-> right-section-buttons count dec)]
      (map-indexed (fn [index
-                       {:keys [icon on-press type style icon-background-color
+                       {:keys [icon on-press type style icon-override-theme icon-background-color
                                accessibility-label label]
                         :or   {type :grey}}]
                     ^{:key index}
@@ -168,11 +168,12 @@
                        :type                      type
                        :before                    (when label icon)
                        :size                      32
+                       :override-theme            icon-override-theme
                        :override-background-color icon-background-color}
                       (if label label icon)]])
                   right-section-buttons))])
 
-(defn- page-nav-internal
+(defn page-nav
   "[page-nav opts]
    opts
    { :one-icon-align-left?    true/false
@@ -197,26 +198,25 @@
      {:type                  button-type
       :on-press              event
       :icon                  icon
+      :icon-override-theme   :light/:dark
      }
      :right-section-buttons vector of
       {:type                  button-type
        :on-press              event
        :icon                  icon
+       :icon-override-theme   :light/:dark
       }
-      :theme :light or :dark
    }
   "
   [{:keys [container-style one-icon-align-left? horizontal-description?
            align-mid? page-nav-color page-nav-background-uri
            mid-section
            left-section
-           right-section-buttons
-           theme]}]
+           right-section-buttons]}]
   (let [put-middle-section-on-left? (or align-mid?
                                         (> (count right-section-buttons) 1))
         mid-section-props
         {:type                    (:type mid-section)
-         :theme                   theme
          :horizontal-description? horizontal-description?
          :description-img         (:description-img mid-section)
          :main-text               (:main-text mid-section)
@@ -258,5 +258,3 @@
           (not put-middle-section-on-left?)
           [mid-section-view mid-section-props]))]
      [right-section-view right-section-buttons]]))
-
-(def page-nav (theme/with-theme page-nav-internal))

src/quo2/components/notifications/activity_log/view.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.notifications.activity-log.view
   (:require [clojure.string :as string]
             [quo.core :as quo]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.icon :as icon]
             [quo2.components.markdown.text :as text]
             [quo2.components.notifications.activity-log.style :as style]
@@ -150,8 +150,8 @@
          [activity-reply-text-input props reply-input])
        (when items
          [rn/view style/footer-container
-          (for [item items]
-            ^{:key (:key item)}
+          (for [{:keys [key] :as item} items]
+            ^{:key key}
             [footer-item-view item replying? reply-input])])])))
 
 (defn view

src/quo2/components/notifications/count_down_circle.cljs

@@ -30,10 +30,10 @@
      :path-length path-length}))
 
 (defn- linear-ease
-  [input-time start goal duration]
+  [time start goal duration]
   (if (zero? duration)
     start
-    (-> input-time
+    (-> time
         (/ duration)
         (* goal)
         (+ start))))

src/quo2/components/notifications/info_count.cljs

@@ -4,10 +4,10 @@
             [react-native.core :as rn]))
 
 (defn info-count
-  ([amount]
-   (info-count {} amount))
-  ([props amount]
-   (when (> amount 0)
+  ([count]
+   (info-count {} count))
+  ([props count]
+   (when (> count 0)
      [rn/view
       (merge props
              {:style (merge {:width            16
@@ -23,4 +23,4 @@
        {:style (merge typography/font-medium
                       typography/label
                       {:color colors/white :text-align :center})}
-       amount]])))
+       count]])))

src/quo2/components/notifications/notification/style.cljs

@@ -18,10 +18,10 @@
    :background-color :transparent})
 
 (defn content-container
-  [theme]
+  [override-theme]
   (merge
-   (shadows/get 1 theme)
-   {:background-color   (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme)
+   (:shadow-1 shadows/normal-scale)
+   {:background-color   (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 override-theme)
     :flex-direction     :row
     :padding-vertical   8
     :padding-horizontal 12}))

src/quo2/components/notifications/toast/style.cljs

@@ -18,10 +18,10 @@
    :background-color :transparent})
 
 (defn content-container
-  [theme]
+  [override-theme]
   (merge
-   (shadows/get 1 theme)
-   {:background-color (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme)
+   (:shadow-1 shadows/normal-scale)
+   {:background-color (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 override-theme)
     :flex-direction   :row
     :justify-content  :space-between
     :padding-vertical 8

src/quo2/components/notifications/toast/view.cljs

@@ -21,7 +21,8 @@
 
 (defn toast-undo-action
   [duration on-press override-theme]
-  [toast-action-container {:on-press on-press :accessibility-label :toast-undo-action}
+  [toast-action-container
+   {:on-press on-press :accessibility-label :toast-undo-action}
    [rn/view {:style {:margin-right 5}}
     [count-down-circle/circle-timer {:duration duration}]]
    [text/text
@@ -30,17 +31,17 @@
 
 (defn- toast-container
   [{:keys [left title text right container-style override-theme]}]
-  [rn/view {:style (merge style/box-container container-style)}
+  [rn/view
+   {:style (merge style/box-container container-style)}
    [blur/view
     {:style         style/blur-container
      :blur-amount   13
      :blur-radius   10
      :blur-type     :transparent
      :overlay-color :transparent}]
-
-   [rn/view {:style (style/content-container override-theme)}
-    [rn/view {:style style/left-side-container}
-     left]
+   [rn/view
+    {:style (style/content-container override-theme)}
+    [rn/view {:style style/left-side-container} left]
     [rn/view {:style style/right-side-container}
      (when title
        [text/text
@@ -56,7 +57,7 @@
          :style               (style/text override-theme)
          :accessibility-label :toast-content}
         text])]
-    right]])
+    (when right right)]])
 
 (defn toast
   [{:keys [icon icon-color title text action undo-duration undo-on-press container-style

src/quo2/components/profile/profile_card/view.cljs

@@ -6,7 +6,7 @@
             [quo2.foundations.colors :as colors]
             [react-native.hole-view :as hole-view]
             [quo2.components.markdown.text :as text]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.profile.profile-card.style :as style]
             [quo2.components.avatars.user-avatar.view :as user-avatar]))
 

src/quo2/components/record_audio/record_audio/buttons/record_button.cljs

@@ -4,7 +4,7 @@
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn :refer [use-effect]]
             [react-native.reanimated :as reanimated]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.record-audio.record-audio.helpers :as helpers]))
 
 (defn f-record-button

src/quo2/components/separator.cljs

@@ -1,4 +1,4 @@
-(ns quo2.components.common.separator.view
+(ns quo2.components.separator
   (:require [quo2.foundations.colors :as quo2.colors]
             [react-native.core :as rn]))
 

src/quo2/components/settings/accounts/view.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.settings.accounts.view
   (:require [quo2.components.avatars.account-avatar :as account-avatar]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.markdown.text :as text]
             [quo2.components.settings.accounts.style :as style]
             [react-native.core :as rn]))

src/quo2/components/settings/reorder_item/component_spec.cljs

@@ -26,4 +26,4 @@
                {:data [{:id    1
                         :label "Item 1"}
                       ]} types/tab])
-    (h/is-truthy (h/get-by-text "Item 1"))))
+    (h/is-truthy (h/get-by-text "Item 1"))))

src/quo2/components/settings/settings_list/view.cljs

@@ -2,7 +2,7 @@
   (:require [quo2.components.settings.settings-list.style :as style]
             [quo2.components.icon :as icons]
             [quo2.components.selectors.selectors.view :as selectors]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [quo2.components.markdown.text :as text]
             [quo2.components.tags.status-tags :as status-tag]
             [quo2.foundations.colors :as colors]

src/quo2/components/share/share_qr_code/view.cljs

@@ -4,7 +4,7 @@
             [react-native.blur :as blur]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.button.view :as button]
+            [quo2.components.buttons.button :as button]
             [react-native.core :as rn]))
 
 (defn view

src/quo2/components/tabs/account_selector.cljs

@@ -41,8 +41,8 @@
    :margin-right     8})
 
 (defn get-color-by-type
-  [type k]
-  (get-in themes [(theme/get-theme) type k]))
+  [type key]
+  (get-in themes [(theme/get-theme) type key]))
 
 (defn account-selector
   "[account-selector opts]
@@ -73,3 +73,4 @@
         :size   :paragraph-1
         :style  {:color account-text-color}}
        account-text]]]))
+

src/quo2/components/tags/permission_tag.cljs

@@ -132,14 +132,13 @@
 
 (defn tag
   [_ _]
-  (fn [{:keys [locked? tokens size background-color on-press accessibility-label]
+  (fn [{:keys [locked? tokens size background-color on-press]
         :or   {size 24}}]
     [base-tag/base-tag
-     {:accessibility-label accessibility-label
-      :background-color    background-color
-      :size                size
-      :type                :permission
-      :on-press            on-press}
+     {:background-color background-color
+      :size             size
+      :type             :permission
+      :on-press         on-press}
      [rn/view
       {:flex-direction  :row
        :align-items     :center

src/quo2/core.cljs

@@ -2,24 +2,21 @@
   (:refer-clojure :exclude [filter])
   (:require
     quo2.components.avatars.account-avatar
-    quo2.components.avatars.channel-avatar.view
+    quo2.components.avatars.channel-avatar
     quo2.components.avatars.group-avatar
     quo2.components.avatars.icon-avatar
     quo2.components.avatars.user-avatar.view
     quo2.components.avatars.wallet-user-avatar
     quo2.components.banners.banner.view
-    quo2.components.buttons.button.view
+    quo2.components.buttons.button
     quo2.components.buttons.dynamic-button
     quo2.components.buttons.predictive-keyboard.view
     quo2.components.buttons.slide-button.view
-    quo2.components.code.snippet
     quo2.components.colors.color-picker.view
-    quo2.components.common.separator.view
-    quo2.components.community.banner.view
-    quo2.components.community.channel-actions
     quo2.components.community.community-card-view
     quo2.components.community.community-list-view
     quo2.components.community.community-view
+    quo2.components.community.banner.view
     quo2.components.community.icon
     quo2.components.community.token-gating
     quo2.components.counter.counter
@@ -33,8 +30,8 @@
     quo2.components.drawers.drawer-buttons.view
     quo2.components.drawers.permission-context.view
     quo2.components.dropdowns.dropdown
-    quo2.components.empty-state.empty-state.view
     quo2.components.header
+    quo2.components.empty-state.empty-state.view
     quo2.components.icon
     quo2.components.info.info-message
     quo2.components.info.information-box.view
@@ -44,17 +41,14 @@
     quo2.components.inputs.search-input.view
     quo2.components.inputs.title-input.view
     quo2.components.keycard.view
-    quo2.components.links.link-preview.view
     quo2.components.links.url-preview-list.view
     quo2.components.links.url-preview.view
+    quo2.components.links.link-preview.view
     quo2.components.list-items.channel
-    quo2.components.list-items.community.view
     quo2.components.list-items.menu-item
     quo2.components.list-items.preview-list
     quo2.components.list-items.user-list
     quo2.components.loaders.skeleton
-    quo2.components.loaders.skeleton.view
-    quo2.components.markdown.list.view
     quo2.components.markdown.text
     quo2.components.messages.author.view
     quo2.components.messages.gap
@@ -72,16 +66,15 @@
     quo2.components.profile.profile-card.view
     quo2.components.profile.select-profile.view
     quo2.components.reactions.reaction
+    quo2.components.selectors.reactions.view
     quo2.components.record-audio.record-audio.view
     quo2.components.record-audio.soundtrack.view
     quo2.components.selectors.disclaimer.view
     quo2.components.selectors.filter.view
-    quo2.components.selectors.reactions.view
     quo2.components.selectors.selectors.view
+    quo2.components.separator
     quo2.components.settings.accounts.view
     quo2.components.settings.privacy-option
-    quo2.components.settings.reorder-item.view
-    quo2.components.settings.settings-list.view
     quo2.components.share.qr-code.view
     quo2.components.share.share-qr-code.view
     quo2.components.tabs.account-selector
@@ -93,10 +86,14 @@
     quo2.components.tags.tag
     quo2.components.tags.tags
     quo2.components.tags.token-tag
-    quo2.components.text-combinations.title.view))
+    quo2.components.text-combinations.title.view
+    quo2.components.settings.settings-list.view
+    quo2.components.settings.reorder-item.view
+    quo2.components.community.channel-actions))
 
+(def text quo2.components.markdown.text/text)
 (def icon quo2.components.icon/icon)
-(def separator quo2.components.common.separator.view/separator)
+(def separator quo2.components.separator/separator)
 (def header quo2.components.header/header)
 (def dropdown quo2.components.dropdowns.dropdown/dropdown)
 (def info-message quo2.components.info.info-message/info-message)
@@ -110,11 +107,12 @@
 (def group-avatar-tag quo2.components.tags.context-tag.view/group-avatar-tag)
 (def audio-tag quo2.components.tags.context-tag.view/audio-tag)
 (def community-tag quo2.components.tags.context-tag.view/community-tag)
-
-
+(def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
+(def page-nav quo2.components.navigation.page-nav/page-nav)
 (def disclaimer quo2.components.selectors.disclaimer.view/view)
 (def checkbox quo2.components.selectors.selectors.view/checkbox)
 (def filter quo2.components.selectors.filter.view/view)
+(def skeleton quo2.components.loaders.skeleton/skeleton)
 (def author quo2.components.messages.author.view/author)
 
 ;;;; SELECTORS
@@ -122,7 +120,7 @@
 
 ;;;; AVATAR
 (def account-avatar quo2.components.avatars.account-avatar/account-avatar)
-(def channel-avatar quo2.components.avatars.channel-avatar.view/view)
+(def channel-avatar quo2.components.avatars.channel-avatar/channel-avatar)
 (def group-avatar quo2.components.avatars.group-avatar/group-avatar)
 (def icon-avatar quo2.components.avatars.icon-avatar/icon-avatar)
 (def user-avatar quo2.components.avatars.user-avatar.view/user-avatar)
@@ -132,14 +130,11 @@
 (def banner quo2.components.banners.banner.view/banner)
 
 ;;;; BUTTONS
-(def button quo2.components.buttons.button.view/button)
+(def button quo2.components.buttons.button/button)
 (def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
 (def predictive-keyboard quo2.components.buttons.predictive-keyboard.view/view)
 (def slide-button quo2.components.buttons.slide-button.view/view)
 
-;;;; CODE
-(def snippet quo2.components.code.snippet/snippet)
-
 ;;;; CARDS
 (def small-option-card quo2.components.onboarding.small-option-card.view/small-option-card)
 (def keycard quo2.components.keycard.view/keycard)
@@ -150,6 +145,7 @@
 
 ;;;; COMMUNITY
 (def community-card-view-item quo2.components.community.community-card-view/community-card-view-item)
+(def communities-list-view-item quo2.components.community.community-list-view/communities-list-view-item)
 (def communities-membership-list-item
   quo2.components.community.community-list-view/communities-membership-list-item)
 (def community-stats-column quo2.components.community.community-view/community-stats-column)
@@ -193,19 +189,6 @@
 (def menu-item quo2.components.list-items.menu-item/menu-item)
 (def preview-list quo2.components.list-items.preview-list/preview-list)
 (def user-list quo2.components.list-items.user-list/user-list)
-(def community-list-item quo2.components.list-items.community.view/view)
-
-;;;; LOADERS
-(def skeleton quo2.components.loaders.skeleton/skeleton)
-(def static-skeleton quo2.components.loaders.skeleton.view/view)
-
-;;;; NAVIGATION
-(def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
-(def page-nav quo2.components.navigation.page-nav/page-nav)
-
-;;;; MARKDOWN
-(def markdown-list quo2.components.markdown.list.view/view)
-(def text quo2.components.markdown.text/text)
 
 ;;;; NOTIFICATIONS
 (def activity-log quo2.components.notifications.activity-log.view/view)

src/quo2/core_spec.cljs

@@ -2,7 +2,7 @@
   (:require
     [quo2.components.avatars.user-avatar.component-spec]
     [quo2.components.banners.banner.component-spec]
-    [quo2.components.buttons.button.component-spec]
+    [quo2.components.buttons.--tests--.buttons-component-spec]
     [quo2.components.buttons.predictive-keyboard.component-spec]
     [quo2.components.buttons.slide-button.component-spec]
     [quo2.components.colors.color-picker.component-spec]
@@ -22,9 +22,7 @@
     [quo2.components.links.link-preview.component-spec]
     [quo2.components.links.url-preview-list.component-spec]
     [quo2.components.links.url-preview.component-spec]
-    [quo2.components.list-items.community.component-spec]
     [quo2.components.markdown.--tests--.text-component-spec]
-    [quo2.components.markdown.list.component-spec]
     [quo2.components.notifications.notification.component-spec]
     [quo2.components.onboarding.small-option-card.component-spec]
     [quo2.components.password.tips.component-spec]

src/quo2/foundations/colors.cljs

@@ -89,6 +89,7 @@
 (def neutral-100-opa-10 (alpha neutral-100 0.1))
 (def neutral-100-opa-30 (alpha neutral-100 0.3))
 (def neutral-100-opa-50 (alpha neutral-100 0.5))
+
 (def neutral-100-opa-60 (alpha neutral-100 0.6))
 (def neutral-100-opa-70 (alpha neutral-100 0.7))
 (def neutral-100-opa-80 (alpha neutral-100 0.8))
@@ -246,8 +247,7 @@
      ([color suffix opacity]
       (let [color-keyword (keyword color)
             base-color    (get-in colors-map
-                                  [color-keyword suffix]
-                                  color)]
+                                  [color-keyword suffix])]
         (if opacity (alpha base-color (/ opacity 100)) base-color))))))
 
 (defn custom-color-by-theme

src/quo2/foundations/shadows.cljs

@@ -1,77 +1,66 @@
 (ns quo2.foundations.shadows
-  (:refer-clojure :exclude [get])
   (:require [quo2.foundations.colors :as colors]
-            [quo2.theme :as quo.theme]))
+            [quo2.theme :as theme]))
 
-(def ^:private shadows
-  (let [dark-normal           {1 {:shadow-color   (colors/alpha colors/neutral-100 0.5)
-                                  :shadow-offset  {:width 0 :height 4}
-                                  :elevation      3
-                                  :shadow-opacity 1
-                                  :shadow-radius  20}
-                               2 {:shadow-color   (colors/alpha colors/neutral-100 0.64)
-                                  :shadow-offset  {:width 0 :height 4}
-                                  :elevation      4
-                                  :shadow-opacity 1
-                                  :shadow-radius  20}
-                               3 {:shadow-color   (colors/alpha colors/neutral-100 0.64)
-                                  :shadow-offset  {:width 0 :height 12}
-                                  :elevation      8
-                                  :shadow-opacity 1
-                                  :shadow-radius  20}
-                               4 {:shadow-color   (colors/alpha colors/neutral-100 0.72)
-                                  :shadow-offset  {:width 0 :height 16}
-                                  :shadow-opacity 1
-                                  :shadow-radius  20
-                                  :elevation      15}}
-        dark-normal-inverted  (-> dark-normal
-                                  (update-in [:soft :shadow-offset :height] -)
-                                  (update-in [:medium :shadow-offset :height] -)
-                                  (update-in [:intense :shadow-offset :height] -)
-                                  (update-in [:strong :shadow-offset :height] -))
-        light-normal          {1 {:shadow-color   (colors/alpha colors/neutral-100 0.04)
-                                  :shadow-offset  {:width 0 :height 4}
-                                  :elevation      1
-                                  :shadow-opacity 1
-                                  :shadow-radius  16}
-                               2 {:shadow-color   (colors/alpha colors/neutral-100 0.08)
-                                  :shadow-offset  {:width 0 :height 4}
-                                  :elevation      2
-                                  :shadow-opacity 1
-                                  :shadow-radius  16}
-                               3 {:shadow-color   (colors/alpha colors/neutral-100 0.12)
-                                  :shadow-offset  {:width 0 :height 12}
-                                  :elevation      5
-                                  :shadow-opacity 1
-                                  :shadow-radius  16}
-                               4 {:shadow-color   (colors/alpha colors/neutral-100 0.16)
-                                  :shadow-offset  {:width 0 :height 16}
-                                  :shadow-opacity 1
-                                  :shadow-radius  16
-                                  :elevation      13}}
-        light-normal-inverted (-> light-normal
-                                  (update-in [:soft :shadow-offset :height] -)
-                                  (update-in [:medium :shadow-offset :height] -)
-                                  (update-in [:intense :shadow-offset :height] -)
-                                  (update-in [:strong :shadow-offset :height] -))]
-    {:dark  {:normal dark-normal :inverted dark-normal-inverted}
-     :light {:normal light-normal :inverted light-normal-inverted}}))
+(defn- get-inverted
+  [inverted? number]
+  (if inverted? (* -1 number) number))
 
-(defn get
-  "Get the appropriate shadow map for a given shadow `weight`, `theme`, and `scale-type`.
+(defn- get-scales
+  [inverted?]
+  (if (theme/dark?)
+    {:shadow-1 {:shadow-color   (colors/alpha colors/neutral-100 0.5)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 4)}
+                :elevation      3
+                :shadow-opacity 1
+                :shadow-radius  20}
+     :shadow-2 {:shadow-color   (colors/alpha colors/neutral-100 0.64)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 4)}
+                :elevation      4
+                :shadow-opacity 1
+                :shadow-radius  20}
+     :shadow-3 {:shadow-color   (colors/alpha colors/neutral-100 0.64)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 12)}
+                :elevation      8
+                :shadow-opacity 1
+                :shadow-radius  20}
+     :shadow-4 {:shadow-color   (colors/alpha colors/neutral-100 0.72)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 16)}
+                :shadow-opacity 1
+                :shadow-radius  20
+                :elevation      15}}
+    {:shadow-1 {:shadow-color   (colors/alpha colors/neutral-100 0.04)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 4)}
+                :elevation      1
+                :shadow-opacity 1
+                :shadow-radius  16}
+     :shadow-2 {:shadow-color   (colors/alpha colors/neutral-100 0.08)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 4)}
+                :elevation      2
+                :shadow-opacity 1
+                :shadow-radius  16}
+     :shadow-3 {:shadow-color   (colors/alpha colors/neutral-100 0.12)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 12)}
+                :elevation      5
+                :shadow-opacity 1
+                :shadow-radius  16}
+     :shadow-4 {:shadow-color   (colors/alpha colors/neutral-100 0.16)
+                :shadow-offset  {:width  0
+                                 :height (get-inverted inverted? 16)}
+                :shadow-opacity 1
+                :shadow-radius  16
+                :elevation      13}}))
 
-  Return nil if no shadow is found.
+(def normal-scale (get-scales false))
 
-  `weight` - int (required) from 1 to 4.
-  `theme` - :light/:dark (optional).
-  `scale-type` - :normal/:inverted (optional).
-  "
-  ([weight]
-   (get weight (quo.theme/get-theme)))
-  ([weight theme]
-   (get weight theme :normal))
-  ([weight theme scale-type]
-   (get-in shadows [theme scale-type weight])))
+(def inverted-scale (get-scales true))
 
 (def inner-shadow
   {:shadow-color   (colors/alpha colors/neutral-100 0.08)

src/react_native/core.cljs

@@ -21,7 +21,6 @@
 (def text (reagent/adapt-react-class (.-Text ^js react-native)))
 (def text-input (reagent/adapt-react-class (.-TextInput ^js react-native)))
 
-(def pressable (reagent/adapt-react-class (.-Pressable ^js react-native)))
 (def touchable-opacity (reagent/adapt-react-class (.-TouchableOpacity ^js react-native)))
 (def touchable-highlight (reagent/adapt-react-class (.-TouchableHighlight ^js react-native)))
 (def touchable-without-feedback