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

Commit c85db0c6 authored by keeshii's avatar keeshii Committed by Niedermann IT-Dienstleistungen
Browse files

Removed "Tiny" from font sizes.

parent 87da8601

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

+1 −4
Original line number Diff line number Diff line
@@ -321,15 +321,12 @@ 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)) {

        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);

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

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
        <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>

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

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
    <dimen name="secondary_font_size">14sp</dimen>



    <!-- Font Sizes -->

    <dimen name="note_font_size_tiny">14sp</dimen>

    <dimen name="note_font_size_small">16sp</dimen>

    <dimen name="note_font_size_medium">18sp</dimen>

    <dimen name="note_font_size_large">22sp</dimen>

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

+0 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
    <string name="pref_value_mode_preview" translatable="false">preview</string>

    <string name="pref_value_mode_last" translatable="false">last</string>

    <string name="pref_value_mode_note" translatable="false">note</string>

    <string name="pref_value_font_size_tiny" translatable="false">tiny</string>

    <string name="pref_value_font_size_small" translatable="false">small</string>

    <string name="pref_value_font_size_medium" translatable="false">medium</string>

    <string name="pref_value_font_size_large" translatable="false">large</string>
@@ -175,7 +174,6 @@ 


    <!-- Array: font size -->

    <string-array name="fontSize_entries">

        <item>Tiny</item>

        <item>Small</item>

        <item>Medium</item>

        <item>Large</item>