mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-17 17:09:15 +01:00
Remove unused resources
This commit is contained in:
parent
fb9791f597
commit
448978ac8a
@ -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) {}
|
|
||||||
}
|
|
@ -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.activity.BaseActivity
|
||||||
import eu.kanade.tachiyomi.ui.base.controller.ComposeContentController
|
import eu.kanade.tachiyomi.ui.base.controller.ComposeContentController
|
||||||
import eu.kanade.tachiyomi.ui.base.controller.DialogController
|
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.RootController
|
||||||
import eu.kanade.tachiyomi.ui.base.controller.pushController
|
import eu.kanade.tachiyomi.ui.base.controller.pushController
|
||||||
import eu.kanade.tachiyomi.ui.base.controller.setRoot
|
import eu.kanade.tachiyomi.ui.base.controller.setRoot
|
||||||
@ -121,12 +120,6 @@ class MainActivity : BaseActivity() {
|
|||||||
|
|
||||||
// Draw edge-to-edge
|
// Draw edge-to-edge
|
||||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
WindowCompat.setDecorFitsSystemWindows(window, false)
|
||||||
binding.fabLayout.rootFab.applyInsetter {
|
|
||||||
ignoreVisibility(true)
|
|
||||||
type(navigationBars = true) {
|
|
||||||
margin()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
binding.bottomNav?.applyInsetter {
|
binding.bottomNav?.applyInsetter {
|
||||||
type(navigationBars = true) {
|
type(navigationBars = true) {
|
||||||
padding()
|
padding()
|
||||||
@ -589,16 +582,6 @@ class MainActivity : BaseActivity() {
|
|||||||
showNav(true)
|
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
|
val isComposeController = internalTo is ComposeContentController
|
||||||
binding.appbar.isVisible = !isComposeController
|
binding.appbar.isVisible = !isComposeController
|
||||||
binding.controllerContainer.enableScrollingBehavior(!isComposeController)
|
binding.controllerContainer.enableScrollingBehavior(!isComposeController)
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:duration="100"
|
|
||||||
android:fromAlpha="0.0"
|
|
||||||
android:interpolator="@android:interpolator/linear"
|
|
||||||
android:toAlpha="1.0" />
|
|
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:duration="100"
|
|
||||||
android:fromAlpha="1.0"
|
|
||||||
android:interpolator="@android:interpolator/linear"
|
|
||||||
android:toAlpha="0.0" />
|
|
@ -76,8 +76,4 @@
|
|||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/fab_layout"
|
|
||||||
layout="@layout/main_activity_fab" />
|
|
||||||
|
|
||||||
</eu.kanade.tachiyomi.widget.TachiyomiCoordinatorLayout>
|
</eu.kanade.tachiyomi.widget.TachiyomiCoordinatorLayout>
|
||||||
|
@ -55,10 +55,6 @@
|
|||||||
|
|
||||||
</com.google.android.material.appbar.TachiyomiAppBarLayout>
|
</com.google.android.material.appbar.TachiyomiAppBarLayout>
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/fab_layout"
|
|
||||||
layout="@layout/main_activity_fab" />
|
|
||||||
|
|
||||||
<eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
|
<eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
|
||||||
android:id="@+id/bottom_nav"
|
android:id="@+id/bottom_nav"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:id="@+id/root_fab"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:layout_gravity="bottom|end"
|
|
||||||
android:minWidth="0dp"
|
|
||||||
android:visibility="gone"
|
|
||||||
tools:icon="@drawable/ic_help_24dp"
|
|
||||||
tools:text="Action"
|
|
||||||
tools:visibility="visible" />
|
|
@ -70,48 +70,11 @@
|
|||||||
<!--Widgets-->
|
<!--Widgets-->
|
||||||
<!--=======-->
|
<!--=======-->
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.GridView" parent="android:Widget">
|
|
||||||
<item name="android:smoothScrollbar">true</item>
|
|
||||||
<item name="android:numColumns">auto_fit</item>
|
|
||||||
<item name="android:stretchMode">columnWidth</item>
|
|
||||||
<item name="android:scrollbarStyle">outsideOverlay</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.GridView.Source">
|
|
||||||
<item name="android:gravity">top|left</item>
|
|
||||||
<item name="android:smoothScrollbar">true</item>
|
|
||||||
<item name="android:cacheColorHint">?android:attr/textColorHint</item>
|
|
||||||
<item name="android:fastScrollEnabled">true</item>
|
|
||||||
<item name="android:horizontalSpacing">0dp</item>
|
|
||||||
<item name="android:verticalSpacing">0dp</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
|
<style name="Widget.Tachiyomi.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
|
||||||
<item name="android:textColor">?attr/colorOnSurface</item>
|
<item name="android:textColor">?attr/colorOnSurface</item>
|
||||||
<item name="android:background">@drawable/list_item_selector</item>
|
<item name="android:background">@drawable/list_item_selector</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.Chip.Action" parent="Widget.Material3.Chip.Suggestion">
|
|
||||||
<item name="chipBackgroundColor">?attr/chipBackgroundColor</item>
|
|
||||||
<item name="android:textColor">?attr/chipTextColor</item>
|
|
||||||
<item name="rippleColor">?attr/colorControlHighlight</item>
|
|
||||||
<item name="chipStrokeWidth">0dp</item>
|
|
||||||
|
|
||||||
<!-- Smaller text/height -->
|
|
||||||
<item name="chipMinHeight">28dp</item>
|
|
||||||
<item name="android:textAppearance">?attr/textAppearanceBodySmall</item>
|
|
||||||
|
|
||||||
<!-- Collapse horizontal margin -->
|
|
||||||
<item name="chipMinTouchTargetSize">28dp</item>
|
|
||||||
|
|
||||||
<!-- Custom chip states -->
|
|
||||||
<item name="android:clickable">true</item>
|
|
||||||
<item name="android:focusable">true</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.CircularProgressIndicator.Small" parent="Widget.Material3.CircularProgressIndicator">
|
<style name="Widget.Tachiyomi.CircularProgressIndicator.Small" parent="Widget.Material3.CircularProgressIndicator">
|
||||||
<item name="indicatorSize">16dp</item>
|
<item name="indicatorSize">16dp</item>
|
||||||
<item name="trackThickness">2dp</item>
|
<item name="trackThickness">2dp</item>
|
||||||
@ -128,33 +91,6 @@
|
|||||||
<item name="android:textColor">@color/button_action_selector</item>
|
<item name="android:textColor">@color/button_action_selector</item>
|
||||||
<item name="android:textSize">12sp</item>
|
<item name="android:textSize">12sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.Button.IconButton" parent="Widget.Material3.Button.TextButton.Icon">
|
|
||||||
<item name="iconTint">?attr/colorAccent</item>
|
|
||||||
<item name="iconPadding">0dp</item>
|
|
||||||
<item name="android:insetTop">0dp</item>
|
|
||||||
<item name="android:insetBottom">0dp</item>
|
|
||||||
<item name="android:paddingLeft">12dp</item>
|
|
||||||
<item name="android:paddingRight">12dp</item>
|
|
||||||
<item name="android:minWidth">0dp</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.Button.InlineButton" parent="Widget.Material3.Button.TextButton">
|
|
||||||
<item name="android:minHeight">0dp</item>
|
|
||||||
<item name="android:minWidth">0dp</item>
|
|
||||||
<item name="android:paddingTop">0dp</item>
|
|
||||||
<item name="android:paddingBottom">0dp</item>
|
|
||||||
<item name="android:insetTop">0dp</item>
|
|
||||||
<item name="android:insetBottom">0dp</item>
|
|
||||||
|
|
||||||
<item name="android:background">?android:attr/colorBackground</item>
|
|
||||||
<item name="backgroundTint">@null</item>
|
|
||||||
<item name="rippleColor">@null</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="Widget.Tachiyomi.Button.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton" />
|
|
||||||
|
|
||||||
|
|
||||||
<!--=======================-->
|
<!--=======================-->
|
||||||
<!--Widgets.MaterialDivider-->
|
<!--Widgets.MaterialDivider-->
|
||||||
<!--=======================-->
|
<!--=======================-->
|
||||||
@ -239,16 +175,6 @@
|
|||||||
<item name="cornerSize">@dimen/card_radius</item>
|
<item name="cornerSize">@dimen/card_radius</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ThemeOverlay.Tachiyomi.Dialog.Fullscreen" parent="ThemeOverlay.Material3">
|
|
||||||
<item name="android:windowIsFloating">false</item>
|
|
||||||
<item name="android:windowAnimationStyle">@style/Animation.Tachiyomi.Dialog</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="Animation.Tachiyomi.Dialog" parent="Animation.AppCompat.Dialog">
|
|
||||||
<item name="android:windowEnterAnimation">@anim/fade_in_short</item>
|
|
||||||
<item name="android:windowExitAnimation">@anim/fade_out_short</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<!--===========-->
|
<!--===========-->
|
||||||
<!--Preferences-->
|
<!--Preferences-->
|
||||||
<!--===========-->
|
<!--===========-->
|
||||||
|
@ -67,9 +67,6 @@
|
|||||||
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
|
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
|
||||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Tachiyomi</item>
|
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Tachiyomi</item>
|
||||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||||
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
|
|
||||||
<item name="chipTextColor">?android:attr/textColorPrimary</item>
|
|
||||||
<item name="chipBackgroundColor">?android:attr/divider</item>
|
|
||||||
<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
|
<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
|
||||||
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
|
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
|
||||||
<item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
|
<item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
|
||||||
|
Loading…
Reference in New Issue
Block a user