taler-ios

commit 914e94b1044cc5aee21574666241a22940ef47d6
parent b09c66fb97ab46545fd6527e2180426a7373549f
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 21 Jul 2025 11:48:04 +0200

Colors

Diffstat:
M
TalerWallet1/Resources/Assets.xcassets/Error.colorset/Contents.json
 | 
12
++++++------
A
TalerWallet1/Resources/Assets.xcassets/Success.colorset/Contents.json
 | 
38
++++++++++++++++++++++++++++++++++++++
M
TalerWallet1/Resources/Assets.xcassets/Taler.colorset/Contents.json
 | 
12
++++++------
M
TalerWallet1/Views/Transactions/TransactionRowView.swift
 | 
3
+++

4 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/TalerWallet1/Resources/Assets.xcassets/Error.colorset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/Error.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "24",
-          "green" : "35",
-          "red" : "175"
+          "blue" : "0x1E",
+          "green" : "0x26",
+          "red" : "0xB3"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "99",
-          "green" : "99",
-          "red" : "255"
+          "blue" : "0xAA",
+          "green" : "0xB4",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"
diff --git a/TalerWallet1/Resources/Assets.xcassets/Success.colorset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/Success.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x40",
+          "green" : "0x7A",
+          "red" : "0x33"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x2D",
+          "green" : "0xDE",
+          "red" : "0x4F"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TalerWallet1/Resources/Assets.xcassets/Taler.colorset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/Taler.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "179",
-          "green" : "66",
-          "red" : "0"
+          "blue" : "0xB3",
+          "green" : "0x42",
+          "red" : "0x00"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "255",
-          "green" : "197",
-          "red" : "180"
+          "blue" : "0xFF",
+          "green" : "0xC5",
+          "red" : "0xB4"
         }
       },
       "idiom" : "universal"
diff --git a/TalerWallet1/Views/Transactions/TransactionRowView.swift b/TalerWallet1/Views/Transactions/TransactionRowView.swift
@@ -117,6 +117,9 @@ struct TransactionRowView: View {
                           : pending ? WalletColors().pendingColor(incoming)
                              : done ? WalletColors().transactionColor(incoming)
                                     : WalletColors().uncompletedColor
+        let for2Color = refreshZero ? textColor
+                : (pending || done) ? (incoming ? WalletColors().talerColor : textColor)
+                                    : WalletColors().uncompletedColor
 
         let iconBadge = TransactionIconBadge(type: common.type, foreColor: foreColor,
                                              done: done, incoming: incoming,