From 1f61d636dc71038f85205bba830973f2b764712a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD?= Date: Fri, 11 Oct 2024 14:20:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20Client=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../java/com/github/nullptroma/wallenc/MainActivity.kt | 5 +++-- build.gradle.kts | 5 +++-- gradle/libs.versions.toml | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 775ca57..8e73234 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,7 @@ android { useSupportLibrary = true } - manifestPlaceholders["YANDEX_CLIENT_ID"] = "f1402bc7bc8b4502a39624d9acecc54c" + manifestPlaceholders["YANDEX_CLIENT_ID"] = "0854a43a284a445480c5ced2258f2069" } buildTypes { diff --git a/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt b/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt index 21361fd..6266cb4 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt @@ -44,8 +44,9 @@ class MainActivity : ComponentActivity() { setContent { WallencTheme { Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> - val vm : MainViewModel = hiltViewModel() - MainScreen(Modifier.padding(innerPadding), vm) + Greeting(Modifier.padding(innerPadding)) { + launcher.launch(loginOptions) + } } } } diff --git a/build.gradle.kts b/build.gradle.kts index 2342b3e..27ec794 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,10 @@ + // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.compose.compiler) apply false - alias(libs.plugins.ksp) apply false - alias(libs.plugins.dagger.hilt) apply false alias(libs.plugins.android.library) apply false + alias(libs.plugins.dagger.hilt) apply false + alias(libs.plugins.ksp) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c718385..f9f08c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,12 +7,12 @@ junitVersion = "1.2.1" espressoCore = "3.6.1" lifecycleRuntimeKtx = "2.8.6" activityCompose = "1.9.2" -composeBom = "2024.09.02" -navigation = "2.8.1" +composeBom = "2024.09.03" +navigation = "2.8.2" hiltNavigation = "1.2.0" yandexAuthSdk = "3.1.1" -daggerHilt = "2.49" -ksp = "2.0.20-1.0.24" +daggerHilt = "2.51.1" +ksp = "2.0.20-1.0.25" room = "2.6.1" retrofit = "2.9.0" gson = "2.10.1"