Merge pull request #52 from Jacob3075/WTA-39/add-more-items-to-home-page

Added logic and UI for current streak
Jacob3075 · Nov 5, 2022 · f521091 · f521091
2 parents 3cf2828 + fa563ac
commit f521091
Show file tree

Hide file tree

Showing 46 changed files with 2,132 additions and 451 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/runConfigurations/Home_Unit_Tests.xml b/.idea/runConfigurations/Home_Unit_Tests.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("wakatimeapp.android.application")
-    id("androidx.navigation.safeargs.kotlin")
+}
+
+android {
+    namespace = "com.jacob.wakatimeapp"
 }
 
 dependencies {
@@ -14,7 +17,7 @@ dependencies {
 
     implementation("androidx.core:core-splashscreen:1.0.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
 
     // Core Testing
     testImplementation("junit:junit:4.13.2")
@@ -25,7 +28,7 @@ dependencies {
     androidTestImplementation("androidx.test:runner:1.4.0")
     androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.1")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.0")
     androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0")
 
     androidTestImplementation("com.google.dagger:hilt-android-testing:2.42")
@@ -34,10 +37,4 @@ dependencies {
     androidTestImplementation("com.google.truth:truth:1.1.3")
     androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")
     androidTestImplementation("io.mockk:mockk-android:1.12.4")
-
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.1")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.2.1")
-}
-android {
-    namespace = "com.jacob.wakatimeapp"
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,9 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.0")
+        classpath("com.android.tools.build:gradle:8.0.0-alpha07")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2")
         classpath("com.google.dagger:hilt-android-gradle-plugin:2.42")
         classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1")
     }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -30,10 +30,10 @@ buildscript {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:7.3.0")
+    implementation("com.android.tools.build:gradle:8.0.0-alpha07")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
 
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.10")
+    implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.20")
     implementation("com.google.devtools.ksp:symbol-processing-api:1.7.10-1.0.6")
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0-RC1")
 

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.application.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.application.gradle
@@ -40,7 +40,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions { jvmTarget = "11" }
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    }
 
     buildFeatures { compose = true }
     composeOptions { kotlinCompilerExtensionVersion = "1.3.1" }
@@ -60,22 +63,24 @@ dependencies {
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
+    implementation("com.google.android.material:material:1.7.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
-    implementation("androidx.activity:activity-compose:1.6.0")
+    implementation(platform("androidx.compose:compose-bom:2022.10.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.activity:activity-compose:1.6.1")
+
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     // Navigation
     implementation("io.github.raamcosta.compose-destinations:core:1.6.19-beta")
     ksp("io.github.raamcosta.compose-destinations:ksp:1.6.19-beta")
 
-    implementation("androidx.hilt:hilt-navigation-fragment:1.0.0")
-
     // Hilt
     implementation("com.google.dagger:hilt-android:2.43.1")
     kapt("com.google.dagger:hilt-android-compiler:2.43.1")
@@ -84,6 +89,7 @@ dependencies {
     implementation("com.jakewharton.timber:timber:5.0.1")
 
     implementation("io.arrow-kt:arrow-core:1.0.1")
+
 }
 
 kapt {

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.feature.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.feature.gradle
@@ -38,7 +38,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions { jvmTarget = "11" }
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    }
 
     buildFeatures { compose = true }
     composeOptions { kotlinCompilerExtensionVersion = "1.3.1" }
@@ -50,18 +53,22 @@ dependencies {
     implementation(project(":core:common"))
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
+    implementation("com.google.android.material:material:1.7.0")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
-    implementation("androidx.activity:activity-compose:1.6.0")
+    implementation(platform("androidx.compose:compose-bom:2022.10.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.activity:activity-compose:1.6.1")
+
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     // Hilt
     implementation("com.google.dagger:hilt-android:2.43.1")
@@ -79,13 +86,23 @@ dependencies {
 
     // Base testing dependencies
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+
+    // Coroutines & Flows
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+    testImplementation("app.cash.turbine:turbine:0.12.0")
+
+    // Mocks
     testImplementation("io.mockk:mockk:1.13.2")
+
+    // Assertions
     testImplementation("io.kotest:kotest-assertions-core:5.5.0")
+    testImplementation("io.kotest.extensions:kotest-assertions-arrow:1.2.5")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
 
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:1.3.0")
 }
 
 kapt {

diff --git a/buildSrc/src/main/kotlin/wakatimeapp.android.library.gradle b/buildSrc/src/main/kotlin/wakatimeapp.android.library.gradle
@@ -22,12 +22,15 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions { jvmTarget = "11" }
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+    }
 }
 
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("wakatimeapp.android.library")
 }
 
+android {
+    namespace = "com.jacob.wakatimeapp.core.common"
+}
+
 dependencies {
     implementation(project(":core:models"))
 
@@ -25,6 +29,3 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
 }
-android {
-    namespace = "com.jacob.wakatimeapp.core.common"
-}
diff --git a/core/common/src/main/java/com/jacob/wakatimeapp/core/common/Utils.kt b/core/common/src/main/java/com/jacob/wakatimeapp/core/common/Utils.kt
@@ -1,8 +1,14 @@
-package com.jacob.wakatimeapp.core.common // ktlint-disable filename
+package com.jacob.wakatimeapp.core.common
 
 import java.time.format.TextStyle.SHORT
 import java.util.Locale
+import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+
+fun Instant.toDate(timeZone: TimeZone = TimeZone.currentSystemDefault()) =
+    toLocalDateTime(timeZone).date
 
 fun LocalDate.getDisplayNameForDay(): String =
     dayOfWeek.getDisplayName(SHORT, Locale.getDefault())
diff --git a/core/models/build.gradle.kts b/core/models/build.gradle.kts
@@ -2,8 +2,9 @@ plugins {
     id("wakatimeapp.android.library")
 }
 
-dependencies {
-}
 android {
     namespace = "com.jacob.wakatimeapp.core.models"
 }
+
+dependencies {
+}
diff --git a/core/models/src/main/java/com/jacob/wakatimeapp/core/models/Stats.kt b/core/models/src/main/java/com/jacob/wakatimeapp/core/models/Stats.kt
@@ -0,0 +1,7 @@
+package com.jacob.wakatimeapp.core.models
+
+data class Stats(
+    val totalTime: Time,
+    val dailyStats: List<DailyStats>,
+    val range: StatsRange,
+)
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -18,14 +18,19 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
-    implementation("androidx.compose.material3:material3:1.0.0-rc01")
+    implementation("com.google.android.material:material:1.7.0")
+    implementation("androidx.compose.material3:material3:1.0.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 
     // Compose
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
+    implementation(platform("androidx.compose:compose-bom:2022.10.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material3:material3")
+
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     implementation("com.airbnb.android:lottie-compose:5.0.3")
 

diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/WtaPreviews.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/WtaPreviews.kt
@@ -0,0 +1,31 @@
+package com.jacob.wakatimeapp.core.ui
+
+import android.content.res.Configuration
+import androidx.compose.ui.tooling.preview.Preview
+
+@Preview(
+    name = "Light Mode",
+    uiMode = Configuration.UI_MODE_NIGHT_NO or Configuration.UI_MODE_TYPE_NORMAL,
+    group = "component"
+)
+@Preview(
+    name = "Dark Mode",
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_YES or Configuration.UI_MODE_TYPE_NORMAL,
+    group = "component"
+)
+@Preview(
+    name = "Full Device Light ",
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_NO or Configuration.UI_MODE_TYPE_NORMAL,
+    showSystemUi = true,
+    group = "full"
+)
+@Preview(
+    name = "Full Device Dark ",
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_YES or Configuration.UI_MODE_TYPE_NORMAL,
+    showSystemUi = true,
+    group = "full"
+)
+annotation class WtaPreviews
diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/modifiers/RemoveFontPadding.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/modifiers/RemoveFontPadding.kt
@@ -0,0 +1,21 @@
+package com.jacob.wakatimeapp.core.ui.modifiers
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.text.TextStyle
+
+/**
+ * Removes excess padding from the top and bottom of the text.
+ *
+ * [Source](https://issuetracker.google.com/issues/171394808#comment38)
+ */
+fun Modifier.removeFontPadding(
+    textStyle: TextStyle,
+) = layout { measurable, constraints ->
+    val placeable = measurable.measure(constraints)
+    val heightWithoutPadding =
+        placeable.height - placeable.height.mod(textStyle.lineHeight.roundToPx())
+    layout(placeable.width, heightWithoutPadding) {
+        placeable.placeRelative(0, 0)
+    }
+}
diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/theme/colors/Gradients.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/theme/colors/Gradients.kt
@@ -14,7 +14,9 @@ data class Gradient(
     val opacity: Int = 100,
     val onStartColor: Color = startColor,
     val onEndColor: Color = endColor,
-)
+) {
+    val colorList get() = listOf(startColor, endColor)
+}
 
 @Immutable
 data class Gradients(