Merge branch 'develop' into issue-13832

android/app/src/main/AndroidManifest.xml

@@ -36,6 +36,7 @@
         <meta-data android:name="commitHash" android:value="${commitHash}"/>
         <activity
                 android:name=".MainActivity"
+                android:exported="true"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize"

android/gradle.properties

@@ -23,8 +23,8 @@
 # Version requirements used throughout the Gradle scripts
 kotlinVersion=1.3.50
 minSdkVersion=23
-compileSdkVersion=30
-targetSdkVersion=30
+compileSdkVersion=31
+targetSdkVersion=31
 buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/ForegroundService.java

@@ -78,9 +78,10 @@ public int onStartCommand(Intent i, int flags, int startId) {
 
 
 
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE);
         Intent stopIntent = new Intent(PushNotificationHelper.ACTION_TAP_STOP);
-        PendingIntent stopPendingIntent = PendingIntent.getBroadcast(context, 0, stopIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+        PendingIntent stopPendingIntent = PendingIntent.getBroadcast(context, 0, stopIntent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
 
         Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_stat_notify_status)

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -522,7 +522,7 @@ public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap larg
                     actionIntent.setPackage(packageName);
 
                     PendingIntent pendingActionIntent = PendingIntent.getBroadcast(context, notificationID, actionIntent,
-                            PendingIntent.FLAG_UPDATE_CURRENT);
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                       notification.addAction(new NotificationCompat.Action.Builder(icon, action, pendingActionIntent).build());
@@ -708,26 +708,30 @@ private PendingIntent createGroupOnDismissedIntent(Context context, int notifica
         Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
         intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
     }
 
     private PendingIntent createGroupOnTapIntent(Context context, int notificationId, String groupId, String deepLink) {
         Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
         intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }
 
     private PendingIntent createOnTapIntent(Context context, int notificationId, String deepLink) {
         Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }
 
     private PendingIntent createOnDismissedIntent(Context context, int notificationId, String deepLink) {
         Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
     }
 
     public void removeStatusMessage(Bundle bundle) {

nix/pkgs/android-sdk/compose.nix

@@ -11,7 +11,7 @@ androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
   platformToolsVersion = "33.0.1";
   buildToolsVersions = [ "31.0.0" ];
-  platformVersions = [ "30" ];
+  platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];
   ndkVersion = "22.1.7171670";
   includeNDK = true;

scripts/build-android.sh

@@ -45,9 +45,9 @@ if [[ -n "${OPENSEA_API_KEY}" ]]; then append_env_export 'OPENSEA_API_KEY'; fi
 
 # If no secrets were passed there's no need to pass the 'secretsFile'.
 if [[ -s "${SECRETS_FILE_PATH}" ]]; then
+  nixOpts+=("--option" "extra-sandbox-paths" "${SECRETS_FILE_PATH}")
   nixOpts+=("--argstr" "secretsFile" "${SECRETS_FILE_PATH}")
 fi
-nixOpts+=("--option" "extra-sandbox-paths" "${KEYSTORE_PATH} ${SECRETS_FILE_PATH}")
 
 # Used by Clojure at compile time to include JS modules
 nixOpts+=("--argstr" "buildEnv" "$(must_get_env BUILD_ENV)")

src/quo2/components/list_items/dropdown.cljs

@@ -0,0 +1,147 @@
+(ns quo2.components.list-items.dropdown
+  (:require [quo.react-native :as rn]
+            [quo2.components.icon :as icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [quo2.reanimated :as reanimated]
+            [reagent.core :as reagent]))
+
+(defn apply-anim [dd-height val]
+  (reanimated/animate-shared-value-with-delay dd-height
+                                              val
+                                              300
+                                              :easing1
+                                              0))
+
+(def sizes {:big    {:icon-size 20
+                     :font      {:font-size :paragraph-1}
+                     :height    40
+                     :padding   {:padding-with-icon    {:padding-vertical   9
+                                                        :padding-horizontal 12}
+                                 :padding-with-no-icon {:padding-vertical 9
+                                                        :padding-left     12
+                                                        :padding-right    8}}}
+            :medium {:icon-size 20
+                     :font      {:font-size :paragraph-1}
+                     :height    32
+                     :padding   {:padding-with-icon    {:padding-vertical   5
+                                                        :padding-horizontal 8}
+                                 :padding-with-no-icon {:padding-vertical 5
+                                                        :padding-left     12
+                                                        :padding-right    8}}}
+            :small  {:icon-size 15
+                     :font      {:font-size :paragraph-2}
+                     :height    24
+                     :padding   {:padding-with-icon    {:padding-vertical   3
+                                                        :padding-horizontal 6}
+                                 :padding-with-no-icon {:padding-vertical   3
+                                                        :padding-horizontal 6}}}})
+(defn color-by-10
+  [color]
+  (colors/alpha color 0.6))
+
+(defn dropdown-comp [{:keys [icon open? dd-height size disabled? dd-color use-border? border-color]}]
+  (let [dark?                                                         (colors/dark?)
+        {:keys [width height width-with-icon padding font icon-size]} (size sizes)
+        {:keys [padding-with-icon padding-with-no-icon]}              padding
+        font-size                                                     (:font-size font)
+        spacing                                                       (case size
+                                                                        :big 4
+                                                                        :medium 2
+                                                                        :small 2)]
+    [rn/touchable-opacity (cond-> {:on-press (fn []
+                                               (if (swap! open? not)
+                                                 (apply-anim dd-height 120)
+                                                 (apply-anim dd-height 0)))
+                                   :style    (cond-> (merge
+                                                      (if icon
+                                                        padding-with-icon
+                                                        padding-with-no-icon)
+                                                      {:width            (if icon
+                                                                           width-with-icon
+                                                                           width)
+                                                       :height           height
+                                                       :border-radius    (case size
+                                                                           :big 12
+                                                                           :medium 10
+                                                                           :small 8)
+                                                       :flex-direction   :row
+                                                       :align-items      :center
+                                                       :background-color (if @open?
+                                                                           dd-color
+                                                                           (color-by-10 dd-color))})
+                                               use-border? (assoc :border-width 1
+                                                                  :border-color (if @open? border-color (color-by-10 border-color))))}
+                            disabled? (assoc-in [:style :opacity] 0.3)
+                            disabled? (assoc :disabled true))
+     (when icon
+       [icons/icon icon {:no-color        true
+                         :size            20
+                         :container-style {:margin-right spacing
+                                           :margin-top   1
+                                           :width        icon-size
+                                           :height       icon-size}}])
+     [text/text {:size   font-size
+                 :weight :medium
+                 :font   :font-medium
+                 :color  :main} "Dropdown"]
+     [icons/icon (if @open?
+                   (if dark?
+                     :main-icons/pullup-dark
+                     :main-icons/pullup)
+                   (if dark?
+                     :main-icons/dropdown-dark
+                     :main-icons/dropdown))
+      {:size            20
+       :no-color        true
+       :container-style {:width         (+ icon-size 3)
+                         :border-radius 20
+                         :margin-left   (if (= :small size)
+                                          2
+                                          4)
+                         :margin-top    1
+                         :height        (+ icon-size 4)}}]]))
+
+(defn items-comp
+  [{:keys [items on-select]}]
+  (let [items-count (count items)]
+    [rn/scroll-view {:style               {:height "100%"}
+                     :horizontal          false
+                     :nestedScrollEnabled true}
+     (doall
+      (map-indexed (fn [index item]
+                     [rn/touchable-opacity
+                      {:key      (str item index)
+                       :style    {:padding             4
+                                  :border-bottom-width (if (= index (- items-count 1))
+                                                         0
+                                                         1)
+                                  :border-color        (colors/theme-colors
+                                                        colors/black
+                                                        colors/white)
+                                  :text-align          :center}
+                       :on-press #(on-select item)}
+                      [text/text {:style {:text-align :center}} item]]) items))]))
+
+(defn dropdown [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
+  [:f>
+   (fn []
+     (let [open?     (reagent/atom false)
+           dd-height (reanimated/use-shared-value 0)]
+       [rn/view {:style {:flex-grow 1}}
+        [dropdown-comp {:items        items
+                        :icon         icon
+                        :disabled?    disabled?
+                        :size         size
+                        :dd-color     dd-color
+                        :text         text
+                        :border-color (colors/custom-color-by-theme border-color 50 60)
+                        :use-border? use-border?
+                        :default-item default-item
+                        :open?        open?
+                        :dd-height    dd-height}]
+        [reanimated/view {:style (reanimated/apply-animations-to-style
+                                  {:height dd-height}
+                                  {:height dd-height})}
+         [items-comp {:items     items
+                      :on-select on-select}]]]))])

src/quo2/components/tabs/account_selector.cljs

@@ -0,0 +1,72 @@
+(ns quo2.components.tabs.account-selector
+  (:require
+   [quo.theme :as theme]
+   [quo.react-native :as rn]
+   [quo2.foundations.colors :as colors]
+   [quo2.components.markdown.text :as quo2]))
+
+(def themes
+  {:light {:default         {:bg            colors/neutral-10
+                             :account-text  colors/black
+                             :label-text    colors/neutral-50}
+           :transparent     {:bg            colors/neutral-80-opa-5
+                             :account-text  colors/black
+                             :label-text    colors/neutral-80-opa-40}}
+
+   :dark  {:default         {:bg            colors/neutral-80-opa-80
+                             :account-text  colors/white
+                             :label-text    colors/neutral-40}
+           :transparent     {:bg            colors/white-opa-5
+                             :account-text  colors/white
+                             :label-text    colors/neutral-40}}})
+
+(defn account-container-row [background-color]
+  {:padding-vertical  4
+   :flex-direction    :row
+   :align-items       :center
+   :background-color  background-color
+   :border-radius     12})
+
+(def account-emoji
+  {:height  16
+   :width   16})
+
+(def account-emoji-container
+  {:background-color  (colors/custom-color :purple 50)
+   :padding           8
+   :justify-content   :center
+   :align-items       :center
+   :border-radius     10
+   :margin-left       4
+   :margin-right      8})
+
+(defn get-color-by-type [type key]
+  (get-in themes [(theme/get-theme) type key]))
+
+(defn account-selector
+  "[account-selector opts]
+   opts
+   {:show-label?       true/false            ;; hide or show the label
+    :transparent?      true/false            ;; implement transparent background styles
+    :style             style                 ;; any other styling can be passed
+    :label-text        \"Label\"             ;; content to show where the label should be shown
+    :account-text      \"My Savings\"        ;; content in place of account name
+   }"
+  [{:keys [show-label? account-text account-emoji transparent? label-text style]}]
+  (let [background-color   (get-color-by-type (if transparent? :transparent :default) :bg)
+        account-text-color (get-color-by-type (if transparent? :transparent :default) :account-text)
+        label-text-color   (get-color-by-type (if transparent? :transparent :default) :label-text)]
+    [rn/view {:style style}
+     (when show-label? [quo2/text {:weight  :medium
+                                   :size    :paragraph-2
+                                   :style   {:color label-text-color
+                                             :margin-bottom 8}}
+                        label-text])
+     [rn/view {:style (account-container-row background-color)}
+      [rn/view {:style account-emoji-container}
+       [quo2/text account-emoji]]
+      [quo2/text {:weight :medium
+                  :size   :paragraph-1
+                  :style  {:color account-text-color}}
+       account-text]]]))
+

src/quo2/screens/list_items/dropdown.cljs

@@ -0,0 +1,79 @@
+(ns quo2.screens.list-items.dropdown
+  (:require [quo.components.text :as text]
+            [quo.previews.preview :as preview]
+            [quo.react-native :as rn]
+            [quo2.components.list-items.dropdown :as quo2]
+            [quo2.foundations.colors :as colors]
+            [reagent.core :as reagent]))
+
+(def descriptor [{:label   "Icon"
+                  :key     :icon
+                  :type    :select
+                  :options [{:key   :main-icons/placeholder
+                             :value "Placeholder"}
+                            {:key   :main-icons/locked
+                             :value "Wallet"}]}
+                 {:label "Disabled"
+                  :key   :disabled?
+                  :type  :boolean}
+                 {:label "Default item"
+                  :key   :default-item
+                  :type  :text}
+                 {:label "Use border?"
+                  :key   :use-border?
+                  :type  :boolean}
+                 {:label   "Border color"
+                  :key     :border-color
+                  :type    :select
+                  :options (map
+                            (fn [c]
+                              {:key   c
+                               :value c})
+                            (keys colors/customization))}
+                 {:label "DD color"
+                  :key   :dd-color
+                  :type  :text}
+                 {:label   "Size"
+                  :key     :size
+                  :type    :select
+                  :options [{:key   :big
+                             :value "big"}
+                            {:key   :medium
+                             :value "medium"}
+                            {:key   :small
+                             :value "small"}]}])
+
+(defn cool-preview []
+  (let [items         ["Banana"
+                       "Apple"
+                       "COVID +18"
+                       "Orange"
+                       "Kryptonite"
+                       "BMW"
+                       "Meh"]
+        state         (reagent/atom {:icon         :main-icons/placeholder
+                                     :default-item "item1"
+                                     :use-border? false
+                                     :dd-color     (colors/custom-color :purple 50)
+                                     :size         :big})
+        selected-item (reagent/cursor state [:default-item])
+        on-select     #(reset! selected-item %)]
+    (fn []
+      [rn/view {:margin-bottom 50
+                :padding       16}
+       [preview/customizer state descriptor]
+       [rn/view {:padding-vertical 60
+                 :align-items      :center}
+        [text/text {:color :main} (str "Selected item: " @selected-item)]
+        [quo2/dropdown (merge @state {:on-select on-select
+                                      :items     items})]]])))
+
+(defn preview-dropdown []
+  [rn/view {:background-color (colors/theme-colors colors/white colors/neutral-90)
+            :flex             1}
+   [rn/flat-list {:flex                      1
+                  :flex-grow                 1
+                  :nestedScrollEnabled       true
+                  :keyboardShouldPersistTaps :always
+                  :header                    [cool-preview]
+                  :key-fn                    str}]])