fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-02-09 16:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

convert SimpleActivity to kotlin

Browse Source
This commit is contained in:
tibbi 2016-11-13 23:50:09 +01:00
parent ff8f075e5c
commit a3a3fbd99c
4 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
View File

@ -45,7 +45,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
mDb = DBHelper.newInstance(getApplicationContext()); mDb = DBHelper.newInstance(getApplicationContext());
mNotes = mDb.getNotes(); mNotes = mDb.getNotes();
updateSelectedNote(mConfig.getCurrentNoteId()); updateSelectedNote(getConfig().getCurrentNoteId());
} }
@Override @Override
@ -64,7 +64,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
mConfig.setFirstRun(false); getConfig().setFirstRun(false);
} }
@Override @Override
@ -117,7 +117,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
mCurrentNote = mDb.getNote(id); mCurrentNote = mDb.getNote(id);
mNotes = mDb.getNotes(); mNotes = mDb.getNotes();
if (mCurrentNote != null) { if (mCurrentNote != null) {
mConfig.setCurrentNoteId(id); getConfig().setCurrentNoteId(id);
mNotesView.setText(mCurrentNote.getValue()); mNotesView.setText(mCurrentNote.getValue());
mCurrNoteTitle.setText(mCurrentNote.getTitle()); mCurrNoteTitle.setText(mCurrentNote.getTitle());
} }
@ -185,7 +185,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
final int firstNoteId = mNotes.get(0).getId(); final int firstNoteId = mNotes.get(0).getId();
updateSelectedNote(firstNoteId); updateSelectedNote(firstNoteId);
mConfig.setWidgetNoteId(firstNoteId); getConfig().setWidgetNoteId(firstNoteId);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }

10
app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java
View File

@ -22,7 +22,7 @@ public class SettingsActivity extends SimpleActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
mConfig = Config.Companion.newInstance(getApplicationContext()); setConfig(Config.Companion.newInstance(getApplicationContext()));
ButterKnife.bind(this); ButterKnife.bind(this);
setupDarkTheme(); setupDarkTheme();
@ -30,23 +30,23 @@ public class SettingsActivity extends SimpleActivity {
} }
private void setupDarkTheme() { private void setupDarkTheme() {
mDarkThemeSwitch.setChecked(mConfig.isDarkTheme()); mDarkThemeSwitch.setChecked(getConfig().isDarkTheme());
} }
private void setupFontSize() { private void setupFontSize() {
mFontSizeSpinner.setSelection(mConfig.getFontSize()); mFontSizeSpinner.setSelection(getConfig().getFontSize());
} }
@OnClick(R.id.settings_dark_theme_holder) @OnClick(R.id.settings_dark_theme_holder)
public void handleDarkTheme() { public void handleDarkTheme() {
mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked()); mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
mConfig.setDarkTheme(mDarkThemeSwitch.isChecked()); getConfig().setDarkTheme(mDarkThemeSwitch.isChecked());
restartActivity(); restartActivity();
} }
@OnItemSelected(R.id.settings_font_size) @OnItemSelected(R.id.settings_font_size)
public void handleFontSize() { public void handleFontSize() {
mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition()); getConfig().setFontSize(mFontSizeSpinner.getSelectedItemPosition());
Utils.INSTANCE.updateWidget(getApplicationContext()); Utils.INSTANCE.updateWidget(getApplicationContext());
} }

31
app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java
View File

@ -1,31 +0,0 @@
package com.simplemobiletools.notes.activities;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import com.simplemobiletools.notes.Config;
import com.simplemobiletools.notes.R;
public class SimpleActivity extends AppCompatActivity {
protected Config mConfig;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
mConfig = Config.Companion.newInstance(getApplicationContext());
setTheme(mConfig.isDarkTheme() ? R.style.AppTheme_Dark : R.style.AppTheme);
super.onCreate(savedInstanceState);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
}

28
app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt Normal file
View File

@ -0,0 +1,28 @@
package com.simplemobiletools.notes.activities
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.MenuItem
import com.simplemobiletools.notes.Config
import com.simplemobiletools.notes.R
open class SimpleActivity : AppCompatActivity() {
lateinit var config: Config
override fun onCreate(savedInstanceState: Bundle?) {
config = Config.newInstance(applicationContext)
setTheme(if (config.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
super.onCreate(savedInstanceState)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
android.R.id.home -> {
finish()
true
}
else -> super.onOptionsItemSelected(item)
}
}
}