Skip to content

Commit

Permalink
fix: remove patch for android activity
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioRibera committed Jun 28, 2023
1 parent caed06b commit 7f6bdf8
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 62 deletions.
13 changes: 0 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ Add to Cargo.toml
bevy = "0.10.1"
virtual_joystick = "*" # Add your version
```
To solve [sizing issue](#user-content-issues)
```
[patch.crates-io]
android-activity = { git = "https://github.com/rust-mobile/android-activity", rev = "79e03e08fbf70e374cb88d8ef8c89acaa006bbfc" }
```

The minimal requirement:
```rust
Expand Down Expand Up @@ -259,13 +254,5 @@ struct VirtualJoystickBundle {
}
```

# Issues
- [Sizing problem between desktop and mobile (UI/2D)](https://github.com/bevyengine/bevy/issues/8322)
> **Note**: Temporary solution, add this to your Cargo.toml
```rs
[patch.crates-io]
android-activity = { git = "https://github.com/rust-mobile/android-activity", rev = "79e03e08fbf70e374cb88d8ef8c89acaa006bbfc" }
```

# TODOs
- Add more better documentation
7 changes: 4 additions & 3 deletions examples/multiple_joysticks_mobile/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions examples/multiple_joysticks_mobile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,3 @@ crate-type = ["staticlib", "cdylib"]
[dependencies]
bevy = "0.10.1"
virtual_joystick = { path = "../../" }

[package.metadata.android]
package = "com.sergioribera.multiple_joysticks"
apk_name = "Multiple_Joysticks"
assets = "./assets"
resources = "./assets/android-res"
build_targets = ["aarch64-linux-android", "armv7-linux-androideabi"]

[package.metadata.android.sdk]
target_sdk_version = 31

[package.metadata.android.application]
icon = "@mipmap/ic_launcher"
label = "Multiple Joystick"

#
# Important: this solve the [issue](https://github.com/bevyengine/bevy/issues/8322)
#
[patch.crates-io]
android-activity = { git = "https://github.com/rust-mobile/android-activity", rev = "79e03e08fbf70e374cb88d8ef8c89acaa006bbfc" }
35 changes: 29 additions & 6 deletions examples/simple_mobile/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions examples/simple_mobile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,3 @@ crate-type = ["staticlib", "cdylib"]
[dependencies]
bevy = "0.10.1"
virtual_joystick = { path = "../../" }

[package.metadata.android]
package = "com.sergioribera.simple"
apk_name = "Simple_Joystick"
assets = "./assets"
resources = "./assets/android-res"
build_targets = ["aarch64-linux-android", "armv7-linux-androideabi"]

[package.metadata.android.sdk]
target_sdk_version = 31

[package.metadata.android.application]
icon = "@mipmap/ic_launcher"
label = "Simple Joystick"

#
# Important: this solve the [issue](https://github.com/bevyengine/bevy/issues/8322)
#
[patch.crates-io]
android-activity = { git = "https://github.com/rust-mobile/android-activity", rev = "79e03e08fbf70e374cb88d8ef8c89acaa006bbfc" }

0 comments on commit 7f6bdf8

Please sign in to comment.