Skip to content

Commit 6a5e7f5

Browse files
tibbitibbi
committed
permanently enable autosave
1 parent c43e4c1 commit 6a5e7f5

File tree

16 files changed

+12
-135
lines changed

16 files changed

+12
-135
lines changed

‎app/src/main/java/com/simplemobiletools/notes/Config.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ public void setIsDarkTheme(boolean isDarkTheme) {
3030
mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply();
3131
}
3232

33-
public boolean getIsAutosaveEnabled() {
34-
return mPrefs.getBoolean(Constants.AUTOSAVE, false);
35-
}
36-
37-
public void setIsAutosaveEnabled(boolean enabled) {
38-
mPrefs.edit().putBoolean(Constants.AUTOSAVE, enabled).apply();
39-
}
40-
41-
public boolean getShouldPromptAutosave() {
42-
return mPrefs.getBoolean(Constants.PROMPT_AUTOSAVE, true);
43-
}
44-
45-
public void setShouldPromptAutosave(boolean prompt) {
46-
mPrefs.edit().putBoolean(Constants.PROMPT_AUTOSAVE, prompt).apply();
47-
}
48-
4933
public int getFontSize() {
5034
return mPrefs.getInt(Constants.FONT_SIZE, Constants.FONT_SIZE_MEDIUM);
5135
}

‎app/src/main/java/com/simplemobiletools/notes/Constants.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ public class Constants {
77
public static final String PREFS_KEY = "Notes";
88
public static final String IS_FIRST_RUN = "is_first_run";
99
public static final String IS_DARK_THEME = "is_dark_theme";
10-
public static final String AUTOSAVE = "autosave";
11-
public static final String PROMPT_AUTOSAVE = "prompt_autosave";
1210
public static final String FONT_SIZE = "font_size";
1311
public static final String WIDGET_BG_COLOR = "widget_bg_color";
1412
public static final String WIDGET_TEXT_COLOR = "widget_text_color";

‎app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.simplemobiletools.notes.activities;
22

33
import android.content.Context;
4-
import android.content.DialogInterface;
54
import android.content.Intent;
65
import android.content.SharedPreferences;
76
import android.content.res.Resources;
87
import android.os.Bundle;
9-
import android.support.v7.app.AlertDialog;
108
import android.util.TypedValue;
119
import android.view.Menu;
1210
import android.view.MenuItem;
@@ -48,19 +46,7 @@ protected void onResume() {
4846
@Override
4947
protected void onPause() {
5048
super.onPause();
51-
if (mConfig.getIsAutosaveEnabled()) {
52-
saveText(false);
53-
}
54-
}
55-
56-
@Override
57-
public void onBackPressed() {
58-
if (mConfig.getShouldPromptAutosave() && !getCurrentNote().equals(getSavedNote())) {
59-
mConfig.setShouldPromptAutosave(false);
60-
displayAutosavePrompt();
61-
} else {
62-
super.onBackPressed();
63-
}
49+
saveText();
6450
}
6551

6652
@Override
@@ -72,18 +58,12 @@ protected void onDestroy() {
7258
@Override
7359
public boolean onCreateOptionsMenu(Menu menu) {
7460
getMenuInflater().inflate(R.menu.menu, menu);
75-
if (mConfig.getIsAutosaveEnabled())
76-
menu.findItem(R.id.save).setVisible(false);
77-
7861
return true;
7962
}
8063

8164
@Override
8265
public boolean onOptionsItemSelected(MenuItem item) {
8366
switch (item.getItemId()) {
84-
case R.id.save:
85-
saveText(true);
86-
return true;
8767
case R.id.share:
8868
shareText();
8969
return true;
@@ -103,30 +83,14 @@ public void newNoteClicked(View view) {
10383

10484
}
10585

106-
private void displayAutosavePrompt() {
107-
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
108-
alertDialog.setTitle(getString(R.string.unsaved_changes));
109-
alertDialog.setMessage(getString(R.string.autosave_prompt_msg));
110-
111-
alertDialog.setNegativeButton(R.string.cancel, null);
112-
alertDialog.setPositiveButton(R.string.enable_autosave, new DialogInterface.OnClickListener() {
113-
@Override
114-
public void onClick(DialogInterface dialog, int which) {
115-
mConfig.setIsAutosaveEnabled(true);
116-
supportInvalidateOptionsMenu();
117-
}
118-
});
119-
alertDialog.create().show();
120-
}
121-
122-
private void saveText(boolean showToast) {
123-
final String text = getCurrentNote();
124-
mPrefs.edit().putString(Constants.TEXT, text).apply();
125-
126-
if (showToast) {
127-
Utils.showToast(getApplicationContext(), R.string.text_saved);
86+
private void saveText() {
87+
final String newText = getCurrentNote();
88+
final String oldText = mPrefs.getString(Constants.TEXT, "");
89+
if (!newText.equals(oldText)) {
90+
Utils.showToast(getApplicationContext(), R.string.note_saved);
12891
}
12992

93+
mPrefs.edit().putString(Constants.TEXT, newText).apply();
13094
hideKeyboard();
13195
Utils.updateWidget(getApplicationContext());
13296
}

‎app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
public class SettingsActivity extends SimpleActivity {
1818
@BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch;
19-
@BindView(R.id.settings_autosave) SwitchCompat mAutosaveSwitch;
2019
@BindView(R.id.settings_font_size) AppCompatSpinner mFontSizeSpinner;
2120

2221
private static Config mConfig;
@@ -29,19 +28,13 @@ protected void onCreate(Bundle savedInstanceState) {
2928
ButterKnife.bind(this);
3029

3130
setupDarkTheme();
32-
setupAutosave();
3331
setupFontSize();
34-
mConfig.setShouldPromptAutosave(false);
3532
}
3633

3734
private void setupDarkTheme() {
3835
mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme());
3936
}
4037

41-
private void setupAutosave() {
42-
mAutosaveSwitch.setChecked(mConfig.getIsAutosaveEnabled());
43-
}
44-
4538
private void setupFontSize() {
4639
mFontSizeSpinner.setSelection(mConfig.getFontSize());
4740
}
@@ -53,12 +46,6 @@ public void handleDarkTheme() {
5346
restartActivity();
5447
}
5548

56-
@OnClick(R.id.settings_autosave_holder)
57-
public void handleAutosave() {
58-
mAutosaveSwitch.setChecked(!mAutosaveSwitch.isChecked());
59-
mConfig.setIsAutosaveEnabled(mAutosaveSwitch.isChecked());
60-
}
61-
6249
@OnItemSelected(R.id.settings_font_size)
6350
public void handleFontSize() {
6451
mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition());

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,6 @@
3737

3838
</RelativeLayout>
3939

40-
<RelativeLayout
41-
android:id="@+id/settings_autosave_holder"
42-
android:layout_width="match_parent"
43-
android:layout_height="wrap_content"
44-
android:layout_marginTop="@dimen/settings_padding"
45-
android:background="?attr/selectableItemBackground"
46-
android:padding="@dimen/activity_margin">
47-
48-
<TextView
49-
android:id="@+id/settings_autosave_label"
50-
android:layout_width="wrap_content"
51-
android:layout_height="wrap_content"
52-
android:layout_centerVertical="true"
53-
android:paddingLeft="@dimen/settings_padding"
54-
android:text="@string/autosave"/>
55-
56-
<android.support.v7.widget.SwitchCompat
57-
android:id="@+id/settings_autosave"
58-
android:layout_width="wrap_content"
59-
android:layout_height="wrap_content"
60-
android:layout_alignParentRight="true"
61-
android:background="@null"
62-
android:clickable="false"/>
63-
64-
</RelativeLayout>
65-
6640
<RelativeLayout
6741
android:id="@+id/settings_font_size_holder"
6842
android:layout_width="match_parent"

‎app/src/main/res/menu/menu.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
4-
<item
5-
android:id="@+id/save"
6-
android:icon="@mipmap/save"
7-
android:title="@string/save"
8-
app:showAsAction="ifRoom"/>
94
<item
105
android:id="@+id/share"
116
android:icon="@mipmap/share"

‎app/src/main/res/mipmap-hdpi/save.png‎

-247 Bytes
Binary file not shown.

‎app/src/main/res/mipmap-mdpi/save.png‎

-168 Bytes
Binary file not shown.

‎app/src/main/res/mipmap-xhdpi/save.png‎

-273 Bytes
Binary file not shown.

‎app/src/main/res/mipmap-xxhdpi/save.png‎

-391 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)