TEMP

Mivik · Mivik · commit 2f5a44fc8ba7 · 2026-03-08T13:36:17.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,6 +29,8 @@ fluent-syntax = "0.12.0"
 futures-util = "0.3.31"
 hex = "0.4.3"
 image = { version = "0.25.9", default-features = false }
+# inputbox = "0.0.1"
+inputbox = { git = "https://github.com/Mivik/inputbox.git", rev = "c20e7a9" }
 lru = "0.16.3"
 lyon = "1.0.16"
 nalgebra = "0.34.1"
diff --git a/phira/Cargo.toml b/phira/Cargo.toml
@@ -39,6 +39,7 @@ image = { workspace = true, default-features = false, features = [
     "rayon",
     "webp",
 ] }
+inputbox = { workspace = true }
 logos = "0.16.1"
 lru = { workspace = true }
 lyon = { workspace = true }
diff --git a/phira/src/lib.rs b/phira/src/lib.rs
@@ -42,7 +42,7 @@ use tracing::{error, info};
 
 #[cfg(target_os = "android")]
 use jni::{
-    objects::{JClass, JString},
+    objects::{JClass, JObject, JString},
     sys::jint,
     JNIEnv,
 };
@@ -346,6 +346,12 @@ fn string_from_java(env: &mut JNIEnv, s: JString) -> String {
     env.get_string(&s).unwrap().to_str().unwrap().to_owned()
 }
 
+#[cfg(target_os = "android")]
+#[no_mangle]
+pub extern "C" fn Java_quad_1native_QuadNative_initializeContext2(mut env: JNIEnv, _: JClass, context: JObject) {
+    inputbox::backend::Android::set_android_context(&mut env, &context).unwrap();
+}
+
 #[cfg(target_os = "android")]
 #[no_mangle]
 pub extern "C" fn Java_quad_1native_QuadNative_prprActivityOnPause(_env: JNIEnv, _: JClass) {
diff --git a/phira/src/login.rs b/phira/src/login.rs
@@ -8,12 +8,13 @@ use crate::{
     scene::{check_read_tos_and_policy, dispatch_tos_task, JUST_ACCEPTED_TOS},
 };
 use anyhow::Result;
+use inputbox::{InputBox, InputMode};
 use macroquad::prelude::*;
 use once_cell::sync::Lazy;
 use prpr::{
     core::BOLD_FONT,
     ext::{semi_black, semi_white, RectExt},
-    scene::{request_input, request_password, return_input, show_error, show_message, take_input},
+    scene::{request_input, return_input, show_error, show_message, take_input},
     task::Task,
     ui::{DRectButton, Dialog, Ui},
 };
@@ -147,23 +148,23 @@ impl Login {
                 return true;
             }
             if self.input_email.touch(touch, t) {
-                request_input("email", &self.t_email);
+                request_input("email", InputBox::new().default_text(&self.t_email));
                 return true;
             }
             if self.input_pwd.touch(touch, t) {
-                request_password("pwd", &self.t_pwd);
+                request_input("pwd", InputBox::new().default_text(&self.t_pwd).mode(InputMode::Password));
                 return true;
             }
             if self.input_reg_email.touch(touch, t) {
-                request_input("reg_email", &self.t_reg_email);
+                request_input("reg_email", InputBox::new().default_text(&self.t_reg_email));
                 return true;
             }
             if self.input_reg_name.touch(touch, t) {
-                request_input("reg_name", &self.t_reg_name);
+                request_input("reg_name", InputBox::new().default_text(&self.t_reg_name));
                 return true;
             }
             if self.input_reg_pwd.touch(touch, t) {
-                request_password("reg_pwd", &self.t_reg_pwd);
+                request_input("reg_pwd", InputBox::new().default_text(&self.t_reg_pwd).mode(InputMode::Password));
                 return true;
             }
             if self.btn_to_reg.touch(touch, t) || self.btn_to_login.touch(touch, t) {
diff --git a/phira/src/mp/panel.rs b/phira/src/mp/panel.rs
@@ -5,6 +5,7 @@ use crate::{
     scene::{Downloading, SongScene, RECORD_ID},
 };
 use anyhow::{anyhow, Context, Result};
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use phira_mp_client::Client;
 use phira_mp_common::{RoomId, RoomState};
@@ -302,7 +303,7 @@ impl MPPanel {
             }
             if let Some(state) = client.blocking_state() {
                 if self.chat_btn.touch(touch, t) {
-                    request_input("chat", &self.chat_text);
+                    request_input("chat", InputBox::new().default_text(&self.chat_text));
                     return true;
                 }
                 if self.chat_send_btn.touch(touch, t) {
@@ -362,11 +363,11 @@ impl MPPanel {
                 }
             } else {
                 if self.create_room_btn.touch(touch, t) {
-                    request_input("room_id", "");
+                    request_input("room_id", InputBox::new());
                     return true;
                 }
                 if self.join_room_btn.touch(touch, t) {
-                    request_input("join_room", "");
+                    request_input("join_room", InputBox::new());
                     return true;
                 }
                 if self.disconnect_btn.touch(touch, t) {
diff --git a/phira/src/page/favorites.rs b/phira/src/page/favorites.rs
@@ -14,6 +14,7 @@ use crate::{
 };
 use anyhow::Result;
 use chrono::{DateTime, Utc};
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use prpr::{
     core::Tweenable,
@@ -418,11 +419,11 @@ impl Page for FavoritesPage {
         }
 
         if self.create_btn.touch(touch, t) {
-            request_input("fav_create", "");
+            request_input("fav_create", InputBox::new());
             return Ok(true);
         }
         if self.import_btn.touch(touch, t) {
-            request_input("fav_import", "");
+            request_input("fav_import", InputBox::new());
             return Ok(true);
         }
 
@@ -660,10 +661,10 @@ impl Page for FavoritesPage {
             if self.edit_menu.changed() {
                 match self.edit_options[self.edit_menu.selected()] {
                     "rename" => {
-                        request_input("fav_rename", &data.collections[index].name);
+                        request_input("fav_rename", InputBox::new().default_text(&data.collections[index].name));
                     }
                     "set-description" => {
-                        request_input("fav_description", &data.collections[index].description);
+                        request_input("fav_description", InputBox::new().default_text(&data.collections[index].description));
                     }
                     "set-cover" => {
                         if data.collections[index].id.is_none() {
@@ -701,7 +702,7 @@ impl Page for FavoritesPage {
                         self.rebuild_folders();
                     }
                     "batch-import" => {
-                        request_input("fav_batch_import", "");
+                        request_input("fav_batch_import", InputBox::new());
                     }
                     _ => {}
                 }
diff --git a/phira/src/page/library.rs b/phira/src/page/library.rs
@@ -15,6 +15,7 @@ use crate::{
     tags::TagsDialog,
 };
 use anyhow::{anyhow, Result};
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use prpr::{
     ext::{poll_future, semi_black, JoinToString, LocalTask, RectExt, SafeTexture, ScaleType},
@@ -492,7 +493,7 @@ impl Page for LibraryPage {
                     return Ok(true);
                 }
                 if !self.search_clr_btn.contains(touch.position) && self.search_btn.touch(touch, t) {
-                    request_input("search", &self.search_str);
+                    request_input("search", InputBox::new().default_text(&self.search_str));
                     return Ok(true);
                 }
             }
@@ -505,7 +506,7 @@ impl Page for LibraryPage {
                     return Ok(true);
                 }
                 if !self.search_clr_btn.contains(touch.position) && self.search_btn.touch(touch, t) {
-                    request_input("search", &self.search_str);
+                    request_input("search", InputBox::new().default_text(&self.search_str));
                     return Ok(true);
                 }
                 if self.filter_btn.touch(touch, t) {
@@ -693,7 +694,7 @@ impl Page for LibraryPage {
                     todo!()
                 }
                 1 => {
-                    request_input("new_fav", "");
+                    request_input("new_fav", InputBox::new());
                 }
                 2 => {
                     confirm_dialog(ttl!("del-confirm"), tl!("multi-delete-confirm", "count" => selected.len()), self.delete_multi.clone());
diff --git a/phira/src/page/settings.rs b/phira/src/page/settings.rs
@@ -11,6 +11,7 @@ use crate::{
 };
 use anyhow::Result;
 use bytesize::ByteSize;
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use prpr::{
     core::BOLD_FONT,
@@ -391,7 +392,7 @@ impl GeneralList {
             return Ok(Some(true));
         }
         if self.mp_addr_btn.touch(touch, t) {
-            request_input("mp_addr", &config.mp_address);
+            request_input("mp_addr", InputBox::new().default_text(&config.mp_address));
             return Ok(Some(true));
         }
         #[cfg(not(target_env = "ohos"))]
@@ -408,7 +409,7 @@ impl GeneralList {
             return Ok(Some(true));
         }
         if self.anys_gateway_btn.touch(touch, t) {
-            request_input("anys_gateway", &data.anys_gateway);
+            request_input("anys_gateway", InputBox::new().default_text(&data.anys_gateway));
             return Ok(Some(true));
         }
         Ok(None)
diff --git a/phira/src/scene/song.rs b/phira/src/scene/song.rs
@@ -26,6 +26,7 @@ use base64::{engine::general_purpose::STANDARD, Engine};
 use chrono::{DateTime, Utc};
 use core::f32;
 use futures_util::StreamExt;
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use phira_mp_common::{ClientCommand, CompactPos, JudgeEvent, TouchFrame};
 use prpr::{
@@ -1854,7 +1855,7 @@ impl Scene for SongScene {
                     }));
                 }
                 "review-deny" => {
-                    request_input("deny-reason", "");
+                    request_input("deny-reason", InputBox::new());
                 }
                 "review-del" => {
                     confirm_delete(self.chart_should_delete.clone());
@@ -1892,10 +1893,10 @@ impl Scene for SongScene {
                     }));
                 }
                 "stabilize-comment" => {
-                    request_input("stabilize-comment", "");
+                    request_input("stabilize-comment", InputBox::new());
                 }
                 "stabilize-deny" => {
-                    request_input("stabilize-deny-reason", "");
+                    request_input("stabilize-deny-reason", InputBox::new());
                 }
                 _ => {}
             }
diff --git a/phira/src/tags.rs b/phira/src/tags.rs
@@ -1,6 +1,7 @@
 prpr_l10n::tl_file!("tags");
 
 use crate::{client::Permissions, page::Fader};
+use inputbox::InputBox;
 use macroquad::prelude::*;
 use prpr::{
     core::BOLD_FONT,
@@ -70,7 +71,7 @@ impl Tags {
             }
         }
         if self.add.touch(touch, t) {
-            request_input(self.input_id, "");
+            request_input(self.input_id, InputBox::new());
             return true;
         }
         false
diff --git a/prpr/Cargo.toml b/prpr/Cargo.toml
@@ -41,6 +41,7 @@ image = { workspace = true, default-features = false, features = [
 	"rayon",
 	"webp",
 ] }
+inputbox = { workspace = true }
 intl-memoizer = "0.5.3"
 libc = "0.2.180"
 lru = { workspace = true }
@@ -81,7 +82,6 @@ prpr-l10n = { workspace = true }
 [target.'cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))'.dependencies]
 open = "5.3.3"
 rfd = "0.17.2"
-tfd = "=0.1.0"
 
 [target.'cfg(target_os = "ios")'.dependencies]
 block = "0.1.6"
diff --git a/prpr/src/log.rs b/prpr/src/log.rs
@@ -12,19 +12,26 @@ where
     S: Subscriber,
 {
     fn on_event(&self, event: &tracing::Event<'_>, _ctx: tracing_subscriber::layer::Context<'_, S>) {
-        struct Visitor(Option<String>, Vec<(&'static str, String)>);
+        #[derive(Default)]
+        struct Visitor {
+            message: Option<String>,
+            target: Option<String>,
+            fields: Vec<(&'static str, String)>,
+        }
         impl Visit for Visitor {
             fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
                 let val = format!("{value:?}");
                 if field.name() == "message" {
-                    self.0 = Some(val);
+                    self.message = Some(val);
                 } else if !field.name().starts_with("log.") {
-                    self.1.push((field.name(), val));
+                    self.fields.push((field.name(), val));
+                } else if field.name() == "log.target" {
+                    self.target = Some(val);
                 }
             }
         }
 
-        let mut v = Visitor(None, Vec::new());
+        let mut v = Visitor::default();
         event.record(&mut v);
 
         let meta = event.metadata();
@@ -44,22 +51,25 @@ where
         #[cfg(target_os = "android")]
         let mut msg = String::new();
 
-        msg += &meta.target().bright_black().to_string();
-        if !v.1.is_empty() {
+        let target = v.target.as_deref().unwrap_or_else(|| meta.target());
+        if target.starts_with("jni::") && meta.level() >= &Level::INFO {
+            return;
+        }
+        msg += &target.bright_black().to_string();
+        if !v.fields.is_empty() {
             msg += &"{".bold().to_string();
-            let len = v.1.len();
-            for (idx, (name, val)) in v.1.into_iter().enumerate() {
+            for (name, val) in &v.fields {
                 use std::fmt::Write;
-                let _ = write!(msg, "{}={val}", name.italic());
-                if idx + 1 != len {
-                    msg.push(' ');
-                }
+                let _ = write!(msg, "{}={val} ", name.italic());
+            }
+            if !v.fields.is_empty() {
+                msg.pop();
             }
             msg += &"}".bold().to_string();
         }
-        if let Some(content) = v.0 {
+        if let Some(message) = v.message {
             msg += ": ";
-            msg += &content;
+            msg += &message;
         }
 
         match *meta.level() {
diff --git a/prpr/src/scene.rs b/prpr/src/scene.rs
diff --git a/prpr/src/scene/game.rs b/prpr/src/scene/game.rs
diff --git a/prpr/src/ui.rs b/prpr/src/ui.rs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ use crate::{`
`5`	`5`	`scene::{Downloading, SongScene, RECORD_ID},`
`6`	`6`	`};`
`7`	`7`	`use anyhow::{anyhow, Context, Result};`
	`8`	`+use inputbox::InputBox;`
`8`	`9`	`use macroquad::prelude::*;`
`9`	`10`	`use phira_mp_client::Client;`
`10`	`11`	`use phira_mp_common::{RoomId, RoomState};`
`@@ -302,7 +303,7 @@ impl MPPanel {`
`302`	`303`	`}`
`303`	`304`	`if let Some(state) = client.blocking_state() {`
`304`	`305`	`if self.chat_btn.touch(touch, t) {`
`305`		`- request_input("chat", &self.chat_text);`
	`306`	`+ request_input("chat", InputBox::new().default_text(&self.chat_text));`
`306`	`307`	`return true;`
`307`	`308`	`}`
`308`	`309`	`if self.chat_send_btn.touch(touch, t) {`
`@@ -362,11 +363,11 @@ impl MPPanel {`
`362`	`363`	`}`
`363`	`364`	`} else {`
`364`	`365`	`if self.create_room_btn.touch(touch, t) {`
`365`		`- request_input("room_id", "");`
	`366`	`+ request_input("room_id", InputBox::new());`
`366`	`367`	`return true;`
`367`	`368`	`}`
`368`	`369`	`if self.join_room_btn.touch(touch, t) {`
`369`		`- request_input("join_room", "");`
	`370`	`+ request_input("join_room", InputBox::new());`
`370`	`371`	`return true;`
`371`	`372`	`}`
`372`	`373`	`if self.disconnect_btn.touch(touch, t) {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ use crate::{`
`14`	`14`	`};`
`15`	`15`	`use anyhow::Result;`
`16`	`16`	`use chrono::{DateTime, Utc};`
	`17`	`+use inputbox::InputBox;`
`17`	`18`	`use macroquad::prelude::*;`
`18`	`19`	`use prpr::{`
`19`	`20`	`core::Tweenable,`
`@@ -418,11 +419,11 @@ impl Page for FavoritesPage {`
`418`	`419`	`}`
`419`	`420`
`420`	`421`	`if self.create_btn.touch(touch, t) {`
`421`		`- request_input("fav_create", "");`
	`422`	`+ request_input("fav_create", InputBox::new());`
`422`	`423`	`return Ok(true);`
`423`	`424`	`}`
`424`	`425`	`if self.import_btn.touch(touch, t) {`
`425`		`- request_input("fav_import", "");`
	`426`	`+ request_input("fav_import", InputBox::new());`
`426`	`427`	`return Ok(true);`
`427`	`428`	`}`
`428`	`429`
`@@ -660,10 +661,10 @@ impl Page for FavoritesPage {`
`660`	`661`	`if self.edit_menu.changed() {`
`661`	`662`	`match self.edit_options[self.edit_menu.selected()] {`
`662`	`663`	`"rename" => {`
`663`		`- request_input("fav_rename", &data.collections[index].name);`
	`664`	`+ request_input("fav_rename", InputBox::new().default_text(&data.collections[index].name));`
`664`	`665`	`}`
`665`	`666`	`"set-description" => {`
`666`		`- request_input("fav_description", &data.collections[index].description);`
	`667`	`+ request_input("fav_description", InputBox::new().default_text(&data.collections[index].description));`
`667`	`668`	`}`
`668`	`669`	`"set-cover" => {`
`669`	`670`	`if data.collections[index].id.is_none() {`
`@@ -701,7 +702,7 @@ impl Page for FavoritesPage {`
`701`	`702`	`self.rebuild_folders();`
`702`	`703`	`}`
`703`	`704`	`"batch-import" => {`
`704`		`- request_input("fav_batch_import", "");`
	`705`	`+ request_input("fav_batch_import", InputBox::new());`
`705`	`706`	`}`
`706`	`707`	`_ => {}`
`707`	`708`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ use crate::{`
`15`	`15`	`tags::TagsDialog,`
`16`	`16`	`};`
`17`	`17`	`use anyhow::{anyhow, Result};`
	`18`	`+use inputbox::InputBox;`
`18`	`19`	`use macroquad::prelude::*;`
`19`	`20`	`use prpr::{`
`20`	`21`	`ext::{poll_future, semi_black, JoinToString, LocalTask, RectExt, SafeTexture, ScaleType},`
`@@ -492,7 +493,7 @@ impl Page for LibraryPage {`
`492`	`493`	`return Ok(true);`
`493`	`494`	`}`
`494`	`495`	`if !self.search_clr_btn.contains(touch.position) && self.search_btn.touch(touch, t) {`
`495`		`- request_input("search", &self.search_str);`
	`496`	`+ request_input("search", InputBox::new().default_text(&self.search_str));`
`496`	`497`	`return Ok(true);`
`497`	`498`	`}`
`498`	`499`	`}`
`@@ -505,7 +506,7 @@ impl Page for LibraryPage {`
`505`	`506`	`return Ok(true);`
`506`	`507`	`}`
`507`	`508`	`if !self.search_clr_btn.contains(touch.position) && self.search_btn.touch(touch, t) {`
`508`		`- request_input("search", &self.search_str);`
	`509`	`+ request_input("search", InputBox::new().default_text(&self.search_str));`
`509`	`510`	`return Ok(true);`
`510`	`511`	`}`
`511`	`512`	`if self.filter_btn.touch(touch, t) {`
`@@ -693,7 +694,7 @@ impl Page for LibraryPage {`
`693`	`694`	`todo!()`
`694`	`695`	`}`
`695`	`696`	`1 => {`
`696`		`- request_input("new_fav", "");`
	`697`	`+ request_input("new_fav", InputBox::new());`
`697`	`698`	`}`
`698`	`699`	`2 => {`
`699`	`700`	`confirm_dialog(ttl!("del-confirm"), tl!("multi-delete-confirm", "count" => selected.len()), self.delete_multi.clone());`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ use crate::{`
`11`	`11`	`};`
`12`	`12`	`use anyhow::Result;`
`13`	`13`	`use bytesize::ByteSize;`
	`14`	`+use inputbox::InputBox;`
`14`	`15`	`use macroquad::prelude::*;`
`15`	`16`	`use prpr::{`
`16`	`17`	`core::BOLD_FONT,`
`@@ -391,7 +392,7 @@ impl GeneralList {`
`391`	`392`	`return Ok(Some(true));`
`392`	`393`	`}`
`393`	`394`	`if self.mp_addr_btn.touch(touch, t) {`
`394`		`- request_input("mp_addr", &config.mp_address);`
	`395`	`+ request_input("mp_addr", InputBox::new().default_text(&config.mp_address));`
`395`	`396`	`return Ok(Some(true));`
`396`	`397`	`}`
`397`	`398`	`#[cfg(not(target_env = "ohos"))]`
`@@ -408,7 +409,7 @@ impl GeneralList {`
`408`	`409`	`return Ok(Some(true));`
`409`	`410`	`}`
`410`	`411`	`if self.anys_gateway_btn.touch(touch, t) {`
`411`		`- request_input("anys_gateway", &data.anys_gateway);`
	`412`	`+ request_input("anys_gateway", InputBox::new().default_text(&data.anys_gateway));`
`412`	`413`	`return Ok(Some(true));`
`413`	`414`	`}`
`414`	`415`	`Ok(None)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ use base64::{engine::general_purpose::STANDARD, Engine};`
`26`	`26`	`use chrono::{DateTime, Utc};`
`27`	`27`	`use core::f32;`
`28`	`28`	`use futures_util::StreamExt;`
	`29`	`+use inputbox::InputBox;`
`29`	`30`	`use macroquad::prelude::*;`
`30`	`31`	`use phira_mp_common::{ClientCommand, CompactPos, JudgeEvent, TouchFrame};`
`31`	`32`	`use prpr::{`
`@@ -1854,7 +1855,7 @@ impl Scene for SongScene {`
`1854`	`1855`	`}));`
`1855`	`1856`	`}`
`1856`	`1857`	`"review-deny" => {`
`1857`		`- request_input("deny-reason", "");`
	`1858`	`+ request_input("deny-reason", InputBox::new());`
`1858`	`1859`	`}`
`1859`	`1860`	`"review-del" => {`
`1860`	`1861`	`confirm_delete(self.chart_should_delete.clone());`
`@@ -1892,10 +1893,10 @@ impl Scene for SongScene {`
`1892`	`1893`	`}));`
`1893`	`1894`	`}`
`1894`	`1895`	`"stabilize-comment" => {`
`1895`		`- request_input("stabilize-comment", "");`
	`1896`	`+ request_input("stabilize-comment", InputBox::new());`
`1896`	`1897`	`}`
`1897`	`1898`	`"stabilize-deny" => {`
`1898`		`- request_input("stabilize-deny-reason", "");`
	`1899`	`+ request_input("stabilize-deny-reason", InputBox::new());`
`1899`	`1900`	`}`
`1900`	`1901`	`_ => {}`
`1901`	`1902`	`}`