diff --git a/src/components/mobile/AccountBalanceTrendsBarChart.vue b/src/components/mobile/AccountBalanceTrendsBarChart.vue index 273549fe..43e09fa8 100644 --- a/src/components/mobile/AccountBalanceTrendsBarChart.vue +++ b/src/components/mobile/AccountBalanceTrendsBarChart.vue @@ -7,7 +7,7 @@ @@ -108,7 +104,7 @@ const allVirtualListItems = computed(() = averageBalance: dataItem.averageBalance, minimumBalance: dataItem.minimumBalance, maximumBalance: dataItem.maximumBalance, - color: `#${DEFAULT_CHART_COLORS[0]}`, + color: DEFAULT_CHART_COLORS[0], percent: 0.0 }; @@ -130,9 +126,3 @@ function renderExternal(vl: unknown, vlData: MobileAccountBalanceTrendsChartVirt virtualDataItems.value = vlData; } - - diff --git a/src/styles/mobile/global.scss b/src/styles/mobile/global.scss index 854a7639..4c7148e5 100644 --- a/src/styles/mobile/global.scss +++ b/src/styles/mobile/global.scss @@ -792,6 +792,10 @@ html[dir="rtl"] .dp__main .dp__btn.dp--arrow-btn-nav { --f7-progressbar-bg-color: #f8f8f8; } +.dark .statistics-percent-line .progressbar { + --f7-progressbar-bg-color: #444444; +} + .statistics-multi-percent-line > div > .progressbar { border-radius: unset; } diff --git a/src/views/base/statistics/StatisticsTransactionPageBase.ts b/src/views/base/statistics/StatisticsTransactionPageBase.ts index 447277d4..fe09f9f4 100644 --- a/src/views/base/statistics/StatisticsTransactionPageBase.ts +++ b/src/views/base/statistics/StatisticsTransactionPageBase.ts @@ -9,8 +9,13 @@ import { type TransactionStatisticsFilter, useStatisticsStore } from '@/stores/s import type { TypeAndDisplayName } from '@/core/base.ts'; import { type LocalizedDateRange, type WeekDayValue, DateRangeScene, DateRange } from '@/core/datetime.ts'; import { StatisticsAnalysisType, ChartDataType, ChartSortingType, ChartDateAggregationType } from '@/core/statistics.ts'; +import { DEFAULT_ACCOUNT_COLOR, DEFAULT_CATEGORY_COLOR } from '@/consts/color.ts'; import { DISPLAY_HIDDEN_AMOUNT } from '@/consts/numeral.ts'; -import type { TransactionCategoricalAnalysisData, TransactionTrendsAnalysisData } from '@/models/transaction.ts'; +import type { + TransactionCategoricalAnalysisData, + TransactionCategoricalAnalysisDataItem, + TransactionTrendsAnalysisData +} from '@/models/transaction.ts'; import { limitText, findNameByType, findDisplayNameByType } from '@/lib/common.ts'; import { getYearMonthFirstUnixTime, getYearMonthLastUnixTime } from '@/lib/datetime.ts'; @@ -200,6 +205,24 @@ export function useStatisticsTransactionPageBase() { } } + function getTransactionCategoricalAnalysisDataItemColor(item: TransactionCategoricalAnalysisDataItem): string { + if (item.type === 'category') { + if (item.color === DEFAULT_CATEGORY_COLOR) { + return 'var(--default-icon-color)'; + } else { + return '#' + item.color; + } + } else if (item.type === 'account') { + if (item.color === DEFAULT_ACCOUNT_COLOR) { + return 'var(--default-icon-color)'; + } else { + return '#' + item.color; + } + } else { + return item.color; + } + } + function getDisplayAmount(amount: number, currency: string, textLimit?: number): string { const finalAmount = formatAmountToLocalizedNumeralsWithCurrency(amount, currency); @@ -249,6 +272,7 @@ export function useStatisticsTransactionPageBase() { trendsAnalysisData, // functions canShowCustomDateRange, + getTransactionCategoricalAnalysisDataItemColor, getDisplayAmount }; } diff --git a/src/views/desktop/statistics/TransactionPage.vue b/src/views/desktop/statistics/TransactionPage.vue index e9a3ca8a..50f8e688 100644 --- a/src/views/desktop/statistics/TransactionPage.vue +++ b/src/views/desktop/statistics/TransactionPage.vue @@ -244,8 +244,8 @@ {{ getDisplayAmount(item.totalAmount, defaultCurrency) }}
-
@@ -458,6 +458,7 @@ const { categoricalAnalysisData, trendsAnalysisData, canShowCustomDateRange, + getTransactionCategoricalAnalysisDataItemColor, getDisplayAmount } = useStatisticsTransactionPageBase(); diff --git a/src/views/mobile/statistics/TransactionPage.vue b/src/views/mobile/statistics/TransactionPage.vue index c96a5b5e..68d6b153 100644 --- a/src/views/mobile/statistics/TransactionPage.vue +++ b/src/views/mobile/statistics/TransactionPage.vue @@ -182,7 +182,7 @@ @@ -404,6 +404,7 @@ const { categoricalAnalysisData, trendsAnalysisData, canShowCustomDateRange, + getTransactionCategoricalAnalysisDataItemColor, getDisplayAmount } = useStatisticsTransactionPageBase(); @@ -800,10 +801,6 @@ init(); transform: translateY(1.5em); } -.dark .statistics-percent-line .progressbar { - --f7-progressbar-bg-color: #161616; -} - .chart-data-type-popover-menu .popover-inner{ max-height: 440px; overflow-y: auto;