Added longest streak calculation.

build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.0-alpha07")
+        classpath("com.android.tools.build:gradle:8.0.0-alpha08")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
         classpath("com.google.dagger:hilt-android-gradle-plugin:2.42")
         classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1")

buildSrc/build.gradle.kts

@@ -30,7 +30,7 @@ buildscript {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:8.0.0-alpha07")
+    implementation("com.android.tools.build:gradle:8.0.0-alpha08")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
 
     implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.20")

core/common/src/main/java/com/jacob/wakatimeapp/core/common/di/DataModule.kt

@@ -10,6 +10,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import java.time.Duration
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -19,6 +20,7 @@ import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.logging.HttpLoggingInterceptor.Level.BODY
 import retrofit2.Retrofit
 
 @Module
@@ -37,10 +39,11 @@ object DataModule {
     @Provides
     fun provideOkHttpClient(): OkHttpClient {
         val builder = OkHttpClient.Builder()
-        val loggingInterceptor = HttpLoggingInterceptor()
-            .setLevel(HttpLoggingInterceptor.Level.BODY)
-        builder.networkInterceptors()
-            .add(loggingInterceptor)
+            .readTimeout(Duration.ofMinutes(1))
+            .connectTimeout(Duration.ofMinutes(1))
+
+        builder.networkInterceptors().add(HttpLoggingInterceptor().setLevel(BODY))
+
         return builder.build()
     }
 
@@ -55,10 +58,8 @@ object DataModule {
     @ExperimentalSerializationApi
     @Singleton
     @Provides
-    fun provideRetrofit(okHttpClient: OkHttpClient, json: Json) = Retrofit.Builder()
-        .addConverterFactory(
-            json.asConverterFactory("application/json".toMediaType())
-        )
+    fun provideRetrofit(okHttpClient: OkHttpClient, json: Json): Retrofit = Retrofit.Builder()
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
         .baseUrl(BASE_URL)
         .client(okHttpClient)
         .build()

core/models/src/main/java/com/jacob/wakatimeapp/core/models/Error.kt

@@ -18,8 +18,12 @@ sealed class Error {
             override val statusCode = -1
         }
 
+        data class Timeout(override val message: String) : NetworkErrors() {
+            override val statusCode = -1
+        }
+
         data class GenericError(override val message: String) : NetworkErrors() {
-            override val statusCode: Int = -1
+            override val statusCode = -1
         }
 
         data class ClientError(override val message: String, override val statusCode: Int) :

core/models/src/main/java/com/jacob/wakatimeapp/core/models/UserDetails.kt

@@ -1,5 +1,6 @@
 package com.jacob.wakatimeapp.core.models
 
+import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -14,7 +15,7 @@ data class UserDetails(
     val lastProject: String,
     val fullName: String,
     val durationsSliceBy: String,
-    val createdAt: String,
+    val createdAt: LocalDate,
     val dateFormat: String,
     val photoUrl: String,
 )

gradle.properties

@@ -22,3 +22,4 @@ kotlin.code.style=official
 
 org.gradle.unsafe.configuration-cache=true
 org.gradle.unsafe.configuration-cache-problems=warn
+android.nonTransitiveRClass=false

home/src/main/java/com/jacob/wakatimeapp/home/HomePageModule.kt

@@ -13,16 +13,14 @@ import retrofit2.Retrofit
 
 @Module
 @InstallIn(SingletonComponent::class)
-object HomePageModule {
-    @Singleton
-    @Provides
-    fun provideHomePageService(retrofit: Retrofit): HomePageAPI =
-        retrofit.create(HomePageAPI::class.java)
-}
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface HomePageModuleBinds {
+abstract class HomePageModule {
     @Binds
-    fun provideInstantProvider(impl: DefaultInstantProvider): InstantProvider
+    abstract fun provideInstantProvider(impl: DefaultInstantProvider): InstantProvider
+
+    companion object {
+        @Singleton
+        @Provides
+        internal fun provideHomePageService(retrofit: Retrofit) =
+            retrofit.create(HomePageAPI::class.java)
+    }
 }

home/src/main/java/com/jacob/wakatimeapp/home/data/local/HomePageCache.kt

@@ -12,7 +12,7 @@ import com.jacob.wakatimeapp.core.models.Error
 import com.jacob.wakatimeapp.core.models.Error.DatabaseError
 import com.jacob.wakatimeapp.home.domain.InstantProvider
 import com.jacob.wakatimeapp.home.domain.models.Last7DaysStats
-import com.jacob.wakatimeapp.home.domain.models.StreakRange
+import com.jacob.wakatimeapp.home.domain.models.Streak
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlinx.coroutines.flow.catch
@@ -55,24 +55,36 @@ class HomePageCache @Inject constructor(
         }
     }
 
-    fun getCurrentStreak() = dataStore.data.map<Preferences, Either<Error, StreakRange>> {
-        val streakRange = it[KEY_CURRENT_STREAK]?.let<String, StreakRange>(json::decodeFromString)
-            ?: StreakRange.ZERO
-        streakRange.right()
-    }.catch {
-        Timber.e(it)
-        emit(DatabaseError.UnknownError(it.message!!, it).left())
+    fun getCurrentStreak() = getStreak(KEY_CURRENT_STREAK)
+
+    suspend fun updateCurrentStreak(streak: Streak) {
+        dataStore.edit {
+            it[KEY_CURRENT_STREAK] = json.encodeToString(streak)
+        }
     }
 
-    suspend fun updateCurrentStreak(streakRange: StreakRange) {
+    fun getLongestStreak() = getStreak(KEY_LONGEST_STREAK)
+
+    suspend fun updateLongestStreak(streak: Streak) {
         dataStore.edit {
-            it[KEY_CURRENT_STREAK] = json.encodeToString(streakRange)
+            it[KEY_LONGEST_STREAK] = json.encodeToString(streak)
         }
     }
 
+    private fun getStreak(key: Preferences.Key<String>) =
+        dataStore.data.map<Preferences, Either<Error, Streak>> {
+            val streak = it[key]?.let<String, Streak>(json::decodeFromString)
+                ?: Streak.ZERO
+            streak.right()
+        }.catch {
+            Timber.e(it)
+            emit(DatabaseError.UnknownError(it.message!!, it).left())
+        }
+
     companion object {
         private val KEY_LAST_REQUEST_TIME = longPreferencesKey("KEY_LAST_REQUEST_TIME")
         private val KEY_LAST_7_DAYS_STATS = stringPreferencesKey("KEY_LAST_7_DAYS_STATS")
         private val KEY_CURRENT_STREAK = stringPreferencesKey("KEY_CURRENT_STREAK")
+        private val KEY_LONGEST_STREAK = stringPreferencesKey("KEY_LONGEST_STREAK")
     }
 }

home/src/main/java/com/jacob/wakatimeapp/home/data/network/HomePageAPI.kt

@@ -7,9 +7,9 @@ import com.jacob.wakatimeapp.home.data.network.dtos.GetStatsForRangeResDTO
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Header
-import retrofit2.http.Path
+import retrofit2.http.Query
 
-interface HomePageAPI {
+internal interface HomePageAPI {
     @GET("/api/v1/users/current/all_time_since_today")
     suspend fun getData(@Header("Authorization") token: String): Response<AllTimeDataDTO>
 
@@ -19,10 +19,10 @@ interface HomePageAPI {
     @GET("/api/v1/users/current/summaries?range=last_7_days")
     suspend fun getLast7DaysStats(@Header("Authorization") token: String): Response<GetLast7DaysStatsResDTO>
 
-    @GET("/api/v1/users/current/summaries?start={start}&end={end}")
+    @GET("/api/v1/users/current/summaries")
     suspend fun getStatsForRange(
         @Header("Authorization") token: String,
-        @Path("start") start: String,
-        @Path("end") end: String,
+        @Query("start") start: String,
+        @Query("end") end: String,
     ): Response<GetStatsForRangeResDTO>
 }