From 8227d5cc56d7a56057d9dcc9bc5a5a9be6922350 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2016 23:43:09 +0100 Subject: [PATCH] convert utils to kotlin --- .../notes/MyWidgetProvider.java | 2 +- .../com/simplemobiletools/notes/Utils.java | 42 ------------------- .../notes/activities/MainActivity.java | 14 +++---- .../notes/activities/SettingsActivity.java | 2 +- .../activities/WidgetConfigureActivity.java | 2 +- .../com/simplemobiletools/notes/Utils.kt | 35 ++++++++++++++++ 6 files changed, 45 insertions(+), 52 deletions(-) delete mode 100644 app/src/main/java/com/simplemobiletools/notes/Utils.java create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/Utils.kt diff --git a/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java b/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java index f01e5781..452ec957 100644 --- a/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java +++ b/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java @@ -28,7 +28,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); + mRemoteViews.setFloat(R.id.notes_view, "setTextSize", Utils.INSTANCE.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 deleted file mode 100644 index f3265725..00000000 --- a/app/src/main/java/com/simplemobiletools/notes/Utils.java +++ /dev/null @@ -1,42 +0,0 @@ -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; - -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.Companion.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; - case Constants.FONT_SIZE_EXTRA_LARGE: - textSize = res.getDimension(R.dimen.extra_large_text_size); - break; - } - 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 2e88dec4..68aef558 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java @@ -52,7 +52,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN protected void onResume() { super.onResume(); invalidateOptionsMenu(); - mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(getApplicationContext())); + mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.INSTANCE.getTextSize(getApplicationContext())); } @Override @@ -124,7 +124,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN mCurrNoteLabel.setVisibility(mNotes.size() <= 1 ? View.GONE : View.VISIBLE); mCurrNoteTitle.setVisibility(mNotes.size() <= 1 ? View.GONE : View.VISIBLE); - Utils.updateWidget(getApplicationContext()); + Utils.INSTANCE.updateWidget(getApplicationContext()); } @OnClick(R.id.notes_fab) @@ -146,9 +146,9 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN final EditText titleET = (EditText) newNoteView.findViewById(R.id.note_name); final String title = titleET.getText().toString().trim(); if (title.isEmpty()) { - Utils.showToast(getApplicationContext(), R.string.no_title); + Utils.INSTANCE.showToast(getApplicationContext(), R.string.no_title); } else if (mDb.doesTitleExist(title)) { - Utils.showToast(getApplicationContext(), R.string.title_taken); + Utils.INSTANCE.showToast(getApplicationContext(), R.string.title_taken); } else { saveText(); final Note newNote = new Note(0, title, ""); @@ -200,19 +200,19 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN final String newText = getCurrentNote(); final String oldText = mCurrentNote.getValue(); if (!newText.equals(oldText)) { - Utils.showToast(getApplicationContext(), R.string.note_saved); + Utils.INSTANCE.showToast(getApplicationContext(), R.string.note_saved); mCurrentNote.setValue(newText); mDb.updateNote(mCurrentNote); } hideKeyboard(); - Utils.updateWidget(getApplicationContext()); + Utils.INSTANCE.updateWidget(getApplicationContext()); } private void shareText() { final String text = getCurrentNote(); if (text.isEmpty()) { - Utils.showToast(getApplicationContext(), R.string.cannot_share_empty_text); + Utils.INSTANCE.showToast(getApplicationContext(), R.string.cannot_share_empty_text); return; } 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 8892b671..f63e6d75 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java @@ -47,7 +47,7 @@ public class SettingsActivity extends SimpleActivity { @OnItemSelected(R.id.settings_font_size) public void handleFontSize() { mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition()); - Utils.updateWidget(getApplicationContext()); + Utils.INSTANCE.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 b9086a74..e4fecf1b 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java @@ -57,7 +57,7 @@ public class WidgetConfigureActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(getApplicationContext())); + mNotesView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.INSTANCE.getTextSize(getApplicationContext())); } private void initVariables() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/Utils.kt b/app/src/main/kotlin/com/simplemobiletools/notes/Utils.kt new file mode 100644 index 00000000..f82e51c0 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/Utils.kt @@ -0,0 +1,35 @@ +package com.simplemobiletools.notes + +import android.appwidget.AppWidgetManager +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.widget.Toast + +object Utils { + fun showToast(context: Context, resId: Int) { + Toast.makeText(context, context.resources.getString(resId), Toast.LENGTH_SHORT).show() + } + + fun getTextSize(context: Context): Float { + val fontSize = Config.newInstance(context).fontSize + val res = context.resources + var textSize = res.getDimension(R.dimen.medium_text_size) + when (fontSize) { + Constants.FONT_SIZE_SMALL -> textSize = res.getDimension(R.dimen.small_text_size) + Constants.FONT_SIZE_LARGE -> textSize = res.getDimension(R.dimen.large_text_size) + Constants.FONT_SIZE_EXTRA_LARGE -> textSize = res.getDimension(R.dimen.extra_large_text_size) + } + return textSize + } + + fun updateWidget(context: Context) { + val widgetManager = AppWidgetManager.getInstance(context) + val ids = widgetManager.getAppWidgetIds(ComponentName(context, MyWidgetProvider::class.java)) + + val intent = Intent(context, MyWidgetProvider::class.java) + intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids) + context.sendBroadcast(intent) + } +}