From 13051145b79aba8fb95355e573a7ffe8e3e1e7c7 Mon Sep 17 00:00:00 2001 From: Nacho Date: Tue, 29 Jul 2025 00:01:02 +0200 Subject: [PATCH] Few things: - Speed up the fade animation a tad bit - Added a back arrow in the scan screen - Improved a bit the placeholder of the battles screen, since it'd throw out the transition animation. --- .../github/nacabaro/vbhelper/navigation/AppNavigation.kt | 6 +----- .../com/github/nacabaro/vbhelper/screens/BattlesScreen.kt | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt index 03e0d78..c2fd07c 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt @@ -1,7 +1,5 @@ package com.github.nacabaro.vbhelper.navigation -import androidx.compose.animation.AnimatedContentTransitionScope -import androidx.compose.animation.ExitTransition import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut @@ -71,9 +69,7 @@ fun AppNavigation( ) { composable(NavigationItems.Battles.route) { - BattlesScreen( - navController = navController - ) + BattlesScreen() } composable(NavigationItems.Home.route) { HomeScreen( diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt index d7f9d5d..b50ef12 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt @@ -4,20 +4,15 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.navigation.NavController import com.github.nacabaro.vbhelper.components.TopBanner -import com.github.nacabaro.vbhelper.navigation.NavigationItems @Composable -fun BattlesScreen( - navController: NavController -) { +fun BattlesScreen() { Scaffold ( topBar = { TopBanner(