diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/FabController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/FabController.kt deleted file mode 100644 index 23b8c579a..000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/FabController.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.kanade.tachiyomi.ui.base.controller - -import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton - -interface FabController { - - fun configureFab(fab: ExtendedFloatingActionButton) {} - - fun cleanupFab(fab: ExtendedFloatingActionButton) {} -} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 44c0a5555..66d95ae03 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -43,7 +43,6 @@ import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.base.controller.ComposeContentController import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.setRoot @@ -121,12 +120,6 @@ class MainActivity : BaseActivity() { // Draw edge-to-edge WindowCompat.setDecorFitsSystemWindows(window, false) - binding.fabLayout.rootFab.applyInsetter { - ignoreVisibility(true) - type(navigationBars = true) { - margin() - } - } binding.bottomNav?.applyInsetter { type(navigationBars = true) { padding() @@ -589,16 +582,6 @@ class MainActivity : BaseActivity() { showNav(true) } - if (from is FabController) { - from.cleanupFab(binding.fabLayout.rootFab) - } - if (internalTo is FabController) { - binding.fabLayout.rootFab.show() - internalTo.configureFab(binding.fabLayout.rootFab) - } else { - binding.fabLayout.rootFab.hide() - } - val isComposeController = internalTo is ComposeContentController binding.appbar.isVisible = !isComposeController binding.controllerContainer.enableScrollingBehavior(!isComposeController) diff --git a/app/src/main/res/anim/fade_in_short.xml b/app/src/main/res/anim/fade_in_short.xml deleted file mode 100644 index 763776244..000000000 --- a/app/src/main/res/anim/fade_in_short.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/anim/fade_out_short.xml b/app/src/main/res/anim/fade_out_short.xml deleted file mode 100644 index 2aef4ef5b..000000000 --- a/app/src/main/res/anim/fade_out_short.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml index c4bee8733..cf51be786 100644 --- a/app/src/main/res/layout-sw720dp/main_activity.xml +++ b/app/src/main/res/layout-sw720dp/main_activity.xml @@ -76,8 +76,4 @@ - - diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 191bdcb85..5e08fb8ef 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -55,10 +55,6 @@ - - - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7130d28c4..25aa3214b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -70,48 +70,11 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6a70f005d..3ca41570e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -67,9 +67,6 @@ @drawable/ic_close_24dp @style/PreferenceThemeOverlay.Tachiyomi @style/ThemeOverlay.Tachiyomi.BottomSheetDialog - @style/Widget.Tachiyomi.Chip.Action - ?android:attr/textColorPrimary - ?android:attr/divider @style/Widget.Material3.TextInputLayout.OutlinedBox @style/Widget.Material3.AppBarLayout @style/Widget.Material3.Toolbar.Surface