-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from MineInAbyss/main-menu
Main menu revamp
- Loading branch information
Showing
9 changed files
with
426 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| group=com.mineinabyss | ||
| version=1.0.4 | ||
| version=1.1.0 | ||
| idofrontConventions=1.6.10-51 | ||
| kotlinVersion=1.6.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #!/bin/bash | ||
|
|
||
| HERE="$(dirname $"$(readlink -f "${0}")")" | ||
| EXEC="${HERE}/usr/bin/MineInAbyss_Launcher" | ||
| EXEC="${HERE}/usr/bin/MineInAbyss_Launcher-linux" | ||
| exec "${EXEC}" |
28 changes: 28 additions & 0 deletions
28
src/main/kotlin/com/mineinabyss/launchy/ColorSchemeGenerator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.mineinabyss.launchy | ||
|
|
||
| import androidx.compose.material3.ColorScheme | ||
| import androidx.compose.material3.darkColorScheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.graphics.Color | ||
| import kotlin.reflect.KMutableProperty1 | ||
| import kotlin.reflect.full.memberProperties | ||
|
|
||
| @Composable | ||
| fun rememberMIAColorScheme(): ColorScheme = remember { | ||
| darkColorScheme().also { scheme -> | ||
| ColorScheme::class.memberProperties.filterIsInstance<KMutableProperty1<ColorScheme, Color>>() | ||
| .filter { "error" !in it.name.toLowerCase() } | ||
| .map { prop -> | ||
| val col = (prop.get(scheme)) | ||
| val hsbVals = FloatArray(3) | ||
| val javaCol = java.awt.Color(col.red, col.green, col.blue, col.alpha) | ||
| java.awt.Color.RGBtoHSB(javaCol.red, javaCol.green, javaCol.blue, hsbVals) | ||
| val shiftedColor = Color(java.awt.Color.HSBtoRGB(0.02f, hsbVals[1], hsbVals[2])) | ||
| prop.set( | ||
| scheme, | ||
| col.copy(red = shiftedColor.red, blue = shiftedColor.blue, green = shiftedColor.green) | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package com.mineinabyss.launchy | ||
|
|
||
| import androidx.compose.animation.AnimatedVisibility | ||
| import androidx.compose.animation.core.spring | ||
| import androidx.compose.animation.core.tween | ||
| import androidx.compose.animation.fadeIn | ||
| import androidx.compose.animation.slideIn | ||
| import androidx.compose.animation.slideOut | ||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.foundation.window.WindowDraggableArea | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.rounded.ArrowBack | ||
| import androidx.compose.material.icons.rounded.Close | ||
| import androidx.compose.material.icons.rounded.CropSquare | ||
| import androidx.compose.material.icons.rounded.Minimize | ||
| import androidx.compose.material3.* | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.IntOffset | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| @Composable | ||
| fun WindowButton(icon: ImageVector, onClick: () -> Unit) { | ||
| Surface( | ||
| onClick = onClick, | ||
| modifier = Modifier.fillMaxHeight().width(44.dp), | ||
| contentColor = Color.White, | ||
| color = Color.Transparent | ||
| ) { | ||
| Icon(icon, "", Modifier.padding(10.dp)) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun AppTopBar( | ||
| state: TopBarState, | ||
| transparent: Boolean, | ||
| showBackButton: Boolean, | ||
| onBackButtonClicked: (() -> Unit), | ||
| ) = state.windowScope.WindowDraggableArea( | ||
| // Modifier.combinedClickable(onDoubleClick = { toggleMaximized(state) }, onClick = {}) | ||
| ) { | ||
| Box( | ||
| Modifier.fillMaxWidth().height(40.dp) | ||
| ) { | ||
| AnimatedVisibility( | ||
| !transparent, | ||
| enter = slideIn(initialOffset = { IntOffset(0, -40) }), | ||
| exit = slideOut(targetOffset = { IntOffset(0, -40) }) | ||
| ) { | ||
| Surface(tonalElevation = 1.dp, modifier = Modifier.fillMaxSize()) {} | ||
| } | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.SpaceAround, | ||
| ) { | ||
| Spacer(Modifier.width(5.dp)) | ||
| Row( | ||
| Modifier.weight(1f), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| AnimatedVisibility(showBackButton/*, enter = fadeIn(animationSpec = tween(300, 300))*/) { | ||
| IconButton(onClick = onBackButtonClicked) { | ||
| Icon(Icons.Rounded.ArrowBack, contentDescription = "Back button") | ||
| } | ||
| Spacer(Modifier.width(5.dp)) | ||
| } | ||
| AnimatedVisibility(!transparent) { | ||
| Text( | ||
| "Mine in Abyss", | ||
| fontWeight = FontWeight.Medium, | ||
| color = MaterialTheme.colorScheme.primary | ||
| ) | ||
| } | ||
| } | ||
| Row { | ||
| WindowButton(Icons.Rounded.Minimize) { | ||
| state.windowState.isMinimized = true | ||
| } | ||
| WindowButton(Icons.Rounded.CropSquare) { | ||
| state.toggleMaximized() | ||
| } | ||
| WindowButton(Icons.Rounded.Close) { | ||
| state.onClose() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.mineinabyss.launchy | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.compositionLocalOf | ||
| import androidx.compose.ui.window.ApplicationScope | ||
| import androidx.compose.ui.window.WindowPlacement | ||
| import androidx.compose.ui.window.WindowScope | ||
| import androidx.compose.ui.window.WindowState | ||
| import com.mineinabyss.launchy.logic.LaunchyState | ||
|
|
||
| val TopBarProvider = compositionLocalOf<TopBarState> { error("No top bar provided") } | ||
| val TopBar: TopBarState | ||
| @Composable | ||
| get() = TopBarProvider.current | ||
|
|
||
| class TopBarState( | ||
| val onClose: () -> Unit, | ||
| val windowState: WindowState, | ||
| val windowScope: WindowScope, | ||
| ) { | ||
| fun toggleMaximized() { | ||
| if (windowState.placement != WindowPlacement.Maximized) | ||
| windowState.placement = WindowPlacement.Maximized | ||
| else windowState.placement = WindowPlacement.Floating | ||
| } | ||
| } |
Oops, something went wrong.