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

Commit 6f23054f authored by Kamil K's avatar Kamil K Committed by Niedermann IT-Dienstleistungen
Browse files

Added font size preference.

parent 5d1a3e61

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

+19 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import android.app.Fragment; 
import android.app.FragmentManager;

import android.app.PendingIntent;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ShortcutInfo;

import android.content.pm.ShortcutManager;

import android.graphics.drawable.Icon;
@@ -319,6 +320,24 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo 
        }

    }



    protected float getFontSizeFromPreferences(SharedPreferences sp) {

        final String prefValueTiny = getString(R.string.pref_value_font_size_tiny);

        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(prefValueTiny)) {

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

        } else 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 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.preference.PreferenceManager; 
import android.text.Editable;

import android.text.TextWatcher;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.View;
@@ -155,6 +156,7 @@ public class NoteEditFragment extends BaseNoteFragment { 


            editContent.setCustomSelectionActionModeCallback(new StyleCallback(this.editContent));

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

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

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

                editContent.setTypeface(Typeface.MONOSPACE);

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import android.os.Bundle; 
import android.preference.PreferenceManager;

import android.text.method.LinkMovementMethod;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.View;
@@ -100,6 +101,7 @@ public class NotePreviewFragment extends BaseNoteFragment { 
        noteContent.setMovementMethod(LinkMovementMethod.getInstance());



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

        noteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));

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

            noteContent.setTypeface(Typeface.MONOSPACE);

        }

app/src/main/res/drawable/ic_format_size_black_24dp.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<vector android:autoMirrored="true" android:height="24dp"

    android:tint="#666666" android:viewportHeight="24.0"

    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#FF000000" android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>

</vector>

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

+6 −0
Original line number Diff line number Diff line
@@ -5,4 +5,10 @@ 
        <item>@string/pref_value_mode_preview</item>

        <item>@string/pref_value_mode_last</item>

    </string-array>

    <string-array name="fontSize_values">

        <item>@string/pref_value_font_size_tiny</item>

        <item>@string/pref_value_font_size_small</item>

        <item>@string/pref_value_font_size_medium</item>

        <item>@string/pref_value_font_size_large</item>

    </string-array>

</resources>
 
 No newline at end of file