github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-11-11 16:23:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

android: fix exit on background

Browse Source
This commit is contained in:
ardocrat
2023-06-13 23:45:03 +03:00
parent f95645ea81
commit 23712ca361
5 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/app.rs
+27 -1
View File
@@ -15,9 +15,10 @@
use egui::{Context, Stroke};
use egui::os::OperatingSystem;
use crate::gui::Colors;
use crate::gui::{Colors, Navigator};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::screens::Root;
use crate::node::Node;
pub struct PlatformApp<Platform> {
pub(crate) app: App,
@@ -132,3 +133,28 @@ impl App {
}
}
#[allow(dead_code)]
#[cfg(target_os = "android")]
#[allow(non_snake_case)]
#[no_mangle]
pub extern "C" fn Java_mw_gri_android_MainActivity_onBackButtonPress(
_env: jni::JNIEnv,
_class: jni::objects::JObject,
_activity: jni::objects::JObject,
) {
Navigator::back();
}
#[allow(dead_code)]
#[cfg(target_os = "android")]
#[allow(non_snake_case)]
#[no_mangle]
/// Calling on unexpected Android application termination (removal from recent apps).
pub extern "C" fn Java_mw_gri_android_MainActivity_onTermination(
_env: jni::JNIEnv,
_class: jni::objects::JObject,
_activity: jni::objects::JObject,
) {
Node::stop(false);
}
src/gui/screens/root.rs
+6 -21
View File
@@ -80,12 +80,9 @@ impl Root {
}
ui.add_space(16.0);
ui.vertical_centered(|ui| {
Spinner::new().size(48.0).color(Colors::GRAY).ui(ui);
Spinner::new().size(48.0).color(Colors::GOLD).ui(ui);
ui.add_space(12.0);
ui.label(RichText::new(t!("sync_status.shutdown"))
.size(17.0)
.color(Colors::TEXT)
);
ui.label(t!("sync_status.shutdown"));
});
ui.add_space(10.0);
} else {
@@ -103,7 +100,7 @@ impl Root {
App::exit(frame, cb);
modal.close();
} else {
Node::stop();
Node::stop(true);
modal.disable_closing();
self.show_exit_progress = true;
}
@@ -123,9 +120,9 @@ impl Root {
}
fn show_current_screen(&mut self,
ui: &mut egui::Ui,
frame: &mut eframe::Frame,
cb: &dyn PlatformCallbacks) {
ui: &mut egui::Ui,
frame: &mut eframe::Frame,
cb: &dyn PlatformCallbacks) {
let Self { screens, .. } = self;
for screen in screens.iter_mut() {
if Navigator::is_current(&screen.id()) {
@@ -146,16 +143,4 @@ impl Root {
};
(is_panel_open, panel_width)
}
}
#[allow(dead_code)]
#[cfg(target_os = "android")]
#[allow(non_snake_case)]
#[no_mangle]
pub extern "C" fn Java_mw_gri_android_MainActivity_onBackButtonPress(
_env: jni::JNIEnv,
_class: jni::objects::JObject,
_activity: jni::objects::JObject,
) {
Navigator::back();
}