isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Preserve selections when reopening EditSettingActivity (#524)

Browse Source
This commit is contained in:
Mick Dekkers
2019-11-10 15:41:10 +01:00
committed by Alinson Xavier
parent 0790961bb5
commit a69fb369df
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
View File

@@ -35,8 +35,10 @@ class EditSettingActivity : BaseActivity() {
.setCompletedAllowed(true)
.build())
val args = SettingUtils.parseIntent(this.intent, habits)
val controller = EditSettingController(this)
val rootView = EditSettingRootView(this, habits, controller)
val rootView = EditSettingRootView(this, habits, controller, args)
val screen = BaseScreen(this)
screen.setRootView(rootView)
setScreen(screen)

8
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
View File

@@ -34,7 +34,8 @@ import java.util.*
class EditSettingRootView(
context: Context,
private val habitList: HabitList,
private val controller: EditSettingController
private val controller: EditSettingController,
args: SettingUtils.Arguments?
) : BaseRootView(context) {
@BindView(R.id.toolbar)
@@ -50,6 +51,11 @@ class EditSettingRootView(
addView(inflate(getContext(), R.layout.automation, null))
ButterKnife.bind(this)
populateHabitSpinner()
args?.let {
habitSpinner.setSelection(habitList.indexOf(it.habit))
actionSpinner.setSelection(it.action)
}
}
override fun getToolbar(): Toolbar {

12
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
View File

@@ -44,7 +44,7 @@ class FireSettingReceiver : BroadcastReceiver() {
.habitsApplicationComponent(app.component)
.build()
allHabits = app.component.habitList
val args = parseIntent(intent) ?: return
val args = SettingUtils.parseIntent(intent, allHabits) ?: return
val timestamp = DateUtils.getToday()
val controller = component.widgetController
@@ -55,19 +55,9 @@ class FireSettingReceiver : BroadcastReceiver() {
}
}
private fun parseIntent(intent: Intent): Arguments? {
val bundle = intent.getBundleExtra(EXTRA_BUNDLE) ?: return null
val action = bundle.getInt("action")
if (action < 0 || action > 2) return null
val habit = allHabits.getById(bundle.getLong("habit")) ?: return null
return Arguments(action, habit)
}
@ReceiverScope
@Component(dependencies = arrayOf(HabitsApplicationComponent::class))
internal interface ReceiverComponent {
val widgetController: WidgetBehavior
}
private class Arguments(var action: Int, var habit: Habit)
}

18
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt Normal file
View File

@@ -0,0 +1,18 @@
package org.isoron.uhabits.automation
import android.content.Intent
import org.isoron.uhabits.core.models.Habit
import org.isoron.uhabits.core.models.HabitList
object SettingUtils {
@JvmStatic
fun parseIntent(intent: Intent, allHabits: HabitList): Arguments? {
val bundle = intent.getBundleExtra(EXTRA_BUNDLE) ?: return null
val action = bundle.getInt("action")
if (action < 0 || action > 2) return null
val habit = allHabits.getById(bundle.getLong("habit")) ?: return null
return Arguments(action, habit)
}
class Arguments(var action: Int, var habit: Habit)
}