From b09fb4dc2ce8c76b9c855e8ceb0140fd6739a9cb Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sat, 14 May 2022 12:47:37 +0300 Subject: [PATCH] Dependencies bump --- app/build.gradle.kts | 10 +++++----- app/src/main/java/com/sadellie/unitto/MainActivity.kt | 7 +++++-- build.gradle.kts | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ce9efcd0..300c0dc7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -127,13 +127,13 @@ dependencies { implementation("androidx.navigation:navigation-compose:2.5.0-beta01") // Material Design 3 - implementation("androidx.compose.material3:material3:1.0.0-alpha10") + implementation("androidx.compose.material3:material3:1.0.0-alpha11") // Hilt and navigation implementation("androidx.hilt:hilt-navigation-compose:1.0.0") - kapt("com.google.dagger:dagger-android-processor:2.41") - implementation("com.google.dagger:hilt-android:2.41") - kapt("com.google.dagger:hilt-compiler:2.41") + kapt("com.google.dagger:dagger-android-processor:2.42") + implementation("com.google.dagger:hilt-android:2.42") + kapt("com.google.dagger:hilt-compiler:2.42") // There are a lot of icons implementation("androidx.compose.material:material-icons-extended:$composeVersion") @@ -145,7 +145,7 @@ dependencies { implementation("com.google.accompanist:accompanist-systemuicontroller:0.17.0") // Firebase - implementation(platform("com.google.firebase:firebase-bom:29.0.4")) + implementation(platform("com.google.firebase:firebase-bom:30.0.0")) implementation("com.google.firebase:firebase-analytics-ktx") // Crashlytics and Analytics diff --git a/app/src/main/java/com/sadellie/unitto/MainActivity.kt b/app/src/main/java/com/sadellie/unitto/MainActivity.kt index 4a92f8cd..3fe79ab6 100644 --- a/app/src/main/java/com/sadellie/unitto/MainActivity.kt +++ b/app/src/main/java/com/sadellie/unitto/MainActivity.kt @@ -1,13 +1,16 @@ package com.sadellie.unitto +import android.annotation.SuppressLint import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.viewModels +import androidx.compose.foundation.layout.padding import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.NavHost @@ -61,8 +64,8 @@ fun UnittoApp( navController: NavHostController, viewModel: MainViewModel, ) { - Scaffold { - NavHost(navController = navController, startDestination = MAIN_SCREEN) { + Scaffold { padding -> + NavHost(modifier = Modifier.padding(padding), navController = navController, startDestination = MAIN_SCREEN) { composable(MAIN_SCREEN) { MainScreen( diff --git a/build.gradle.kts b/build.gradle.kts index 17343ed7..93c01145 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - val composeVersion by extra ("1.2.0-alpha08") + val composeVersion by extra ("1.2.0-beta01") repositories { google() @@ -9,8 +9,8 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:7.1.3") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20") - classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") + classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.1") // Google services classpath("com.google.gms:google-services:4.3.10")