Skip to content

Commit 216b85e

Browse files
committed
feat: add mobile UI adaptation
1 parent dca5daf commit 216b85e

File tree

8 files changed

+46
-10
lines changed

8 files changed

+46
-10
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8+
"dev:mobile": "VITE_MOBILE=true vite",
89
"build": "tsc && vite build",
910
"preview": "vite preview",
1011
"tauri": "tauri",

src-tauri/src/lib.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@
1515
all(not(debug_assertions), target_os = "windows"),
1616
windows_subsystem = "windows"
1717
)]
18-
18+
#[cfg(desktop)]
1919
mod updates;
2020
use dev_utility_core;
2121
use std::sync::Mutex;
22-
use tauri::{
23-
menu::{MenuItem, MenuItemKind, PredefinedMenuItem, SubmenuBuilder, HELP_SUBMENU_ID},
24-
Manager,
25-
};
2622

2723
const SETTINGS_ID: &str = "settings";
2824
const UPDATE_ID: &str = "update";
@@ -36,6 +32,12 @@ pub fn run() {
3632
.setup(|app| {
3733
#[cfg(desktop)]
3834
{
35+
use tauri::{
36+
menu::{
37+
MenuItem, MenuItemKind, PredefinedMenuItem, SubmenuBuilder, HELP_SUBMENU_ID,
38+
},
39+
Manager,
40+
};
3941
app.handle()
4042
.plugin(tauri_plugin_updater::Builder::new().build())
4143
.unwrap();

src-tauri/tauri.android.conf.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$schema": "https://schema.tauri.app/config/2",
3+
"productName": "DevUtility",
4+
"version": "0.1.4",
5+
"identifier": "dev.utility.app",
6+
"build": {
7+
"beforeDevCommand": "pnpm dev:mobile",
8+
"devUrl": "http://localhost:1420",
9+
"beforeBuildCommand": "make prebuild-desktop",
10+
"frontendDist": "../dist"
11+
}
12+
}

src/components/sidebar/index.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import {
4343
SidebarRail,
4444
SidebarTrigger,
4545
} from "@/components/ui/sidebar";
46+
import { IS_MOBILE } from "@/contants";
4647
import { cn } from "@/lib/utils";
4748
import utilities, { type UtilityMeta } from "@/utilities/meta";
4849
import { Button } from "../ui/button";
@@ -232,9 +233,19 @@ export default function AppSidebar({
232233
</SidebarContent>
233234
<SidebarRail />
234235
</Sidebar>
235-
<SidebarInset className="bg-background rounded-lg m-2 overflow-hidden">
236+
<SidebarInset
237+
className={cn(
238+
"bg-background overflow-hidden",
239+
!IS_MOBILE && "rounded-lg m-2",
240+
)}
241+
>
236242
<InsetHeader title={title} />
237-
<main className="@container/main flex-1 max-h-[calc(100vh-3rem)] px-4 pb-2 overflow-hidden">
243+
<main
244+
className={cn(
245+
"@container/main flex-1 max-h-[calc(100vh-3rem)] overflow-hidden",
246+
IS_MOBILE ? "overflow-y-auto" : "px-4 pb-2",
247+
)}
248+
>
238249
{children}
239250
</main>
240251
</SidebarInset>

src/contants.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const IS_TAURI = "__TAURI__" in window;
2+
3+
export const IS_MOBILE = import.meta.env.VITE_MOBILE === "true";
File renamed without changes.

src/utilities/invoke.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
*/
1515

1616
// #v-ifdef WASM
17-
import wasmFunctions from "./invoke.wasm";
17+
import wasmFunctions from "./invoke-wasm";
1818
// #v-endif
1919

2020
import { type InvokeOptions, invoke as invokeCore } from "@tauri-apps/api/core";
2121
import useSWRMutation, {
2222
type SWRMutationConfiguration,
2323
type SWRMutationResponse,
2424
} from "swr/mutation";
25+
import { IS_TAURI } from "@/contants";
2526
import {
2627
type HashResult,
2728
type IndentStyle,
@@ -34,8 +35,6 @@ import {
3435
type TotpValidationResult,
3536
} from "./types";
3637

37-
export const IS_TAURI = "__TAURI__" in window;
38-
3938
export interface UtilitiesArgs {
4039
[InvokeFunction.GenerateUlid]: { count: number };
4140
[InvokeFunction.GenerateNanoid]: { count: number };

src/vite-env.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@
1414
*/
1515

1616
/// <reference types="vite/client" />
17+
18+
interface ImportMetaEnv {
19+
readonly VITE_MOBILE?: string;
20+
}
21+
22+
interface ImportMeta {
23+
readonly env: ImportMetaEnv;
24+
}

0 commit comments

Comments
 (0)