From 350c22cda6807db52b6023d9b062fe6d190060af Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 25 Sep 2016 18:51:25 +0200
Subject: [PATCH] really change the font size based on settings

---
 .../java/com/simplemobiletools/notes/Config.java |  2 +-
 .../com/simplemobiletools/notes/Constants.java   |  3 +--
 .../java/com/simplemobiletools/notes/Utils.java  | 16 ++++++++++++++++
 .../notes/activities/MainActivity.java           |  2 ++
 app/src/main/res/layout/activity_main.xml        |  3 +--
 app/src/main/res/layout/widget.xml               |  5 ++---
 app/src/main/res/values/dimens.xml               |  3 ++-
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/simplemobiletools/notes/Config.java b/app/src/main/java/com/simplemobiletools/notes/Config.java
index 43011666..9de3bbcf 100644
--- a/app/src/main/java/com/simplemobiletools/notes/Config.java
+++ b/app/src/main/java/com/simplemobiletools/notes/Config.java
@@ -47,7 +47,7 @@ public class Config {
     }
 
     public int getFontSize() {
-        return mPrefs.getInt(Constants.FONT_SIZE, Constants.FONT_SIZE_NORMAL);
+        return mPrefs.getInt(Constants.FONT_SIZE, Constants.FONT_SIZE_MEDIUM);
     }
 
     public void setFontSize(int size) {
diff --git a/app/src/main/java/com/simplemobiletools/notes/Constants.java b/app/src/main/java/com/simplemobiletools/notes/Constants.java
index 875e8767..daf97fa6 100644
--- a/app/src/main/java/com/simplemobiletools/notes/Constants.java
+++ b/app/src/main/java/com/simplemobiletools/notes/Constants.java
@@ -15,7 +15,6 @@ public class Constants {
 
     // font sizes
     public static final int FONT_SIZE_SMALL = 0;
-    public static final int FONT_SIZE_NORMAL = 1;
+    public static final int FONT_SIZE_MEDIUM = 1;
     public static final int FONT_SIZE_LARGE = 2;
-
 }
diff --git a/app/src/main/java/com/simplemobiletools/notes/Utils.java b/app/src/main/java/com/simplemobiletools/notes/Utils.java
index f855f864..097c390a 100644
--- a/app/src/main/java/com/simplemobiletools/notes/Utils.java
+++ b/app/src/main/java/com/simplemobiletools/notes/Utils.java
@@ -1,10 +1,26 @@
 package com.simplemobiletools.notes;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.widget.Toast;
 
 public class Utils {
     public static void showToast(Context context, int resId) {
         Toast.makeText(context, context.getResources().getString(resId), Toast.LENGTH_SHORT).show();
     }
+
+    public static float getTextSize(Context context) {
+        final int fontSize = Config.newInstance(context).getFontSize();
+        final Resources res = context.getResources();
+        float textSize = res.getDimension(R.dimen.medium_text_size);
+        switch (fontSize) {
+            case Constants.FONT_SIZE_SMALL:
+                textSize = res.getDimension(R.dimen.small_text_size);
+                break;
+            case Constants.FONT_SIZE_LARGE:
+                textSize = res.getDimension(R.dimen.large_text_size);
+                break;
+        }
+        return textSize;
+    }
 }
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
index e53c2387..286d92fd 100644
--- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
@@ -41,6 +42,7 @@ public class MainActivity extends SimpleActivity {
     protected void onResume() {
         super.onResume();
         invalidateOptionsMenu();
+        mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(getApplicationContext()));
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ed54f98e..b248911d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,6 @@
         android:layout_height="wrap_content"
         android:background="@null"
         android:gravity="top"
-        android:padding="@dimen/activity_margin"
-        android:textSize="@dimen/normal_text_size"/>
+        android:padding="@dimen/activity_margin"/>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index de688cf0..b87f8095 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/notes_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/notes_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,7 +11,6 @@
         android:layout_height="match_parent"
         android:background="@null"
         android:gravity="top"
-        android:padding="@dimen/activity_margin"
-        android:textSize="@dimen/normal_text_size"/>
+        android:padding="@dimen/activity_margin"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e1c8bbe0..d0cc2099 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,8 +4,9 @@
     <dimen name="social_logo">40dp</dimen>
     <dimen name="settings_padding">8dp</dimen>
 
-    <dimen name="tiny_text_size">12sp</dimen>
+    <dimen name="small_text_size">12sp</dimen>
     <dimen name="normal_text_size">14sp</dimen>
+    <dimen name="medium_text_size">16sp</dimen>
     <dimen name="large_text_size">18sp</dimen>
     <dimen name="config_text_size">18sp</dimen>
 </resources>