wip: initial about screen and layer picker

Author: cilki

Cargo.lock

@@ -16,9 +16,13 @@ crate-type = ["lib", "cdylib"]
 bevy = { workspace = true }
 rustls = { workspace = true }
 tokio = { workspace = true }
-sandpolis = { path = "../sandpolis", version = "8.0.0", features = [
+sandpolis = { path = "../sandpolis", version = "8.0.0", default-features = false, features = [
   "client",
   "client-gui",
   "agent",
+  "layer-desktop",
+  "layer-inventory",
+  "layer-power",
+  "layer-shell",
 ] }
 sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }

sandpolis-mobile/Cargo.toml

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

sandpolis-mobile/android/.gitignore

@@ -1,26 +1,94 @@
-{ pkgs ? import <nixpkgs> { config.allowUnfree = true; } }:
+{ pkgs ? import <nixpkgs> {
+    config.allowUnfree = true;
+    overlays = [
+      (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
+    ];
+  }
+}:
 
 with pkgs;
 
 let
+  # Android SDK with minimal components needed for building APKs
   android-nixpkgs = callPackage <android-nixpkgs> { channel = "stable"; };
 
   android-sdk = android-nixpkgs.sdk (sdkPkgs:
     with sdkPkgs; [
-      cmdline-tools-latest
-      build-tools-34-0-0
-      platform-tools
-      platforms-android-34
-      emulator
-      cmake-3-22-1
-      ndk-26-1-10909125
+      cmdline-tools-latest   # SDK manager
+      build-tools-34-0-0     # Required by gradle
+      platforms-android-34   # API 34 for compilation
+      ndk-26-1-10909125      # Native compilation for Rust
     ]);
 
+  # Rust toolchain with Android targets
+  rust-android = rust-bin.stable.latest.default.override {
+    extensions = [ "rust-src" ];
+    targets = [ "aarch64-linux-android" ];
+  };
+
 in mkShell {
-  buildInputs = [ android-studio android-sdk jdk ];
-  nativeBuildInputs =
-    [ cargo cargo-ndk rustc rust-analyzer rustfmt clippy rustup ];
+  buildInputs = [
+    android-sdk
+    jdk17        # Required by gradle
+    gradle       # APK assembly
+    cargo-ndk    # Builds Rust for Android targets
+    rust-android # Rust with Android targets
+    cmake        # Required by aws-lc-sys for crypto
+    pkg-config   # Required for library detection
+    zlib         # System zlib to avoid NDK build issues
+    clang        # Host C compiler for build scripts
+    llvmPackages.bintools # Host linker
+  ];
+
+  # Android SDK/NDK environment variables
+  ANDROID_HOME = "${android-sdk}/share/android-sdk";
+  ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
+  ANDROID_NDK_ROOT = "${android-sdk}/share/android-sdk/ndk/26.1.10909125";
+  NDK_HOME = "${android-sdk}/share/android-sdk/ndk/26.1.10909125";
+
+  # Configure cargo-ndk to use system zlib instead of building it
+  ZLIB_SYS_STATIC = "0";
+  PKG_CONFIG_ALLOW_CROSS = "1";
+
+  GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android-sdk}/share/android-sdk/build-tools/34.0.0/aapt2";
 
-  GRADLE_OPTS =
-    "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android-sdk}/share/android-sdk/build-tools/34.0.0/aapt2";
+  shellHook = ''
+    # Generate local.properties with Nix store paths
+    cat > android/local.properties <<EOF
+sdk.dir=$ANDROID_SDK_ROOT
+ndk.dir=$ANDROID_NDK_ROOT
+EOF
+
+    # Set host compilers for build scripts (before cargo-ndk overrides them)
+    export CC_x86_64_unknown_linux_gnu=${pkgs.clang}/bin/clang
+    export CXX_x86_64_unknown_linux_gnu=${pkgs.clang}/bin/clang++
+    export AR_x86_64_unknown_linux_gnu=${pkgs.llvmPackages.bintools}/bin/ar
+
+    # Welcome message with build instructions
+    echo "Android build environment ready"
+    echo "Rust version: $(rustc --version)"
+    echo ""
+    echo "To build APK:"
+    echo "  # Debug build:"
+    echo "  cargo ndk -t arm64-v8a -o android/app/src/main/jniLibs build"
+    echo "  cd android && ./gradlew assembleDebug"
+    echo ""
+    echo "  # Release build:"
+    echo "  cargo ndk -t arm64-v8a -o android/app/src/main/jniLibs build --release"
+    echo "  cd android && ./gradlew assembleRelease"
+    echo ""
+    echo "APK output: android/app/build/outputs/apk/"
+  '';
 }
+
+# Usage:
+#   nix-shell                    Enter development environment
+#
+# Build APK:
+#   Debug:   cargo ndk -t arm64-v8a -o android/app/src/main/jniLibs build && cd android && ./gradlew assembleDebug
+#   Release: cargo ndk -t arm64-v8a -o android/app/src/main/jniLibs build --release && cd android && ./gradlew assembleRelease
+#
+# To add debugging tools, include in buildInputs:
+#   - platform-tools (for adb, fastboot)
+#   - emulator (for Android Virtual Device)
+#   - android-studio (for GUI development)

sandpolis-mobile/android/local.properties

@@ -59,6 +59,7 @@ pub fn render_edges(
             // Color based on layer
             let color = match edge.layer {
                 Layer::Network => Color::srgb(0.3, 0.8, 1.0),    // Cyan
+                #[cfg(feature = "layer-filesystem")]
                 Layer::Filesystem => Color::srgb(0.3, 1.0, 0.3), // Green
                 Layer::Desktop => Color::srgb(1.0, 0.5, 0.3),    // Orange
                 _ => Color::srgb(0.6, 0.6, 0.6),                 // Gray
@@ -101,6 +102,7 @@ pub fn update_edges_for_layer(
                 }
             }
         }
+        #[cfg(feature = "layer-filesystem")]
         Layer::Filesystem => {
             // TODO: Query filesystem connections (file transfer paths)
             // For now, no edges

sandpolis-mobile/shell.nix

@@ -468,56 +468,3 @@ pub fn handle_keymap(
             }
         });
 }
-
-/// Switch to another layer from keypress
-pub fn handle_layer_change(
-    mut contexts: EguiContexts,
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut current_layer: ResMut<CurrentLayer>,
-    time: Res<Time>,
-    mut timer: ResMut<LayerChangeTimer>,
-    mut windows: Query<&mut Window>,
-) {
-    // Don't handle layer change if egui wants keyboard input
-    let Ok(ctx) = contexts.ctx_mut() else {
-        return;
-    };
-    if ctx.wants_keyboard_input() {
-        return;
-    }
-
-    // TODO don't allow change while timer is running
-
-    #[cfg(feature = "layer-filesystem")]
-    if keyboard_input.pressed(KeyCode::KeyF) {
-        **current_layer = Layer::Filesystem;
-        timer.reset();
-    }
-    #[cfg(feature = "layer-package")]
-    if keyboard_input.pressed(KeyCode::KeyP) {
-        **current_layer = Layer::Package;
-        timer.reset();
-    }
-    #[cfg(feature = "layer-desktop")]
-    if keyboard_input.pressed(KeyCode::KeyD) {
-        **current_layer = Layer::Desktop;
-        timer.reset();
-    }
-
-    // Now show the current layer for a few seconds
-    if !timer.tick(time.delta()).finished() {
-        let _window_size = windows.single_mut().unwrap().size();
-        // TODO util
-        // egui::Window::new("Current layer")
-        //     .id(egui::Id::new("current_layer"))
-        //     .pivot(egui::Align2::CENTER_CENTER)
-        //     .resizable(false)
-        //     .movable(false)
-        //     .collapsible(false)
-        //     .title_bar(false)
-        //     .fixed_pos(egui::Pos2::new(window_size.x / 2.0, window_size.y -
-        // 30.0))     .show(contexts.ctx_mut(), |ui| {
-        //         ui.label(format!("{:?}", **current_layer));
-        //     });
-    }
-}