diff --git a/android/assets/skin/Esteban-Regular.ttf b/android/assets/skin/Esteban-Regular.ttf new file mode 100644 index 0000000000..f278773f89 Binary files /dev/null and b/android/assets/skin/Esteban-Regular.ttf differ diff --git a/android/assets/skin/OFL.txt b/android/assets/skin/OFL.txt new file mode 100644 index 0000000000..17588bc20e --- /dev/null +++ b/android/assets/skin/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011, Ang�lica D�iaz (http://typereview.wordpress.com|angiecina@gmail.com), +with Reserved Font Name "Esteban" + +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/build.gradle b/build.gradle index 8170a23ff5..f32a118611 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,14 @@ project(":android") { natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" - + + // Freetype + compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" } } @@ -104,6 +111,7 @@ project(":core") { dependencies { compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" } } diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index 125cd9558e..d3485b3e6d 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -13,11 +13,23 @@ import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.disable import com.unciv.ui.utils.enable + + class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() { private var pickedPolicy: Policy? = null init { + + + // Proof-of-concept for font generation +// val generator = FreeTypeFontGenerator(Gdx.files.internal("skin/Esteban-Regular.ttf")) +// val parameter = FreeTypeFontParameter() +// parameter.size = 25 +// val font12 = generator.generateFont(parameter) // font size 12 pixels +// generator.dispose() // don't forget to dispose to avoid memory leaks! +// rightSideButton.style.font = font12 + val policies = civInfo.policies displayTutorials("PolicyPickerScreen") @@ -91,24 +103,24 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( } private fun getPolicyButton(policy: Policy, image: Boolean): Button { - var toReturn = Button(CameraStageBaseScreen.skin) + var policyButton = Button(CameraStageBaseScreen.skin) if (image) { val policyImage = ImageGetter.getImage("PolicyIcons/" + policy.name.replace(" ", "_") + "_(Civ5).png") - toReturn.add(policyImage).size(30f) + policyButton.add(policyImage).size(30f) } else - toReturn = TextButton(policy.name, CameraStageBaseScreen.skin) + policyButton = TextButton(policy.name, CameraStageBaseScreen.skin) if (civInfo.policies.isAdopted(policy.name)) { // existing - toReturn.color = Color.GREEN + policyButton.color = Color.GREEN } else if (!civInfo.policies. getAdoptedPolicies().containsAll(policy.requires!!)) // non-available { - toReturn.disable() + policyButton.color = Color.GRAY } - toReturn.addClickListener { pickPolicy(policy) } - toReturn.pack() - return toReturn + policyButton.addClickListener { pickPolicy(policy) } + policyButton.pack() + return policyButton } } \ No newline at end of file diff --git a/desktop/build.gradle b/desktop/build.gradle index a14115e32c..8bf47bc830 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -55,5 +55,6 @@ task afterEclipseImport(description: "Post processing after project generation", } dependencies { + compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" compile project(path: ':core') } \ No newline at end of file