Skip to content

Commit

Permalink
Use a monospace font for arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole committed Nov 5, 2023
1 parent a717a06 commit a01947c
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 8 deletions.
93 changes: 93 additions & 0 deletions src/main/assets/LICENSE-OFL.txt
@@ -0,0 +1,93 @@
Copyright 2012 The B612 Project Authors (https://github.com/polarsys/b612)

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.
5 changes: 3 additions & 2 deletions src/main/assets/LICENSE.txt
Expand Up @@ -37,8 +37,6 @@ OAuth support for Vespucci is provided by the oauth-signpost library https://git

Credits:

EXIF support outside of what is provided by google is implemented with the metadata extractor library https://github.com/drewnoakes/metadata-extractor licensed under the Apache License, version 2.

The SplitPane layout was retrieved from https://github.com/MobiDevelop/android-split-pane-layout licensed under the Apache License, version 2.

The countryboundaries library used for geo-coding OSM elements is © 2018 Tobias Zwick. The library is released under the terms of the GNU Lesser General Public License (LGPL) and is available from https://github.com/westnordost/countryboundaries
Expand Down Expand Up @@ -69,11 +67,14 @@ The "todo" icon is available on MIT terms from gitlab

The de.blau.android.util.egm96.EGM96.java file is derived from code from NASAs Worldwind and is available on Terms of the NASA OPEN SOURCE AGREEMENT VERSION 1.3, see the directory for the full licence text.

The B612-MONO font by Nicolas Chauveau, Thomas Paillot, Jonathan Favre-Lamarine and Jean-Luc Vinot SIL Open Font License 1.1

The full license texts are also available online:
http://www.apache.org/licenses/LICENSE-2.0
http://www.gnu.org/licenses/gpl-3.0.txt
http://mozilla.org/MPL/2.0/
http://www.gnu.org/licenses/lgpl-3.0.html
https://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web

--

Expand Down
18 changes: 12 additions & 6 deletions src/main/java/de/blau/android/DisambiguationMenu.java
Expand Up @@ -10,7 +10,9 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.text.style.TypefaceSpan;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -25,6 +27,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import de.blau.android.gpx.WayPoint;
import de.blau.android.layer.ClickedObject;
import de.blau.android.osm.Node;
Expand Down Expand Up @@ -63,6 +66,7 @@ public interface OnMenuItemClickListener {
private final List<OnMenuItemClickListener> onClickListeners = new ArrayList<>();
private View header;
private boolean rtl;
private final TypefaceSpan monospaceSpan;

/**
* Create a new menu to disambiguate between nearby objects
Expand All @@ -72,6 +76,7 @@ public interface OnMenuItemClickListener {
public DisambiguationMenu(@NonNull View anchor) {
this.anchor = anchor;
rtl = Util.isRtlScript(anchor.getContext());
monospaceSpan = new TypefaceSpan(ResourcesCompat.getFont(anchor.getContext(), R.font.b612mono));
}

/**
Expand Down Expand Up @@ -172,13 +177,14 @@ private Type typeFromObject(@NonNull ClickedObject<?> clicked) {
* @param listener callback when the menu item is selected
*/
public void add(int id, @Nullable Type type, @NonNull String text, boolean selected, @NonNull final OnMenuItemClickListener listener) { // NOSONAR
if (selected) {
SpannableString s = new SpannableString(text);
s.setSpan(new ForegroundColorSpan(ThemeUtils.getStyleAttribColorValue(anchor.getContext(), R.attr.colorAccent, 0)), 0, s.length(), 0);
add(new DisambiguationMenuItem(type, s), listener);
return;
SpannableString s = new SpannableString(text);
if (text.length() > 0) {
s.setSpan(monospaceSpan, 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (selected) {
s.setSpan(new ForegroundColorSpan(ThemeUtils.getStyleAttribColorValue(anchor.getContext(), R.attr.colorAccent, 0)), 1, s.length(), 0);
}
}
add(new DisambiguationMenuItem(type, text), listener);
add(new DisambiguationMenuItem(type, s), listener);
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/main/java/de/blau/android/LicenseViewer.java
Expand Up @@ -41,6 +41,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
load("LICENSE-Apache.txt", builder);
load("josm-contributors.txt", builder);
load("LICENSE-LGPL3.txt", builder);
load("LICENSE-OFL.txt", builder);
textFull.setText(builder.toString());
setContentView(container);
}
Expand Down
Binary file added src/main/res/font/b612mono.ttf
Binary file not shown.

0 comments on commit a01947c

Please sign in to comment.