todo: migrate AsRawWidget, RawWidget, port winio_handle

Author: mokurin000

Cargo.toml

@@ -13,6 +13,7 @@ members = [
     "winio-ui-gtk",
     "winio-ui-qt",
     "winio-ui-app-kit",
+    "winio-ui-android",
 ]
 
 resolver = "3"
@@ -36,6 +37,7 @@ winio-ui-winui = { path = "winio-ui-winui", version = "0.6.0-rc.2" }
 winio-ui-gtk = { path = "winio-ui-gtk", version = "0.6.0-rc.1" }
 winio-ui-qt = { path = "winio-ui-qt", version = "0.6.0-rc.1" }
 winio-ui-app-kit = { path = "winio-ui-app-kit", version = "0.6.0-rc.1" }
+winio-ui-android = { path = "winio-ui-android", version = "0.1.0" }
 
 compio = { version = "0.19.0-rc.2", default-features = false }
 compio-log = "0.1.0"

winio-ui-android/Cargo.toml

@@ -3,31 +3,31 @@ name = "winio-ui-android"
 version = "0.1.0"
 description = "Android backend for winio."
 edition = { workspace = true }
-authors = { workspace = true }
 readme = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
 
 [target.'cfg(target_os = "android")'.dependencies]
-log.workspace = true
-jni.workspace = true
 image = { workspace = true, default-features = false }
 futures-util = "0.3.31"
 libc = "1.0.0-alpha.1"
+jni = "0.21.1"
+log = "0.4"
+
+oneshot = { version = "0.1.13", features = ["default"] }
 
 winio-primitive = { workspace = true }
 winio-callback = { workspace = true }
 winio-handle = { workspace = true }
 winio-pollable = { workspace = true }
 
 compio = { workspace = true }
-oneshot = {workspace = true,features = ["default"]}
 
 inherit-methods-macro = { workspace = true }
 
 scoped-tls = { workspace = true }
 
 [build-dependencies]
-encoding_rs = "0.8.35"
+encoding_rs = "0.8.35"

winio-ui-gtk/Cargo.toml

@@ -7,7 +7,7 @@ readme = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 
-[target.'cfg(not(any(windows, target_os = "macos")))'.dependencies]
+[target.'cfg(not(any(windows, target_os = "macos", target_os = "android")))'.dependencies]
 winio-primitive = { workspace = true }
 winio-handle = { workspace = true, features = ["gtk"] }
 winio-callback = { workspace = true }

winio-ui-gtk/src/lib.rs

@@ -2,6 +2,7 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg(not(any(windows, target_os = "macos")))]
+#![cfg(not(target_os = "android"))]
 
 pub(crate) use winio_pollable::GlobalRuntime;
 

winio-ui-qt/build.rs

@@ -5,7 +5,10 @@ fn main() {
 
     let target_os = std::env::var("CARGO_CFG_TARGET_OS");
 
-    if target_os.as_deref() != Ok("windows") && target_os.as_deref() != Ok("macos") {
+    if target_os.as_deref() != Ok("windows")
+        && target_os.as_deref() != Ok("macos")
+        && target_os.as_deref() != Ok("android")
+    {
         let mut modules = vec![
             "Core".into(),
             "Gui".into(),

winio-ui-qt/src/lib.rs

@@ -2,6 +2,7 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg(not(any(windows, target_os = "macos")))]
+#![cfg(not(target_os = "android"))]
 
 pub(crate) use winio_pollable::GlobalRuntime;
 

winio/Cargo.toml

@@ -33,6 +33,9 @@ winio-ui-winui = { workspace = true, optional = true }
 [target.'cfg(target_os = "macos")'.dependencies]
 winio-ui-app-kit = { workspace = true }
 
+[target.'cfg(target_os = "android")'.dependencies]
+winio-ui-android = { workspace = true }
+
 [target.'cfg(not(any(windows, target_os = "macos")))'.dependencies]
 winio-ui-gtk = { workspace = true, optional = true }
 winio-ui-qt = { workspace = true, optional = true }

winio/src/lib.rs

@@ -30,6 +30,8 @@ cfg_if::cfg_if! {
         }
     } else if #[cfg(target_os = "macos")] {
         use winio_ui_app_kit as sys;
+    } else if #[cfg(target_os = "android")] {
+        use winio_ui_android as sys;
     } else {
         #[cfg(all(feature = "gtk", feature = "qt"))]
         compile_error!("You must choose only one of these features: [\"gtk\", \"qt\"]");