Ver código fonte

app: fix warnings

darkfi 9 meses atrás
pai
commit
f28e18f349

+ 6 - 6
bin/app/src/app/schema/test.rs

@@ -19,8 +19,7 @@
 use crate::{
     app::{
         node::{
-            create_layer, create_multiline_edit, create_singleline_edit, create_text,
-            create_vector_art, create_video,
+            create_layer, create_singleline_edit, create_text, create_vector_art, create_video,
         },
         App,
     },
@@ -36,20 +35,21 @@ const LIGHTMODE: bool = false;
 
 #[cfg(target_os = "android")]
 mod ui_consts {
-    pub const CHATDB_PATH: &str = "/data/data/darkfi.app/chatdb/";
-    pub const KING_PATH: &str = "king.png";
+    //pub const CHATDB_PATH: &str = "/data/data/darkfi.app/chatdb/";
+    //pub const KING_PATH: &str = "king.png";
     pub const VID_PATH: &str = "forest/forest_{frame}.png";
 }
 
 #[cfg(not(target_os = "android"))]
 mod ui_consts {
-    pub const CHATDB_PATH: &str = "chatdb";
-    pub const KING_PATH: &str = "assets/king.png";
+    //pub const CHATDB_PATH: &str = "chatdb";
+    //pub const KING_PATH: &str = "assets/king.png";
     pub const VID_PATH: &str = "assets/forest/forest_{frame}.png";
 }
 
 use ui_consts::*;
 
+#[allow(dead_code)]
 pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
     let atom = &mut PropertyAtomicGuard::none();
 

+ 2 - 2
bin/app/src/text2/editor/android.rs

@@ -263,8 +263,8 @@ impl Editor {
         assert!(side.abs() == 1);
         let edit = android::get_editable(self.composer_id).unwrap();
 
-        let mut select_start = char16_to_byte_index(&edit.buffer, edit.select_start).unwrap();
-        let mut select_end = char16_to_byte_index(&edit.buffer, edit.select_end).unwrap();
+        let select_start = char16_to_byte_index(&edit.buffer, edit.select_start).unwrap();
+        let select_end = char16_to_byte_index(&edit.buffer, edit.select_end).unwrap();
         //t!("selection() -> ({select_start}, {select_end})");
 
         let (anchor, focus) = match side {

+ 1 - 1
bin/app/src/ui/chatview/mod.rs

@@ -687,7 +687,7 @@ impl ChatView {
         &self,
         batch_id: BatchGuardId,
         msgbuf: &mut MessageBuffer,
-        trace_id: u32,
+        _trace_id: u32,
     ) {
         //t!("ChatView::redraw_cached() [trace_id={trace_id}]");
         let timest = unixtime();

+ 4 - 4
bin/app/src/ui/edit/mod.rs

@@ -1012,7 +1012,7 @@ impl BaseEdit {
     async fn redraw(&self, atom: &mut PropertyAtomicGuard) {
         let trace_id = rand::random();
         let timest = unixtime();
-        let draw_update = self.make_draw_calls(trace_id, atom).await;
+        let draw_update = self.make_draw_calls(trace_id).await;
         self.render_api.replace_draw_calls(atom.batch_id, timest, draw_update.draw_calls);
     }
 
@@ -1161,7 +1161,7 @@ impl BaseEdit {
         self.behave.eval_rect(atom).await;
     }
 
-    async fn make_draw_calls(&self, _trace_id: u32, atom: &mut PropertyAtomicGuard) -> DrawUpdate {
+    async fn make_draw_calls(&self, _trace_id: u32) -> DrawUpdate {
         let rect = self.rect.get();
 
         let cursor_instrs = self.get_cursor_instrs().await;
@@ -1563,12 +1563,12 @@ impl UIObject for BaseEdit {
         &self,
         parent_rect: Rectangle,
         trace_id: u32,
-        atom: &mut PropertyAtomicGuard,
+        _atom: &mut PropertyAtomicGuard,
     ) -> Option<DrawUpdate> {
         t!("BaseEdit::draw({:?}, {trace_id})", self.node());
         *self.parent_rect.lock() = Some(parent_rect);
         self.eval_rect().await;
-        Some(self.make_draw_calls(trace_id, atom).await)
+        Some(self.make_draw_calls(trace_id).await)
     }
 
     async fn handle_char(&self, key: char, mods: KeyMods, repeat: bool) -> bool {