diff --git a/android/THIRD_PARTY_NOTICES.md b/android/THIRD_PARTY_NOTICES.md index 7462b81..cae3496 100644 --- a/android/THIRD_PARTY_NOTICES.md +++ b/android/THIRD_PARTY_NOTICES.md @@ -12,6 +12,7 @@ distributions. | Kotlin | Apache-2.0 | | JNA | Apache-2.0 or LGPL-2.1-or-later | | UniFFI | MPL-2.0 | +| Inter typeface (bundled, `Inter-OFL.txt`) | OFL-1.1 | | proton-stream shared Rust crates | MIT | This summary is not a replacement for dependency license files. Before a diff --git a/android/app/src/main/assets/licenses/Inter-OFL.txt b/android/app/src/main/assets/licenses/Inter-OFL.txt new file mode 100644 index 0000000..9b2ca37 --- /dev/null +++ b/android/app/src/main/assets/licenses/Inter-OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) + +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 AND 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/android/app/src/main/assets/licenses/THIRD_PARTY_NOTICES.md b/android/app/src/main/assets/licenses/THIRD_PARTY_NOTICES.md index cf75c96..14ba90c 100644 --- a/android/app/src/main/assets/licenses/THIRD_PARTY_NOTICES.md +++ b/android/app/src/main/assets/licenses/THIRD_PARTY_NOTICES.md @@ -11,6 +11,7 @@ complete GNU GPL version 3 text is packaged beside this file as `GPL-3.0.txt`. | Kotlin | Apache-2.0 | | JNA | Apache-2.0 or LGPL-2.1-or-later | | UniFFI | MPL-2.0 | +| Inter typeface (bundled, `Inter-OFL.txt`) | OFL-1.1 | | proton-stream reusable Rust crates | MIT | Before release, replace this dependency summary with an inventory generated diff --git a/android/app/src/main/java/io/narl/protonstream/ui/theme/Type.kt b/android/app/src/main/java/io/narl/protonstream/ui/theme/Type.kt index 1ee6bd7..c91295c 100644 --- a/android/app/src/main/java/io/narl/protonstream/ui/theme/Type.kt +++ b/android/app/src/main/java/io/narl/protonstream/ui/theme/Type.kt @@ -2,9 +2,28 @@ package io.narl.protonstream.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight +import io.narl.protonstream.R import androidx.compose.ui.unit.sp +/** + * Inter, the desktop client's face, from the same two files. + * + * Only Regular and SemiBold ship, as on the desktop. A `Medium` role resolves + * to Regular by the usual weight matching rather than to a synthesised bold, + * which is how the desktop draws it too. + * + * Above [ProtonTypography] on purpose: top-level properties initialise in + * file order, and a ramp built first would capture this as null and fall back + * to the system face without a word. + */ +internal val Inter = FontFamily( + Font(R.font.inter_regular, FontWeight.Normal), + Font(R.font.inter_semibold, FontWeight.SemiBold), +) + /** * The type ramp, which is the desktop client's type ramp. * @@ -72,4 +91,5 @@ private fun role(size: Float, weight: FontWeight) = TextStyle( fontSize = size.sp, lineHeight = (size * 1.35f).sp, fontWeight = weight, + fontFamily = Inter, ) diff --git a/android/app/src/main/res/font/inter_regular.ttf b/android/app/src/main/res/font/inter_regular.ttf new file mode 100644 index 0000000..d2cad37 Binary files /dev/null and b/android/app/src/main/res/font/inter_regular.ttf differ diff --git a/android/app/src/main/res/font/inter_semibold.ttf b/android/app/src/main/res/font/inter_semibold.ttf new file mode 100644 index 0000000..2187923 Binary files /dev/null and b/android/app/src/main/res/font/inter_semibold.ttf differ diff --git a/android/app/src/test/screenshots/downloads-empty.png b/android/app/src/test/screenshots/downloads-empty.png index 6a808f6..c83e719 100644 Binary files a/android/app/src/test/screenshots/downloads-empty.png and b/android/app/src/test/screenshots/downloads-empty.png differ diff --git a/android/app/src/test/screenshots/library-empty.png b/android/app/src/test/screenshots/library-empty.png index 94f3e39..8d0f57e 100644 Binary files a/android/app/src/test/screenshots/library-empty.png and b/android/app/src/test/screenshots/library-empty.png differ diff --git a/android/app/src/test/screenshots/library-phone-large-font.png b/android/app/src/test/screenshots/library-phone-large-font.png index 9d6dab1..cd0ff4b 100644 Binary files a/android/app/src/test/screenshots/library-phone-large-font.png and b/android/app/src/test/screenshots/library-phone-large-font.png differ diff --git a/android/app/src/test/screenshots/library-phone.png b/android/app/src/test/screenshots/library-phone.png index 2ad841f..1e175b2 100644 Binary files a/android/app/src/test/screenshots/library-phone.png and b/android/app/src/test/screenshots/library-phone.png differ diff --git a/android/app/src/test/screenshots/library-tablet.png b/android/app/src/test/screenshots/library-tablet.png index 17f04b7..7fee3bb 100644 Binary files a/android/app/src/test/screenshots/library-tablet.png and b/android/app/src/test/screenshots/library-tablet.png differ diff --git a/android/app/src/test/screenshots/settings-phone.png b/android/app/src/test/screenshots/settings-phone.png index f50e9a3..a9511d3 100644 Binary files a/android/app/src/test/screenshots/settings-phone.png and b/android/app/src/test/screenshots/settings-phone.png differ diff --git a/android/app/src/test/screenshots/shares-phone.png b/android/app/src/test/screenshots/shares-phone.png index 32aec70..c2a8c7a 100644 Binary files a/android/app/src/test/screenshots/shares-phone.png and b/android/app/src/test/screenshots/shares-phone.png differ diff --git a/android/app/src/test/screenshots/title-phone.png b/android/app/src/test/screenshots/title-phone.png index 3d84b3b..894e083 100644 Binary files a/android/app/src/test/screenshots/title-phone.png and b/android/app/src/test/screenshots/title-phone.png differ