diff --git a/connector/composeApp/src/desktopMain/kotlin/tab/test/RunTest.kt b/connector/composeApp/src/desktopMain/kotlin/tab/test/RunTest.kt deleted file mode 100644 index 9a94f6d..0000000 --- a/connector/composeApp/src/desktopMain/kotlin/tab/test/RunTest.kt +++ /dev/null @@ -1,29 +0,0 @@ -package tab.test - -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import cafe.adriel.voyager.navigator.tab.Tab -import cafe.adriel.voyager.navigator.tab.TabOptions - -object RunTest : Tab { - private fun readResolve(): Any = RunTest - - override val options: TabOptions - @Composable - get() { - val title = "Run Test" - - return remember { - TabOptions( - index = 0u, - title = title, - ) - } - } - - @Composable - override fun Content() { - Text("Simulator Running Tests...") - } -} diff --git a/connector/composeApp/src/desktopMain/kotlin/tab/test/SimulatorTest.kt b/connector/composeApp/src/desktopMain/kotlin/tab/test/SimulatorTest.kt index f0bb2f4..a5df89b 100644 --- a/connector/composeApp/src/desktopMain/kotlin/tab/test/SimulatorTest.kt +++ b/connector/composeApp/src/desktopMain/kotlin/tab/test/SimulatorTest.kt @@ -1,12 +1,9 @@ package tab.test -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.* +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextOverflow -import cafe.adriel.voyager.navigator.tab.* +import cafe.adriel.voyager.navigator.tab.Tab +import cafe.adriel.voyager.navigator.tab.TabOptions import connector.composeapp.generated.resources.Res import connector.composeapp.generated.resources.check_box_24px import org.jetbrains.compose.resources.ExperimentalResourceApi @@ -31,41 +28,8 @@ object SimulatorTest : Tab { } } - @OptIn(ExperimentalMaterial3Api::class) @Composable override fun Content() { - TabNavigator(RunTest) { - val tabNavigator = LocalTabNavigator.current - - Scaffold( - topBar = { - SecondaryTabRow(selectedTabIndex = tabNavigator.current.options.index.toInt()) { - TabItem(RunTest) - TabItem(TestResult) - } - }, - content = { innerPadding -> - Column( - modifier = Modifier.padding(innerPadding) - ) { - CurrentTab() - } - } - ) - } - - } - - @Composable - private fun TabItem( - tab: Tab - ) { - val tabNavigator = LocalTabNavigator.current - - Tab( - text = { Text(text = tab.options.title, maxLines = 2, overflow = TextOverflow.Ellipsis) }, - selected = tabNavigator.current == tab, - onClick = { tabNavigator.current = tab } - ) + Text("Simulator Test") } } diff --git a/connector/composeApp/src/desktopMain/kotlin/tab/test/TestResult.kt b/connector/composeApp/src/desktopMain/kotlin/tab/test/TestResult.kt deleted file mode 100644 index 55c1f5c..0000000 --- a/connector/composeApp/src/desktopMain/kotlin/tab/test/TestResult.kt +++ /dev/null @@ -1,29 +0,0 @@ -package tab.test - -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import cafe.adriel.voyager.navigator.tab.Tab -import cafe.adriel.voyager.navigator.tab.TabOptions - -object TestResult : Tab { - private fun readResolve(): Any = TestResult - - override val options: TabOptions - @Composable - get() { - val title = "Test Result" - - return remember { - TabOptions( - index = 1u, - title = title, - ) - } - } - - @Composable - override fun Content() { - Text("Test Results") - } -}