diff --git a/src-tauri/gen/android/app/src/main/java/com/emerald/legacy/MainActivity.kt b/src-tauri/gen/android/app/src/main/java/com/emerald/legacy/MainActivity.kt index 369471f..d034d12 100644 --- a/src-tauri/gen/android/app/src/main/java/com/emerald/legacy/MainActivity.kt +++ b/src-tauri/gen/android/app/src/main/java/com/emerald/legacy/MainActivity.kt @@ -3,11 +3,18 @@ package com.emerald.legacy import android.os.Bundle import android.webkit.WebView import androidx.activity.enableEdgeToEdge +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat class MainActivity : TauriActivity() { override fun onCreate(savedInstanceState: Bundle?) { enableEdgeToEdge() super.onCreate(savedInstanceState) + WindowCompat.getInsetsController(window, window.decorView).apply { + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + hide(WindowInsetsCompat.Type.statusBars()) + } } override fun onWebViewCreate(webView: WebView) { diff --git a/src/components/views/CreditsView.tsx b/src/components/views/CreditsView.tsx index 8599c22..953929a 100644 --- a/src/components/views/CreditsView.tsx +++ b/src/components/views/CreditsView.tsx @@ -1,6 +1,7 @@ import { useEffect, memo, useState } from "react"; import { motion } from "framer-motion"; import { useUI, useAudio } from "../../context/LauncherContext"; +import { usePlatform } from "../../hooks/usePlatform"; interface CreditCategory { category: string; @@ -31,6 +32,7 @@ interface CreditCategory { const CreditsView = memo(function CreditsView() { const { setActiveView } = useUI(); const { playPressSound } = useAudio(); + const { isAndroid } = usePlatform(); const [isHovered, setIsHovered] = useState(false); const credits: CreditCategory[] = [ @@ -242,25 +244,27 @@ const CreditsView = memo(function CreditsView() { return (
- + {!isAndroid && ( + + )} ([]); @@ -239,30 +241,32 @@ const ScreenshotsView = memo(function ScreenshotsView() {
-
- -
+ {!isAndroid && ( +
+ +
+ )} {selectedScreenshot && ( diff --git a/src/components/views/SettingsView.tsx b/src/components/views/SettingsView.tsx index db570ee..61c0fcb 100644 --- a/src/components/views/SettingsView.tsx +++ b/src/components/views/SettingsView.tsx @@ -925,7 +925,7 @@ const SettingsView = memo(function SettingsView() { )} - {(() => { + {!isAndroid && (() => { const backIndex = settingsItems.findIndex((i) => i.id === "back"); const backItem = settingsItems[backIndex]; if (!backItem || backItem.type !== "button") return null; diff --git a/src/components/views/SkinsView.tsx b/src/components/views/SkinsView.tsx index 122f8cb..5b12c8b 100644 --- a/src/components/views/SkinsView.tsx +++ b/src/components/views/SkinsView.tsx @@ -10,6 +10,7 @@ import { } from "../../context/LauncherContext"; import SkinViewer from "../common/SkinViewer"; import CapePreview from "../common/CapePreview"; +import { usePlatform } from "../../hooks/usePlatform"; interface SavedSkin { id: string; @@ -101,6 +102,7 @@ const HeadPreview = memo(function HeadPreview({ src }: { src: string }) { const SkinsView = memo(function SkinsView() { const { setActiveView, setIsUiHidden } = useUI(); const { playPressSound, playBackSound } = useAudio(); + const { isAndroid } = usePlatform(); const { skinUrl, setSkinUrl, setSkinIsSlim, capeUrl, setCapeUrl } = useSkin(); const [focusIndex, setFocusIndex] = useState(null); @@ -722,25 +724,27 @@ const SkinsView = memo(function SkinsView() { /> - + {!isAndroid && ( + + )} {showImportModal && viewMode === "skin" && (
diff --git a/src/components/views/VersionsView.tsx b/src/components/views/VersionsView.tsx index 7b5fa18..fc95009 100644 --- a/src/components/views/VersionsView.tsx +++ b/src/components/views/VersionsView.tsx @@ -914,27 +914,29 @@ const VersionsView = memo(function VersionsView() {
-
- -
+ {!isAndroid && ( +
+ +
+ )} (null); const gridRef = useRef(null); @@ -1109,30 +1111,32 @@ const WorkshopView = memo(function WorkshopView({ )} -
- -
+ {!isAndroid && ( +
+ +
+ )} {selectedPkg && ( diff --git a/src/pages/App.tsx b/src/pages/App.tsx index e215c20..c65a456 100644 --- a/src/pages/App.tsx +++ b/src/pages/App.tsx @@ -455,7 +455,7 @@ export default function App() { animate={{ opacity: 1 }} className={`flex flex-col h-full z-10 w-full relative ${showHeader ? "pt-12" : ""}`} > - {!config.legacyMode && ( + {!config.legacyMode && !isAndroid && ( + + )} + {!config.legacyMode && (