diff --git a/CHANGELOG b/CHANGELOG index 8eb0bc043..9ffdd32c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ * Updated Russian translations from filimonic * Update Spanish translations (closes: #766) * Update Czech translations (closes: #743) + * New password font (closes: #451) KeePassDroid (2.0) * Remove beta warning diff --git a/LICENSE b/LICENSE index af5c975ce..92ba91624 100644 --- a/LICENSE +++ b/LICENSE @@ -304,3 +304,105 @@ Many files under jni/final_key/ are coverage by the following license: in respect of its properties, including, but not limited to, correctness and/or fitness for purpose. +--- + +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +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 BITSTREAM OR THE GNOME +FOUNDATION 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. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +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 +TAVMJONG BAH 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. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ + diff --git a/assets/fonts/DejaVuSansMono.ttf b/assets/fonts/DejaVuSansMono.ttf new file mode 100644 index 000000000..8b7bb2a4e Binary files /dev/null and b/assets/fonts/DejaVuSansMono.ttf differ diff --git a/res/layout-v11/entry_view_contents.xml b/res/layout-v11/entry_view_contents.xml index c093e9f72..ccd8fe62b 100644 --- a/res/layout-v11/entry_view_contents.xml +++ b/res/layout-v11/entry_view_contents.xml @@ -56,12 +56,11 @@ android:text="@string/entry_password" style="@style/WhiteOnDarkSmall" /> - diff --git a/res/layout/entry_edit.xml b/res/layout/entry_edit.xml index 655517292..0fc9f6314 100644 --- a/res/layout/entry_edit.xml +++ b/res/layout/entry_edit.xml @@ -121,7 +121,7 @@ android:text="@string/ellipsis" android:layout_height="wrap_content" android:layout_alignParentRight="true"/> - - diff --git a/src/com/keepassdroid/view/PasswordEditText.java b/src/com/keepassdroid/view/PasswordEditText.java new file mode 100644 index 000000000..295579632 --- /dev/null +++ b/src/com/keepassdroid/view/PasswordEditText.java @@ -0,0 +1,46 @@ +/* + * Copyright 2015 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * KeePassDroid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePassDroid. If not, see . + * + */ +package com.keepassdroid.view; + +import android.content.Context; +import android.graphics.Typeface; +import android.util.AttributeSet; +import android.widget.EditText; + +public class PasswordEditText extends EditText { + + public PasswordEditText(Context context, AttributeSet attrs, + int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public PasswordEditText(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public PasswordEditText(Context context) { + super(context); + } + + @Override + public void setTypeface(Typeface tf, int style) { + super.setTypeface(Typeface.createFromAsset(getContext().getAssets(), "fonts/DejaVuSansMono.ttf")); + } +} diff --git a/src/com/keepassdroid/view/PasswordTextViewSelect.java b/src/com/keepassdroid/view/PasswordTextViewSelect.java new file mode 100644 index 000000000..7490bb34f --- /dev/null +++ b/src/com/keepassdroid/view/PasswordTextViewSelect.java @@ -0,0 +1,46 @@ +/* + * Copyright 2015 Brian Pellin. + * + * This file is part of KeePassDroid. + * + * KeePassDroid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * KeePassDroid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePassDroid. If not, see . + * + */ +package com.keepassdroid.view; + +import android.content.Context; +import android.graphics.Typeface; +import android.util.AttributeSet; + +public class PasswordTextViewSelect extends TextViewSelect { + + public PasswordTextViewSelect(Context context, AttributeSet attrs, + int defStyle) { + super(context, attrs, defStyle); + } + + public PasswordTextViewSelect(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public PasswordTextViewSelect(Context context) { + super(context); + } + + @Override + public void setTypeface(Typeface tf, int style) { + super.setTypeface(Typeface.createFromAsset(getContext().getAssets(), "fonts/DejaVuSansMono.ttf")); + } + +}