diff --git a/app/src/main/java/me/lucky/wasted/MainActivity.kt b/app/src/main/java/me/lucky/wasted/MainActivity.kt index 16be669..40c4024 100644 --- a/app/src/main/java/me/lucky/wasted/MainActivity.kt +++ b/app/src/main/java/me/lucky/wasted/MainActivity.kt @@ -161,12 +161,12 @@ open class MainActivity : AppCompatActivity() { MaterialAlertDialogBuilder(this) .setMultiChoiceItems( strings.toTypedArray(), - values.map { launchers.and(it.flag) != 0 }.toBooleanArray(), + values.map { launchers.and(it.value) != 0 }.toBooleanArray(), ) { _, index, isChecked -> - val value = values[index] + val flag = values[index] launchers = when (isChecked) { - true -> launchers.or(value.flag) - false -> launchers.and(value.flag.inv()) + true -> launchers.or(flag.value) + false -> launchers.and(flag.value.inv()) } } .setPositiveButton(android.R.string.ok) { _, _ -> @@ -214,11 +214,11 @@ open class MainActivity : AppCompatActivity() { private fun setLaunchersState(value: Boolean) { if (value) { val launchers = prefs.launchers - setPanicKitState(launchers.and(Launcher.PANIC_KIT.flag) != 0) - setQSTileState(launchers.and(Launcher.TILE.flag) != 0) - shortcut.setState(launchers.and(Launcher.SHORTCUT.flag) != 0) - setCodeReceiverState(launchers.and(Launcher.BROADCAST.flag) != 0) - setNotificationListenerState(launchers.and(Launcher.NOTIFICATION.flag) != 0) + setPanicKitState(launchers.and(Launcher.PANIC_KIT.value) != 0) + setQSTileState(launchers.and(Launcher.TILE.value) != 0) + shortcut.setState(launchers.and(Launcher.SHORTCUT.value) != 0) + setCodeReceiverState(launchers.and(Launcher.BROADCAST.value) != 0) + setNotificationListenerState(launchers.and(Launcher.NOTIFICATION.value) != 0) } else { setPanicKitState(false) setQSTileState(false) diff --git a/app/src/main/java/me/lucky/wasted/Preferences.kt b/app/src/main/java/me/lucky/wasted/Preferences.kt index c593958..8779ff3 100644 --- a/app/src/main/java/me/lucky/wasted/Preferences.kt +++ b/app/src/main/java/me/lucky/wasted/Preferences.kt @@ -43,7 +43,7 @@ class Preferences(ctx: Context) { var launchers: Int get() = prefs.getInt( LAUNCHERS, - if (prefs.getBoolean(CODE_ENABLED, false)) Launcher.BROADCAST.flag else 0, + if (prefs.getBoolean(CODE_ENABLED, false)) Launcher.BROADCAST.value else 0, ) set(value) = prefs.edit { putInt(LAUNCHERS, value) } @@ -78,7 +78,7 @@ class Preferences(ctx: Context) { set(value) = prefs.edit { putInt(WIPE_ON_INACTIVITY_DAYS, value) } } -enum class Launcher(val flag: Int) { +enum class Launcher(val value: Int) { PANIC_KIT(1), TILE(1 shl 1), SHORTCUT(1 shl 2),