Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6617ee91 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

#359 Use monospace font 

- Merge current master
- Update settings title
parent c221aa13

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java

+0 −32
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.Looper;

import android.preference.PreferenceManager;

import android.support.annotation.Nullable;

import android.text.Editable;

import android.text.TextWatcher;

import android.util.Log;
@@ -150,25 +149,6 @@ public class NoteEditFragment extends BaseNoteFragment { 
        }

    }



    private final TextWatcher textWatcher = new TextWatcher() {

        @Override

        public void beforeTextChanged(CharSequence s, int start, int count, int after) {

        }



        @Override

        public void onTextChanged(final CharSequence s, int start, int before, int count) {

        }



        @Override

        public void afterTextChanged(final Editable s) {

            unsavedEdit = true;

            if (!saveActive) {

                handler.removeCallbacks(runAutoSave);

                handler.postDelayed(runAutoSave, DELAY);

            }

        }

    };



    @Override

    public void onResume() {

        super.onResume();
@@ -182,18 +162,6 @@ public class NoteEditFragment extends BaseNoteFragment { 
        cancelTimers();

    }



    private final Runnable runAutoSave = new Runnable() {

        @Override

        public void run() {

            if (unsavedEdit) {

                Log.d(LOG_TAG_AUTOSAVE, "runAutoSave: start AutoSave");

                autoSave();

            } else {

                Log.d(LOG_TAG_AUTOSAVE, "runAutoSave: nothing changed");

            }

        }

    };



    private void cancelTimers() {

        handler.removeCallbacks(runAutoSave);

    }

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java

+14 −19
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ import android.content.SharedPreferences; 
import android.graphics.Typeface;

import android.os.Bundle;

import android.preference.PreferenceManager;

import android.support.annotation.Nullable;

import android.support.v4.content.res.ResourcesCompat;

import android.support.v4.content.res.TypedArrayUtils;

import android.support.v4.text.TextUtilsCompat;

import android.text.TextUtils;

import android.text.method.LinkMovementMethod;

import android.util.Log;

import android.view.LayoutInflater;

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

+2 −2
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ 
    <string name="settings_password_check_description">Displays whether the credentials are correct.</string>

    <string name="settings_submit">Connect</string>

    <string name="settings_submitting">Connecting &#8230;</string>

    <string name="settings_note_mode">Display mode for Notes</string>

    <string name="settings_note_mode">Display mode for notes</string>

    <string name="settings_theme_title">Theme</string>

    <string name="settings_font_title">Mono-Font</string>

    <string name="settings_font_title">Monospace font</string>

    <string name="settings_cert_category">Manage certificates</string>

    <string name="settings_cert_trust_system">Trust system certificates</string>

    <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>