From 6a5e7f5cdbb6cdf5d28d2d3dd0d7fdc9b7ac251a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Sep 2016 18:22:19 +0200 Subject: [PATCH] permanently enable autosave --- .../com/simplemobiletools/notes/Config.java | 16 ------ .../simplemobiletools/notes/Constants.java | 2 - .../notes/activities/MainActivity.java | 50 +++--------------- .../notes/activities/SettingsActivity.java | 13 ----- app/src/main/res/layout/activity_settings.xml | 26 --------- app/src/main/res/menu/menu.xml | 5 -- app/src/main/res/mipmap-hdpi/save.png | Bin 247 -> 0 bytes app/src/main/res/mipmap-mdpi/save.png | Bin 168 -> 0 bytes app/src/main/res/mipmap-xhdpi/save.png | Bin 273 -> 0 bytes app/src/main/res/mipmap-xxhdpi/save.png | Bin 391 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/save.png | Bin 504 -> 0 bytes app/src/main/res/values-de/strings.xml | 7 +-- app/src/main/res/values-it/strings.xml | 7 +-- app/src/main/res/values-ja/strings.xml | 7 +-- app/src/main/res/values-sv/strings.xml | 7 +-- app/src/main/res/values/strings.xml | 7 +-- 16 files changed, 12 insertions(+), 135 deletions(-) delete mode 100644 app/src/main/res/mipmap-hdpi/save.png delete mode 100644 app/src/main/res/mipmap-mdpi/save.png delete mode 100644 app/src/main/res/mipmap-xhdpi/save.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/save.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/save.png diff --git a/app/src/main/java/com/simplemobiletools/notes/Config.java b/app/src/main/java/com/simplemobiletools/notes/Config.java index 9de3bbcf..17315477 100644 --- a/app/src/main/java/com/simplemobiletools/notes/Config.java +++ b/app/src/main/java/com/simplemobiletools/notes/Config.java @@ -30,22 +30,6 @@ public class Config { mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply(); } - public boolean getIsAutosaveEnabled() { - return mPrefs.getBoolean(Constants.AUTOSAVE, false); - } - - public void setIsAutosaveEnabled(boolean enabled) { - mPrefs.edit().putBoolean(Constants.AUTOSAVE, enabled).apply(); - } - - public boolean getShouldPromptAutosave() { - return mPrefs.getBoolean(Constants.PROMPT_AUTOSAVE, true); - } - - public void setShouldPromptAutosave(boolean prompt) { - mPrefs.edit().putBoolean(Constants.PROMPT_AUTOSAVE, prompt).apply(); - } - public int getFontSize() { return mPrefs.getInt(Constants.FONT_SIZE, Constants.FONT_SIZE_MEDIUM); } diff --git a/app/src/main/java/com/simplemobiletools/notes/Constants.java b/app/src/main/java/com/simplemobiletools/notes/Constants.java index daf97fa6..d423bb7c 100644 --- a/app/src/main/java/com/simplemobiletools/notes/Constants.java +++ b/app/src/main/java/com/simplemobiletools/notes/Constants.java @@ -7,8 +7,6 @@ public class Constants { public static final String PREFS_KEY = "Notes"; public static final String IS_FIRST_RUN = "is_first_run"; public static final String IS_DARK_THEME = "is_dark_theme"; - public static final String AUTOSAVE = "autosave"; - public static final String PROMPT_AUTOSAVE = "prompt_autosave"; public static final String FONT_SIZE = "font_size"; public static final String WIDGET_BG_COLOR = "widget_bg_color"; public static final String WIDGET_TEXT_COLOR = "widget_text_color"; 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 12439a48..e7a964fe 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java @@ -1,12 +1,10 @@ package com.simplemobiletools.notes.activities; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; 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; @@ -48,19 +46,7 @@ public class MainActivity extends SimpleActivity { @Override protected void onPause() { super.onPause(); - if (mConfig.getIsAutosaveEnabled()) { - saveText(false); - } - } - - @Override - public void onBackPressed() { - if (mConfig.getShouldPromptAutosave() && !getCurrentNote().equals(getSavedNote())) { - mConfig.setShouldPromptAutosave(false); - displayAutosavePrompt(); - } else { - super.onBackPressed(); - } + saveText(); } @Override @@ -72,18 +58,12 @@ public class MainActivity extends SimpleActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu, menu); - if (mConfig.getIsAutosaveEnabled()) - menu.findItem(R.id.save).setVisible(false); - return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.save: - saveText(true); - return true; case R.id.share: shareText(); return true; @@ -103,30 +83,14 @@ public class MainActivity extends SimpleActivity { } - private void displayAutosavePrompt() { - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(this); - alertDialog.setTitle(getString(R.string.unsaved_changes)); - alertDialog.setMessage(getString(R.string.autosave_prompt_msg)); - - alertDialog.setNegativeButton(R.string.cancel, null); - alertDialog.setPositiveButton(R.string.enable_autosave, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - mConfig.setIsAutosaveEnabled(true); - supportInvalidateOptionsMenu(); - } - }); - alertDialog.create().show(); - } - - private void saveText(boolean showToast) { - final String text = getCurrentNote(); - mPrefs.edit().putString(Constants.TEXT, text).apply(); - - if (showToast) { - Utils.showToast(getApplicationContext(), R.string.text_saved); + private void saveText() { + final String newText = getCurrentNote(); + final String oldText = mPrefs.getString(Constants.TEXT, ""); + if (!newText.equals(oldText)) { + Utils.showToast(getApplicationContext(), R.string.note_saved); } + mPrefs.edit().putString(Constants.TEXT, newText).apply(); hideKeyboard(); Utils.updateWidget(getApplicationContext()); } 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 bbdaba0d..c2c2cf17 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java @@ -16,7 +16,6 @@ import butterknife.OnItemSelected; public class SettingsActivity extends SimpleActivity { @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch; - @BindView(R.id.settings_autosave) SwitchCompat mAutosaveSwitch; @BindView(R.id.settings_font_size) AppCompatSpinner mFontSizeSpinner; private static Config mConfig; @@ -29,19 +28,13 @@ public class SettingsActivity extends SimpleActivity { ButterKnife.bind(this); setupDarkTheme(); - setupAutosave(); setupFontSize(); - mConfig.setShouldPromptAutosave(false); } private void setupDarkTheme() { mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme()); } - private void setupAutosave() { - mAutosaveSwitch.setChecked(mConfig.getIsAutosaveEnabled()); - } - private void setupFontSize() { mFontSizeSpinner.setSelection(mConfig.getFontSize()); } @@ -53,12 +46,6 @@ public class SettingsActivity extends SimpleActivity { restartActivity(); } - @OnClick(R.id.settings_autosave_holder) - public void handleAutosave() { - mAutosaveSwitch.setChecked(!mAutosaveSwitch.isChecked()); - mConfig.setIsAutosaveEnabled(mAutosaveSwitch.isChecked()); - } - @OnItemSelected(R.id.settings_font_size) public void handleFontSize() { mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition()); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 1df8bd5e..56f3e032 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -37,32 +37,6 @@ - - - - - - - - - 42EYy@ILa0M5s>6LU8FOEP0!EMA1UJnE#X>H4|#tUDM{qm&kf2dMhR)ifj z8WUZ|7;_;tCIr>VOqfCg&;~EnCQz8@q32GR5=%FAqdn+F@^p=hssQl$U@002ovPDHLkV1jXsV!!|Z diff --git a/app/src/main/res/mipmap-mdpi/save.png b/app/src/main/res/mipmap-mdpi/save.png deleted file mode 100644 index 015062ed3b316909362e3bfe43579715a4f2c14e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+id`}n05R2ZcmmRqp6hvGD%@cNQ zTrf?MD{tY`DCrY!+h+!7)MX@<|M>91UCT6U&6_Q^vKIW^bNn|gNPwG~q2dAY{6@(2Ul)|NDzIgd>D5-Nv3R_&pT)_9!>hC0v RLqMw;JYD@<);T3K0RZw0JMaJi diff --git a/app/src/main/res/mipmap-xhdpi/save.png b/app/src/main/res/mipmap-xhdpi/save.png deleted file mode 100644 index adda095754f015a58403af02df101e7213f3fa2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D8=fwXAr*{ouiIy}ILNd;e0ik1 zL&59A`M*Vsf!~yN-&Ah(m2P6Y@~YRDtG;K#iRnrf@56a{K3{q4q*%J-j>M1L^E>wD z_G`*BEKt%ZU=9!xlW_2kcwqhg@J~+L1PJQf&&tujU~xgSfq^Aq(NdMD@Qa448^br9 zJv*meXvT?xG}dmujKXXo3#U&Y*@0w|JqSu;kW8`%L1_GX^wikkMku z+!nN<`{#6z$_n(rC9(4bD+|yj&iNr#+MqpM!jbj0K{JA|g)V3yf=0TarU+{5f*K+y z*9B$&4b&1r9bM2+1dVk;a}l)E1wrp9=N7a<6~#f$6D?x75&I%ZEatS z3r4ib$>}g=S;qtI3$1o(pck}Sr-AO#YLW)JV1q`lWa+;+-xWC5gj7%<=ZrvIc=k>%>fl|gI;!tRK{Z;84l|>e7(Vy4L%kU(lfKjiFI>oQ3X>ech^2hYjIl+l`2ky&>*QB4^6Teilen Teilen via Leerer Text kann nicht geteilt werden - Text gespeichert + Text gespeichert Einfache Notiz - Aktiviere automatisches Speichern - Abbrechen - Ungesicherte Änderungen - Diese Notiz enthält ungesicherte Änderungen. Möchtest du automatisches Speichern aktivieren? Einstellungen Dunkles Thema - Automatisches Speichern Note font size Small Normal diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2fb8f2ed..da723f31 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -6,17 +6,12 @@ Condividi Condividi via Impossibile condividere un testo vuoto - Testo salvato + Testo salvato Simple Note - Enable autosave - Cancel - Unsaved changes - Changes made to the note have not been saved. Do you want to enable autosave? Impostazioni Tema scuro - Autosalvataggio Note font size Small Normal diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c7080aed..871ed9e1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -6,17 +6,12 @@ 共有 共有... 空のテキストは共有できません - テキストを保存しました + テキストを保存しました シンプル メモ - Enable autosave - Cancel - Unsaved changes - Changes made to the note have not been saved. Do you want to enable autosave? 設定 ダークテーマ - 自動保存 Note font size Small Normal diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 31122579..9b9195cd 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -6,17 +6,12 @@ Dela Dela via Det går inte att dela utan text - Text sparad + Text sparad Simple Note - Enable autosave - Cancel - Unsaved changes - Changes made to the note have not been saved. Do you want to enable autosave? Inställningar Mörkt tema - Spara automatiskt Note font size Small Normal diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64cc6c12..5e6586e6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,17 +6,12 @@ Share Share via Cannot share empty text - Text Saved + Note Saved Simple Note - Enable autosave - Cancel - Unsaved changes - Changes made to the note have not been saved. Do you want to enable autosave? Settings Dark theme - Autosave Note font size Small Normal