diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1264d30..d5a60de 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ package="com.fidloo.flux"> + android:theme="@style/Theme.Flux.Splash" + android:exported="true"> diff --git a/app/src/main/java/com/fidloo/flux/app/FluxApplication.kt b/app/src/main/java/com/fidloo/flux/app/FluxApplication.kt index ec1832d..f97bc42 100644 --- a/app/src/main/java/com/fidloo/flux/app/FluxApplication.kt +++ b/app/src/main/java/com/fidloo/flux/app/FluxApplication.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.fidloo.flux.app.ui +package com.fidloo.flux.app import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/build.gradle b/build.gradle index ef0cffe..16ac75f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,13 +17,13 @@ import com.fidloo.flux.buildsrc.Libs buildscript { - ext.kotlin_version = '1.4.31' - ext.compose_version = '1.0.0-beta02' - ext.coroutines_version = '1.4.2' + ext.kotlin_version = '1.7.0' + ext.compose_version = '1.2.0' + ext.coroutines_version = '1.7.0' repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -41,7 +41,7 @@ plugins { subprojects { repositories { google() - jcenter() + mavenCentral() } apply plugin: 'com.diffplug.spotless' diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fc374f6..5c9e163 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,7 @@ */ repositories { - jcenter() + mavenCentral() } plugins { diff --git a/buildSrc/src/main/java/com/fidloo/flux/buildsrc/Dependencies.kt b/buildSrc/src/main/java/com/fidloo/flux/buildsrc/Dependencies.kt index 0219bcc..a22a095 100644 --- a/buildSrc/src/main/java/com/fidloo/flux/buildsrc/Dependencies.kt +++ b/buildSrc/src/main/java/com/fidloo/flux/buildsrc/Dependencies.kt @@ -17,9 +17,9 @@ package com.fidloo.flux.buildsrc object Versions { - const val CompileSdkVersion = 30 + const val CompileSdkVersion = 33 const val MinSdkVersion = 23 - const val TargetSdkVersion = 30 + const val TargetSdkVersion = 33 const val VersionCode = 1 const val VersionName = "1.0" @@ -28,23 +28,23 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.4.2" object Accompanist { - private const val version = "0.6.0" - const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" - const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version" + private const val version = "0.10.0" + const val coil = "com.google.accompanist:accompanist-coil:$version" + const val insets = "com.google.accompanist:accompanist-insets:$version" } object Kotlin { - private const val version = "1.4.31" + private const val version = "1.7.0" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" } object Coroutines { - private const val version = "1.4.2" + private const val version = "1.7.0" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" @@ -58,12 +58,12 @@ object Libs { const val material = "com.google.android.material:material:1.3.0" object AndroidX { - const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01" - const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha09" + const val coreKtx = "androidx.core:core-ktx:1.10.1" + const val navigation = "androidx.navigation:navigation-compose:2.5.3" object Compose { const val snapshot = "" - const val version = "1.0.0-beta02" + private const val version = "1.2.0" const val animation = "androidx.compose.animation:animation:$version" const val foundation = "androidx.compose.foundation:foundation:$version" @@ -75,19 +75,19 @@ object Libs { const val ui = "androidx.compose.ui:ui:$version" const val uiUtil = "androidx.compose.ui:ui-util:$version" const val uiTest = "androidx.compose.ui:ui-test-junit4:$version" - const val hilt = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha01" + const val hilt = "androidx.hilt:hilt-navigation-compose:1.0.0" } object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04" + const val activityCompose = "androidx.activity:activity-compose:1.7.1" } - const val lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0" - const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01" + const val lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" + const val appcompat = "androidx.appcompat:appcompat:1.6.1" object ConstraintLayout { const val constraintLayoutCompose = - "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha03" + "androidx.constraintlayout:constraintlayout-compose:1.0.1" } object Test { @@ -106,7 +106,7 @@ object Libs { } object Hilt { - private const val version = "2.33-beta" + private const val version = "2.46" const val library = "com.google.dagger:hilt-android:$version" const val compiler = "com.google.dagger:hilt-android-compiler:$version" const val testing = "com.google.dagger:hilt-android-testing:$version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6332c1d..ae99a06 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 24 18:05:51 CET 2021 +#Thu May 11 22:25:32 EEST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/presentation/src/main/java/com/fidloo/flux/presentation/ui/App.kt b/presentation/src/main/java/com/fidloo/flux/presentation/ui/App.kt index d2c1d6e..139d383 100644 --- a/presentation/src/main/java/com/fidloo/flux/presentation/ui/App.kt +++ b/presentation/src/main/java/com/fidloo/flux/presentation/ui/App.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.Modifier import com.fidloo.flux.presentation.ui.navigation.LocalBackDispatcher import com.fidloo.flux.presentation.ui.navigation.NavGraph import com.fidloo.flux.presentation.ui.theme.FluxTheme -import dev.chrisbanes.accompanist.insets.ProvideWindowInsets +import com.google.accompanist.insets.ProvideWindowInsets @Composable fun App(backDispatcher: OnBackPressedDispatcher, window: Window) { diff --git a/presentation/src/main/java/com/fidloo/flux/presentation/ui/home/landscape/DynamicWeatherLandscape.kt b/presentation/src/main/java/com/fidloo/flux/presentation/ui/home/landscape/DynamicWeatherLandscape.kt index 0355d3e..94bfac7 100644 --- a/presentation/src/main/java/com/fidloo/flux/presentation/ui/home/landscape/DynamicWeatherLandscape.kt +++ b/presentation/src/main/java/com/fidloo/flux/presentation/ui/home/landscape/DynamicWeatherLandscape.kt @@ -22,13 +22,7 @@ import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.tween import androidx.compose.animation.core.updateTransition import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.offset -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.* import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface import androidx.compose.material.Text @@ -63,7 +57,6 @@ import com.fidloo.flux.presentation.ui.particle.rainParameters import com.fidloo.flux.presentation.ui.particle.snowParameters import com.fidloo.flux.presentation.ui.theme.white import com.fidloo.flux.presentation.ui.utils.getDescriptionRes -import dev.chrisbanes.accompanist.insets.statusBarsPadding import java.util.Calendar @Composable @@ -104,7 +97,7 @@ fun DynamicWeatherLandscape( MutableTransitionState(AnimatedTimeJumpProgress.START) .apply { targetState = AnimatedTimeJumpProgress.END } } - val transition = updateTransition(currentState) + val transition = updateTransition(currentState, label = "") val timeInMin by transition.animateFloat( transitionSpec = { @@ -112,7 +105,7 @@ fun DynamicWeatherLandscape( durationMillis = 900, easing = LinearOutSlowInEasing ) - } + }, label = "" ) { progress -> if (progress == AnimatedTimeJumpProgress.START) { oldTimeInMin.toFloat() diff --git a/presentation/src/main/java/com/fidloo/flux/presentation/ui/navigation/NavGraph.kt b/presentation/src/main/java/com/fidloo/flux/presentation/ui/navigation/NavGraph.kt index d50a1a8..7bb4095 100644 --- a/presentation/src/main/java/com/fidloo/flux/presentation/ui/navigation/NavGraph.kt +++ b/presentation/src/main/java/com/fidloo/flux/presentation/ui/navigation/NavGraph.kt @@ -16,7 +16,7 @@ package com.fidloo.flux.presentation.ui.navigation import androidx.compose.runtime.Composable -import androidx.hilt.navigation.compose.hiltNavGraphViewModel +import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController @@ -36,7 +36,7 @@ fun NavGraph(startDestination: String = MainDestinations.HOME_ROUTE) { startDestination = startDestination ) { composable(MainDestinations.HOME_ROUTE) { backStackEntry -> - val viewModel = hiltNavGraphViewModel(backStackEntry = backStackEntry) + val viewModel = hiltViewModel(backStackEntry) HomeScreen(viewModel) } }