add descriptor menu

Author: zsqw123

Cargo.lock

@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.0.12" # JAVA_ASM_VERSION
+version = "0.0.13" # JAVA_ASM_VERSION
 authors = ["zsqw123"]
 edition = "2021"
 license = "Apache-2.0"
@@ -20,9 +20,9 @@ homepage = "https://crates.io/crates/java_asm"
 readme = "README.md"
 
 [workspace.dependencies]
-java_asm_macro = { path = "asm_macro", version = "0.0.12" } # JAVA_ASM_VERSION
-java_asm = { path = "asm", version = "0.0.12" } # JAVA_ASM_VERSION
-java_asm_server = { path = "asm_server", version = "0.0.12" } # JAVA_ASM_VERSION
+java_asm_macro = { path = "asm_macro", version = "0.0.13" } # JAVA_ASM_VERSION
+java_asm = { path = "asm", version = "0.0.13" } # JAVA_ASM_VERSION
+java_asm_server = { path = "asm_server", version = "0.0.13" } # JAVA_ASM_VERSION
 
 enum_dispatch = "0.3.13"
 zip = "2.2.0"
@@ -33,7 +33,7 @@ egui_extras = "0.31.1"
 egui_flex = "0.3.0"
 
 tokio = { version = "1.44.2", features = ["full"] }
-parking_lot = "0.12.3"
+parking_lot = { version = "0.12.3", features = ["deadlock_detection"] }
 
 #iced = "0.13.1"
 #cosmic-text = "0.12.1"

Cargo.toml

@@ -6,9 +6,8 @@ use eframe::{CreationContext, Frame};
 use egui::{Context, DroppedFile, ScrollArea};
 use egui_extras::{Size, StripBuilder};
 use java_asm_server::ui::log::{inject_log, LogHolder};
-use java_asm_server::ui::{AppContainer, Content};
+use java_asm_server::ui::AppContainer;
 use java_asm_server::{AsmServer, ServerMut};
-use std::ops::DerefMut;
 use std::sync::Arc;
 
 pub struct EguiApp {
@@ -89,27 +88,17 @@ impl EguiApp {
 
     fn central_panel(&mut self, ctx: &Context) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            let mut server_content = self.server_app.content().lock();
-            let Content { current, opened_tabs } = server_content.deref_mut();
-
-            let mut deleted_tab = None;
+            let server_locked = self.server.lock();
+            let Some(server) = server_locked.as_ref() else {
+                return;
+            };
+            let server_app = &self.server_app;
 
-            render_tabs(ui, current, opened_tabs, &mut deleted_tab);
+            render_tabs(ui, server_app);
 
             ui.separator();
 
-            if let Some(current_tab) = current {
-                let current_tab = *current_tab;
-                let content = &opened_tabs[current_tab].content;
-                ScrollArea::vertical().show(ui, |ui| {
-                    smali_layout(ui, content);
-                });
-            }
-
-            // remove tab after this time rendering
-            if let Some(index) = deleted_tab {
-                opened_tabs.remove(index);
-            }
+            smali_layout(ui, server, &self.server_app);
         });
     }
 }

asm_egui/src/app.rs

@@ -1,42 +1,54 @@
+use std::ops::DerefMut;
 use eframe::emath::Align;
 use eframe::epaint::StrokeKind;
 use egui::{Layout, Pos2, Rect, Response, Sense, TextStyle, Ui, Vec2, WidgetInfo, WidgetText, WidgetType};
 use egui_flex::{item, Flex, FlexAlignContent};
 use java_asm::StrRef;
-use java_asm_server::ui::Tab;
-
-pub fn render_tabs(ui: &mut Ui, current: &mut Option<usize>, tabs: &Vec<Tab>, deleted_tab: &mut Option<usize>) {
+use java_asm_server::ui::{AppContainer, Tab};
+
+pub fn render_tabs(
+    ui: &mut Ui, app_container: &AppContainer,
+) {
+    let mut deleted_tab = None;
+    let mut content_locked = app_container.content().lock();
+    let content_ref = content_locked.deref_mut();
+    let selected_tab_index = &mut content_ref.selected;
+    let opened_tabs = &mut content_ref.opened_tabs;
     Flex::horizontal()
         .align_content(FlexAlignContent::Start)
         .w_full()
         .wrap(true)
         .show(ui, |flex| {
-        for tab in tabs.iter().enumerate() {
+            for tab in opened_tabs.iter().enumerate() {
             flex.add_ui(item(), |ui: &mut Ui| {
-                file_title(ui, current, deleted_tab, tab)
+                file_title(ui, selected_tab_index, &mut deleted_tab, tab)
             });
         }
     });
+    // remove tab after this time rendering
+    if let Some(index) = deleted_tab {
+        opened_tabs.remove(index);
+    }
 }
 
-fn file_title(ui: &mut Ui, current: &mut Option<usize>, deleted_tab: &mut Option<usize>, tab: (usize, &Tab)) {
+fn file_title(ui: &mut Ui, selected_tab_index: &mut Option<usize>, deleted_tab: &mut Option<usize>, tab: (usize, &Tab)) {
     let (index, tab) = tab;
-    let selected = current.map(|current| current == index).unwrap_or_default();
+    let selected = selected_tab_index.map(|current| current == index).unwrap_or_default();
     let title = tab.title.clone();
     let selectable_label = SelectableClosableLabel { selected, title };
     let response = selectable_label.ui(ui);
     if response.closed {
         *deleted_tab = Some(index);
         // recalculate current tab
-        if let Some(cur) = *current {
+        if let Some(cur) = *selected_tab_index {
             if cur == index {
-                *current = None;
+                *selected_tab_index = None;
             } else if cur > index {
-                *current = Some(cur - 1);
+                *selected_tab_index = Some(cur - 1);
             }
         }
     } else if response.raw.clicked() {
-        *current = Some(index);
+        *selected_tab_index = Some(index);
     }
 }
 

asm_egui/src/file_tab.rs

@@ -1,19 +1,16 @@
 use crate::app::EguiApp;
 use egui::text::LayoutJob;
 use egui::{ScrollArea, TextStyle};
-use java_asm_server::ui::{Content, FileEntry, FileInfo, RawDirInfo, Tab};
+use java_asm_server::ui::{AppContainer, FileEntry, FileInfo, RawDirInfo};
 use java_asm_server::AsmServer;
 use std::ops::Deref;
-use std::sync::Arc;
 
 pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
     let server_app = &app.server_app;
     let mut server_app_left = server_app.left().lock();
-    let mut server_app_content = server_app.content().lock();
     let entries = &mut server_app_left.root_node.visible_items();
     let server = app.server.lock();
     if let Some(server) = server.deref() {
-        let content = &mut server_app_content;
         let row_height = ui.spacing().interact_size.y;
         ScrollArea::vertical().auto_shrink(false)
             .show_rows(ui, row_height, entries.len(), |ui, range| {
@@ -24,7 +21,7 @@ pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
                             render_dir_raw(ui, raw_dir);
                         }
                         FileEntry::File(file_info) => {
-                            render_file(ui, file_info, server, content);
+                            render_file(ui, file_info, server, server_app);
                         }
                     }
                 }
@@ -34,31 +31,15 @@ pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
 
 fn render_file(
     ui: &mut egui::Ui, file_info: &mut FileInfo,
-    server: &AsmServer, content: &mut Content,
+    server: &AsmServer, app: &AppContainer,
 ) {
     let FileInfo { title, file_key, level } = file_info;
     ui.horizontal(|ui| {
         ui.add_space((*level as f32) * 12.0);
         let layout_job = layout_string(ui, title.to_string());
         let label = ui.selectable_label(false, layout_job);
         if label.clicked() {
-            let existed_tab = content.opened_tabs.iter().position(|tab| tab.file_key == *file_key);
-            if let Some(existed_tab) = existed_tab {
-                content.current = Some(existed_tab);
-                return;
-            }
-            let smali = server.read_content(file_key);
-            if let Some(smali) = smali {
-                let current_tab = Tab {
-                    selected: false,
-                    file_key: Arc::clone(file_key),
-                    title: Arc::clone(title),
-                    content: smali,
-                };
-                let current = content.opened_tabs.len();
-                content.opened_tabs.push(current_tab);
-                content.current = Some(current);
-            }
+            server.switch_or_open(file_key, app);
         }
     });
 }