Merge pull request #37

Use Material 3

app/src/main/java/com/jacob/wakatimeapp/MainActivity.kt

@@ -8,10 +8,13 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.Scaffold
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -22,6 +25,7 @@ import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.navigation.dependency
 import dagger.hilt.android.AndroidEntryPoint
 
+@ExperimentalMaterial3Api
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,17 +34,17 @@ class MainActivity : AppCompatActivity() {
         installSplashScreen()
         setContent {
             WakaTimeAppTheme {
-                val scaffoldState = rememberScaffoldState()
+                val snackbarHostState = remember { SnackbarHostState() }
                 Scaffold(
-                    scaffoldState = scaffoldState,
+                    snackbarHost = { SnackbarHost(snackbarHostState) },
                     modifier = Modifier.fillMaxSize()
                 ) {
                     LockScreenOrientation()
                     DestinationsNavHost(
                         navGraph = NavGraphs.root,
                         dependenciesContainerBuilder = {
                             dependency(ApplicationNavigator(navController))
-                            dependency(scaffoldState)
+                            dependency(snackbarHostState)
                         }
                     )
                 }

app/src/main/java/com/jacob/wakatimeapp/navigation/AppDestinations.kt

@@ -1,6 +1,6 @@
 package com.jacob.wakatimeapp.navigation
 
-import androidx.compose.material.ScaffoldState
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import com.jacob.wakatimeapp.home.ui.HomePageContent
 import com.jacob.wakatimeapp.home.ui.HomePageNavigator
@@ -12,15 +12,15 @@ import com.ramcosta.composedestinations.annotation.RootNavGraph
 @RootNavGraph(start = true)
 @Destination
 @Composable
-fun LoginPage(loginPageNavigator: LoginPageNavigator, scaffoldState: ScaffoldState) =
-    LoginPageContent(loginPageNavigator = loginPageNavigator, scaffoldState = scaffoldState)
+fun LoginPage(loginPageNavigator: LoginPageNavigator, scaffoldState: SnackbarHostState) =
+    LoginPageContent(loginPageNavigator = loginPageNavigator, snackbarHostState = scaffoldState)
 
 @Composable
 @Destination
 fun HomePage(
     homePageNavigator: HomePageNavigator,
-    scaffoldState: ScaffoldState,
+    scaffoldState: SnackbarHostState,
 ) = HomePageContent(
     navigator = homePageNavigator,
-    scaffoldState = scaffoldState
+    snackbarHostState = scaffoldState
 )

buildSrc/src/main/kotlin/wakatimeapp.android.application.gradle

@@ -63,7 +63,9 @@ dependencies {
 
     // Compose
     implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.material:material: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")
 

buildSrc/src/main/kotlin/wakatimeapp.android.feature.gradle

@@ -52,10 +52,11 @@ 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")
 
     // Compose
     implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.material:material: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")
 

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

@@ -1,9 +1,7 @@
 package com.jacob.wakatimeapp.core.common.di
 
 import android.content.Context
-import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
-import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
 import com.jacob.wakatimeapp.core.common.auth.AuthDataStore.Companion.STORE_NAME
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
@@ -29,7 +27,7 @@ object DataModule {
 
     @Singleton
     @Provides
-    fun providePreferencesDataStore(@ApplicationContext appContext: Context): DataStore<Preferences> =
+    fun providePreferencesDataStore(@ApplicationContext appContext: Context) =
         PreferenceDataStoreFactory.create(
             scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
             produceFile = { appContext.preferencesDataStoreFile(STORE_NAME) }
@@ -57,7 +55,7 @@ object DataModule {
     @ExperimentalSerializationApi
     @Singleton
     @Provides
-    fun provideRetrofit(okHttpClient: OkHttpClient, json: Json): Retrofit = Retrofit.Builder()
+    fun provideRetrofit(okHttpClient: OkHttpClient, json: Json) = Retrofit.Builder()
         .addConverterFactory(
             json.asConverterFactory("application/json".toMediaType())
         )

core/ui/build.gradle.kts

@@ -18,13 +18,13 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.7.0-rc01")
+    implementation("androidx.compose.material3:material3:1.0.0-rc01")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 
     // Compose
     implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.material:material:1.2.1")
     implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
 
     implementation("com.airbnb.android:lottie-compose:5.0.3")

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/components/WtaAnimation.kt

@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -41,7 +41,7 @@ fun WtaAnimation(
         Spacer(modifier = Modifier.height(MaterialTheme.spacing.lMedium))
         Text(
             text = text,
-            style = MaterialTheme.typography.subtitle1,
+            style = MaterialTheme.typography.titleMedium,
         )
     }
 }

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/components/WtaIllustration.kt

@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -37,6 +37,6 @@ fun WtaIllustration(
     Spacer(modifier = Modifier.height(MaterialTheme.spacing.lMedium))
     Text(
         text = text,
-        style = MaterialTheme.typography.subtitle1
+        style = MaterialTheme.typography.titleMedium
     )
 }

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/components/cards/OtherStatsCard.kt

@@ -3,7 +3,7 @@ package com.jacob.wakatimeapp.core.ui.components.cards
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
-import com.jacob.wakatimeapp.core.ui.theme.Gradient
+import com.jacob.wakatimeapp.core.ui.theme.colors.Gradient
 
 @Composable
 fun OtherStatsCard(

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/components/cards/StatsCard.kt

@@ -10,8 +10,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -26,8 +26,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.jacob.wakatimeapp.core.ui.theme.Gradient
 import com.jacob.wakatimeapp.core.ui.theme.cardContent
+import com.jacob.wakatimeapp.core.ui.theme.colors.Gradient
 import com.jacob.wakatimeapp.core.ui.theme.spacing
 
 @Composable
@@ -74,6 +74,7 @@ internal fun StatsCard(
                 maxLines = 2,
                 modifier = Modifier.weight(weights.first, true),
                 style = MaterialTheme.typography.cardContent,
+                color = gradient.onStartColor,
             )
             Text(
                 text = text,
@@ -82,8 +83,9 @@ internal fun StatsCard(
                 style = TextStyle(
                     color = Color.White,
                     fontSize = 20.sp,
-                    fontWeight = FontWeight.Bold
-                )
+                    fontWeight = FontWeight.Medium,
+                ),
+                color = gradient.onEndColor,
             )
         }
     }

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/components/cards/TimeSpentCard.kt

@@ -2,11 +2,11 @@ package com.jacob.wakatimeapp.core.ui.components.cards
 
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import com.jacob.wakatimeapp.core.models.Time
-import com.jacob.wakatimeapp.core.ui.theme.Gradient
+import com.jacob.wakatimeapp.core.ui.theme.colors.Gradient
 import com.jacob.wakatimeapp.core.ui.theme.WakaTimeAppTheme
 import com.jacob.wakatimeapp.core.ui.theme.assets
 import com.jacob.wakatimeapp.core.ui.theme.gradients

core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/theme/Shape.kt

@@ -1,7 +1,7 @@
 package com.jacob.wakatimeapp.core.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
+import androidx.compose.material3.Shapes
 import androidx.compose.ui.unit.dp
 
 val Shapes = Shapes(