feat(stats): show reading pages heatmap

KMReader.xcodeproj/project.pbxproj

@@ -442,7 +442,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "KMReader/KMReader-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 501;
+				CURRENT_PROJECT_VERSION = 502;
 				DEVELOPMENT_TEAM = M777UHWZA4;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -500,7 +500,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "KMReader/KMReader-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 501;
+				CURRENT_PROJECT_VERSION = 502;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=appletvos*]" = M777UHWZA4;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M777UHWZA4;
@@ -560,7 +560,7 @@
 				CODE_SIGN_ENTITLEMENTS = KMReaderWidgets/KMReaderWidgets.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 501;
+				CURRENT_PROJECT_VERSION = 502;
 				DEVELOPMENT_TEAM = M777UHWZA4;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = KMReaderWidgets/Info.plist;
@@ -594,7 +594,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 501;
+				CURRENT_PROJECT_VERSION = 502;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M777UHWZA4;
 				GENERATE_INFOPLIST_FILE = YES;

KMReader/Core/Storage/AppConfig.swift

@@ -1130,15 +1130,15 @@ enum AppConfig {
 
   static nonisolated var readingStatsCache: ReadingStatsCache {
     get {
-      if let stored = UserDefaults.standard.string(forKey: "readingStatsCache"),
+      if let stored = UserDefaults.standard.string(forKey: "readingStatsCacheV2"),
         let cache = ReadingStatsCache(rawValue: stored)
       {
         return cache
       }
       return ReadingStatsCache()
     }
     set {
-      UserDefaults.standard.set(newValue.rawValue, forKey: "readingStatsCache")
+      UserDefaults.standard.set(newValue.rawValue, forKey: "readingStatsCacheV2")
     }
   }
 

KMReader/Features/History/Models/ReadingPagesHeatmapWeek.swift

@@ -0,0 +1,11 @@
+//
+// ReadingPagesHeatmapWeek.swift
+//
+//
+
+import Foundation
+
+nonisolated struct ReadingPagesHeatmapWeek: Equatable, Sendable, Identifiable {
+  let id: String
+  let days: [ReadingStatsTimePoint?]
+}

KMReader/Features/History/Services/ReadingStatsService.swift

@@ -56,12 +56,10 @@ nonisolated enum ReadingStatsService {
     let completedBooks = filteredBooks.filter(\.isCompleted)
 
     let totalPagesRead = completedBooks.reduce(0.0) { partial, book in
-      partial + Double(book.readProgress?.page ?? 0)
+      partial + Double(readPageCount(for: book))
     }
 
     let averagePagesPerBook = completedBooks.isEmpty ? 0 : (totalPagesRead / Double(completedBooks.count)).rounded()
-    let estimatedReadingHours = (totalPagesRead / 2 / 60).rounded()
-
     let readDates = completedBooks.compactMap { $0.readProgress?.readDate }
     let lastReadDate = readDates.max()
     let uniqueReadingDays = Set(readDates.map(Self.dayKey))
@@ -73,7 +71,7 @@ nonisolated enum ReadingStatsService {
       totalPagesRead: totalPagesRead,
       averagePagesPerBook: averagePagesPerBook,
       readingDays: Double(uniqueReadingDays.count),
-      estimatedReadingHours: estimatedReadingHours,
+      estimatedReadingHours: 0,
       lastReadAt: lastReadDate.map(Self.isoDateTime)
     )
 
@@ -85,7 +83,7 @@ nonisolated enum ReadingStatsService {
 
     let dailyDistribution = buildDailyDistribution(completedBooks: completedBooks)
     let hourlyDistribution = buildHourlyDistribution(completedBooks: completedBooks)
-    let readingTimeSeries = buildReadingTimeSeries(completedBooks: completedBooks)
+    let dailyPagesSeries = buildDailyPagesSeries(completedBooks: completedBooks)
 
     let dimensions = buildDimensions(completedBooks: completedBooks, readSeries: readSeries)
 
@@ -94,7 +92,7 @@ nonisolated enum ReadingStatsService {
       statusDistribution: statusDistribution,
       dailyDistribution: dailyDistribution,
       hourlyDistribution: hourlyDistribution,
-      readingTimeSeries: readingTimeSeries,
+      readingTimeSeries: dailyPagesSeries,
       topAuthors: dimensions.topAuthors,
       topGenres: dimensions.topGenres,
       topTags: dimensions.topTags,
@@ -153,7 +151,7 @@ nonisolated enum ReadingStatsService {
     }
   }
 
-  private static func buildReadingTimeSeries(completedBooks: [Book]) -> [ReadingStatsTimePoint] {
+  private static func buildDailyPagesSeries(completedBooks: [Book]) -> [ReadingStatsTimePoint] {
     guard !completedBooks.isEmpty else { return [] }
 
     let today = Date()
@@ -164,12 +162,12 @@ nonisolated enum ReadingStatsService {
       .map { Calendar.current.startOfDay(for: $0) }
       ?? Calendar.current.startOfDay(for: today)
 
-    var hoursByDay: [String: Double] = [:]
+    var pagesByDay: [String: Double] = [:]
     for book in completedBooks {
       guard let progress = book.readProgress else { continue }
       let dayKey = Self.dayKey(progress.readDate)
-      let hours = Double(progress.page) / 2 / 60
-      hoursByDay[dayKey, default: 0] += hours
+      let pages = Double(readPageCount(for: book))
+      pagesByDay[dayKey, default: 0] += pages
     }
 
     var points: [ReadingStatsTimePoint] = []
@@ -181,7 +179,7 @@ nonisolated enum ReadingStatsService {
       points.append(
         ReadingStatsTimePoint(
           name: dayKey,
-          value: hoursByDay[dayKey, default: 0],
+          value: pagesByDay[dayKey, default: 0],
           dateString: dayKey
         )
       )
@@ -192,6 +190,17 @@ nonisolated enum ReadingStatsService {
     return points
   }
 
+  private static func readPageCount(for book: Book) -> Int {
+    guard let progress = book.readProgress else { return 0 }
+
+    let mediaPagesCount = max(book.media.pagesCount, 0)
+    if progress.completed, mediaPagesCount > 0 {
+      return mediaPagesCount
+    }
+
+    return max(progress.page, 0)
+  }
+
   private static func buildDimensions(completedBooks: [Book], readSeries: [Series]) -> ReadingStatsDimensions {
     let seriesById = Dictionary(uniqueKeysWithValues: readSeries.map { ($0.id, $0) })
     let booksBySeries = Dictionary(grouping: completedBooks, by: \.seriesId)