Skip to content

Commit

Permalink
Rename bindValue to bind
Browse files Browse the repository at this point in the history
  • Loading branch information
szeweq committed Oct 17, 2021
1 parent b69d96c commit a0faf3d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/main/kotlin/szeweq/craftery/craftery.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.FrameWindowScope
import androidx.compose.ui.window.singleWindowApplication
import szeweq.craftery.layout.*
import szeweq.craftery.util.bindValue
import szeweq.craftery.util.bind
import szeweq.craftery.util.logTime
import szeweq.craftery.views.*

Expand Down Expand Up @@ -55,8 +55,8 @@ fun topBar() {
Box(Modifier.fillMaxHeight().requiredWidth(24.dp).padding(vertical = 6.dp)) {
val menuToggle = remember { mutableStateOf(false) }
val iconSize = 24.dp
val dismiss = menuToggle.bindValue(false)
IconButton(menuToggle.bindValue(true)) {
val dismiss = menuToggle.bind(false)
IconButton(menuToggle.bind(true)) {
Icon(Icons.Default.Menu, "Menu", Modifier.size(iconSize))
}
DropdownMenu(menuToggle.value, dismiss, offset = DpOffset(-iconSize, 0.dp)) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/szeweq/craftery/layout/ComboBox.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import szeweq.craftery.util.bindValue
import szeweq.craftery.util.bind

/**
* A combo box with custom values and labels.
Expand Down Expand Up @@ -50,8 +50,8 @@ fun ComboBoxItem(
@Composable
private fun ComboBoxLayout(name: String, content: @Composable ColumnScope.(() -> Unit) -> Unit) = Box {
val menuToggle = remember { mutableStateOf(false) }
val dismiss = menuToggle.bindValue(false)
DesktopButton(menuToggle.bindValue(true), Modifier.heightIn(24.dp), contentPadding = PaddingValues(8.dp, 4.dp)) {
val dismiss = menuToggle.bind(false)
DesktopButton(menuToggle.bind(true), Modifier.heightIn(24.dp), contentPadding = PaddingValues(8.dp, 4.dp)) {
Text(name, fontSize = 12.sp, letterSpacing = 0.5.sp)
Icon(Icons.Default.ArrowDropDown, "Dropdown", Modifier.size(16.dp))
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/szeweq/craftery/util/utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import java.util.concurrent.CompletableFuture
/**
* Method for binding specific values for use in an event.
*/
fun <T> MutableState<T>.bindValue(value: T): () -> Unit = { this.value = value }
fun <T> MutableState<T>.bind(value: T): () -> Unit = { this.value = value }

/**
* Method fix for Kotlin code.
Expand All @@ -27,4 +27,4 @@ inline fun logTime(name: String, fn: () -> Unit) {
val d = System.nanoTime()
fn()
TimeLogManager.logNano(name, d)
}
}
6 changes: 3 additions & 3 deletions src/main/kotlin/szeweq/craftery/views/FileLookup.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import szeweq.craftery.mcdata.Modpack
import szeweq.craftery.net.Downloader
import szeweq.craftery.scan.ScanInfo
import szeweq.craftery.util.FileLoader
import szeweq.craftery.util.bindValue
import szeweq.craftery.util.bind
import java.io.InputStream
import java.net.URLEncoder
import java.util.zip.ZipInputStream
Expand Down Expand Up @@ -72,7 +72,7 @@ class FileLookup(
}
val enabled = remember { derivedStateOf { for (b in checks) if (b) return@derivedStateOf true; false } }
DesktopButton(
workState.bindValue(1),
workState.bind(1),
Modifier.padding(vertical = 4.dp).align(Alignment.CenterHorizontally).fillMaxWidth(0.5f),
enabled = enabled.value,
content = ComposeScopeText("Continue")
Expand Down Expand Up @@ -118,7 +118,7 @@ class FileLookup(
Box(Modifier
.hoverState { hover[i] = it }
.background(bg, MaterialTheme.shapes.medium)
.clickable(onClick = index.bindValue(i))
.clickable(onClick = index.bind(i))
) { sideListItem(i, l) }
}
}
Expand Down

0 comments on commit a0faf3d

Please sign in to comment.