Skip to content

Commit bbfff11

Browse files
committed
refactor code
1 parent 0c1cd72 commit bbfff11

File tree

1 file changed

+14
-30
lines changed

1 file changed

+14
-30
lines changed

app/src/main/java/com/jecelyin/editor/v2/ui/activities/EditorActivity.java

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.graphics.drawable.Drawable;
2525
import android.net.Uri;
2626
import android.os.Bundle;
27-
import android.os.PersistableBundle;
2827
import android.support.annotation.IdRes;
2928
import android.support.annotation.NonNull;
3029
import android.support.annotation.Nullable;
@@ -109,31 +108,17 @@ public class EditorActivity extends FullScreenActivity
109108

110109
private TabManager mTabManager;
111110

112-
private Preferences preferences;
111+
private Preferences mPreferences;
113112
private ClusterCommand clusterCommand;
114113
private MenuManager mMenuManager;
115114
private long mExitTime;
116115
private SlidingUpPanelLayout mSlidingUpPanelLayout;
117116
private DiagnosticPresenter mDiagnosticPresenter;
118117

119-
@Override
120-
protected void onRestoreInstanceState(Bundle savedInstanceState) {
121-
try {
122-
super.onRestoreInstanceState(savedInstanceState);
123-
} catch (Exception e) {
124-
DLog.d(e); //ignore exception: Unmarshalling unknown type code 7602281 at offset 58340
125-
}
126-
}
127-
128-
@Override
129-
public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) {
130-
super.onSaveInstanceState(outState, outPersistentState);
131-
}
132-
133118
@Override
134119
protected void onCreate(Bundle savedInstanceState) {
135120
super.onCreate(savedInstanceState);
136-
preferences = Preferences.getInstance(this);
121+
mPreferences = Preferences.getInstance(this);
137122
MenuManager.init(this);
138123

139124
setContentView(R.layout.activity_main);
@@ -175,11 +160,10 @@ public void onClick(View v, String text) {
175160
}
176161

177162
private void bindPreferences() {
178-
// mEditorPager.setOffscreenPageLimit(preferences.getMaxEditor());
179-
mDrawerLayout.setKeepScreenOn(preferences.isKeepScreenOn());
180-
mDrawerLayout.setDrawerLockMode(preferences.isEnabledDrawers() ? DrawerLayout.LOCK_MODE_UNDEFINED : DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
181-
mSymbolBarLayout.setVisibility(preferences.isReadOnly() ? View.GONE : View.VISIBLE);
182-
preferences.registerOnSharedPreferenceChangeListener(this);
163+
mDrawerLayout.setKeepScreenOn(mPreferences.isKeepScreenOn());
164+
mDrawerLayout.setDrawerLockMode(mPreferences.isEnabledDrawers() ? DrawerLayout.LOCK_MODE_UNDEFINED : DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
165+
mSymbolBarLayout.setVisibility(mPreferences.isReadOnly() ? View.GONE : View.VISIBLE);
166+
mPreferences.registerOnSharedPreferenceChangeListener(this);
183167
}
184168

185169
@Override
@@ -192,23 +176,23 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
192176
break;
193177
case Preferences.KEY_ENABLE_HIGHLIGHT:
194178
Command command = new Command(Command.CommandEnum.HIGHLIGHT);
195-
command.object = preferences.isHighlight() ? null : Catalog.DEFAULT_MODE_NAME;
179+
command.object = mPreferences.isHighlight() ? null : Catalog.DEFAULT_MODE_NAME;
196180
doClusterCommand(command);
197181
break;
198182
case Preferences.KEY_SCREEN_ORIENTATION:
199183
setScreenOrientation();
200184
break;
201185
case Preferences.KEY_PREF_ENABLE_DRAWERS:
202-
mDrawerLayout.setDrawerLockMode(preferences.isEnabledDrawers() ? DrawerLayout.LOCK_MODE_UNDEFINED : DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
186+
mDrawerLayout.setDrawerLockMode(mPreferences.isEnabledDrawers() ? DrawerLayout.LOCK_MODE_UNDEFINED : DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
203187
break;
204188
case Preferences.KEY_READ_ONLY:
205-
mSymbolBarLayout.setVisibility(preferences.isReadOnly() ? View.GONE : View.VISIBLE);
189+
mSymbolBarLayout.setVisibility(mPreferences.isReadOnly() ? View.GONE : View.VISIBLE);
206190
break;
207191
}
208192
}
209193

210194
private void setScreenOrientation() {
211-
int orgi = preferences.getScreenOrientation();
195+
int orgi = mPreferences.getScreenOrientation();
212196

213197
if (Preferences.SCREEN_ORIENTATION_AUTO == orgi) {
214198
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
@@ -419,15 +403,15 @@ public void run() {
419403
new ChangeThemeDialog(getContext()).show();
420404
break;
421405
case R.id.m_fullscreen:
422-
boolean fullscreenMode = preferences.isFullScreenMode();
423-
preferences.setFullScreenMode(!fullscreenMode);
406+
boolean fullscreenMode = mPreferences.isFullScreenMode();
407+
mPreferences.setFullScreenMode(!fullscreenMode);
424408
UIUtils.toast(this, fullscreenMode
425409
? R.string.disabled_fullscreen_mode_message
426410
: R.string.enable_fullscreen_mode_message);
427411
break;
428412
case R.id.m_readonly:
429-
boolean readOnly = !preferences.isReadOnly();
430-
preferences.setReadOnly(readOnly);
413+
boolean readOnly = !mPreferences.isReadOnly();
414+
mPreferences.setReadOnly(readOnly);
431415
doClusterCommand(new Command(Command.CommandEnum.READONLY_MODE));
432416
break;
433417
case R.id.m_encoding:

0 commit comments

Comments
 (0)