From 79e302f9225c681abb1933f3e6fdfa1ad1e4ed1c Mon Sep 17 00:00:00 2001 From: Bindu <56578479+vbh@users.noreply.github.com> Date: Thu, 30 Sep 2021 00:51:05 -0700 Subject: [PATCH] Change variable name --- .../activities/common/dialogs/HistoryEditorDialog.kt | 4 ++-- .../uhabits/activities/habits/show/views/HistoryCardView.kt | 2 +- .../main/java/org/isoron/uhabits/widgets/HistoryWidget.kt | 4 ++-- .../core/ui/screens/habits/show/views/HistoryCard.kt | 6 +++--- .../java/org/isoron/uhabits/core/ui/views/HistoryChart.kt | 6 +++--- .../org/isoron/uhabits/core/ui/views/HistoryChartTest.kt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt index 55ed8093e..21999d4e1 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt @@ -63,7 +63,7 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener { paletteColor = habit.color, series = emptyList(), defaultSquare = HistoryChart.Square.OFF, - hasNotes = emptyList(), + notesIndicators = emptyList(), theme = themeSwitcher.currentTheme, today = DateUtils.getTodayWithOffset().toLocalDate(), onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {}, @@ -104,7 +104,7 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener { ) chart?.series = model.series chart?.defaultSquare = model.defaultSquare - chart?.hasNotes = model.hasNotes + chart?.notesIndicators = model.notesIndicators dataView.postInvalidate() } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt index 345789cca..74e566fbb 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt @@ -44,7 +44,7 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont dateFormatter = JavaLocalDateFormatter(Locale.getDefault()), series = state.series, defaultSquare = state.defaultSquare, - hasNotes = state.hasNotes, + notesIndicators = state.notesIndicators, firstWeekday = state.firstWeekday, ) binding.chart.postInvalidate() diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt index 7d520bec5..25d8b7348 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt @@ -59,7 +59,7 @@ class HistoryWidget( val historyChart = (this.view as HistoryChart) historyChart.series = model.series historyChart.defaultSquare = model.defaultSquare - historyChart.hasNotes = model.hasNotes + historyChart.notesIndicators = model.notesIndicators } } @@ -75,7 +75,7 @@ class HistoryWidget( firstWeekday = prefs.firstWeekday, series = listOf(), defaultSquare = HistoryChart.Square.OFF, - hasNotes = listOf(), + notesIndicators = listOf(), ) } ).apply { diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt index a3b9c9587..ae738f932 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt @@ -46,7 +46,7 @@ data class HistoryCardState( val firstWeekday: DayOfWeek, val series: List, val defaultSquare: HistoryChart.Square, - val hasNotes: List, + val notesIndicators: List, val theme: Theme, val today: LocalDate, ) @@ -169,7 +169,7 @@ class HistoryCardPresenter( else HistoryChart.Square.OFF - val hasNotes = entries.map { + val notesIndicators = entries.map { when (it.notes) { "" -> false else -> true @@ -183,7 +183,7 @@ class HistoryCardPresenter( theme = theme, series = series, defaultSquare = defaultSquare, - hasNotes = hasNotes, + notesIndicators = notesIndicators, ) } } diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt index c7c9d443c..afdc5d3b0 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt @@ -43,7 +43,7 @@ class HistoryChart( var paletteColor: PaletteColor, var series: List, var defaultSquare: Square, - var hasNotes: List, + var notesIndicators: List, var theme: Theme, var today: LocalDate, var onDateClickedListener: OnDateClickedListener = object : OnDateClickedListener {}, @@ -205,7 +205,7 @@ class HistoryChart( ) { val value = if (offset >= series.size) defaultSquare else series[offset] - val notes = if (offset >= hasNotes.size) false else hasNotes[offset] + val hasNotes = if (offset >= notesIndicators.size) false else notesIndicators[offset] val squareColor: Color val circleColor: Color val color = theme.color(paletteColor.paletteIndex) @@ -252,7 +252,7 @@ class HistoryChart( canvas.setTextAlign(TextAlign.CENTER) canvas.drawText(date.day.toString(), x + width / 2, y + width / 2) - if (notes) { + if (hasNotes) { circleColor = when (value) { Square.ON -> theme.lowContrastTextColor else -> color diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt index 627e29dca..8a9d523ab 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt @@ -73,7 +73,7 @@ class HistoryChartTest { else -> OFF } }, - hasNotes = MutableList(85) { + notesIndicators = MutableList(85) { index: Int -> index % 3 == 0 }