Skip to content
Snippets Groups Projects
Commit 11e15373 authored by Roman Sedaikin's avatar Roman Sedaikin
Browse files

Move ImageViewer to build149 and Kotlin 1.4.30.

parent f8f6ad38
No related branches found
No related tags found
No related merge requests found
...@@ -11,10 +11,10 @@ buildscript { ...@@ -11,10 +11,10 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build146") classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build149")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.21-2")) classpath(kotlin("gradle-plugin", version = "1.4.30"))
} }
} }
......
package example.imageviewer.view package example.imageviewer.view
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableRow
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
...@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.padding ...@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
...@@ -142,7 +144,8 @@ fun setToolBar( ...@@ -142,7 +144,8 @@ fun setToolBar(
.align(Alignment.CenterVertically), .align(Alignment.CenterVertically),
shape = CircleShape shape = CircleShape
) { ) {
ScrollableRow { val state = rememberScrollState(0f)
Row(modifier = Modifier.horizontalScroll(state)) {
Row { Row {
for (type in FilterType.values()) { for (type in FilterType.values()) {
FilterButton(content, type) FilterButton(content, type)
......
package example.imageviewer.view package example.imageviewer.view
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.VerticalScrollbar import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
...@@ -20,7 +19,10 @@ import androidx.compose.foundation.layout.preferredSize ...@@ -20,7 +19,10 @@ import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.rememberScrollbarAdapter import androidx.compose.foundation.rememberScrollbarAdapter
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Card import androidx.compose.material.Card
import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.Divider import androidx.compose.material.Divider
...@@ -269,7 +271,7 @@ fun setScrollableArea(content: ContentState) { ...@@ -269,7 +271,7 @@ fun setScrollableArea(content: ContentState) {
.padding(end = 8.dp) .padding(end = 8.dp)
) { ) {
val stateVertical = rememberScrollState(0f) val stateVertical = rememberScrollState(0f)
ScrollableColumn(scrollState = stateVertical) { Column(modifier = Modifier.verticalScroll(stateVertical)) {
var index = 1 var index = 1
Column { Column {
for (picture in content.getMiniatures()) { for (picture in content.getMiniatures()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment