diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 258cc370..8f7d14e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ androidx-test-ext = "1.3.0" biometric = "1.2.0-alpha05" compose = "1.10.0-beta02" compose-androidx = "1.9.5" +compose-material = "1.10.0-beta02" immutable-collections = "0.4.0" coroutines = "1.10.2" agp = "8.10.1" @@ -59,6 +60,7 @@ kotlinx-coroutine-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co kotlinx-coroutine-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-date-time" } compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "compose" } +compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose" } compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "composeMaterialIconsExtended" } compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" } russhwolf-multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatform-settings" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 7455a601..27e0571e 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -51,12 +51,13 @@ kotlin { val commonMain by getting { dependencies { - api(libs.compose.runtime) - api(libs.compose.foundation) - api(libs.compose.material) - api(libs.compose.material.icons.extended) - api(libs.compose.ui) - api(libs.compose.components.resources) + implementation(libs.compose.runtime) + implementation(libs.compose.foundation) + implementation(libs.compose.material) + implementation(libs.compose.material3) + implementation(libs.compose.material.icons.extended) + implementation(libs.compose.ui) + implementation(libs.compose.components.resources) implementation(libs.jetbrains.ui.tooling.preview) implementation(libs.androidx.lifecycle.viewmodel) diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/navigation/MoneyFlowNavHost.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/navigation/MoneyFlowNavHost.kt index 4202ab41..8e1f204c 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/navigation/MoneyFlowNavHost.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/navigation/MoneyFlowNavHost.kt @@ -6,12 +6,12 @@ import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.size -import androidx.compose.material.BottomNavigation -import androidx.compose.material.BottomNavigationItem -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Scaffold -import androidx.compose.material.Text +import org.jetbrains.compose.material.BottomNavigation +import org.jetbrains.compose.material.BottomNavigationItem +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Scaffold +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.MutableState diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/AddTransactionScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/AddTransactionScreen.kt index 416c2964..0779133d 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/AddTransactionScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/AddTransactionScreen.kt @@ -4,11 +4,11 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Scaffold -import androidx.compose.material.Surface -import androidx.compose.material.rememberScaffoldState +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Scaffold +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.State diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/DatePicker.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/DatePicker.kt index 033b4b21..b9f49e9a 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/DatePicker.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/DatePicker.kt @@ -9,16 +9,16 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material.AlertDialog -import androidx.compose.material.DropdownMenu -import androidx.compose.material.DropdownMenuItem -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.material.TextButton -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.KeyboardArrowDown +import org.jetbrains.compose.material.AlertDialog +import org.jetbrains.compose.material.DropdownMenu +import org.jetbrains.compose.material.DropdownMenuItem +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text +import org.jetbrains.compose.material.TextButton +import org.jetbrains.compose.material.icons.Icons +import org.jetbrains.compose.material.icons.rounded.KeyboardArrowDown import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/IconTextClicableRow.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/IconTextClicableRow.kt index 46d86257..a8cb4e05 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/IconTextClicableRow.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/IconTextClicableRow.kt @@ -11,10 +11,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/MFTextField.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/MFTextField.kt index 491a58b0..8d6db269 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/MFTextField.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/MFTextField.kt @@ -2,11 +2,11 @@ package com.prof18.moneyflow.presentation.addtransaction.components import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.OutlinedTextField -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.OutlinedTextField +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/TransactionTypeTabBar.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/TransactionTypeTabBar.kt index fa5a9b4c..99058306 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/TransactionTypeTabBar.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/components/TransactionTypeTabBar.kt @@ -15,11 +15,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.TabPosition -import androidx.compose.material.TabRow -import androidx.compose.material.Text +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.TabPosition +import org.jetbrains.compose.material.TabRow +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/alltransactions/AllTransactionsScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/alltransactions/AllTransactionsScreen.kt index 0f911536..2b8eb4bd 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/alltransactions/AllTransactionsScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/alltransactions/AllTransactionsScreen.kt @@ -3,8 +3,8 @@ package com.prof18.moneyflow.presentation.alltransactions import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material.Divider -import androidx.compose.material.Scaffold +import org.jetbrains.compose.material.Divider +import org.jetbrains.compose.material.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/auth/AuthInProgressScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/auth/AuthInProgressScreen.kt index f6c3742f..13442a4b 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/auth/AuthInProgressScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/auth/AuthInProgressScreen.kt @@ -5,11 +5,11 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size -import androidx.compose.material.Button -import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Button +import org.jetbrains.compose.material.CircularProgressIndicator +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/budget/BudgetScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/budget/BudgetScreen.kt index 72b896e6..9c241d15 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/budget/BudgetScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/budget/BudgetScreen.kt @@ -2,7 +2,7 @@ package com.prof18.moneyflow.presentation.budget import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material.Text +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/CategoriesScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/CategoriesScreen.kt index aab5e74b..2f355608 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/CategoriesScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/CategoriesScreen.kt @@ -4,9 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material.Divider -import androidx.compose.material.Scaffold -import androidx.compose.material.Surface +import org.jetbrains.compose.material.Divider +import org.jetbrains.compose.material.Scaffold +import org.jetbrains.compose.material.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/components/CategoryCard.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/components/CategoryCard.kt index a166b92e..19ba4c7d 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/components/CategoryCard.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/components/CategoryCard.kt @@ -8,10 +8,10 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/HomeScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/HomeScreen.kt index 9ffcccfb..914b2d45 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/HomeScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/HomeScreen.kt @@ -11,18 +11,18 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material.Divider -import androidx.compose.material.DropdownMenu -import androidx.compose.material.DropdownMenuItem -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Add -import androidx.compose.material.icons.rounded.Visibility -import androidx.compose.material.icons.rounded.VisibilityOff +import org.jetbrains.compose.material.Divider +import org.jetbrains.compose.material.DropdownMenu +import org.jetbrains.compose.material.DropdownMenuItem +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.IconButton +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text +import org.jetbrains.compose.material.icons.Icons +import org.jetbrains.compose.material.icons.rounded.Add +import org.jetbrains.compose.material.icons.rounded.Visibility +import org.jetbrains.compose.material.icons.rounded.VisibilityOff import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HeaderNavigator.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HeaderNavigator.kt index 9c9b69b3..9b6197e2 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HeaderNavigator.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HeaderNavigator.kt @@ -5,13 +5,13 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.IconButton +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text +import org.jetbrains.compose.material.icons.Icons +import org.jetbrains.compose.material.icons.automirrored.outlined.KeyboardArrowRight import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HomeRecap.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HomeRecap.kt index 1ddfbdd7..e129a12a 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HomeRecap.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/components/HomeRecap.kt @@ -12,10 +12,10 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/recap/RecapScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/recap/RecapScreen.kt index 3b92ecd9..c68e2828 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/recap/RecapScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/recap/RecapScreen.kt @@ -2,7 +2,7 @@ package com.prof18.moneyflow.presentation.recap import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material.Text +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/settings/SettingsScreen.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/settings/SettingsScreen.kt index 8508db56..2edce3a7 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/settings/SettingsScreen.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/settings/SettingsScreen.kt @@ -3,10 +3,10 @@ package com.prof18.moneyflow.presentation.settings import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Scaffold -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Scaffold +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ArrowCircleIcon.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ArrowCircleIcon.kt index 7ab126e8..fd44ed55 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ArrowCircleIcon.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ArrowCircleIcon.kt @@ -5,8 +5,8 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.Icon -import androidx.compose.material.Surface +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ErrorView.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ErrorView.kt index b74d7d4b..5b56f879 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ErrorView.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ErrorView.kt @@ -5,9 +5,9 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/HideableTextField.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/HideableTextField.kt index 23d851a4..7be1145e 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/HideableTextField.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/HideableTextField.kt @@ -1,8 +1,8 @@ package com.prof18.moneyflow.ui.components -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/Loader.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/Loader.kt index 355d88d2..e2ef6fb2 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/Loader.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/Loader.kt @@ -2,8 +2,8 @@ package com.prof18.moneyflow.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.Surface +import org.jetbrains.compose.material.CircularProgressIndicator +import org.jetbrains.compose.material.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/MFTopBar.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/MFTopBar.kt index e9c98a1d..572045be 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/MFTopBar.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/MFTopBar.kt @@ -2,14 +2,14 @@ package com.prof18.moneyflow.ui.components import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.material.TextButton -import androidx.compose.material.TopAppBar -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Close +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.IconButton +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Text +import org.jetbrains.compose.material.TextButton +import org.jetbrains.compose.material.TopAppBar +import org.jetbrains.compose.material.icons.Icons +import org.jetbrains.compose.material.icons.rounded.Close import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/SwitchWithText.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/SwitchWithText.kt index 2de5a2c9..d0b1822d 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/SwitchWithText.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/SwitchWithText.kt @@ -4,10 +4,10 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Switch -import androidx.compose.material.Text +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Switch +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/TransactionCard.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/TransactionCard.kt index 93cbc684..203c0bcc 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/TransactionCard.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/TransactionCard.kt @@ -11,10 +11,10 @@ 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.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import org.jetbrains.compose.material.Icon +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.Surface +import org.jetbrains.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Shape.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Shape.kt index b369666d..12e9e230 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Shape.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Shape.kt @@ -1,7 +1,7 @@ package com.prof18.moneyflow.ui.style import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Shapes +import org.jetbrains.compose.material.Shapes import androidx.compose.ui.unit.dp internal val MoneyFlowShapes = Shapes( diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Theme.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Theme.kt index 4e3cb520..4141b8bb 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Theme.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Theme.kt @@ -1,9 +1,9 @@ package com.prof18.moneyflow.ui.style import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.MaterialTheme -import androidx.compose.material.darkColors -import androidx.compose.material.lightColors +import org.jetbrains.compose.material.MaterialTheme +import org.jetbrains.compose.material.darkColors +import org.jetbrains.compose.material.lightColors import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Typography.kt b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Typography.kt index c14cbfbd..0c4a076f 100644 --- a/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Typography.kt +++ b/shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/style/Typography.kt @@ -1,6 +1,6 @@ package com.prof18.moneyflow.ui.style -import androidx.compose.material.Typography +import org.jetbrains.compose.material.Typography import androidx.compose.runtime.Composable import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily