Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/android-material3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:enhance
"@tauri-apps/cli": patch:enhance
---

Use `Theme.Material3.DayNight.NoActionBar` instead of `Theme.MaterialComponents.DayNight.NoActionBar` when running `tauri android init`
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.{{snake-case app.name}}" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<style name="Theme.{{snake-case app.name}}" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.{{snake-case app.name}}" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<style name="Theme.{{snake-case app.name}}" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>
6 changes: 3 additions & 3 deletions examples/api/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<div
id="sidebarToggle"
bind:this={sidebarToggle}
class="z-2000 hidden lt-sm:flex justify-center items-center absolute top-2 left-2 w-8 h-8 rd-8
class="z-2000 hidden lt-sm:flex justify-center absolute items-center w-8 h-8 rd-8
bg-accent dark:bg-darkAccent active:bg-accentDark dark:active:bg-darkAccentDark"
>
{#if isSideBarOpen}
Expand All @@ -250,13 +250,13 @@
</div>

<div
class="flex h-screen w-screen overflow-hidden children-pt4 children-pb-2 text-primaryText dark:text-darkPrimaryText"
class="flex h-screen w-screen overflow-hidden text-primaryText dark:text-darkPrimaryText"
>
<aside
id="sidebar"
bind:this={sidebar}
class="lt-sm:h-screen lt-sm:shadow-lg lt-sm:shadow lt-sm:transition-transform lt-sm:absolute lt-sm:z-1999
bg-darkPrimaryLighter transition-colors-250 overflow-hidden grid grid-rows-[min-content_auto] select-none px-2"
bg-darkPrimaryLighter transition-colors-250 overflow-hidden grid grid-rows-[min-content_auto] content-start select-none px-2"
>
<img
class="self-center p-7 cursor-pointer"
Expand Down
25 changes: 24 additions & 1 deletion examples/api/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,32 @@ code.code-block {
width: 18.75rem;
}

@media screen and (max-width: 640px) {
@media screen and (width < 640px) {
#sidebar {
--translate-x: -18.75rem;
transform: translateX(var(--translate-x));
}
}

#sidebar,
main {
padding-top: calc(env(safe-area-inset-top) + 1rem);
}

#sidebar {
padding-left: calc(env(safe-area-inset-left) + 0.5rem);
}

main {
padding-right: env(safe-area-inset-right);
}

#sidebarToggle {
margin-top: calc(env(safe-area-inset-top) + 0.5rem);
margin-left: calc(env(safe-area-inset-left) + 0.5rem);
}

#sidebar,
#console {
padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
}
Loading