diff --git a/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt b/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt index 0fadaf7..581dfa2 100644 --- a/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt +++ b/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt @@ -40,7 +40,13 @@ class Setting( modifier = rowModifier ) { Column( - modifier = Modifier.fillMaxWidth(0.8f) + modifier = Modifier.fillMaxWidth( + if (checkState != null) { + 0.8f + } else { + 1f + } + ) ) { Text( text = name, @@ -54,8 +60,9 @@ class Setting( style = descriptionTextStyle ) } - Spacer(modifier = Modifier.weight(1f)) if (checkState != null) { + Spacer(modifier = Modifier.weight(1f)) + Switch( checked = checkState!!, onCheckedChange = { diff --git a/app/src/main/jniLibs/arm64-v8a/libsysinfo.so b/app/src/main/jniLibs/arm64-v8a/libsysinfo.so index f5959d0..0b2fed9 100755 Binary files a/app/src/main/jniLibs/arm64-v8a/libsysinfo.so and b/app/src/main/jniLibs/arm64-v8a/libsysinfo.so differ diff --git a/app/src/main/jniLibs/x86_64/libsysinfo.so b/app/src/main/jniLibs/x86_64/libsysinfo.so index c8014da..4b39217 100755 Binary files a/app/src/main/jniLibs/x86_64/libsysinfo.so and b/app/src/main/jniLibs/x86_64/libsysinfo.so differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b21fb0..79a9a2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ 文件管理器 - 文件管理器 浏览 编辑 图片 @@ -12,11 +11,8 @@ 内部存储 最近删除 下载与接收 - 来源 - 浏览器 + 快速查看 录音机 - Next - Previous 删除 复制 剪切 @@ -59,7 +55,7 @@ 最后修改时间:%s - 查看什么 + 查看 软件设置 全部文件 内部存储信息 diff --git a/app/src/main/rust/libsysinfo/src/lib.rs b/app/src/main/rust/libsysinfo/src/lib.rs index a672950..8d34310 100644 --- a/app/src/main/rust/libsysinfo/src/lib.rs +++ b/app/src/main/rust/libsysinfo/src/lib.rs @@ -17,12 +17,12 @@ fn get_sys() -> String { let available_memory = sys.available_memory()/1024/1024; let kernel_string = match kernel { - Some(k) => format!("kernel: {}\n", k), + Some(k) => format!("Kernel: {}\n", k), None => String::new(), }; format!( - "{}memory:{}MB available, {}MB in total", + "{}Memory: {}MB available, {}MB in total", kernel_string, available_memory, all_memory ) } @@ -34,7 +34,7 @@ pub extern "system" fn Java_com_example_myapplication_utils_Sysinfo_getSystemNat ) -> jstring { let page_size = get_page_size(); let output = env - .new_string(format!("{}\nPagesize: {}", get_sys(), page_size)) + .new_string(format!("{}\nPage Size: {}", get_sys(), page_size)) .expect("Couldn't create java string!"); output.into_raw() }