Skip to content

Commit 2ed7964

Browse files
naveensinghnaveensingh
committed
Switch to KTX extension for preferences
1 parent 0075e5b commit 2ed7964

File tree

1 file changed

+39
-33
lines changed
  • app/src/main/kotlin/org/fossify/clock/helpers

1 file changed

+39
-33
lines changed

‎app/src/main/kotlin/org/fossify/clock/helpers/Config.kt‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,76 +20,81 @@ class Config(context: Context) : BaseConfig(context) {
2020

2121
var selectedTimeZones: Set<String>
2222
get() = prefs.getStringSet(SELECTED_TIME_ZONES, HashSet())!!
23-
set(selectedTimeZones) = prefs.edit().putStringSet(SELECTED_TIME_ZONES, selectedTimeZones)
24-
.apply()
23+
set(selectedTimeZones) = prefs.edit { putStringSet(SELECTED_TIME_ZONES, selectedTimeZones) }
2524

2625
var editedTimeZoneTitles: Set<String>
2726
get() = prefs.getStringSet(EDITED_TIME_ZONE_TITLES, HashSet())!!
28-
set(editedTimeZoneTitles) = prefs.edit()
29-
.putStringSet(EDITED_TIME_ZONE_TITLES, editedTimeZoneTitles).apply()
27+
set(editedTimeZoneTitles) = prefs.edit {
28+
putStringSet(EDITED_TIME_ZONE_TITLES, editedTimeZoneTitles)
29+
}
3030

3131
var timerSeconds: Int
3232
get() = prefs.getInt(TIMER_SECONDS, 300)
33-
set(lastTimerSeconds) = prefs.edit().putInt(TIMER_SECONDS, lastTimerSeconds).apply()
33+
set(lastTimerSeconds) = prefs.edit { putInt(TIMER_SECONDS, lastTimerSeconds) }
3434

3535
var timerVibrate: Boolean
3636
get() = prefs.getBoolean(TIMER_VIBRATE, false)
37-
set(timerVibrate) = prefs.edit().putBoolean(TIMER_VIBRATE, timerVibrate).apply()
37+
set(timerVibrate) = prefs.edit { putBoolean(TIMER_VIBRATE, timerVibrate) }
3838

3939
var timerSoundUri: String
4040
get() = prefs.getString(
4141
TIMER_SOUND_URI,
4242
context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM).uri
4343
)!!
44-
set(timerSoundUri) = prefs.edit().putString(TIMER_SOUND_URI, timerSoundUri).apply()
44+
set(timerSoundUri) = prefs.edit { putString(TIMER_SOUND_URI, timerSoundUri) }
4545

4646
var timerSoundTitle: String
4747
get() = prefs.getString(
4848
TIMER_SOUND_TITLE,
4949
context.getDefaultAlarmTitle(RingtoneManager.TYPE_ALARM)
5050
)!!
51-
set(timerSoundTitle) = prefs.edit().putString(TIMER_SOUND_TITLE, timerSoundTitle).apply()
51+
set(timerSoundTitle) = prefs.edit { putString(TIMER_SOUND_TITLE, timerSoundTitle) }
5252

5353
var timerMaxReminderSecs: Int
5454
get() = prefs.getInt(TIMER_MAX_REMINDER_SECS, DEFAULT_MAX_TIMER_REMINDER_SECS)
55-
set(timerMaxReminderSecs) = prefs.edit()
56-
.putInt(TIMER_MAX_REMINDER_SECS, timerMaxReminderSecs).apply()
55+
set(timerMaxReminderSecs) = prefs.edit {
56+
putInt(TIMER_MAX_REMINDER_SECS, timerMaxReminderSecs)
57+
}
5758

5859
var timerLabel: String?
5960
get() = prefs.getString(TIMER_LABEL, null)
60-
set(label) = prefs.edit().putString(TIMER_LABEL, label).apply()
61+
set(label) = prefs.edit { putString(TIMER_LABEL, label) }
6162

6263
var toggleStopwatch: Boolean
6364
get() = prefs.getBoolean(TOGGLE_STOPWATCH, false)
64-
set(toggleStopwatch) = prefs.edit().putBoolean(TOGGLE_STOPWATCH, toggleStopwatch).apply()
65+
set(toggleStopwatch) = prefs.edit { putBoolean(TOGGLE_STOPWATCH, toggleStopwatch) }
6566

6667
var alarmSort: Int
6768
get() = prefs.getInt(ALARMS_SORT_BY, SORT_BY_CREATION_ORDER)
68-
set(alarmSort) = prefs.edit().putInt(ALARMS_SORT_BY, alarmSort).apply()
69+
set(alarmSort) = prefs.edit { putInt(ALARMS_SORT_BY, alarmSort) }
6970

7071
var alarmsCustomSorting: String
7172
get() = prefs.getString(ALARMS_CUSTOM_SORTING, "")!!
72-
set(alarmsCustomSorting) = prefs.edit()
73-
.putString(ALARMS_CUSTOM_SORTING, alarmsCustomSorting).apply()
73+
set(alarmsCustomSorting) = prefs.edit {
74+
putString(ALARMS_CUSTOM_SORTING, alarmsCustomSorting)
75+
}
7476

7577
var timerSort: Int
7678
get() = prefs.getInt(TIMERS_SORT_BY, SORT_BY_CREATION_ORDER)
77-
set(timerSort) = prefs.edit().putInt(TIMERS_SORT_BY, timerSort).apply()
79+
set(timerSort) = prefs.edit { putInt(TIMERS_SORT_BY, timerSort) }
7880

7981
var timersCustomSorting: String
8082
get() = prefs.getString(TIMERS_CUSTOM_SORTING, "")!!
81-
set(timersCustomSorting) = prefs.edit()
82-
.putString(TIMERS_CUSTOM_SORTING, timersCustomSorting).apply()
83+
set(timersCustomSorting) = prefs.edit {
84+
putString(TIMERS_CUSTOM_SORTING, timersCustomSorting)
85+
}
8386

8487
var alarmMaxReminderSecs: Int
8588
get() = prefs.getInt(ALARM_MAX_REMINDER_SECS, DEFAULT_MAX_ALARM_REMINDER_SECS)
86-
set(alarmMaxReminderSecs) = prefs.edit()
87-
.putInt(ALARM_MAX_REMINDER_SECS, alarmMaxReminderSecs).apply()
89+
set(alarmMaxReminderSecs) = prefs.edit {
90+
putInt(ALARM_MAX_REMINDER_SECS, alarmMaxReminderSecs)
91+
}
8892

8993
var increaseVolumeGradually: Boolean
9094
get() = prefs.getBoolean(INCREASE_VOLUME_GRADUALLY, true)
91-
set(increaseVolumeGradually) = prefs.edit()
92-
.putBoolean(INCREASE_VOLUME_GRADUALLY, increaseVolumeGradually).apply()
95+
set(increaseVolumeGradually) = prefs.edit {
96+
putBoolean(INCREASE_VOLUME_GRADUALLY, increaseVolumeGradually)
97+
}
9398

9499
var alarmLastConfig: Alarm?
95100
get() = prefs.getString(ALARM_LAST_CONFIG, null)?.let { lastAlarm ->
@@ -99,11 +104,11 @@ class Config(context: Context) : BaseConfig(context) {
99104
} else {
100105
gson.fromJson(lastAlarm, Alarm::class.java)
101106
}
102-
} catch (e: Exception) {
107+
} catch (_: Exception) {
103108
null
104109
}
105110
}
106-
set(alarm) = prefs.edit().putString(ALARM_LAST_CONFIG, gson.toJson(alarm)).apply()
111+
set(alarm) = prefs.edit { putString(ALARM_LAST_CONFIG, gson.toJson(alarm)) }
107112

108113
var timerLastConfig: Timer?
109114
get() = prefs.getString(TIMER_LAST_CONFIG, null)?.let { lastTimer ->
@@ -113,30 +118,31 @@ class Config(context: Context) : BaseConfig(context) {
113118
} else {
114119
gson.fromJson(lastTimer, Timer::class.java)
115120
}
116-
} catch (e: Exception) {
121+
} catch (_: Exception) {
117122
null
118123
}
119124
}
120-
set(timer) = prefs.edit().putString(TIMER_LAST_CONFIG, gson.toJson(timer)).apply()
125+
set(timer) = prefs.edit { putString(TIMER_LAST_CONFIG, gson.toJson(timer)) }
121126

122127
var timerChannelId: String?
123128
get() = prefs.getString(TIMER_CHANNEL_ID, null)
124-
set(id) = prefs.edit().putString(TIMER_CHANNEL_ID, id).apply()
129+
set(id) = prefs.edit { putString(TIMER_CHANNEL_ID, id) }
125130

126131
var stopwatchLapsSort: Int
127132
get() = prefs.getInt(STOPWATCH_LAPS_SORT_BY, SORT_BY_LAP or SORT_DESCENDING)
128-
set(stopwatchLapsSort) = prefs.edit().putInt(STOPWATCH_LAPS_SORT_BY, stopwatchLapsSort)
129-
.apply()
133+
set(stopwatchLapsSort) = prefs.edit { putInt(STOPWATCH_LAPS_SORT_BY, stopwatchLapsSort) }
130134

131135
var wasInitialWidgetSetUp: Boolean
132136
get() = prefs.getBoolean(WAS_INITIAL_WIDGET_SET_UP, false)
133-
set(wasInitialWidgetSetUp) = prefs.edit()
134-
.putBoolean(WAS_INITIAL_WIDGET_SET_UP, wasInitialWidgetSetUp).apply()
137+
set(wasInitialWidgetSetUp) = prefs.edit {
138+
putBoolean(WAS_INITIAL_WIDGET_SET_UP, wasInitialWidgetSetUp)
139+
}
135140

136141
var lastDataExportPath: String
137142
get() = prefs.getString(LAST_DATA_EXPORT_PATH, "")!!
138-
set(lastDataExportPath) = prefs.edit().putString(LAST_DATA_EXPORT_PATH, lastDataExportPath)
139-
.apply()
143+
set(lastDataExportPath) = prefs.edit {
144+
putString(LAST_DATA_EXPORT_PATH, lastDataExportPath)
145+
}
140146

141147
@Deprecated("Remove this method in future releases")
142148
var migrateFirstDayOfWeek: Boolean

0 commit comments

Comments
 (0)