From 988a65061d0e88b9f44a071875ea4cfbf0bbefdd Mon Sep 17 00:00:00 2001 From: Kevin Boos Date: Fri, 31 May 2024 11:39:40 -0700 Subject: [PATCH] Update makepad and use new RadioButton styling --- Cargo.lock | 113 +++++++++++++++++++++++++++++------------------------ src/app.rs | 8 ++-- 2 files changed, 66 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bfeb717..cfa526d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1657,11 +1657,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "jni-sys" -version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" - [[package]] name = "js-sys" version = "0.3.64" @@ -1839,10 +1834,19 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "makepad-android-state" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd004cda8be459fd76954218b76a1249a079fb9360bbca4e724cb7ddb2962857" +dependencies = [ + "makepad-jni-sys", +] + [[package]] name = "makepad-derive-live" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -1851,7 +1855,7 @@ dependencies = [ [[package]] name = "makepad-derive-wasm-bridge" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-micro-proc-macro", ] @@ -1859,7 +1863,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -1868,13 +1872,13 @@ dependencies = [ [[package]] name = "makepad-draw" version = "0.6.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "ab_glyph_rasterizer", "makepad-html", "makepad-platform", + "makepad-rustybuzz", "makepad-vector", - "rustybuzz", "sdfer", "unicode-bidi", ] @@ -1882,17 +1886,17 @@ dependencies = [ [[package]] name = "makepad-futures" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" [[package]] name = "makepad-futures-legacy" version = "0.7.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" [[package]] name = "makepad-html" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id", ] @@ -1900,12 +1904,18 @@ dependencies = [ [[package]] name = "makepad-http" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" + +[[package]] +name = "makepad-jni-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-live-compiler" version = "0.5.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-derive-live", "makepad-live-tokenizer", @@ -1915,7 +1925,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id-macros", ] @@ -1923,7 +1933,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-micro-proc-macro", ] @@ -1931,7 +1941,7 @@ dependencies = [ [[package]] name = "makepad-live-tokenizer" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id", "makepad-math", @@ -1941,7 +1951,7 @@ dependencies = [ [[package]] name = "makepad-markdown" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-id", ] @@ -1949,17 +1959,17 @@ dependencies = [ [[package]] name = "makepad-math" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" [[package]] name = "makepad-micro-proc-macro" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" [[package]] name = "makepad-micro-serde" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-micro-serde-derive", ] @@ -1967,7 +1977,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-micro-proc-macro", ] @@ -1975,17 +1985,18 @@ dependencies = [ [[package]] name = "makepad-objc-sys" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" [[package]] name = "makepad-platform" version = "0.6.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ - "jni-sys", + "makepad-android-state", "makepad-futures", "makepad-futures-legacy", "makepad-http", + "makepad-jni-sys", "makepad-objc-sys", "makepad-shader-compiler", "makepad-wasm-bridge", @@ -1994,10 +2005,25 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "makepad-rustybuzz" +version = "0.8.0" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + [[package]] name = "makepad-shader-compiler" version = "0.5.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-live-compiler", ] @@ -2005,7 +2031,7 @@ dependencies = [ [[package]] name = "makepad-vector" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "ttf-parser", ] @@ -2013,7 +2039,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "0.4.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -2022,7 +2048,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "0.6.0" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-derive-widget", "makepad-draw", @@ -2035,7 +2061,7 @@ dependencies = [ [[package]] name = "makepad-windows" version = "0.51.1" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "windows-core 0.51.1 (git+https://github.com/makepad/makepad?branch=rik)", "windows-targets", @@ -2044,7 +2070,7 @@ dependencies = [ [[package]] name = "makepad-zune-core" version = "0.2.14" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "bitflags 2.4.1", ] @@ -2052,7 +2078,7 @@ dependencies = [ [[package]] name = "makepad-zune-inflate" version = "0.2.54" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "simd-adler32", ] @@ -2060,7 +2086,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.3.17" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-zune-core", ] @@ -2068,7 +2094,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.2.1" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "makepad-zune-core", "makepad-zune-inflate", @@ -3610,21 +3636,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustybuzz" -version = "0.8.0" -source = "git+https://github.com/RazrFalcon/rustybuzz?rev=a0b8aa3#a0b8aa3ed002550cfea1137655d9ab7569964ae5" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - [[package]] name = "ryu" version = "1.0.15" @@ -4788,7 +4799,7 @@ dependencies = [ [[package]] name = "windows-core" version = "0.51.1" -source = "git+https://github.com/makepad/makepad?branch=rik#cae2042c711195727b9c147ff5372ef8ba5deead" +source = "git+https://github.com/makepad/makepad?branch=rik#bd972c6d386e839b3cf885f36099583420cbec01" dependencies = [ "windows-targets", ] diff --git a/src/app.rs b/src/app.rs index 3dac0a90..5e889699 100644 --- a/src/app.rs +++ b/src/app.rs @@ -141,7 +141,7 @@ live_design! { mobile_modes = { tab1 = { animator: {selected = {default: on}} - label: "Rooms" + text: "Rooms" draw_icon: { svg_file: (ICON_CHAT), } @@ -151,7 +151,7 @@ live_design! { align: {x: 0.5, y: 0.5} } tab2 = { - label: "DMs", + text: "DMs", draw_icon: { svg_file: (ICON_CONTACTS), } @@ -161,7 +161,7 @@ live_design! { align: {x: 0.5, y: 0.5} } tab3 = { - label: "Spaces", + text: "Spaces", draw_icon: { svg_file: (ICON_DISCOVER), } @@ -171,7 +171,7 @@ live_design! { align: {x: 0.5, y: 0.5} } tab4 = { - label: "Profile", + text: "Profile", draw_icon: { svg_file: (ICON_ME), }