Remove ShowHabitScreen and ShowHabitBehavior

2025-12-07 09:38:52 -06:00 · 2021-01-02 00:45:16 -06:00
parent 162eac3bdf
commit cb6843e08b
40 changed files with 658 additions and 686 deletions
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
@@ -20,14 +20,14 @@ package org.isoron.uhabits.activities

 import org.isoron.uhabits.AndroidDirFinder
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuBehavior
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 import java.io.File
 import javax.inject.Inject

 class HabitsDirFinder @Inject
 constructor(
    private val androidDirFinder: AndroidDirFinder
-) : ShowHabitMenuBehavior.System, ListHabitsBehavior.DirFinder {
+) : ShowHabitMenuPresenter.System, ListHabitsBehavior.DirFinder {

    override fun getCSVOutputDir(): File {
        return androidDirFinder.getFilesDir("CSV")!!
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
@@ -37,7 +37,7 @@ import org.isoron.uhabits.inject.*;
@AutoFactory(allowSubclasses = true)
 public class ConfirmDeleteDialog extends AlertDialog
 {
-    protected ConfirmDeleteDialog(@Provided @ActivityContext Context context,
+    public ConfirmDeleteDialog(@Provided @ActivityContext Context context,
                                  @NonNull OnConfirmedCallback callback,
                                  int quantity)
    {
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
@@ -91,10 +91,9 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
    }

    private fun refreshData() {
-        val model = HistoryCardPresenter().present(
+        val model = HistoryCardPresenter.buildState(
            habit,
            preferences.firstWeekday,
-            preferences.isSkipEnabled,
            theme = LightTheme()
        )
        chart?.series = model.series
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -20,6 +20,7 @@ package org.isoron.uhabits.activities.habits.show

 import android.content.ContentUris
 import android.os.Bundle
+import android.view.HapticFeedbackConstants
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
@@ -28,33 +29,39 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.isoron.uhabits.AndroidDirFinder
 import org.isoron.uhabits.HabitsApplication
+import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.HabitsDirFinder
-import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialogFactory
+import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitBehavior
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuBehavior
+import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
+import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
+import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.intents.IntentFactory
+import org.isoron.uhabits.utils.showMessage
+import org.isoron.uhabits.utils.showSendFileScreen
+import org.isoron.uhabits.widgets.WidgetUpdater

 class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {

-    val presenter = ShowHabitPresenter()
-
    private lateinit var commandRunner: CommandRunner
    private lateinit var menu: ShowHabitMenu
    private lateinit var view: ShowHabitView
    private lateinit var habit: Habit
    private lateinit var preferences: Preferences
    private lateinit var themeSwitcher: AndroidThemeSwitcher
-    private lateinit var behavior: ShowHabitBehavior
+    private lateinit var widgetUpdater: WidgetUpdater

    private val scope = CoroutineScope(Dispatchers.Main)
+    private lateinit var presenter: ShowHabitPresenter
+    private val screen = Screen()

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -64,21 +71,12 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
        habit = habitList.getById(ContentUris.parseId(intent.data!!))!!
        preferences = appComponent.preferences
        commandRunner = appComponent.commandRunner
+        widgetUpdater = appComponent.widgetUpdater
+
        themeSwitcher = AndroidThemeSwitcher(this, preferences)
        themeSwitcher.apply()

-        view = ShowHabitView(this)
-
-        val screen = ShowHabitScreen(
-            activity = this,
-            confirmDeleteDialogFactory = ConfirmDeleteDialogFactory { this },
-            habit = habit,
-            intentFactory = IntentFactory(),
-            numberPickerFactory = NumberPickerFactory(this),
-            widgetUpdater = appComponent.widgetUpdater,
-        )
-
-        behavior = ShowHabitBehavior(
+        presenter = ShowHabitPresenter(
            commandRunner = commandRunner,
            habit = habit,
            habitList = habitList,
@@ -86,7 +84,9 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
            screen = screen,
        )

-        val menuBehavior = ShowHabitMenuBehavior(
+        view = ShowHabitView(this)
+
+        val menuPresenter = ShowHabitMenuPresenter(
            commandRunner = commandRunner,
            habit = habit,
            habitList = habitList,
@@ -97,15 +97,11 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {

        menu = ShowHabitMenu(
            activity = this,
-            behavior = menuBehavior,
+            presenter = menuPresenter,
            preferences = preferences,
        )

-        view.onScoreCardSpinnerPosition = behavior::onScoreCardSpinnerPosition
-        view.onBarCardBoolSpinnerPosition = behavior::onBarCardBoolSpinnerPosition
-        view.onBarCardNumericalSpinnerPosition = behavior::onBarCardNumericalSpinnerPosition
-        view.onClickEditHistoryButton = behavior::onClickEditHistory
-
+        view.setListener(presenter)
        setContentView(view)
    }

@@ -121,9 +117,9 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
        super.onResume()
        commandRunner.addListener(this)
        supportFragmentManager.findFragmentByTag("historyEditor")?.let {
-            (it as HistoryEditorDialog).setOnDateClickedListener(behavior)
+            (it as HistoryEditorDialog).setOnDateClickedListener(presenter.historyCardPresenter)
        }
-        refresh()
+        screen.refresh()
    }

    override fun onPause() {
@@ -132,18 +128,69 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
    }

    override fun onCommandFinished(command: Command) {
-        refresh()
+        screen.refresh()
    }

-    fun refresh() {
-        scope.launch {
-            view.update(
-                presenter.present(
-                    habit = habit,
-                    preferences = preferences,
-                    theme = themeSwitcher.currentTheme,
+    inner class Screen : ShowHabitMenuPresenter.Screen, ShowHabitPresenter.Screen {
+        override fun updateWidgets() {
+            widgetUpdater.updateWidgets()
+        }
+
+        override fun refresh() {
+            scope.launch {
+                view.setState(
+                    ShowHabitPresenter.buildState(
+                        habit = habit,
+                        preferences = preferences,
+                        theme = themeSwitcher.currentTheme,
+                    )
                )
-            )
+            }
+        }
+
+        override fun showHistoryEditorDialog(listener: OnDateClickedListener) {
+            val dialog = HistoryEditorDialog()
+            dialog.arguments = Bundle().apply {
+                putLong("habit", habit.id!!)
+            }
+            dialog.setOnDateClickedListener(listener)
+            dialog.show(supportFragmentManager, "historyEditor")
+        }
+
+        override fun showFeedback() {
+            window.decorView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+        }
+
+        override fun showNumberPicker(
+            value: Double,
+            unit: String,
+            callback: ListHabitsBehavior.NumberPickerCallback,
+        ) {
+            NumberPickerFactory(this@ShowHabitActivity).create(value, unit, callback).show()
+        }
+
+        override fun showEditHabitScreen(habit: Habit) {
+            startActivity(IntentFactory().startEditActivity(this@ShowHabitActivity, habit))
+        }
+
+        override fun showMessage(m: ShowHabitMenuPresenter.Message?) {
+            when (m) {
+                ShowHabitMenuPresenter.Message.COULD_NOT_EXPORT -> {
+                    showMessage(resources.getString(R.string.could_not_export))
+                }
+            }
+        }
+
+        override fun showSendFileScreen(filename: String) {
+            this@ShowHabitActivity.showSendFileScreen(filename)
+        }
+
+        override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) {
+            ConfirmDeleteDialog(this@ShowHabitActivity, callback, 1).show()
+        }
+
+        override fun close() {
+            this@ShowHabitActivity.finish()
        }
    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
@@ -23,11 +23,11 @@ import android.view.Menu
 import android.view.MenuItem
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuBehavior
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter

 class ShowHabitMenu(
    val activity: ShowHabitActivity,
-    val behavior: ShowHabitMenuBehavior,
+    val presenter: ShowHabitMenuPresenter,
    val preferences: Preferences,
 ) {
    fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -41,19 +41,19 @@ class ShowHabitMenu(
    fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            R.id.action_edit_habit -> {
-                behavior.onEditHabit()
+                presenter.onEditHabit()
                return true
            }
            R.id.action_delete -> {
-                behavior.onDeleteHabit()
+                presenter.onDeleteHabit()
                return true
            }
            R.id.action_randomize -> {
-                behavior.onRandomize()
+                presenter.onRandomize()
                return true
            }
            R.id.export -> {
-                behavior.onExportCSV()
+                presenter.onExportCSV()
                return true
            }
        }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.kt
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016-2020 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.activities.habits.show
-
-import android.os.Bundle
-import android.view.HapticFeedbackConstants
-import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialogFactory
-import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
-import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
-import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
-import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitBehavior
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuBehavior
-import org.isoron.uhabits.core.ui.views.OnDateClickedListener
-import org.isoron.uhabits.intents.IntentFactory
-import org.isoron.uhabits.utils.showMessage
-import org.isoron.uhabits.utils.showSendFileScreen
-import org.isoron.uhabits.widgets.WidgetUpdater
-
-class ShowHabitScreen(
-    val activity: ShowHabitActivity,
-    val confirmDeleteDialogFactory: ConfirmDeleteDialogFactory,
-    val habit: Habit,
-    val intentFactory: IntentFactory,
-    val numberPickerFactory: NumberPickerFactory,
-    val widgetUpdater: WidgetUpdater,
-) : ShowHabitBehavior.Screen, ShowHabitMenuBehavior.Screen {
-
-    override fun showNumberPicker(
-        value: Double,
-        unit: String,
-        callback: ListHabitsBehavior.NumberPickerCallback,
-    ) {
-        numberPickerFactory.create(value, unit, callback).show()
-    }
-
-    override fun updateWidgets() {
-        widgetUpdater.updateWidgets(habit.id)
-    }
-
-    override fun refresh() {
-        activity.refresh()
-    }
-
-    override fun showHistoryEditorDialog(listener: OnDateClickedListener) {
-        val dialog = HistoryEditorDialog()
-        dialog.arguments = Bundle().apply {
-            putLong("habit", habit.id!!)
-        }
-        dialog.setOnDateClickedListener(listener)
-        dialog.show(activity.supportFragmentManager, "historyEditor")
-    }
-
-    override fun touchFeedback() {
-        activity.window.decorView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
-    }
-
-    override fun showEditHabitScreen(habit: Habit) {
-        activity.startActivity(intentFactory.startEditActivity(activity, habit))
-    }
-
-    override fun showMessage(m: ShowHabitMenuBehavior.Message?) {
-        when (m) {
-            ShowHabitMenuBehavior.Message.COULD_NOT_EXPORT -> {
-                activity.showMessage(activity.resources.getString(R.string.could_not_export))
-            }
-        }
-    }
-
-    override fun showSendFileScreen(filename: String) {
-        activity.showSendFileScreen(filename)
-    }
-
-    override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) {
-        confirmDeleteDialogFactory.create(callback, 1).show()
-    }
-
-    override fun close() {
-        activity.finish()
-    }
-}
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
@@ -22,37 +22,29 @@ package org.isoron.uhabits.activities.habits.show
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.FrameLayout
-import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitState
 import org.isoron.uhabits.databinding.ShowHabitBinding
 import org.isoron.uhabits.utils.setupToolbar

 class ShowHabitView(context: Context) : FrameLayout(context) {
    private val binding = ShowHabitBinding.inflate(LayoutInflater.from(context))

-    var onScoreCardSpinnerPosition: (position: Int) -> Unit = {}
-    var onClickEditHistoryButton: () -> Unit = {}
-    var onBarCardBoolSpinnerPosition: (position: Int) -> Unit = {}
-    var onBarCardNumericalSpinnerPosition: (position: Int) -> Unit = {}
-
    init {
        addView(binding.root)
-        binding.scoreCard.onSpinnerPosition = { onScoreCardSpinnerPosition(it) }
-        binding.historyCard.onClickEditButton = { onClickEditHistoryButton() }
-        binding.barCard.onBoolSpinnerPosition = { onBarCardBoolSpinnerPosition(it) }
-        binding.barCard.onNumericalSpinnerPosition = { onBarCardNumericalSpinnerPosition(it) }
    }

-    fun update(data: ShowHabitViewModel) {
+    fun setState(data: ShowHabitState) {
        setupToolbar(binding.toolbar, title = data.title, color = data.color)
-        binding.subtitleCard.update(data.subtitle)
-        binding.overviewCard.update(data.overview)
-        binding.notesCard.update(data.notes)
-        binding.targetCard.update(data.target)
-        binding.streakCard.update(data.streaks)
-        binding.scoreCard.update(data.scores)
-        binding.frequencyCard.update(data.frequency)
-        binding.historyCard.update(data.history)
-        binding.barCard.update(data.bar)
+        binding.subtitleCard.setState(data.subtitle)
+        binding.overviewCard.setState(data.overview)
+        binding.notesCard.setState(data.notes)
+        binding.targetCard.setState(data.target)
+        binding.streakCard.setState(data.streaks)
+        binding.scoreCard.setState(data.scores)
+        binding.frequencyCard.setState(data.frequency)
+        binding.historyCard.setState(data.history)
+        binding.barCard.setState(data.bar)
        if (data.isNumerical) {
            binding.overviewCard.visibility = GONE
            binding.streakCard.visibility = GONE
@@ -60,4 +52,10 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
            binding.targetCard.visibility = GONE
        }
    }
+
+    fun setListener(presenter: ShowHabitPresenter) {
+        binding.scoreCard.setListener(presenter.scoreCardPresenter)
+        binding.historyCard.setListener(presenter.historyCardPresenter)
+        binding.barCard.setListener(presenter.barCardPresenter)
+    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
@@ -25,7 +25,8 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.LinearLayout
 import org.isoron.platform.time.JavaLocalDateFormatter
-import org.isoron.uhabits.core.ui.screens.habits.show.views.BarCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.BarCardPresenter
+import org.isoron.uhabits.core.ui.screens.habits.show.views.BarCardState
 import org.isoron.uhabits.core.ui.views.BarChart
 import org.isoron.uhabits.databinding.ShowHabitBarBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor
@@ -34,57 +35,56 @@ import java.util.Locale
 class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {

    private var binding = ShowHabitBarBinding.inflate(LayoutInflater.from(context), this)
-    var onNumericalSpinnerPosition: (position: Int) -> Unit = {}
-    var onBoolSpinnerPosition: (position: Int) -> Unit = {}

-    fun update(data: BarCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
-        binding.chart.view = BarChart(data.theme, JavaLocalDateFormatter(Locale.US)).apply {
-            series = mutableListOf(data.entries.map { it.value / 1000.0 })
-            colors = mutableListOf(theme.color(data.color.paletteIndex))
-            axis = data.entries.map { it.timestamp.toLocalDate() }
+    fun setState(state: BarCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
+        binding.chart.view = BarChart(state.theme, JavaLocalDateFormatter(Locale.US)).apply {
+            series = mutableListOf(state.entries.map { it.value / 1000.0 })
+            colors = mutableListOf(theme.color(state.color.paletteIndex))
+            axis = state.entries.map { it.timestamp.toLocalDate() }
        }
        binding.chart.resetDataOffset()
        binding.chart.postInvalidate()

        binding.title.setTextColor(androidColor)
-        if (data.isNumerical) {
+        if (state.isNumerical) {
            binding.boolSpinner.visibility = GONE
        } else {
            binding.numericalSpinner.visibility = GONE
        }

        binding.numericalSpinner.onItemSelectedListener = null
-        binding.numericalSpinner.setSelection(data.numericalSpinnerPosition)
+        binding.numericalSpinner.setSelection(state.numericalSpinnerPosition)
+        binding.boolSpinner.setSelection(state.boolSpinnerPosition)
+    }
+
+    fun setListener(presenter: BarCardPresenter) {
+        binding.boolSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long,
+            ) {
+                presenter.onBoolSpinnerPosition(position)
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
        binding.numericalSpinner.onItemSelectedListener =
            object : AdapterView.OnItemSelectedListener {
                override fun onItemSelected(
                    parent: AdapterView<*>?,
                    view: View?,
                    position: Int,
-                    id: Long
+                    id: Long,
                ) {
-                    onNumericalSpinnerPosition(position)
+                    presenter.onNumericalSpinnerPosition(position)
                }

                override fun onNothingSelected(parent: AdapterView<*>?) {
                }
            }
-
-        binding.boolSpinner.onItemSelectedListener = null
-        binding.boolSpinner.setSelection(data.boolSpinnerPosition)
-        binding.boolSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                onBoolSpinnerPosition(position)
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-        }
    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt
@@ -22,7 +22,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
-import org.isoron.uhabits.core.ui.screens.habits.show.views.FrequencyCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.FrequencyCardState
 import org.isoron.uhabits.databinding.ShowHabitFrequencyBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor

@@ -30,10 +30,10 @@ class FrequencyCardView(context: Context, attrs: AttributeSet) : LinearLayout(co

    private var binding = ShowHabitFrequencyBinding.inflate(LayoutInflater.from(context), this)

-    fun update(data: FrequencyCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
-        binding.frequencyChart.setFrequency(data.frequency)
-        binding.frequencyChart.setFirstWeekday(data.firstWeekday)
+    fun setState(state: FrequencyCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
+        binding.frequencyChart.setFrequency(state.frequency)
+        binding.frequencyChart.setFirstWeekday(state.firstWeekday)
        binding.title.setTextColor(androidColor)
        binding.frequencyChart.setColor(androidColor)
    }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
@@ -23,7 +23,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import org.isoron.platform.time.JavaLocalDateFormatter
-import org.isoron.uhabits.core.ui.screens.habits.show.views.HistoryCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.HistoryCardPresenter
+import org.isoron.uhabits.core.ui.screens.habits.show.views.HistoryCardState
 import org.isoron.uhabits.core.ui.views.HistoryChart
 import org.isoron.uhabits.databinding.ShowHabitHistoryBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor
@@ -33,23 +34,21 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont

    private var binding = ShowHabitHistoryBinding.inflate(LayoutInflater.from(context), this)

-    var onClickEditButton: () -> Unit = {}
-
-    init {
-        binding.edit.setOnClickListener { onClickEditButton() }
-    }
-
-    fun update(data: HistoryCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
+    fun setState(state: HistoryCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
        binding.title.setTextColor(androidColor)
        binding.chart.view = HistoryChart(
-            today = data.today,
-            paletteColor = data.color,
-            theme = data.theme,
+            today = state.today,
+            paletteColor = state.color,
+            theme = state.theme,
            dateFormatter = JavaLocalDateFormatter(Locale.getDefault()),
-            series = data.series,
-            firstWeekday = data.firstWeekday,
+            series = state.series,
+            firstWeekday = state.firstWeekday,
        )
        binding.chart.postInvalidate()
    }
+
+    fun setListener(presenter: HistoryCardPresenter) {
+        binding.edit.setOnClickListener { presenter.onClickEditButton() }
+    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt
@@ -23,17 +23,17 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
-import org.isoron.uhabits.core.ui.screens.habits.show.views.NotesCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.NotesCardState
 import org.isoron.uhabits.databinding.ShowHabitNotesBinding

 class NotesCardView(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
    private val binding = ShowHabitNotesBinding.inflate(LayoutInflater.from(context), this)
-    fun update(data: NotesCardViewModel) {
-        if (data.description.isEmpty()) {
+    fun setState(state: NotesCardState) {
+        if (state.description.isEmpty()) {
            visibility = GONE
        } else {
            visibility = VISIBLE
-            binding.habitNotes.text = data.description
+            binding.habitNotes.text = state.description
        }
        invalidate()
    }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt
@@ -23,7 +23,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import org.isoron.uhabits.R
-import org.isoron.uhabits.core.ui.screens.habits.show.views.OverviewCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.OverviewCardState
 import org.isoron.uhabits.databinding.ShowHabitOverviewBinding
 import org.isoron.uhabits.utils.StyledResources
 import org.isoron.uhabits.utils.toThemedAndroidColor
@@ -40,21 +40,21 @@ class OverviewCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
        )
    }

-    fun update(data: OverviewCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
+    fun setState(state: OverviewCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
        val res = StyledResources(context)
        val inactiveColor = res.getColor(R.attr.mediumContrastTextColor)
-        binding.monthDiffLabel.setTextColor(if (data.scoreMonthDiff >= 0) androidColor else inactiveColor)
-        binding.monthDiffLabel.text = formatPercentageDiff(data.scoreMonthDiff)
+        binding.monthDiffLabel.setTextColor(if (state.scoreMonthDiff >= 0) androidColor else inactiveColor)
+        binding.monthDiffLabel.text = formatPercentageDiff(state.scoreMonthDiff)
        binding.scoreLabel.setTextColor(androidColor)
-        binding.scoreLabel.text = String.format("%.0f%%", data.scoreToday * 100)
+        binding.scoreLabel.text = String.format("%.0f%%", state.scoreToday * 100)
        binding.scoreRing.color = androidColor
-        binding.scoreRing.percentage = data.scoreToday
+        binding.scoreRing.percentage = state.scoreToday
        binding.title.setTextColor(androidColor)
        binding.totalCountLabel.setTextColor(androidColor)
-        binding.totalCountLabel.text = data.totalCount.toString()
-        binding.yearDiffLabel.setTextColor(if (data.scoreYearDiff >= 0) androidColor else inactiveColor)
-        binding.yearDiffLabel.text = formatPercentageDiff(data.scoreYearDiff)
+        binding.totalCountLabel.text = state.totalCount.toString()
+        binding.yearDiffLabel.setTextColor(if (state.scoreYearDiff >= 0) androidColor else inactiveColor)
+        binding.yearDiffLabel.text = formatPercentageDiff(state.scoreYearDiff)
        postInvalidate()
    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt
@@ -24,24 +24,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.AdapterView
 import android.widget.LinearLayout
-import org.isoron.uhabits.core.ui.screens.habits.show.views.ScoreCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.ScoreCardPresenter
+import org.isoron.uhabits.core.ui.screens.habits.show.views.ScoreCardState
 import org.isoron.uhabits.databinding.ShowHabitScoreBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor

 class ScoreCardView(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
    private var binding = ShowHabitScoreBinding.inflate(LayoutInflater.from(context), this)

-    var onSpinnerPosition: (position: Int) -> Unit = {}
-
-    fun update(data: ScoreCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
+    fun setState(state: ScoreCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
        binding.title.setTextColor(androidColor)
-        binding.spinner.setSelection(data.spinnerPosition)
-        binding.scoreView.setScores(data.scores)
+        binding.spinner.setSelection(state.spinnerPosition)
+        binding.scoreView.setScores(state.scores)
        binding.scoreView.reset()
-        binding.scoreView.setBucketSize(data.bucketSize)
+        binding.scoreView.setBucketSize(state.bucketSize)
        binding.scoreView.setColor(androidColor)
+    }

+    fun setListener(presenter: ScoreCardPresenter) {
        binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
            override fun onItemSelected(
                parent: AdapterView<*>?,
@@ -49,7 +50,7 @@ class ScoreCardView(context: Context, attrs: AttributeSet) : LinearLayout(contex
                position: Int,
                id: Long
            ) {
-                onSpinnerPosition(position)
+                presenter.onSpinnerPosition(position)
            }

            override fun onNothingSelected(parent: AdapterView<*>?) {
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt
@@ -22,17 +22,17 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
-import org.isoron.uhabits.core.ui.screens.habits.show.views.StreakCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.StreakCardState
 import org.isoron.uhabits.databinding.ShowHabitStreakBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor

 class StreakCardView(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
    private val binding = ShowHabitStreakBinding.inflate(LayoutInflater.from(context), this)
-    fun update(data: StreakCardViewModel) {
-        val color = data.color.toThemedAndroidColor(context)
+    fun setState(state: StreakCardState) {
+        val color = state.color.toThemedAndroidColor(context)
        binding.title.setTextColor(color)
        binding.streakChart.setColor(color)
-        binding.streakChart.setStreaks(data.bestStreaks)
+        binding.streakChart.setStreaks(state.bestStreaks)
        postInvalidate()
    }
 }
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.habits.list.views.toShortString
 import org.isoron.uhabits.core.models.Frequency
-import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardState
 import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding
 import org.isoron.uhabits.utils.InterfaceUtils
 import org.isoron.uhabits.utils.formatTime
@@ -47,27 +47,27 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
    }

    @SuppressLint("SetTextI18n")
-    fun update(data: SubtitleCardViewModel) {
-        val color = data.color.toThemedAndroidColor(context)
-        val reminder = data.reminder
-        binding.frequencyLabel.text = data.frequency.format(resources)
+    fun setState(state: SubtitleCardState) {
+        val color = state.color.toThemedAndroidColor(context)
+        val reminder = state.reminder
+        binding.frequencyLabel.text = state.frequency.format(resources)
        binding.questionLabel.setTextColor(color)
-        binding.questionLabel.text = data.question
+        binding.questionLabel.text = state.question
        binding.reminderLabel.text = if (reminder != null) {
            formatTime(context, reminder.hour, reminder.minute)
        } else {
            resources.getString(R.string.reminder_off)
        }
-        binding.targetText.text = "${data.targetValue.toShortString()} ${data.unit}"
+        binding.targetText.text = "${state.targetValue.toShortString()} ${state.unit}"

        binding.questionLabel.visibility = View.VISIBLE
        binding.targetIcon.visibility = View.VISIBLE
        binding.targetText.visibility = View.VISIBLE
-        if (!data.isNumerical) {
+        if (!state.isNumerical) {
            binding.targetIcon.visibility = View.GONE
            binding.targetText.visibility = View.GONE
        }
-        if (data.question.isEmpty()) {
+        if (state.question.isEmpty()) {
            binding.questionLabel.visibility = View.GONE
        }

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt
@@ -24,17 +24,17 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import org.isoron.uhabits.R
-import org.isoron.uhabits.core.ui.screens.habits.show.views.TargetCardViewModel
+import org.isoron.uhabits.core.ui.screens.habits.show.views.TargetCardState
 import org.isoron.uhabits.databinding.ShowHabitTargetBinding
 import org.isoron.uhabits.utils.toThemedAndroidColor

 class TargetCardView(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
    private val binding = ShowHabitTargetBinding.inflate(LayoutInflater.from(context), this)
-    fun update(data: TargetCardViewModel) {
-        val androidColor = data.color.toThemedAndroidColor(context)
-        binding.targetChart.setValues(data.values)
-        binding.targetChart.setTargets(data.targets)
-        binding.targetChart.setLabels(data.intervals.map { intervalToLabel(resources, it) })
+    fun setState(state: TargetCardState) {
+        val androidColor = state.color.toThemedAndroidColor(context)
+        binding.targetChart.setValues(state.values)
+        binding.targetChart.setTargets(state.targets)
+        binding.targetChart.setLabels(state.intervals.map { intervalToLabel(resources, it) })
        binding.title.setTextColor(androidColor)
        binding.targetChart.setColor(androidColor)
        postInvalidate()
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
@@ -46,9 +46,8 @@ class HistoryWidget(
        val widgetView = view as GraphWidgetView
        widgetView.setBackgroundAlpha(preferedBackgroundAlpha)
        if (preferedBackgroundAlpha >= 255) widgetView.setShadowAlpha(0x4f)
-        val model = HistoryCardPresenter().present(
+        val model = HistoryCardPresenter.buildState(
            habit = habit,
-            isSkipEnabled = prefs.isSkipEnabled,
            firstWeekday = prefs.firstWeekday,
            theme = WidgetTheme(),
        )
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
@@ -37,8 +37,7 @@ class ScoreWidget(
        pendingIntentFactory.showHabit(habit)

    override fun refreshData(view: View) {
-        val presenter = ScoreCardPresenter()
-        val viewModel = presenter.present(
+        val viewModel = ScoreCardPresenter.buildState(
            habit = habit,
            firstWeekday = prefs.firstWeekdayInt,
            spinnerPosition = prefs.scoreCardSpinnerPosition
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
@@ -45,8 +45,7 @@ class TargetWidget(
        widgetView.setBackgroundAlpha(preferedBackgroundAlpha)
        if (preferedBackgroundAlpha >= 255) widgetView.setShadowAlpha(0x4f)
        val chart = (widgetView.dataView as TargetChart)
-        val presenter = TargetCardPresenter()
-        val data = presenter.present(habit, prefs.firstWeekdayInt)
+        val data = TargetCardPresenter.buildState(habit, prefs.firstWeekdayInt)
        chart.setColor(data.color.toThemedAndroidColor(context))
        chart.setTargets(data.targets)
        chart.setLabels(data.intervals.map { intervalToLabel(context.resources, it) })