commit c9ce431627a98702d0e874cf5011ac24098c7a02 parent 85ebe55302f553e338ad3a79dffb354fdc2a34d1 Author: Marc Stibane <marc@taler.net> Date: Wed, 30 Jul 2025 08:59:02 +0200 OIM-CHF Diffstat:
36 files changed, 418 insertions(+), 0 deletions(-)
diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-1000.imageset/CHF-1000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-1000.imageset/CHF-1000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-1000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-1000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-1000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-10000.imageset/CHF-10000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-10000.imageset/CHF-10000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-10000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-10000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-10000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-100000.imageset/CHF-100000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-100000.imageset/CHF-100000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-100000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-100000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-100000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-2000.imageset/CHF-2000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-2000.imageset/CHF-2000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-2000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-2000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-2000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-20000.imageset/CHF-20000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-20000.imageset/CHF-20000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-20000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-20000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-20000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-5000.imageset/CHF-5000.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-5000.imageset/CHF-5000.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-5000.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/CHF-5000.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CHF-5000.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-1.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-1.imageset/chf-1.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-1.imageset/chf-1.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-10.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-10.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-10.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-10.imageset/chf-10.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-10.imageset/chf-10.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-100.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-100.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-100.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-100.imageset/chf-100.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-100.imageset/chf-100.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-2.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-2.imageset/chf-2.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-2.imageset/chf-2.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-20.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-20.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-20.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-20.imageset/chf-20.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-20.imageset/chf-20.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-200.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-200.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-200.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-200.imageset/chf-200.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-200.imageset/chf-200.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-5.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-5.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-5.imageset/chf-5.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-5.imageset/chf-5.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-50.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-50.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-50.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-50.imageset/chf-50.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-50.imageset/chf-50.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-500.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-500.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "chf-500.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-500.imageset/chf-500.png b/TalerWallet1/Resources/Assets.xcassets/OIM-CHF/chf-500.imageset/chf-500.png Binary files differ. diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestClosedCHF.imageset/ChestCHclosed.svg b/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestClosedCHF.imageset/ChestCHclosed.svg @@ -0,0 +1,20 @@ +<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 100 100"> + + +<!-- front --> + <polygon points="29.6,64 98.9,52.4 98.9,82.4 29.6,97" fill="#f00"/> + <path d="M63,64h6v7h7v6h-7v7h-6v-7h-7v-6h7z" fill="#fff"/> + + +<g fill="#aaaaaa"> +<!-- links --> + <polygon points="1.8,48.4 26.4,62.8 26.4,96 1.8,74"/> + +<!-- Deckel oben --> + <path d="M5,28.8c0,0,2.6-5.1,8.3-3.7c0,0,8.6-0.6,15.4,34.9 + l70.2-11.6c0,0-5.6-26.3-20.6-27.8L11,24.2C11,24.2,6,24.4,5,28.8z"/> + +<!-- Deckel links --> + <path d="M25.5,59.9c0,0-3.8-35.4-15.3-32.6c0,0-8.8,1-8.4,18.6"/> +</g> +</svg> +\ No newline at end of file diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestClosedCHF.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestClosedCHF.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ChestCHclosed.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestOpenCHF.imageset/ChestCHopen.svg b/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestOpenCHF.imageset/ChestCHopen.svg @@ -0,0 +1,43 @@ +<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 100 100"> + +<!-- front --> + <polygon points="33.3,65.4 99.2,54.5 99.2,84.5 33.3,96.9" fill="#f00"/> + <path d="M64,66h6v7h7v6h-7v7h-6v-7h-7v-6h7z" fill="#fff"/> + + +<!-- links --> +<g fill="#aaaaaa"> + <polygon points="5.8,50.8 29.4,64.2 29.4,96 5.8,76"/> + + +<!-- Deckel oben --> +<path +d="M69.921,3.255c-0.669,0.055-1.335,0.125-2.008,0.161 + c-4.975,0.279-9.951,0.546-14.928,0.825c-5.961,0.333-11.922,0.679-17.883,1.014c-4.445,0.25-8.888,0.489-13.334,0.734 + c-2.644,0.145-5.289,0.292-7.935,0.441c-0.167,0.009-0.334,0.036-0.605,0.068c0.238,0.115,0.384,0.188,0.533,0.259 + c1.2,0.566,2.188,1.354,2.913,2.414c0.129,0.188,0.244,0.288,0.516,0.271c4.052-0.236,8.104-0.457,12.158-0.685 + c4.96-0.278,9.92-0.563,14.88-0.839c3.896-0.218,7.794-0.426,11.69-0.644c4.443-0.247,8.889-0.5,13.33-0.751 + c1.535-0.086,3.067-0.171,4.601-0.259c0.092-0.006,0.183-0.024,0.368-0.048c-0.174-0.282-0.304-0.539-0.478-0.766 + c-0.718-0.925-1.694-1.544-2.796-2.013c-0.123-0.053-0.24-0.121-0.362-0.182C70.359,3.255,70.142,3.255,69.921,3.255z"/> + +<!-- Deckel links --> +<path +d="M5.175,47.03c0.369-1.322,0.717-2.57,1.061-3.818 + c2.413-8.744,4.823-21.511,7.234-30.256c0.171-0.621,0.354-1.239,0.507-1.864c0.033-0.135,0.023-0.342-0.065-0.431 + c-1.147-1.153-2.422-2.124-4.172-2.347C8.521,8.159,7.532,8.6,6.699,9.391c-0.895,0.849-1.411,1.919-1.931,2.979 + c-2.5,5.088-3.764,10.423-3.611,16.025c0.136,5.026,1.422,13.815,3.811,18.327C5.012,46.806,5.078,46.883,5.175,47.03z"/> +</g> + + +<!-- innen --> +<path fill="#888" +d="M8.297,48.493c3.664,2.063,7.323,4.126,10.983,6.186 + c4.197,2.362,8.393,4.729,12.598,7.076c0.215,0.12,0.531,0.175,0.777,0.134c5.492-0.91,10.979-1.839,16.468-2.762 + c6.508-1.096,13.013-2.186,19.521-3.283c5.967-1.004,11.931-2.018,17.896-3.022c2.884-0.486,5.767-0.969,8.676-1.541 + c-10.389-3.275-20.781-6.55-31.221-9.84c3.271-9.43,6.533-22.854,9.82-32.333c-0.864,0.046-1.67,0.084-2.472,0.133 + c-3.146,0.192-6.29,0.391-9.435,0.585c-3.599,0.222-7.195,0.442-10.794,0.664c-3.051,0.187-6.103,0.374-9.152,0.561 + c-3.583,0.219-7.166,0.442-10.748,0.661c-3.114,0.19-6.228,0.377-9.341,0.566c-1.47,0.089-2.939,0.191-4.412,0.258 + c-0.329,0.016-0.381,0.186-0.438,0.401c-0.57,2.075-1.137,4.149-1.708,6.223c-2.277,8.281-4.555,20.584-6.835,28.864 + C8.441,48.172,8.369,48.315,8.297,48.493z"/> + +</svg> +\ No newline at end of file diff --git a/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestOpenCHF.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/OIM-buttons/ChestOpenCHF.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ChestCHopen.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Views/OIM/OIMcurrency.swift b/TalerWallet1/Views/OIM/OIMcurrency.swift @@ -29,6 +29,14 @@ public let OIMeuros = OIMcurrency(bankNotes: [20000, 10000, 5000, 2000, 1000, 5 noteBase: "EUR", coinBase: "eur", currencyStr: "EUR", chest: "EUR") +// 6 banknotes, 9 coins of which 6 are fractionals < 100 +public let OIMfrancs = OIMcurrency(bankNotes: [100000, 20000, 10000, 5000, 2000, 1000], + bankCoins: [500, 200, 100, 50, 20, 10, 5, 2, 1], + coinSizes: [315, 274, 232, 182, 211, 192, 172, 200, 160], + factor: 1, + noteBase: "CHF", coinBase: "chf", + currencyStr: "CHF", chest: "CHF") + // 5 banknotes, 7 coins (no fractionals) public let OIMxofN = OIMcurrency(bankNotes: [10000, 5000, 2000, 1000, 500], bankCoins: [200, 100, 50, 25, 10, 5, 1],
