Skip to content

Commit a3a3fbd

Browse files
committed
convert SimpleActivity to kotlin
1 parent ff8f075 commit a3a3fbd

File tree

4 files changed

+37
-40
lines changed

4 files changed

+37
-40
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
4545

4646
mDb = DBHelper.newInstance(getApplicationContext());
4747
mNotes = mDb.getNotes();
48-
updateSelectedNote(mConfig.getCurrentNoteId());
48+
updateSelectedNote(getConfig().getCurrentNoteId());
4949
}
5050

5151
@Override
@@ -64,7 +64,7 @@ protected void onPause() {
6464
@Override
6565
protected void onDestroy() {
6666
super.onDestroy();
67-
mConfig.setFirstRun(false);
67+
getConfig().setFirstRun(false);
6868
}
6969

7070
@Override
@@ -117,7 +117,7 @@ private void updateSelectedNote(int id) {
117117
mCurrentNote = mDb.getNote(id);
118118
mNotes = mDb.getNotes();
119119
if (mCurrentNote != null) {
120-
mConfig.setCurrentNoteId(id);
120+
getConfig().setCurrentNoteId(id);
121121
mNotesView.setText(mCurrentNote.getValue());
122122
mCurrNoteTitle.setText(mCurrentNote.getTitle());
123123
}
@@ -185,7 +185,7 @@ private void deleteNote() {
185185

186186
final int firstNoteId = mNotes.get(0).getId();
187187
updateSelectedNote(firstNoteId);
188-
mConfig.setWidgetNoteId(firstNoteId);
188+
getConfig().setWidgetNoteId(firstNoteId);
189189
invalidateOptionsMenu();
190190
}
191191

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ public class SettingsActivity extends SimpleActivity {
2222
protected void onCreate(Bundle savedInstanceState) {
2323
super.onCreate(savedInstanceState);
2424
setContentView(R.layout.activity_settings);
25-
mConfig = Config.Companion.newInstance(getApplicationContext());
25+
setConfig(Config.Companion.newInstance(getApplicationContext()));
2626
ButterKnife.bind(this);
2727

2828
setupDarkTheme();
2929
setupFontSize();
3030
}
3131

3232
private void setupDarkTheme() {
33-
mDarkThemeSwitch.setChecked(mConfig.isDarkTheme());
33+
mDarkThemeSwitch.setChecked(getConfig().isDarkTheme());
3434
}
3535

3636
private void setupFontSize() {
37-
mFontSizeSpinner.setSelection(mConfig.getFontSize());
37+
mFontSizeSpinner.setSelection(getConfig().getFontSize());
3838
}
3939

4040
@OnClick(R.id.settings_dark_theme_holder)
4141
public void handleDarkTheme() {
4242
mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
43-
mConfig.setDarkTheme(mDarkThemeSwitch.isChecked());
43+
getConfig().setDarkTheme(mDarkThemeSwitch.isChecked());
4444
restartActivity();
4545
}
4646

4747
@OnItemSelected(R.id.settings_font_size)
4848
public void handleFontSize() {
49-
mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition());
49+
getConfig().setFontSize(mFontSizeSpinner.getSelectedItemPosition());
5050
Utils.INSTANCE.updateWidget(getApplicationContext());
5151
}
5252

app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.simplemobiletools.notes.activities
2+
3+
import android.os.Bundle
4+
import android.support.v7.app.AppCompatActivity
5+
import android.view.MenuItem
6+
7+
import com.simplemobiletools.notes.Config
8+
import com.simplemobiletools.notes.R
9+
10+
open class SimpleActivity : AppCompatActivity() {
11+
lateinit var config: Config
12+
13+
override fun onCreate(savedInstanceState: Bundle?) {
14+
config = Config.newInstance(applicationContext)
15+
setTheme(if (config.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
16+
super.onCreate(savedInstanceState)
17+
}
18+
19+
override fun onOptionsItemSelected(item: MenuItem): Boolean {
20+
return when (item.itemId) {
21+
android.R.id.home -> {
22+
finish()
23+
true
24+
}
25+
else -> super.onOptionsItemSelected(item)
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)