Change font by Droid Sans Mono Slashed and activate by default, add it in password generator #86

LICENSES/LICENSE_FONT_DROID_SANS_MONO.txt

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java

@@ -230,9 +230,11 @@ public class EntryEditActivity extends LockingHideActivity
      * Add a new view to fill in the information of the customized field
      */
     private void addNewCustomField() {
-        EntryEditCustomField ees = new EntryEditCustomField(EntryEditActivity.this);
+        EntryEditCustomField entryEditCustomField = new EntryEditCustomField(EntryEditActivity.this);
-        ees.setData("", new ProtectedString(false, ""));
+        entryEditCustomField.setData("", new ProtectedString(false, ""));
-        entryExtraFieldsContainer.addView(ees);
+        boolean visibilityFontActivated = PreferencesUtil.fieldFontIsInVisibility(this);
+        entryEditCustomField.setFontVisibility(visibilityFontActivated);
+        entryExtraFieldsContainer.addView(entryEditCustomField);
 
         // Scroll bottom
         scrollView.post(() -> scrollView.fullScroll(ScrollView.FOCUS_DOWN));
@@ -483,10 +485,10 @@ public class EntryEditActivity extends LockingHideActivity
 
         boolean visibilityFontActivated = PreferencesUtil.fieldFontIsInVisibility(this);
         if (visibilityFontActivated) {
-            Util.applyFontVisibilityTo(entryUserNameView);
+            Util.applyFontVisibilityTo(this, entryUserNameView);
-            Util.applyFontVisibilityTo(entryPasswordView);
+            Util.applyFontVisibilityTo(this, entryPasswordView);
-            Util.applyFontVisibilityTo(entryConfirmationPasswordView);
+            Util.applyFontVisibilityTo(this, entryConfirmationPasswordView);
-            Util.applyFontVisibilityTo(entryCommentView);
+            Util.applyFontVisibilityTo(this, entryCommentView);
         }
 
 		if (mEntry.allowExtraFields()) {

app/src/main/java/com/kunzisoft/keepass/dialogs/GeneratePasswordDialogFragment.java

@@ -36,6 +36,7 @@ import android.widget.Toast;
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.password.PasswordGenerator;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
+import com.kunzisoft.keepass.utils.Util;
 
 import java.util.Set;
 
@@ -46,6 +47,7 @@ public class GeneratePasswordDialogFragment extends DialogFragment {
 	private GeneratePasswordListener mListener;
 	private View root;
 	private EditText lengthTextView;
+	private EditText passwordView;
 
 	private CompoundButton uppercaseBox;
 	private CompoundButton lowercaseBox;
@@ -75,6 +77,9 @@ public class GeneratePasswordDialogFragment extends DialogFragment {
 		LayoutInflater inflater = getActivity().getLayoutInflater();
         root = inflater.inflate(R.layout.generate_password, null);
 
+        passwordView = root.findViewById(R.id.password);
+        Util.applyFontVisibilityTo(getContext(), passwordView);
+
         lengthTextView = root.findViewById(R.id.length);
 
         uppercaseBox = root.findViewById(R.id.cb_uppercase);
@@ -109,9 +114,8 @@ public class GeneratePasswordDialogFragment extends DialogFragment {
 
         builder.setView(root)
                 .setPositiveButton(R.string.accept, (dialog, id) -> {
-                    EditText password = root.findViewById(R.id.password);
                     Bundle bundle = new Bundle();
-                    bundle.putString(KEY_PASSWORD_ID, password.getText().toString());
+                    bundle.putString(KEY_PASSWORD_ID, passwordView.getText().toString());
                     mListener.acceptPassword(bundle);
 
                     dismiss();

app/src/main/java/com/kunzisoft/keepass/utils/SpannableReplacer.java

@@ -1,88 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePass DX.
- *
- *  KeePass DX 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.utils;
-
-import android.os.Parcel;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SpannableReplacer {
-    private final CharSequence mSource;
-    private final CharSequence mReplacement;
-    private final Matcher mMatcher;
-    private int mAppendPosition;
-    private final boolean mIsSpannable;
-
-    public static CharSequence replace(CharSequence source, String regex,
-                                       CharSequence replacement) {
-
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(source);
-        return new SpannableReplacer(source, matcher, replacement).doReplace();
-    }
-
-    private SpannableReplacer(CharSequence source, Matcher matcher,
-                     CharSequence replacement) {
-        mSource = source;
-        mReplacement = replacement;
-        mMatcher = matcher;
-        mAppendPosition = 0;
-        mIsSpannable = replacement instanceof Spannable;
-    }
-
-    private CharSequence doReplace() {
-        SpannableStringBuilder buffer = new SpannableStringBuilder();
-        while (mMatcher.find()) {
-            appendReplacement(buffer);
-        }
-        return appendTail(buffer);
-    }
-
-    private void appendReplacement(SpannableStringBuilder buffer) {
-        buffer.append(mSource.subSequence(mAppendPosition, mMatcher.start()));
-        CharSequence replacement = mIsSpannable
-                ? copyCharSequenceWithSpans(mReplacement)
-                : mReplacement;
-        buffer.append(replacement);
-
-        mAppendPosition = mMatcher.end();
-    }
-
-    public SpannableStringBuilder appendTail(SpannableStringBuilder buffer) {
-        buffer.append(mSource.subSequence(mAppendPosition, mSource.length()));
-        return buffer;
-    }
-
-    // This is a weird way of copying spans, but I don't know any better way.
-    private CharSequence copyCharSequenceWithSpans(CharSequence string) {
-        Parcel parcel = Parcel.obtain();
-        try {
-            TextUtils.writeToParcel(string, parcel, 0);
-            parcel.setDataPosition(0);
-            return TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
-        } finally {
-            parcel.recycle();
-        }
-    }
-}

app/src/main/java/com/kunzisoft/keepass/utils/Util.java

@@ -24,11 +24,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.net.Uri;
-import android.text.Editable;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.text.style.StrikethroughSpan;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -61,66 +56,18 @@ public class Util {
         }
 	}
 
-	private final static String stringToStrikeThrough = "0";
-
     /**
-     * Replace font by monospace and strike through all zeros, must be called after seText()
+     * Replace font by monospace, must be called after seText()
      */
-    public static void applyFontVisibilityTo(final TextView textView) {
+    public static void applyFontVisibilityTo(final Context context, final TextView textView) {
-        textView.setText(strikeThroughToZero(textView.getText()));
+        Typeface typeFace=Typeface.createFromAsset(context.getAssets(),"fonts/DroidSansMonoSlashed.ttf");
-        textView.setTypeface(Typeface.MONOSPACE);
+        textView.setTypeface(typeFace);
     }
 
     /**
-     * Replace font by monospace and strike through all zeros, must be called after seText()
+     * Replace font by monospace, must be called after seText()
      */
-	public static void applyFontVisibilityTo(final EditText editText) {
+	public static void applyFontVisibilityTo(final Context context, final EditText editText) {
-        // Assign spans to default text
+        applyFontVisibilityTo(context, (TextView) editText);
-        editText.setText(strikeThroughToZero(editText.getText()));
-        // Add spans for each new 0 character
-        class TextWatcherCustomFont implements TextWatcher {
-
-            private boolean applySpannable;
-
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
-                applySpannable = count < after;
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int start, int before, int count) {
-                if (applySpannable) {
-                    String text = charSequence.toString();
-                    if (text.contains(stringToStrikeThrough)) {
-                        for (int index = text.indexOf(stringToStrikeThrough);
-                                index >= 0; index = text.indexOf(stringToStrikeThrough,
-                                index + 1)) {
-                            editText.getText().setSpan(new StrikethroughSpan(),
-                                    index,
-                                    index + stringToStrikeThrough.length(),
-                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                        }
-                    }
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {}
-        };
-        TextWatcher textWatcher = new TextWatcherCustomFont();
-        editText.addTextChangedListener(textWatcher);
-        editText.setTypeface(Typeface.MONOSPACE);
 	}
-
-	private static CharSequence strikeThroughToZero(final CharSequence text) {
-	    if (text.toString().contains(stringToStrikeThrough)) {
-            SpannableString spannable = new SpannableString(stringToStrikeThrough);
-            spannable.setSpan(new StrikethroughSpan(),
-                    0,
-                    stringToStrikeThrough.length(),
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            return SpannableReplacer.replace(text, stringToStrikeThrough, spannable);
-        }
-        return text;
-    }
 }

app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.java

@@ -115,7 +115,7 @@ public class EntryContentsView extends LinearLayout {
             userNameContainerView.setVisibility(VISIBLE);
             userNameView.setText(userName);
             if (fontInVisibility)
-                Util.applyFontVisibilityTo(userNameView);
+                Util.applyFontVisibilityTo(getContext(), userNameView);
         } else {
             userNameContainerView.setVisibility(GONE);
         }
@@ -134,7 +134,7 @@ public class EntryContentsView extends LinearLayout {
             passwordContainerView.setVisibility(VISIBLE);
             passwordView.setText(password);
             if (fontInVisibility)
-                Util.applyFontVisibilityTo(passwordView);
+                Util.applyFontVisibilityTo(getContext(), passwordView);
             passwordActionView.setVisibility(GONE);
         } else {
             passwordContainerView.setVisibility(GONE);
@@ -187,7 +187,7 @@ public class EntryContentsView extends LinearLayout {
             commentContainerView.setVisibility(VISIBLE);
             commentView.setText(comment);
             if (fontInVisibility)
-                Util.applyFontVisibilityTo(commentView);
+                Util.applyFontVisibilityTo(getContext(), commentView);
         } else {
             commentContainerView.setVisibility(GONE);
         }

app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.java

@@ -66,7 +66,7 @@ public class EntryCustomField extends LinearLayout {
 
 	public void applyFontVisibility(boolean fontInVisibility) {
         if (fontInVisibility)
-            Util.applyFontVisibilityTo(valueView);
+            Util.applyFontVisibilityTo(getContext(), valueView);
     }
 	
 	public void setLabel(String label) {

app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.java

@@ -86,7 +86,7 @@ public class EntryEditCustomField extends RelativeLayout {
 
     public void setFontVisibility(boolean applyFontVisibility) {
 	    if (applyFontVisibility)
-            Util.applyFontVisibilityTo(valueView);
+            Util.applyFontVisibilityTo(getContext(), valueView);
     }
 
 	public void deleteViewFromParent() {

app/src/main/res/values/donottranslate.xml

@@ -105,7 +105,7 @@
     <bool name="sort_group_before_default" translatable="false">true</bool>
     <bool name="sort_ascending_default" translatable="false">true</bool>
     <bool name="sort_recycle_bin_bottom_default" translatable="false">true</bool>
-    <bool name="monospace_font_fields_enable_default" translatable="false">false</bool>
+    <bool name="monospace_font_fields_enable_default" translatable="false">true</bool>
     <bool name="auto_open_file_uri_default" translatable="false">true</bool>
     <bool name="allow_copy_password_default" translatable="false">true</bool> <!-- TODO To change after implementing the way to enter password < O -->
     <bool name="education_create_db_default" translatable="false">false</bool>