Update news, scroll bar always visible

JerboaBurrow · Jul 24, 2024 · c375d3e · c375d3e
1 parent 835c685
commit c375d3e
Show file tree

Hide file tree

Showing 5 changed files with 19,408 additions and 27,899 deletions.
diff --git 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
@@ -17,14 +17,15 @@ 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,
     fadeOut: Int = 600
 ): 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
diff --git a/assets/news.png b/assets/news.png