Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.example.otuskmp.StopwatchViewModel
import com.example.otuskmp.androidContext

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
androidContext = applicationContext
setContent {
MyApplicationTheme {
Surface(
Expand Down Expand Up @@ -71,6 +73,11 @@ fun StopWatchContent(modifier: Modifier = Modifier) {
) {
Text("Stop")
}
TextButton(
onClick = viewModel::onCopyClicked
) {
Text("Copy")
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ plugins {
alias(libs.plugins.kotlinAndroid).apply(false)
alias(libs.plugins.kotlinMultiplatform).apply(false)
alias(libs.plugins.compose.compiler).apply(false)
alias(libs.plugins.jetbrainsCompose).apply(false)
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Gradle
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.configuration-cache=false

#Kotlin
kotlin.code.style=official

#Android
android.useAndroidX=true
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kotlin = "2.1.21"
compose = "1.8.1"
compose-material3 = "1.3.2"
androidx-activityCompose = "1.10.1"
jetbrains-compose = "1.7.3"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
Expand All @@ -22,3 +23,4 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
17 changes: 15 additions & 2 deletions iosApp/iosApp/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,21 @@ struct ContentView: View {
.padding()

HStack(spacing: 8) {
Button(action: viewModel.onStartClicked, label: {
Button(action: {
viewModel.onStartClicked()
}, label: {
Text("Start")
})
Button(action: viewModel.onStopClicked, label: {
Button(action: {
viewModel.onStopClicked()
}, label: {
Text("Stop")
})
Button(action: {
viewModel.onCopyClicked()
}, label: {
Text("Copy")
})
}
}
}
Expand All @@ -34,6 +43,10 @@ class StopwatchViewModelWrapper: ObservableObject {
func onStopClicked() {
viewModel.onStopClicked()
}

func onCopyClicked() {
viewModel.onCopyClicked()
}

init() {
observer = viewModel.uiState.collect {
Expand Down
Loading