Home Explore Help
Sign In
lenn
/
dioxus-mirror
mirror of https://github.com/DioxusLabs/dioxus.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Add some logging and debug

Jonathan Kelley 2 years ago
parent
ea3b199eb2
commit
10a3b228f6
3 changed files with 49 additions and 17 deletions
Unified View Show Diff Stats
  1. 12 0
      examples/mobile_demo/src/index.html
  2. 36 16
      examples/mobile_demo/src/lib.rs
  3. 1 1
      packages/core/src/arena.rs

+ 12 - 0
examples/mobile_demo/src/index.html
View File 

@@ -0,0 +1,12 @@
 
+<!DOCTYPE html>
 
+ <html>
 
+   <head>
 
+     <title>Dioxus app</title>
 
+     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
+     <!-- CUSTOM HEAD -->
 
+   </head>
 
+   <body>
 
+     <div id="main"></div>
 
+     <!-- MODULE LOADER -->
 
+   </body>
 
+ </html>

+ 36 - 16
examples/mobile_demo/src/lib.rs
View File 

@@ -1,15 +1,8 @@
 
 use anyhow::Result;
 
 use anyhow::Result;
 
+use dioxus::prelude::*;
 
+use dioxus_desktop::Config;
 
 #[cfg(target_os = "android")]
 
 #[cfg(target_os = "android")]
 
 use wry::android_binding;
 
 use wry::android_binding;
 
-use wry::{
 
-    application::{
 
-        event::{Event, StartCause, WindowEvent},
 
-        event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget},
 
-        window::WindowBuilder,
 
-    },
 
-    http::Response,
 
-    webview::{WebView, WebViewBuilder},
 
-};
 
 
 
 #[cfg(target_os = "android")]
 
 #[cfg(target_os = "android")]
 
 fn init_logging() {
 
 fn init_logging() {
 
@@ -54,13 +47,40 @@ pub extern "C" fn start_app() {
 
 pub fn main() -> Result<()> {
 
 pub fn main() -> Result<()> {
 
     init_logging();
 
     init_logging();
 
 
 
-    use dioxus::prelude::*;
 
-
 
-    dioxus_desktop::launch(|cx| {
 
-        cx.render(rsx! {
 
-            "hello world!"
 
-        })
 
-    });
 
+    // Right now we're going through dioxus-desktop but we'd like to go through dioxus-mobile
 
+    // That will seed the index.html with some fixes that prevent the page from scrolling/zooming etc
 
+    dioxus_desktop::launch_cfg(
 
+        app,
 
+        // Note that we have to disable the viewport goofiness of the browser.
 
+        // Dioxus_mobile should do this for us
 
+        Config::default().with_custom_index(include_str!("index.html").to_string()),
 
+    );
 
 
 
     Ok(())
 
     Ok(())
 
 }
 
 }
 
+
 
+fn app(cx: Scope) -> Element {
 
+    let items = cx.use_hook(|| vec![1, 2, 3]);
 
+
 
+    log::debug!("Hello from the app");
 
+
 
+    render! {
 
+        div {
 
+            h1 { "Hello, Mobile"}
 
+            div { margin_left: "auto", margin_right: "auto", width: "200px", padding: "10px", border: "1px solid black",
 
+                button {
 
+                    onclick: move|_| {
 
+                        println!("Clicked!");
 
+                        items.push(items.len());
 
+                        cx.needs_update_any(ScopeId(0));
 
+                        println!("Requested update");
 
+                    },
 
+                    "Add item"
 
+                }
 
+                for item in items.iter() {
 
+                    div { "- {item}" }
 
+                }
 
+            }
 
+        }
 
+    }
 
+}

+ 1 - 1
packages/core/src/arena.rs
View File 

@@ -22,7 +22,7 @@ pub(crate) struct ElementRef {
 
     pub template: Option<NonNull<VNode<'static>>>,
 
     pub template: Option<NonNull<VNode<'static>>>,
 
 }
 
 }
 
 
 
-#[derive(Clone, Copy)]
 
+#[derive(Clone, Copy, Debug)]
 
 pub enum ElementPath {
 
 pub enum ElementPath {
 
     Deep(&'static [u8]),
 
     Deep(&'static [u8]),
 
     Root(usize),
 
     Root(usize),