diff --git a/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java b/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java index 29a2d1e1..50a7682a 100644 --- a/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java +++ b/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java @@ -23,6 +23,7 @@ public class MyWidgetProvider extends AppWidgetProvider { final int newTextColor = mPrefs.getInt(Constants.WIDGET_TEXT_COLOR, Color.WHITE); mRemoteViews.setInt(R.id.notes_view, "setBackgroundColor", newBgColor); mRemoteViews.setInt(R.id.notes_view, "setTextColor", newTextColor); + mRemoteViews.setFloat(R.id.notes_view, "setTextSize", Utils.getTextSize(context) / context.getResources().getDisplayMetrics().density); for (int widgetId : appWidgetIds) { updateWidget(appWidgetManager, widgetId, mRemoteViews); diff --git a/app/src/main/java/com/simplemobiletools/notes/Utils.java b/app/src/main/java/com/simplemobiletools/notes/Utils.java index 097c390a..3b06d350 100644 --- a/app/src/main/java/com/simplemobiletools/notes/Utils.java +++ b/app/src/main/java/com/simplemobiletools/notes/Utils.java @@ -1,6 +1,9 @@ package com.simplemobiletools.notes; +import android.appwidget.AppWidgetManager; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.widget.Toast; @@ -23,4 +26,14 @@ public class Utils { } return textSize; } + + public static void updateWidget(Context context) { + final AppWidgetManager widgetManager = AppWidgetManager.getInstance(context); + int[] ids = widgetManager.getAppWidgetIds(new ComponentName(context, MyWidgetProvider.class)); + + final Intent intent = new Intent(context, MyWidgetProvider.class); + intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids); + context.sendBroadcast(intent); + } } 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 286d92fd..db452546 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java @@ -1,7 +1,5 @@ package com.simplemobiletools.notes.activities; -import android.appwidget.AppWidgetManager; -import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -16,7 +14,6 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import com.simplemobiletools.notes.Constants; -import com.simplemobiletools.notes.MyWidgetProvider; import com.simplemobiletools.notes.R; import com.simplemobiletools.notes.Utils; @@ -123,7 +120,7 @@ public class MainActivity extends SimpleActivity { } hideKeyboard(); - updateWidget(); + Utils.updateWidget(getApplicationContext()); } private void shareText() { @@ -155,15 +152,4 @@ public class MainActivity extends SimpleActivity { final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(mNotesView.getWindowToken(), 0); } - - private void updateWidget() { - final Context context = getApplicationContext(); - final AppWidgetManager widgetManager = AppWidgetManager.getInstance(context); - int[] ids = widgetManager.getAppWidgetIds(new ComponentName(context, MyWidgetProvider.class)); - - final Intent intent = new Intent(this, MyWidgetProvider.class); - intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids); - sendBroadcast(intent); - } } diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java index c4e62398..bbdaba0d 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java @@ -7,6 +7,7 @@ import android.support.v7.widget.SwitchCompat; import com.simplemobiletools.notes.Config; import com.simplemobiletools.notes.R; +import com.simplemobiletools.notes.Utils; import butterknife.BindView; import butterknife.ButterKnife; @@ -59,8 +60,9 @@ public class SettingsActivity extends SimpleActivity { } @OnItemSelected(R.id.settings_font_size) - public void handleMaxPhotoResolution() { + public void handleFontSize() { mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition()); + Utils.updateWidget(getApplicationContext()); } private void restartActivity() { diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java index e0bae5ae..b9086a74 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java @@ -7,6 +7,7 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.util.TypedValue; import android.view.View; import android.widget.Button; import android.widget.RemoteViews; @@ -16,6 +17,7 @@ import android.widget.TextView; import com.simplemobiletools.notes.Constants; import com.simplemobiletools.notes.MyWidgetProvider; import com.simplemobiletools.notes.R; +import com.simplemobiletools.notes.Utils; import butterknife.BindView; import butterknife.ButterKnife; @@ -52,6 +54,12 @@ public class WidgetConfigureActivity extends AppCompatActivity { finish(); } + @Override + protected void onResume() { + super.onResume(); + mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(getApplicationContext())); + } + private void initVariables() { final SharedPreferences prefs = getSharedPreferences(Constants.PREFS_KEY, Context.MODE_PRIVATE); mBgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, 1); diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml index 90c46891..60961b20 100644 --- a/app/src/main/res/layout/widget_config.xml +++ b/app/src/main/res/layout/widget_config.xml @@ -1,7 +1,7 @@