Skip to content

Commit e7566ca

Browse files
committed
use the Commons config
1 parent c6b81f4 commit e7566ca

File tree

2 files changed

+10
-39
lines changed

2 files changed

+10
-39
lines changed
Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,26 @@
11
package com.simplemobiletools.notes
22

33
import android.content.Context
4-
import android.content.SharedPreferences
5-
6-
class Config(context: Context) {
7-
private val mPrefs: SharedPreferences
4+
import com.simplemobiletools.commons.helpers.BaseConfig
85

6+
class Config(context: Context) : BaseConfig(context) {
97
companion object {
108
fun newInstance(context: Context) = Config(context)
119
}
1210

13-
init {
14-
mPrefs = context.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE)
15-
}
16-
17-
var isFirstRun: Boolean
18-
get() = mPrefs.getBoolean(IS_FIRST_RUN, true)
19-
set(firstRun) = mPrefs.edit().putBoolean(IS_FIRST_RUN, firstRun).apply()
20-
21-
var isDarkTheme: Boolean
22-
get() = mPrefs.getBoolean(IS_DARK_THEME, false)
23-
set(isDarkTheme) = mPrefs.edit().putBoolean(IS_DARK_THEME, isDarkTheme).apply()
24-
2511
var fontSize: Int
26-
get() = mPrefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM)
27-
set(size) = mPrefs.edit().putInt(FONT_SIZE, size).apply()
12+
get() = prefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM)
13+
set(size) = prefs.edit().putInt(FONT_SIZE, size).apply()
2814

2915
var gravity: Int
30-
get() = mPrefs.getInt(GRAVITY, GRAVITY_LEFT)
31-
set(size) = mPrefs.edit().putInt(GRAVITY, size).apply()
16+
get() = prefs.getInt(GRAVITY, GRAVITY_LEFT)
17+
set(size) = prefs.edit().putInt(GRAVITY, size).apply()
3218

3319
var currentNoteId: Int
34-
get() = mPrefs.getInt(CURRENT_NOTE_ID, 1)
35-
set(id) = mPrefs.edit().putInt(CURRENT_NOTE_ID, id).apply()
20+
get() = prefs.getInt(CURRENT_NOTE_ID, 1)
21+
set(id) = prefs.edit().putInt(CURRENT_NOTE_ID, id).apply()
3622

3723
var widgetNoteId: Int
38-
get() = mPrefs.getInt(WIDGET_NOTE_ID, 1)
39-
set(id) = mPrefs.edit().putInt(WIDGET_NOTE_ID, id).apply()
24+
get() = prefs.getInt(WIDGET_NOTE_ID, 1)
25+
set(id) = prefs.edit().putInt(WIDGET_NOTE_ID, id).apply()
4026
}

app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.simplemobiletools.notes.activities
22

33
import android.os.Bundle
4-
import android.support.v4.app.TaskStackBuilder
54
import android.view.View
65
import android.widget.AdapterView
76
import android.widget.ArrayAdapter
@@ -16,21 +15,11 @@ class SettingsActivity : SimpleActivity() {
1615
super.onCreate(savedInstanceState)
1716
setContentView(R.layout.activity_settings)
1817

19-
setupDarkTheme()
2018
setupFontSize()
2119
setupWidgetNote()
2220
setupGravity()
2321
}
2422

25-
private fun setupDarkTheme() {
26-
settings_dark_theme.isChecked = config.isDarkTheme
27-
settings_dark_theme_holder.setOnClickListener {
28-
settings_dark_theme.toggle()
29-
config.isDarkTheme = settings_dark_theme.isChecked
30-
restartActivity()
31-
}
32-
}
33-
3423
private fun setupFontSize() {
3524
settings_font_size.setSelection(config.fontSize)
3625
settings_font_size.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -95,8 +84,4 @@ class SettingsActivity : SimpleActivity() {
9584
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
9685
return adapter
9786
}
98-
99-
private fun restartActivity() {
100-
TaskStackBuilder.create(applicationContext).addNextIntentWithParentStack(intent).startActivities()
101-
}
10287
}

0 commit comments

Comments
 (0)