Compare commits

..

11 commits

Author SHA1 Message Date
08ee5d1b58 Add some self code 2023-08-23 10:22:13 +02:00
dima.avdeev
c20faa0995
Gradle, android -> androidTarget (#20) 2023-07-27 15:09:17 +03:00
Igor Demin
ba91acf5d6 Compose 1.4.3 2023-07-26 01:21:45 +02:00
Igor Demin
858e08f661 Compose 1.4.1 2023-06-26 21:21:47 +02:00
Sebastian Aigner
1ff7cb2f7b Add configChanges to AndroidManifest.xml to prevent activity recreation 2023-06-19 20:28:31 +02:00
Sebastian Aigner
c7d2402619 Add explicit place to change the status bar color
Make it so that Compose stretches to the bottom of the screen (no white border)
2023-05-23 16:57:02 +02:00
Elijah Semyonov
87dfc98d36
Allow higher than 60hz framerates on CADisplayLink on iPhones (#17) 2023-05-18 13:12:26 +03:00
dima.avdeev
29ce600cb8
fix iOS build with multiple modules (#14)
Describe problem here https://github.com/dima-avdeev-jb/kotlin-gradle-plugin-ios-root-project-name-with-space
2023-05-03 17:29:54 +03:00
katia-energizer
bbbb3a8e24
Updated after proofreading (#13)
Co-authored-by: Ekaterina.Volodko <ekaterina.volodko@jetbrains.com>
2023-04-21 12:46:36 +03:00
Sebastian Aigner
dde60620de
Merge pull request #11 from ahmad-hossain/main
Fix typo in README.md
2023-04-16 09:10:04 +02:00
ahmad-hossain
a22b3611f8
Fix typo in README.md 2023-04-16 01:14:08 -04:00
12 changed files with 118 additions and 64 deletions

View file

@ -5,16 +5,16 @@
> **Note** > **Note**
> Compose Multiplatform for iOS is in Alpha. It may change incompatibly and require manual migration in the future. > Compose Multiplatform for iOS is in Alpha. It may change incompatibly and require manual migration in the future.
> We would appreciate your feedback on it in the public Slack channel [#compose-ios](https://kotlinlang.slack.com/archives/C0346LWVBJ4/p1678888063176359). > We would appreciate your feedback on it in the public Slack channel [#compose-ios](https://kotlinlang.slack.com/archives/C0346LWVBJ4/p1678888063176359).
> If you face any issues, please report them on [GitHub](https://github.com/JetBrains/compose-multiplatform/issues). > If you have any issues, please report them on [GitHub](https://github.com/JetBrains/compose-multiplatform/issues).
You can use this template to start developing your own [Compose Multiplatform](https://github.com/JetBrains/compose-multiplatform#readme) mobile application targeting Android and iOS. You can use this template to start developing your own [Compose Multiplatform](https://github.com/JetBrains/compose-multiplatform#readme) mobile application targeting Android and iOS.
Follow our tutorial below to get your first Compose Multiplatform app up and running. Follow our tutorial below to get your first Compose Multiplatform app up and running.
The result will be a [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html) project that uses Compose Multiplatform UI framework. The result will be a [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html) project that uses the Compose Multiplatform UI framework.
![](readme_images/banner.png) ![](readme_images/banner.png)
If you want to create an application targeting desktop platforms Windows, macOS, and Linux, If you want to create an application targeting desktop platforms Windows, macOS, or Linux
use the [Compose Multiplatform for Desktop template](https://github.com/JetBrains/compose-multiplatform-desktop-template#readme). use the [Compose Multiplatform desktop application template](https://github.com/JetBrains/compose-multiplatform-desktop-template#readme).
## Set up the environment ## Set up the environment
@ -27,8 +27,8 @@ To work with this template, you need the following:
* A machine running a recent version of macOS * A machine running a recent version of macOS
* [Xcode](https://apps.apple.com/us/app/xcode/id497799835) * [Xcode](https://apps.apple.com/us/app/xcode/id497799835)
* [Android Studio](https://developer.android.com/studio) * [Android Studio](https://developer.android.com/studio)
* [Kotlin Multiplatform Mobile plugin](https://plugins.jetbrains.com/plugin/14936-kotlin-multiplatform-mobile) * The [Kotlin Multiplatform Mobile plugin](https://plugins.jetbrains.com/plugin/14936-kotlin-multiplatform-mobile)
* [CocoaPods dependency manager](https://kotlinlang.org/docs/native-cocoapods.html) * The [CocoaPods dependency manager](https://kotlinlang.org/docs/native-cocoapods.html)
### Check your environment ### Check your environment
@ -46,7 +46,7 @@ Before you start, use the [KDoctor](https://github.com/Kotlin/kdoctor) tool to e
kdoctor kdoctor
``` ```
If everything is set up correctly, you'll see a valid output: If everything is set up correctly, you'll see valid output:
```text ```text
Environment diagnose (to see all details, use -v option): Environment diagnose (to see all details, use -v option):
@ -57,10 +57,10 @@ Before you start, use the [KDoctor](https://github.com/Kotlin/kdoctor) tool to e
[✓] Cocoapods [✓] Cocoapods
Conclusion: Conclusion:
✓ Your system is ready for Kotlin Multiplatform Mobile Development! ✓ Your system is ready for Kotlin Multiplatform Mobile development!
``` ```
Otherwise, KDoctor will highlight which parts of your setup still need configuration and suggest how to fix them. Otherwise, KDoctor will highlight which parts of your setup still need to be configured and will suggest a way to fix them.
## Examine the project structure ## Examine the project structure
@ -68,13 +68,13 @@ Open the project in Android Studio and switch the view from **Android** to **Pro
<img src="readme_images/open_project_view.png" height="300px"> <img src="readme_images/open_project_view.png" height="300px">
Your Compose Multiplatform project includes three modules: Your Compose Multiplatform project includes 3 modules:
### shared ### shared
This is a Kotlin module that contains the logic common for both Android and iOS applications, the code you share between platforms. This is a Kotlin module that contains the logic common for both Android and iOS applications, that is, the code you share between platforms.
This `shared` module is also where you write your Compose Multiplatform code. This `shared` module is also where youll write your Compose Multiplatform code.
In `shared/src/commonMain/kotlin/App.kt`, you can find the shared root `@Composable` function for your app. In `shared/src/commonMain/kotlin/App.kt`, you can find the shared root `@Composable` function for your app.
It uses Gradle as the build system. You can add dependencies and change settings in `shared/build.gradle.kts`. It uses Gradle as the build system. You can add dependencies and change settings in `shared/build.gradle.kts`.
@ -107,7 +107,7 @@ To run your application on an Android emulator:
<details> <details>
<summary>Alternatively, use Gradle</summary> <summary>Alternatively, use Gradle</summary>
To install an Android application on a real device Android device or an emulator, run `./gradlew installDebug` in the terminal. To install an Android application on a real Android device or an emulator, run `./gradlew installDebug` in the terminal.
</details> </details>
@ -135,12 +135,12 @@ To run your application on an iOS simulator in Android Studio, modify the `iosAp
You can run your Compose Multiplatform application on a real iOS device for free. You can run your Compose Multiplatform application on a real iOS device for free.
To do so, you'll need the following: To do so, you'll need the following:
* `TEAM_ID` associated with your [Apple ID](https://support.apple.com/en-us/HT204316) * The `TEAM_ID` associated with your [Apple ID](https://support.apple.com/en-us/HT204316)
* The iOS device registered in Xcode * The iOS device registered in Xcode
> **Note** > **Note**
> Before you continue, we suggest creating a simple "Hello, world!" project in Xcode to ensure you can successfully run apps on your device. > Before you continue, we suggest creating a simple "Hello, world!" project in Xcode to ensure you can successfully run apps on your device.
> You can follow the instructions below or watch this [Standford CS193P lecture recording](https://youtu.be/bqu6BquVi2M?start=716&end=1399). > You can follow the instructions below or watch this [Stanford CS193P lecture recording](https://youtu.be/bqu6BquVi2M?start=716&end=1399).
<details> <details>
<summary>How to create and run a simple project in Xcode</summary> <summary>How to create and run a simple project in Xcode</summary>
@ -149,8 +149,8 @@ To do so, you'll need the following:
2. On the **iOS** tab, choose the **App** template. Click **Next**. 2. On the **iOS** tab, choose the **App** template. Click **Next**.
3. Specify the product name and keep other settings default. Click **Next**. 3. Specify the product name and keep other settings default. Click **Next**.
4. Select where to store the project on your computer and click **Create**. You'll see an app that displays "Hello, world!" on the device screen. 4. Select where to store the project on your computer and click **Create**. You'll see an app that displays "Hello, world!" on the device screen.
5. At the top of your Xcode screen, click on a device name near the **Run** button. 5. At the top of your Xcode screen, click on the device name near the **Run** button.
6. Plug in your device to the computer. You'll see this device in the list of run options. 6. Plug your device into the computer. You'll see this device in the list of run options.
7. Choose your device and click **Run**. 7. Choose your device and click **Run**.
</details> </details>
@ -166,18 +166,18 @@ ZABCW6SXYZ (SampleTech Inc.)
``` ```
<details> <details>
<summary>Alternative way of finding your Team ID</summary> <summary>Alternative way to find your Team ID</summary>
If KDoctor doesn't work for you, try this alternative method: If KDoctor doesn't work for you, try this alternative method:
1. In Android Studio, run the `iosApp` configuration with the selected real device. The build should fail. 1. In Android Studio, run the `iosApp` configuration with the selected real device. The build should fail.
2. Go to Xcode and select **Open a project or file**. 2. Go to Xcode and select **Open a project or file**.
3. Navigate to the `iosApp/iosApp.xcworkspace` file of your project. 3. Navigate to the `iosApp/iosApp.xcworkspace` file of your project.
4. In the left menu, select `iosApp`. 4. In the left-hand menu, select `iosApp`.
5. Navigate to **Signing & Capabilities**. 5. Navigate to **Signing & Capabilities**.
6. In the **Team** list, select your personal team. 6. In the **Team** list, select your team.
If you haven't set up your team yet, use the **Add account** option and follow the steps. If you haven't set up your team yet, use the **Add account** option and follow the steps.
</details> </details>
@ -189,10 +189,10 @@ To run the application, set the `TEAM_ID`:
## Make your first changes ## Make your first changes
You can now make some changes in the code and see that they will be visible in both iOS and Android applications at once: You can now make some changes in the code and check that they are visible in both the iOS and Android applications at the same time:
1. In Android Studio, navigate to the `shared/src/commonMain/kotlin/App.kt` file. 1. In Android Studio, navigate to the `shared/src/commonMain/kotlin/App.kt` file.
It's the common entry point for your Compose Multiplatform app. This is the common entry point for your Compose Multiplatform app.
Here, you see the code responsible for rendering the "Hello, World!" button and the animated Compose Multiplatform logo: Here, you see the code responsible for rendering the "Hello, World!" button and the animated Compose Multiplatform logo:
@ -249,7 +249,7 @@ You can now make some changes in the code and see that they will be visible in b
} }
``` ```
3. Re-run both `androidApp` and `iosApp` configurations. You'll see this change reflected in both the Android and iOS apps: 3. Re-run both the `androidApp` and `iosApp` configurations. You'll see this change reflected in both the Android and iOS apps:
<img src="readme_images/text_field_added.png" height="200px"> <img src="readme_images/text_field_added.png" height="200px">
@ -258,11 +258,11 @@ You can now make some changes in the code and see that they will be visible in b
To get a better understanding of this template's setup and learn how to configure the basic properties of your iOS app without Xcode, To get a better understanding of this template's setup and learn how to configure the basic properties of your iOS app without Xcode,
open the `iosApp/Configuration/Config.xcconfig` file in Android Studio. The configuration file contains: open the `iosApp/Configuration/Config.xcconfig` file in Android Studio. The configuration file contains:
* `APP_NAME`, a target executable and an application bundle name * `APP_NAME`, a target executable and an application bundle name.
* `BUNDLE_ID` that [uniquely identifies the app throughout the system](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier#discussion) * `BUNDLE_ID`, which [uniquely identifies the app throughout the system](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier#discussion).
* `TEAM_ID`, [a unique identifier generated by Apple that's assigned to your team](https://developer.apple.com/help/account/manage-your-team/locate-your-team-id/#:~:text=A%20Team%20ID%20is%20a,developer%20in%20App%20Store%20Connect) * `TEAM_ID`, [a unique identifier generated by Apple that's assigned to your team](https://developer.apple.com/help/account/manage-your-team/locate-your-team-id/#:~:text=A%20Team%20ID%20is%20a,developer%20in%20App%20Store%20Connect).
To configure the `APP_NAME` option, open `Config.xcconfig` in any text editor *before opening* the project in Android Studio and set the desired name. To configure the `APP_NAME` option, open `Config.xcconfig` in any text editor *before opening* the project in Android Studio, and then set the desired name.
If you need to change this option after you open the project in Android Studio, do the following: If you need to change this option after you open the project in Android Studio, do the following:
@ -272,13 +272,13 @@ If you need to change this option after you open the project in Android Studio,
4. Open the project in Android Studio again. 4. Open the project in Android Studio again.
To configure advanced settings, use Xcode. After opening the project in Android Studio, To configure advanced settings, use Xcode. After opening the project in Android Studio,
go to Xcode and open the `iosApp/iosApp.xcworkspace` file, and make changes. open the `iosApp/iosApp.xcworkspace` file in Xcode and make changes there.
## Next steps ## Next steps
We encourage you to explore Compose Multiplatform further and try out more projects: We encourage you to explore Compose Multiplatform further and try out more projects:
* [Learn about other cases where you can use the Compose Multiplatform UI framework](https://github.com/JetBrains/compose-multiplatform#readme) * [Learn about other cases for using the Compose Multiplatform UI framework](https://github.com/JetBrains/compose-multiplatform#readme)
* [Create an application targeting Windows, macOS, and Linux with Compose Multiplatform for Desktop](https://github.com/JetBrains/compose-multiplatform-desktop-template#readme) * [Create an application targeting Windows, macOS, and Linux with Compose Multiplatform for Desktop](https://github.com/JetBrains/compose-multiplatform-desktop-template#readme)
* [Complete more Compose Multiplatform tutorials](https://github.com/JetBrains/compose-multiplatform/blob/master/tutorials/README.md) * [Complete more Compose Multiplatform tutorials](https://github.com/JetBrains/compose-multiplatform/blob/master/tutorials/README.md)
* [Explore some more advanced Compose Multiplatform example projects](https://github.com/JetBrains/compose-multiplatform/blob/master/examples/README.md) * [Explore some more advanced Compose Multiplatform example projects](https://github.com/JetBrains/compose-multiplatform/blob/master/examples/README.md)

View file

@ -5,7 +5,7 @@ plugins {
} }
kotlin { kotlin {
android() androidTarget()
sourceSets { sourceSets {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {

View file

@ -10,6 +10,7 @@
android:theme="@style/Theme.AppCompat.Light.NoActionBar"> android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<activity <activity
android:exported="true" android:exported="true"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
android:name=".MainActivity" android:name=".MainActivity"
> >
<intent-filter> <intent-filter>

View file

@ -20,6 +20,6 @@ android.targetSdk=33
android.minSdk=24 android.minSdk=24
#Versions #Versions
kotlin.version=1.8.20 kotlin.version=1.9.0
agp.version=7.4.2 agp.version=7.4.2
compose.version=1.4.0 compose.version=1.4.3

View file

@ -1,3 +1,3 @@
TEAM_ID= TEAM_ID=X3U84U8A6F
BUNDLE_ID=com.myapplication.MyApplication BUNDLE_ID=com.myapplication.MyApplication
APP_NAME=My application APP_NAME=My application

View file

@ -13,7 +13,7 @@ struct ComposeView: UIViewControllerRepresentable {
struct ContentView: View { struct ContentView: View {
var body: some View { var body: some View {
ComposeView() ComposeView()
.ignoresSafeArea(.keyboard) // Compose has own keyboard handler .ignoresSafeArea(.all, edges: .bottom) // Compose has own keyboard handler
} }
} }

View file

@ -20,6 +20,8 @@
<string>1</string> <string>1</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSceneManifest</key> <key>UIApplicationSceneManifest</key>
<dict> <dict>
<key>UIApplicationSupportsMultipleScenes</key> <key>UIApplicationSupportsMultipleScenes</key>

View file

@ -4,7 +4,10 @@ import SwiftUI
struct iOSApp: App { struct iOSApp: App {
var body: some Scene { var body: some Scene {
WindowGroup { WindowGroup {
ZStack {
Color.white.ignoresSafeArea(.all) // status bar color
ContentView() ContentView()
}.preferredColorScheme(.light)
} }
} }
} }

View file

@ -1,4 +1,4 @@
rootProject.name = "My application" rootProject.name = "MyApplication"
include(":androidApp") include(":androidApp")
include(":shared") include(":shared")

View file

@ -6,7 +6,7 @@ plugins {
} }
kotlin { kotlin {
android() androidTarget()
iosX64() iosX64()
iosArm64() iosArm64()

View file

@ -1,39 +1,86 @@
import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.itemsIndexed
import androidx.compose.material.Button import androidx.compose.material.Button
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import org.jetbrains.compose.resources.ExperimentalResourceApi import androidx.compose.ui.unit.dp
import org.jetbrains.compose.resources.painterResource
@OptIn(ExperimentalResourceApi::class)
@Composable @Composable
fun App() { fun App() {
MaterialTheme { MaterialTheme {
var greetingText by remember { mutableStateOf("Hello, World!") } val runGame = remember { mutableStateOf(false) }
var showImage by remember { mutableStateOf(false) }
Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { if (!runGame.value) {
Button(onClick = { Column {
greetingText = "Hello, ${getPlatformName()}" Spacer(modifier = Modifier.size(50.dp))
showImage = !showImage Row(
}) { verticalAlignment = Alignment.CenterVertically,
Text(greetingText) horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth()
) {
Button(onClick = { runGame.value = true }) {
Text(text = "Start Game")
} }
AnimatedVisibility(showImage) { }
Image( }
painterResource("compose-multiplatform.xml"), } else {
null
val fieldPos = remember { mutableStateListOf<Field>() }
val selectedPos = remember { mutableStateOf(0) }
val houses = remember { mutableStateOf(0) }
val population = remember { mutableStateOf(0) }
val maxPopulation = remember { mutableStateOf(0) }
if (fieldPos.size != 100) {
for (i in 0..99) {
fieldPos.add(i, Field(text = "x"))
}
}
Column {
Row {
Text(
text = "Einwohneranzahl ${population.value} / ${maxPopulation.value}"
) )
} }
LazyVerticalGrid(
columns = GridCells.Fixed(10)
) {
itemsIndexed(fieldPos) { field, item: Field ->
TextButton(onClick = {
fieldPos[field] = fieldPos[field].copy(text = "o")
selectedPos.value = field
}) {
Text(text = item.text)
}
}
}
Row {
Button(onClick = {
fieldPos[selectedPos.value] = fieldPos[selectedPos.value].copy(text = "H", isBuild = true)
houses.value++
maxPopulation.value = houses.value * 5
}) {
Text("Haus")
}
}
}
} }
} }
} }

View file

@ -0,0 +1 @@
data class Field(var isBuild: Boolean = false, var text: String = "x")