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

Commit 23b10cd7 authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

Respect font size and font family preferences

parent 9ec6054a

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

+0 −17
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package it.niedermann.owncloud.notes.android.fragment; 
import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ShortcutInfo;

import android.content.pm.ShortcutManager;

import android.graphics.Color;
@@ -271,22 +270,6 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego 
        }

    }



    @SuppressWarnings("WeakerAccess") //PMD...

    protected float getFontSizeFromPreferences(SharedPreferences sp) {

        final String prefValueSmall = getString(R.string.pref_value_font_size_small);

        final String prefValueMedium = getString(R.string.pref_value_font_size_medium);

        // final String prefValueLarge = getString(R.string.pref_value_font_size_large);

        String fontSize = sp.getString(getString(R.string.pref_key_font_size), prefValueMedium);



        if (fontSize.equals(prefValueSmall)) {

            return getResources().getDimension(R.dimen.note_font_size_small);

        } else if (fontSize.equals(prefValueMedium)) {

            return getResources().getDimension(R.dimen.note_font_size_medium);

        } else {

            return getResources().getDimension(R.dimen.note_font_size_large);

        }

    }



    protected abstract String getContent();



    /**

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

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import it.niedermann.owncloud.notes.util.format.ContextBasedRangeFormattingCallb 


import static androidx.core.view.ViewCompat.isAttachedToWindow;

import static it.niedermann.owncloud.notes.util.DisplayUtils.searchAndColor;

import static it.niedermann.owncloud.notes.util.NoteUtil.getFontSizeFromPreferences;



public class NoteEditFragment extends SearchableBaseNoteFragment {
@@ -169,7 +170,7 @@ public class NoteEditFragment extends SearchableBaseNoteFragment { 
                binding.editContent.setCustomInsertionActionModeCallback(new ContextBasedFormattingCallback(binding.editContent));

            }

            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(requireContext().getApplicationContext());

            binding.editContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));

            binding.editContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(requireContext(), sp));

            if (sp.getBoolean(getString(R.string.pref_key_font), false)) {

                binding.editContent.setTypeface(Typeface.MONOSPACE);

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static it.niedermann.owncloud.notes.util.MarkDownUtil.CHECKBOX_UNCHECKED_ 
import static it.niedermann.owncloud.notes.util.MarkDownUtil.parseCompat;

import static it.niedermann.owncloud.notes.util.NoteLinksUtils.extractNoteRemoteId;

import static it.niedermann.owncloud.notes.util.NoteLinksUtils.replaceNoteLinksWithDummyUrls;

import static it.niedermann.owncloud.notes.util.NoteUtil.getFontSizeFromPreferences;



public class NotePreviewFragment extends SearchableBaseNoteFragment implements OnRefreshListener {
@@ -180,7 +181,7 @@ public class NotePreviewFragment extends SearchableBaseNoteFragment implements O 
        binding.swiperefreshlayout.setOnRefreshListener(this);



        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext());

        binding.singleNoteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));

        binding.singleNoteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(requireContext(), sp));

        if (sp.getBoolean(getString(R.string.pref_key_font), false)) {

            binding.singleNoteContent.setTypeface(Typeface.MONOSPACE);

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import it.niedermann.owncloud.notes.util.NoteLinksUtils; 
import static androidx.core.view.ViewCompat.isAttachedToWindow;

import static it.niedermann.owncloud.notes.util.DisplayUtils.searchAndColor;

import static it.niedermann.owncloud.notes.util.MarkDownUtil.parseCompat;

import static it.niedermann.owncloud.notes.util.NoteUtil.getFontSizeFromPreferences;



public class NoteReadonlyFragment extends SearchableBaseNoteFragment {
@@ -130,7 +131,7 @@ public class NoteReadonlyFragment extends SearchableBaseNoteFragment { 
        binding.swiperefreshlayout.setEnabled(false);



        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext());

        binding.singleNoteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));

        binding.singleNoteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(requireContext(), sp));

        if (sp.getBoolean(getString(R.string.pref_key_font), false)) {

            binding.singleNoteContent.setTypeface(Typeface.MONOSPACE);

        }

app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java

+11 −0
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes.formattinghelp;



import android.content.Intent;

import android.content.SharedPreferences;

import android.graphics.Typeface;

import android.net.Uri;

import android.os.Bundle;

import android.text.TextUtils;

import android.text.method.LinkMovementMethod;

import android.util.TypedValue;

import android.widget.Toast;



import androidx.annotation.Nullable;

import androidx.preference.PreferenceManager;



import com.yydcdut.markdown.MarkdownProcessor;

import com.yydcdut.markdown.syntax.text.TextFactory;
@@ -27,6 +31,7 @@ import static it.niedermann.owncloud.notes.util.MarkDownUtil.CHECKBOX_UNCHECKED_ 
import static it.niedermann.owncloud.notes.util.MarkDownUtil.CHECKBOX_UNCHECKED_STAR;

import static it.niedermann.owncloud.notes.util.MarkDownUtil.getMarkDownConfiguration;

import static it.niedermann.owncloud.notes.util.MarkDownUtil.parseCompat;

import static it.niedermann.owncloud.notes.util.NoteUtil.getFontSizeFromPreferences;



public class FormattingHelpActivity extends BrandedActivity {
@@ -105,6 +110,12 @@ public class FormattingHelpActivity extends BrandedActivity { 
                .build());

        binding.content.setMovementMethod(LinkMovementMethod.getInstance());

        binding.content.setText(parseCompat(markdownProcessor, content));



        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        binding.content.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(this, sp));

        if (sp.getBoolean(getString(R.string.pref_key_font), false)) {

            binding.content.setTypeface(Typeface.MONOSPACE);

        }

    }



    @Override