gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-ios] 18/19: Nunito Font


From: gnunet
Subject: [taler-taler-ios] 18/19: Nunito Font
Date: Sat, 02 Sep 2023 22:01:19 +0200

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

commit e9e27e9f31b9d620b8b84e91b742ba71f62819b0
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Sep 2 21:56:07 2023 +0200

    Nunito Font
---
 GNU_Taler Info.plist                               |   8 +-
 TalerWallet.xcodeproj/project.pbxproj              |  50 +++++++++--
 .../Atkinson-Hyperlegible-Bold-102.otf             | Bin
 .../Atkinson-Hyperlegible-BoldItalic-102.otf       | Bin
 ...tkinson-Hyperlegible-Font-License-2020-1104.pdf | Bin
 .../Atkinson-Hyperlegible-Italic-102.otf           | Bin
 .../Atkinson-Hyperlegible-Regular-102.otf          | Bin
 TalerWallet1/Fonts/Nunito/Nunito-Bold.ttf          | Bin 0 -> 131672 bytes
 TalerWallet1/Fonts/Nunito/Nunito-BoldItalic.ttf    | Bin 0 -> 134540 bytes
 TalerWallet1/Fonts/Nunito/Nunito-Italic.ttf        | Bin 0 -> 134664 bytes
 TalerWallet1/Fonts/Nunito/Nunito-Regular.ttf       | Bin 0 -> 131736 bytes
 TalerWallet1/Fonts/Nunito/OFL.txt                  |  93 +++++++++++++++++++++
 Taler_Wallet Info.plist                            |   7 +-
 13 files changed, 148 insertions(+), 10 deletions(-)

diff --git a/GNU_Taler Info.plist b/GNU_Taler Info.plist
index 96e9573..5c6173c 100644
--- a/GNU_Taler Info.plist      
+++ b/GNU_Taler Info.plist      
@@ -27,11 +27,13 @@
        <key>UIAppFonts</key>
        <array>
                <string>Atkinson-Hyperlegible-Regular-102.otf</string>
-               <string>Atkinson-Hyperlegible-Italic-102.otf</string>
                <string>Atkinson-Hyperlegible-Bold-102.otf</string>
                <string>Atkinson-Hyperlegible-BoldItalic-102.otf</string>
-               <string>Nunito-Regular</string>
-               <string>Nunito-Bold</string>
+               <string>Atkinson-Hyperlegible-Italic-102.otf</string>
+               <string>Nunito-Regular.ttf</string>
+               <string>Nunito-Bold.ttf</string>
+               <string>Nunito-BoldItalic.ttf</string>
+               <string>Nunito-Italic.ttf</string>
        </array>
        <key>UIBackgroundModes</key>
        <array>
diff --git a/TalerWallet.xcodeproj/project.pbxproj 
b/TalerWallet.xcodeproj/project.pbxproj
index 98e7a48..aa9e2a0 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -122,6 +122,14 @@
                4E3EAE852A990778009F1BE8 /* payment_sent.m4a in Resources */ = 
{isa = PBXBuildFile; fileRef = 4E2254962A822B8100E41D29 /* payment_sent.m4a */; 
};
                4E3EAE8C2AA0933C009F1BE8 /* Font+Taler.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAE8B2AA0933C009F1BE8 /* Font+Taler.swift */; 
};
                4E3EAE8D2AA0933C009F1BE8 /* Font+Taler.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAE8B2AA0933C009F1BE8 /* Font+Taler.swift */; 
};
+               4E3EAE9C2AA12467009F1BE8 /* Nunito-Regular.ttf in Resources */ 
= {isa = PBXBuildFile; fileRef = 4E3EAE9A2AA12467009F1BE8 /* Nunito-Regular.ttf 
*/; };
+               4E3EAE9D2AA12467009F1BE8 /* Nunito-Regular.ttf in Resources */ 
= {isa = PBXBuildFile; fileRef = 4E3EAE9A2AA12467009F1BE8 /* Nunito-Regular.ttf 
*/; };
+               4E3EAE9E2AA12467009F1BE8 /* Nunito-Bold.ttf in Resources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAE9B2AA12467009F1BE8 /* Nunito-Bold.ttf */; 
};
+               4E3EAE9F2AA12467009F1BE8 /* Nunito-Bold.ttf in Resources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAE9B2AA12467009F1BE8 /* Nunito-Bold.ttf */; 
};
+               4E3EAEA22AA12582009F1BE8 /* Nunito-Italic.ttf in Resources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAEA02AA12582009F1BE8 /* Nunito-Italic.ttf 
*/; };
+               4E3EAEA32AA12582009F1BE8 /* Nunito-Italic.ttf in Resources */ = 
{isa = PBXBuildFile; fileRef = 4E3EAEA02AA12582009F1BE8 /* Nunito-Italic.ttf 
*/; };
+               4E3EAEA42AA12582009F1BE8 /* Nunito-BoldItalic.ttf in Resources 
*/ = {isa = PBXBuildFile; fileRef = 4E3EAEA12AA12582009F1BE8 /* 
Nunito-BoldItalic.ttf */; };
+               4E3EAEA52AA12582009F1BE8 /* Nunito-BoldItalic.ttf in Resources 
*/ = {isa = PBXBuildFile; fileRef = 4E3EAEA12AA12582009F1BE8 /* 
Nunito-BoldItalic.ttf */; };
                4E40E0BE29F25ABB00B85369 /* SendAmount.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 4E40E0BD29F25ABB00B85369 /* SendAmount.swift */; 
};
                4E50B3502A1BEE8000F9F01C /* ManualWithdraw.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 4E50B34F2A1BEE8000F9F01C /* 
ManualWithdraw.swift */; };
                4E53A33729F50B7B00830EC2 /* CurrencyField.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 4E53A33629F50B7B00830EC2 /* CurrencyField.swift 
*/; };
@@ -271,6 +279,10 @@
                4E3B4BC82A42BC4800CC88B8 /* Model+Exchange.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= "Model+Exchange.swift"; sourceTree = "<group>"; };
                4E3EAE892A990778009F1BE8 /* GNU_Taler.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = GNU_Taler.app; sourceTree = BUILT_PRODUCTS_DIR; };
                4E3EAE8B2AA0933C009F1BE8 /* Font+Taler.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= "Font+Taler.swift"; sourceTree = "<group>"; };
+               4E3EAE9A2AA12467009F1BE8 /* Nunito-Regular.ttf */ = {isa = 
PBXFileReference; lastKnownFileType = file; path = "Nunito-Regular.ttf"; 
sourceTree = "<group>"; };
+               4E3EAE9B2AA12467009F1BE8 /* Nunito-Bold.ttf */ = {isa = 
PBXFileReference; lastKnownFileType = file; path = "Nunito-Bold.ttf"; 
sourceTree = "<group>"; };
+               4E3EAEA02AA12582009F1BE8 /* Nunito-Italic.ttf */ = {isa = 
PBXFileReference; lastKnownFileType = file; path = "Nunito-Italic.ttf"; 
sourceTree = "<group>"; };
+               4E3EAEA12AA12582009F1BE8 /* Nunito-BoldItalic.ttf */ = {isa = 
PBXFileReference; lastKnownFileType = file; path = "Nunito-BoldItalic.ttf"; 
sourceTree = "<group>"; };
                4E40E0BD29F25ABB00B85369 /* SendAmount.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= SendAmount.swift; sourceTree = "<group>"; };
                4E50B34F2A1BEE8000F9F01C /* ManualWithdraw.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ManualWithdraw.swift; sourceTree = "<group>"; };
                4E53A33629F50B7B00830EC2 /* CurrencyField.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= CurrencyField.swift; sourceTree = "<group>"; };
@@ -431,6 +443,26 @@
                        path = P2P_Sheets;
                        sourceTree = "<group>";
                };
+               4E3EAE992AA12467009F1BE8 /* Nunito */ = {
+                       isa = PBXGroup;
+                       children = (
+                               4E3EAE9A2AA12467009F1BE8 /* Nunito-Regular.ttf 
*/,
+                               4E3EAE9B2AA12467009F1BE8 /* Nunito-Bold.ttf */,
+                               4E3EAEA12AA12582009F1BE8 /* 
Nunito-BoldItalic.ttf */,
+                               4E3EAEA02AA12582009F1BE8 /* Nunito-Italic.ttf 
*/,
+                       );
+                       path = Nunito;
+                       sourceTree = "<group>";
+               };
+               4E3EAEA62AA12750009F1BE8 /* Fonts */ = {
+                       isa = PBXGroup;
+                       children = (
+                               4E8C171B2A6509BB005B2392 /* 
Atkinson-Hyperlegible */,
+                               4E3EAE992AA12467009F1BE8 /* Nunito */,
+                       );
+                       path = Fonts;
+                       sourceTree = "<group>";
+               };
                4E7CFD362A532C7A00CBAFF3 /* TestFlight */ = {
                        isa = PBXGroup;
                        children = (
@@ -443,12 +475,12 @@
                        isa = PBXGroup;
                        children = (
                                4E8C171C2A6509BB005B2392 /* 
Atkinson-Hyperlegible-Regular-102.otf */,
-                               4E8C171D2A6509BB005B2392 /* 
Atkinson-Hyperlegible-Italic-102.otf */,
                                4E8C171E2A6509BB005B2392 /* 
Atkinson-Hyperlegible-Bold-102.otf */,
                                4E8C171F2A6509BB005B2392 /* 
Atkinson-Hyperlegible-BoldItalic-102.otf */,
+                               4E8C171D2A6509BB005B2392 /* 
Atkinson-Hyperlegible-Italic-102.otf */,
                        );
                        path = "Atkinson-Hyperlegible";
-                       sourceTree = SOURCE_ROOT;
+                       sourceTree = "<group>";
                };
                4EB094EE298979840043A8A1 /* TalerWallet1 */ = {
                        isa = PBXGroup;
@@ -461,7 +493,7 @@
                                4EB0950C2989CB9A0043A8A1 /* Quickjs */,
                                4EB094EF298979D30043A8A1 /* Assets.xcassets */,
                                4E2254942A822B8100E41D29 /* Sounds */,
-                               4E8C171B2A6509BB005B2392 /* 
Atkinson-Hyperlegible */,
+                               4E3EAEA62AA12750009F1BE8 /* Fonts */,
                                4E363CBF2A24754200D7E98C /* Settings.bundle */,
                                4EB094F529897A9A0043A8A1 /* Preview Content */,
                        );
@@ -890,11 +922,15 @@
                        buildActionMask = 2147483647;
                        files = (
                                4E3EAE7E2A990778009F1BE8 /* Settings.bundle in 
Resources */,
+                               4E3EAE842A990778009F1BE8 /* Assets.xcassets in 
Resources */,
                                4E3EAE7F2A990778009F1BE8 /* 
Atkinson-Hyperlegible-Regular-102.otf in Resources */,
                                4E3EAE802A990778009F1BE8 /* 
Atkinson-Hyperlegible-Bold-102.otf in Resources */,
                                4E3EAE812A990778009F1BE8 /* 
Atkinson-Hyperlegible-BoldItalic-102.otf in Resources */,
                                4E3EAE832A990778009F1BE8 /* 
Atkinson-Hyperlegible-Italic-102.otf in Resources */,
-                               4E3EAE842A990778009F1BE8 /* Assets.xcassets in 
Resources */,
+                               4E3EAE9C2AA12467009F1BE8 /* Nunito-Regular.ttf 
in Resources */,
+                               4E3EAE9E2AA12467009F1BE8 /* Nunito-Bold.ttf in 
Resources */,
+                               4E3EAEA42AA12582009F1BE8 /* 
Nunito-BoldItalic.ttf in Resources */,
+                               4E3EAEA22AA12582009F1BE8 /* Nunito-Italic.ttf 
in Resources */,
                                4E3EAE822A990778009F1BE8 /* 
payment_received.m4a in Resources */,
                                4E3EAE852A990778009F1BE8 /* payment_sent.m4a in 
Resources */,
                        );
@@ -905,11 +941,15 @@
                        buildActionMask = 2147483647;
                        files = (
                                4E363CC02A24754200D7E98C /* Settings.bundle in 
Resources */,
+                               4EB094F0298979D30043A8A1 /* Assets.xcassets in 
Resources */,
                                4E8C17202A6509BB005B2392 /* 
Atkinson-Hyperlegible-Regular-102.otf in Resources */,
                                4E8C17222A6509BB005B2392 /* 
Atkinson-Hyperlegible-Bold-102.otf in Resources */,
                                4E8C17232A6509BB005B2392 /* 
Atkinson-Hyperlegible-BoldItalic-102.otf in Resources */,
                                4E8C17212A6509BB005B2392 /* 
Atkinson-Hyperlegible-Italic-102.otf in Resources */,
-                               4EB094F0298979D30043A8A1 /* Assets.xcassets in 
Resources */,
+                               4E3EAE9D2AA12467009F1BE8 /* Nunito-Regular.ttf 
in Resources */,
+                               4E3EAE9F2AA12467009F1BE8 /* Nunito-Bold.ttf in 
Resources */,
+                               4E3EAEA52AA12582009F1BE8 /* 
Nunito-BoldItalic.ttf in Resources */,
+                               4E3EAEA32AA12582009F1BE8 /* Nunito-Italic.ttf 
in Resources */,
                                4E2254972A822B8100E41D29 /* 
payment_received.m4a in Resources */,
                                4E2254982A822B8100E41D29 /* payment_sent.m4a in 
Resources */,
                        );
diff --git a/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Bold-102.otf 
b/TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Bold-102.otf
similarity index 100%
rename from Atkinson-Hyperlegible/Atkinson-Hyperlegible-Bold-102.otf
rename to 
TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Bold-102.otf
diff --git a/Atkinson-Hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf 
b/TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf
similarity index 100%
rename from Atkinson-Hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf
rename to 
TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf
diff --git 
a/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Font-License-2020-1104.pdf 
b/TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Font-License-2020-1104.pdf
similarity index 100%
rename from 
Atkinson-Hyperlegible/Atkinson-Hyperlegible-Font-License-2020-1104.pdf
rename to 
TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Font-License-2020-1104.pdf
diff --git a/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Italic-102.otf 
b/TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Italic-102.otf
similarity index 100%
rename from Atkinson-Hyperlegible/Atkinson-Hyperlegible-Italic-102.otf
rename to 
TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Italic-102.otf
diff --git a/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Regular-102.otf 
b/TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Regular-102.otf
similarity index 100%
rename from Atkinson-Hyperlegible/Atkinson-Hyperlegible-Regular-102.otf
rename to 
TalerWallet1/Fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Regular-102.otf
diff --git a/TalerWallet1/Fonts/Nunito/Nunito-Bold.ttf 
b/TalerWallet1/Fonts/Nunito/Nunito-Bold.ttf
new file mode 100644
index 0000000..14be6b7
Binary files /dev/null and b/TalerWallet1/Fonts/Nunito/Nunito-Bold.ttf differ
diff --git a/TalerWallet1/Fonts/Nunito/Nunito-BoldItalic.ttf 
b/TalerWallet1/Fonts/Nunito/Nunito-BoldItalic.ttf
new file mode 100644
index 0000000..ed63eb5
Binary files /dev/null and b/TalerWallet1/Fonts/Nunito/Nunito-BoldItalic.ttf 
differ
diff --git a/TalerWallet1/Fonts/Nunito/Nunito-Italic.ttf 
b/TalerWallet1/Fonts/Nunito/Nunito-Italic.ttf
new file mode 100644
index 0000000..5c906d4
Binary files /dev/null and b/TalerWallet1/Fonts/Nunito/Nunito-Italic.ttf differ
diff --git a/TalerWallet1/Fonts/Nunito/Nunito-Regular.ttf 
b/TalerWallet1/Fonts/Nunito/Nunito-Regular.ttf
new file mode 100644
index 0000000..dfd0fcb
Binary files /dev/null and b/TalerWallet1/Fonts/Nunito/Nunito-Regular.ttf differ
diff --git a/TalerWallet1/Fonts/Nunito/OFL.txt 
b/TalerWallet1/Fonts/Nunito/OFL.txt
new file mode 100644
index 0000000..9a43a3a
--- /dev/null
+++ b/TalerWallet1/Fonts/Nunito/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2014 The Nunito Project Authors 
(https://github.com/googlefonts/nunito)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Taler_Wallet Info.plist b/Taler_Wallet Info.plist
index 703c419..958c7e9 100644
--- a/Taler_Wallet Info.plist   
+++ b/Taler_Wallet Info.plist   
@@ -27,10 +27,13 @@
        <key>UIAppFonts</key>
        <array>
                <string>Atkinson-Hyperlegible-Regular-102.otf</string>
-               <string>Atkinson-Hyperlegible-Italic-102.otf</string>
                <string>Atkinson-Hyperlegible-Bold-102.otf</string>
                <string>Atkinson-Hyperlegible-BoldItalic-102.otf</string>
-               <string>Nunito-Regular</string>
+               <string>Atkinson-Hyperlegible-Italic-102.otf</string>
+               <string>Nunito-Regular.ttf</string>
+               <string>Nunito-Bold.ttf</string>
+               <string>Nunito-BoldItalic.ttf</string>
+               <string>Nunito-Italic.ttf</string>
        </array>
        <key>UIBackgroundModes</key>
        <array>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]