diff --git a/app/src/main/java/app/jerboa/spp/composable/mainMenu.kt b/app/src/main/java/app/jerboa/spp/composable/mainMenu.kt index c9f5f45..4f54e7d 100644 --- a/app/src/main/java/app/jerboa/spp/composable/mainMenu.kt +++ b/app/src/main/java/app/jerboa/spp/composable/mainMenu.kt @@ -277,7 +277,7 @@ fun menu( modifier = Modifier .width(width75Percent.dp * 0.75f) .verticalScroll(scroll) - .verticalScrollBar(scroll) + .verticalScrollBar(scroll, false) ) { label(text = "Particles " + ceil(particleNumber * MAX_PARTICLES).toInt()) Slider( diff --git a/app/src/main/java/app/jerboa/spp/composable/scrollBar.kt b/app/src/main/java/app/jerboa/spp/composable/scrollBar.kt index 82f2d7f..eb08577 100644 --- a/app/src/main/java/app/jerboa/spp/composable/scrollBar.kt +++ b/app/src/main/java/app/jerboa/spp/composable/scrollBar.kt @@ -17,6 +17,7 @@ import androidx.compose.ui.unit.dp @Composable fun Modifier.verticalScrollBar( scroll: ScrollState, + animated: Boolean, color: Color = Color.White, width: Dp = 8.dp, fadeIn: Int = 100, @@ -24,7 +25,7 @@ fun Modifier.verticalScrollBar( ): Modifier { val alpha by animateFloatAsState( - targetValue = if (scroll.isScrollInProgress) 1f else 0f, + targetValue = if (!animated) 1f else {if (scroll.isScrollInProgress) 1f else 0f}, animationSpec = tween(durationMillis = if (scroll.isScrollInProgress) fadeIn else fadeOut), label = "" ) diff --git a/app/src/main/res/drawable/news.png b/app/src/main/res/drawable/news.png index b553eee..6fb29f0 100644 Binary files a/app/src/main/res/drawable/news.png and b/app/src/main/res/drawable/news.png differ diff --git a/assets/news.png b/assets/news.png index b553eee..6fb29f0 100644 Binary files a/assets/news.png and b/assets/news.png differ diff --git a/assets/news.svg b/assets/news.svg index 893f287..078d19e 100644 --- a/assets/news.svg +++ b/assets/news.svg @@ -2,9 +2,9 @@ + + + + + + + transform="translate(-3.6541777,207.36427)"> - News + transform="translate(-0.83477473,157.065)"> + New sliders and a new orbitertoy + + + transform="matrix(0.25343509,0,0,0.25343509,206.70898,-4.2170832)"> - New sliders!Attraction strengthRepulsion strengthParticle mass