From 317947cee7b1a31e004174e8c36e43709b8da23f Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Fri, 26 Nov 2021 05:13:56 +0100 Subject: [PATCH] Moved to compose 1.0.0-rc4 --- build.gradle.kts | 2 +- src/main/kotlin/app/App.kt | 3 +++ src/main/kotlin/app/ui/GMenu.kt | 3 +++ src/main/kotlin/app/ui/Log.kt | 2 ++ src/main/kotlin/app/ui/WelcomePage.kt | 3 +++ src/main/kotlin/app/ui/components/SideMenuSubentry.kt | 6 +++--- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 227b9b3..5dfc876 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { kotlin("kapt") version "1.5.31" kotlin("plugin.serialization") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "1.0.0-rc3" + id("org.jetbrains.compose") version "1.0.0-rc4" } group = "aeab13.github" diff --git a/src/main/kotlin/app/App.kt b/src/main/kotlin/app/App.kt index e2a6828..3188a31 100644 --- a/src/main/kotlin/app/App.kt +++ b/src/main/kotlin/app/App.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalComposeUiApi::class) + package app import androidx.compose.foundation.background @@ -11,6 +13,7 @@ import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme import androidx.compose.runtime.* import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color diff --git a/src/main/kotlin/app/ui/GMenu.kt b/src/main/kotlin/app/ui/GMenu.kt index 265585e..7380bb1 100644 --- a/src/main/kotlin/app/ui/GMenu.kt +++ b/src/main/kotlin/app/ui/GMenu.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalComposeUiApi::class) + package app.ui import androidx.compose.foundation.Image @@ -7,6 +9,7 @@ import androidx.compose.material.Text import androidx.compose.material.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter diff --git a/src/main/kotlin/app/ui/Log.kt b/src/main/kotlin/app/ui/Log.kt index b1b561d..53ee52a 100644 --- a/src/main/kotlin/app/ui/Log.kt +++ b/src/main/kotlin/app/ui/Log.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalComposeUiApi::class) + package app.ui import androidx.compose.foundation.* diff --git a/src/main/kotlin/app/ui/WelcomePage.kt b/src/main/kotlin/app/ui/WelcomePage.kt index 30250cb..19da49e 100644 --- a/src/main/kotlin/app/ui/WelcomePage.kt +++ b/src/main/kotlin/app/ui/WelcomePage.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalComposeUiApi::class) + package app.ui import androidx.compose.foundation.Image @@ -17,6 +19,7 @@ import openRepositoryDialog import androidx.compose.foundation.lazy.items import androidx.compose.ui.Alignment import androidx.compose.ui.BiasAlignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.sp import app.extensions.dirName diff --git a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt index f064a8c..6d50a44 100644 --- a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt +++ b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalComposeUiApi::class) + package app.ui.components import androidx.compose.foundation.clickable @@ -7,15 +9,13 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import app.extensions.simpleName import app.theme.primaryTextColor -import app.theme.secondaryTextColor @Composable fun SideMenuSubentry(