Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More themes cleanup (#5410), remove AMOLED Blue

Browse Source 
* More themes cleanup

* Tweak some things

* Fix 'Clear History' icon

* Split out ripple colored to its own drawable

* Tidy up things

* Unify background dim amount

* Use primaryColor for Account login button

* More colored ripples

* use colorOnPrimary for selected comfortable library item title

Co-authored-by: Soitora <simon.mattila@protonmail.com>
(cherry picked from commit 932c92412c29fe4a8d1410d29a6e77557ad48707)

# Conflicts:
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/menu/library_selection.xml
#	app/src/main/res/menu/reader.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/dimens.xml
This commit is contained in:
Ivan Iskandar 2021-06-20 02:45:16 +07:00 committed by Jobobby04
parent 6283754ce5
commit f61bbfa77a
144 changed files with 670 additions and 1030 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -34,7 +34,7 @@ android {
minSdkVersion(AndroidConfig.minSdk)
targetSdkVersion(AndroidConfig.targetSdk)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
versionCode = 19
versionCode = 20
versionName = "1.7.0"
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")

8
app/src/main/AndroidManifest.xml
View File

@ -33,7 +33,7 @@
android:largeHeap="true"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/Theme.Base"
android:theme="@style/Theme.Base.Light"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".ui.main.MainActivity"
@ -85,7 +85,7 @@
</activity>
<activity
android:name=".ui.security.UnlockActivity"
android:theme="@style/Theme.Base" />
android:theme="@style/Theme.Base.Light" />
<activity
android:name=".ui.webview.WebViewActivity"
android:configChanges="uiMode|orientation|screenSize" />
@ -196,7 +196,7 @@
<activity
android:name="exh.ui.intercept.InterceptActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Base">
android:theme="@style/Theme.Base.Light">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -370,7 +370,7 @@
</activity>
<activity
android:name="exh.ui.captcha.BrowserActionActivity"
android:theme="@style/Theme.Base" />
android:theme="@style/Theme.Base.Light" />
</application>
</manifest>

3
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
View File

@ -35,7 +35,8 @@ abstract class BaseThemedActivity : AppCompatActivity() {
DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Amoled_Blue
// Hide AMOLED blue for now, so we don't crash the fuck out
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Amoled
DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Amoled_Red
}
} else {

9
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
View File

@ -101,12 +101,13 @@ abstract class SettingsController : PreferenceController() {
private fun animatePreferenceHighlight(view: View) {
val origBackground = view.background
ValueAnimator
.ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.rippleColor))
.ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.colorControlHighlight))
.apply {
duration = 500L
repeatCount = 2
duration = 200L
repeatCount = 5
repeatMode = ValueAnimator.REVERSE
addUpdateListener { animator -> view.setBackgroundColor(animator.animatedValue as Int) }
reverse()
start()
}
.doOnEnd {
// Restore original ripple

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -171,7 +171,6 @@ class SettingsGeneralController : SettingsController() {
R.string.theme_dark_midnightdusk,
R.string.theme_dark_amoled,
R.string.theme_dark_amoled_hotpink,
R.string.theme_dark_amoledblue,
R.string.theme_dark_red
)
entryValues = arrayOf(
@ -181,7 +180,6 @@ class SettingsGeneralController : SettingsController() {
Values.DarkThemeVariant.midnightdusk.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.hotpink.name,
Values.DarkThemeVariant.amoledblue.name,
Values.DarkThemeVariant.red.name
)
defaultValue = Values.DarkThemeVariant.default.name

2
app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
View File

@ -157,7 +157,7 @@ class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
backItem?.isEnabled = binding.webview.canGoBack()
forwardItem?.isEnabled = binding.webview.canGoForward()
val iconTintColor = getResourceColor(R.attr.colorOnPrimary)
val iconTintColor = getResourceColor(R.attr.colorOnToolbar)
val translucentIconTintColor = ColorUtils.setAlphaComponent(iconTintColor, 127)
backItem?.icon?.setTint(if (binding.webview.canGoBack()) iconTintColor else translucentIconTintColor)
forwardItem?.icon?.setTint(if (binding.webview.canGoForward()) iconTintColor else translucentIconTintColor)

2
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
View File

@ -93,7 +93,7 @@ fun Context.copyToClipboard(label: String, content: String) {
*/
fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder {
val builder = NotificationCompat.Builder(this, channelId)
.setColor(ContextCompat.getColor(this, R.color.colorPrimary))
.setColor(ContextCompat.getColor(this, R.color.accent_lightblue))
if (block != null) {
builder.block()
}

15
app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
View File

@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.widget
import android.content.Context
import android.content.res.ColorStateList
import android.graphics.Color
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
@ -12,6 +11,7 @@ import androidx.annotation.StringRes
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.view.isVisible
import com.google.android.material.button.MaterialButton
import com.mikepenz.aboutlibraries.util.getThemeColor
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.CommonViewEmptyBinding
import kotlin.random.Random
@ -42,17 +42,22 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
binding.textLabel.text = message
binding.actionsContainer.removeAllViews()
val buttonContext = ContextThemeWrapper(context, R.style.Widget_Tachiyomi_Button_ActionButton)
val buttonColor = ColorStateList.valueOf(context.getThemeColor(R.attr.colorOnBackground))
actions?.forEach {
val button = MaterialButton(ContextThemeWrapper(context, R.style.Theme_Widget_Button_Action)).apply {
val button = MaterialButton(
buttonContext,
null,
R.attr.borderlessButtonStyle
).apply {
layoutParams = LinearLayout.LayoutParams(
0,
LinearLayout.LayoutParams.WRAP_CONTENT,
1f / actions.size
)
backgroundTintList = ColorStateList.valueOf(Color.TRANSPARENT)
stateListAnimator = null
elevation = 0f
setTextColor(buttonColor)
iconTint = buttonColor
setIconResource(it.iconResId)
setText(it.stringResId)

20
app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
View File

@ -2,22 +2,18 @@ package eu.kanade.tachiyomi.widget
import android.content.Context
import android.util.AttributeSet
import androidx.core.content.ContextCompat
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.mikepenz.aboutlibraries.util.getThemeColor
import eu.kanade.tachiyomi.R
class ThemedSwipeRefreshLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
SwipeRefreshLayout(context, attrs) {
class ThemedSwipeRefreshLayout @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null
) : SwipeRefreshLayout(context, attrs) {
init {
setColors()
}
private fun setColors() {
// Background is controlled with "swipeRefreshLayoutProgressSpinnerBackgroundColor" in XML
// Background
setProgressBackgroundColorSchemeColor(context.getThemeColor(R.attr.colorPrimary))
// This updates the progress arrow color
val white = ContextCompat.getColor(context, R.color.md_white_1000)
setColorSchemeColors(white, white, white)
setColorSchemeColors(context.getThemeColor(R.attr.colorOnPrimary))
}
}

8
app/src/main/java/exh/EXHMigrations.kt
View File

@ -286,6 +286,14 @@ object EXHMigrations {
LibraryUpdateJob.setupTask(context, 3)
}
}
if (oldVersion under 20) {
val prefs = PreferenceManager.getDefaultSharedPreferences(context)
if (prefs.getString(PreferenceKeys.themeDark, null) == "amoledblue") {
prefs.edit {
putString(PreferenceKeys.themeDark, "amoled")
}
}
}
// if (oldVersion under 1) { } (1 is current release version)
// do stuff here when releasing changed crap

7
app/src/main/res/color/background_color_chip_state.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/rippleColor" android:state_selected="true" />
<item android:color="?attr/rippleColor" android:state_pressed="true" />
<item android:color="?attr/rippleColor" android:state_focused="true" />
<item android:color="@android:color/transparent" />
</selector>

4
app/src/main/res/color/button_action_selector.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_activated="true" />
<item android:color="?android:attr/textColorHint" android:state_activated="false" />
<item android:alpha="1.00" android:color="?attr/colorPrimary" android:state_activated="true" />
<item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_activated="false" />
</selector>

6
app/src/main/res/color/draggable_card_foreground.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:alpha="0.08" android:color="?attr/colorPrimary" app:state_dragged="true" />
<item android:color="@android:color/transparent" />
</selector>

5
app/src/main/res/color/library_item_background.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
<item android:state_activated="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
</selector>

5
app/src/main/res/color/library_item_foreground.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
<item android:state_activated="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
</selector>

4
app/src/main/res/color/nav_selector.xml
View File

@ -3,6 +3,6 @@
Based on mtrl_bottom_nav_colored_item_tint
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="1.0" android:color="?attr/colorAccentOnPrimary" android:state_checked="true" />
<item android:alpha="0.6" android:color="?attr/colorOnPrimary" />
<item android:alpha="1.0" android:color="?attr/colorPrimary" android:state_checked="true" />
<item android:alpha="0.6" android:color="?attr/colorOnSurface" />
</selector>

4
app/src/main/res/color/selector_overlay.xml → app/src/main/res/color/ripple_colored.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.2" android:color="?attr/colorAccent" />
</selector>
<item android:alpha="0.12" android:color="?attr/colorPrimary" />
</selector>

5
app/src/main/res/color/ripple_toolbar_fainter.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 34% of 12% = ~4% -->
<item android:alpha="0.34" android:color="?attr/rippleColorToolbar" />
</selector>

6
app/src/main/res/color/source_comfortable_item_title.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="?attr/colorOnPrimary" />
<item android:state_activated="true" android:color="?attr/colorOnPrimary" />
<item android:color="?android:attr/textColorPrimary" />
</selector>

4
app/src/main/res/color/tabs_selector.xml
View File

@ -6,6 +6,6 @@
it (i.e. blue themes).
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccentOnPrimary" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnPrimary" />
<item android:color="?attr/colorPrimary" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnToolbar" />
</selector>

10
app/src/main/res/color/tabs_selector_background.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Based on mtrl_tabs_icon_color_selector_colored.
Ensures visibility on top of the background color.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnBackground" />
</selector>

11
app/src/main/res/color/text_input_stroke.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorSecondary" android:state_focused="true" />
<item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true" />
<item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:alpha="0.38" android:color="?attr/colorOnSurface" />
</selector>

6
app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@ -11,10 +11,10 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_explore_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_history_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</group>
</vector>

48
app/src/main/res/drawable/library_item_selector.xml
View File

@ -1,42 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="#80FFFFFF" />
</shape>
</item>
<item>
<selector>
<item
android:state_selected="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:state_activated="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?android:attr/colorBackground" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_background" />
</shape>
</item>
</ripple>

23
app/src/main/res/drawable/library_item_selector_overlay.xml
View File

@ -1,21 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_foreground" />
</shape>
</item>
</ripple>
</ripple>

6
app/src/main/res/drawable/list_item_selector.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_selected="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item>

6
app/src/main/res/drawable/list_item_selector_background.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_selected="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item>

2
app/src/main/res/drawable/reader_seekbar_background.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="?attr/actionBarSize" />
<solid android:color="?attr/colorPrimary" />
<solid android:color="?attr/colorToolbar" />
</shape>

2
app/src/main/res/drawable/reader_seekbar_ripple.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">

5
app/src/main/res/drawable/ripple_background.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
<item android:drawable="?android:attr/colorBackground" />
</ripple>

3
app/src/main/res/drawable/ripple_regular.xml
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor" />

6
app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
View File

@ -6,17 +6,17 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_explore_48dp.xml
View File

@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_history_48dp.xml
View File

@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_new_releases_48dp.xml
View File

@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</group>
</vector>

3
app/src/main/res/drawable/selectable_item_background.xml
View File

@ -1,3 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ripple_regular" />
</selector>

2
app/src/main/res/drawable/splash_background.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?attr/colorBackgroundSplash" />
<item android:drawable="@color/splash" />
<item>
<bitmap

2
app/src/main/res/drawable/tab_indicator.xml
View File

@ -3,5 +3,5 @@
<corners
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<solid android:color="?attr/colorAccentOnPrimary" />
<solid android:color="@android:color/white" />
</shape>

4
app/src/main/res/layout-sw720dp/main_activity.xml
View File

@ -77,7 +77,7 @@
android:layout_height="0dp"
app:elevation="0dp"
app:itemIconTint="@color/nav_selector"
app:itemRippleColor="?attr/rippleSecondaryColor"
app:itemRippleColor="?attr/colorControlHighlight"
app:itemTextColor="@color/nav_selector"
app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent"
@ -87,7 +87,7 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
style="@style/Widget.Tachiyomi.TabLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/action_toolbar.xml
View File

@ -19,8 +19,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:contentInsetEnd="8dp"
app:contentInsetStart="8dp">

6
app/src/main/res/layout/categories_item.xml
View File

@ -6,12 +6,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp">
app:cardElevation="0dp"
app:cardForegroundColor="@color/draggable_card_foreground">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_selector_background">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/reorder"

2
app/src/main/res/layout/chapter_download_view.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="42dp"
android:layout_height="42dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp">
<ImageView

2
app/src/main/res/layout/common_spinner_item.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="@style/Theme.Widget.SpinnerItem"
style="@style/Widget.Tachiyomi.SpinnerItem"
android:layout_width="match_parent"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:ellipsize="end"

10
app/src/main/res/layout/common_tabbed_sheet.xml
View File

@ -12,8 +12,8 @@
<!-- Remove background color so rounded sheet corners work -->
<com.google.android.material.tabs.TabLayout
style="@style/Widget.Tachiyomi.TabLayout"
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
@ -22,15 +22,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabGravity="fill"
app:tabIndicatorColor="?attr/colorAccent"
app:tabMode="fixed"
app:tabTextColor="@color/tabs_selector_background" />
app:tabMode="fixed" />
<ImageButton
android:id="@+id/menu"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu"
android:paddingStart="10dp"
android:paddingEnd="10dp"
@ -39,7 +37,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_overflow_24dp"
app:tint="?attr/colorOnBackground"
app:tint="?attr/colorOnSurface"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/description_adapter_8m.xml
View File

@ -22,7 +22,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_eh.xml
View File

@ -45,7 +45,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_hb.xml
View File

@ -16,7 +16,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_hi.xml
View File

@ -33,7 +33,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_md.xml
View File

@ -30,7 +30,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_nh.xml
View File

@ -45,7 +45,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_pe.xml
View File

@ -34,7 +34,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_pu.xml
View File

@ -45,7 +45,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

2
app/src/main/res/layout/description_adapter_ts.xml
View File

@ -45,7 +45,7 @@
<Button
android:id="@+id/more_info"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="16dp"

8
app/src/main/res/layout/download_item.xml
View File

@ -7,12 +7,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp">
app:cardElevation="0dp"
app:cardForegroundColor="@color/draggable_card_foreground">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_selector_background">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/reorder"
@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/download_progress_text"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu"
android:paddingHorizontal="10dp"
android:paddingVertical="16dp"

9
app/src/main/res/layout/edit_manga_dialog.xml
View File

@ -40,7 +40,7 @@
<com.google.android.material.textfield.TextInputLayout
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -57,7 +57,7 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -74,7 +74,7 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -91,7 +91,7 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -119,7 +119,6 @@
android:id="@+id/reset_tags"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Theme.Widget.Button.FilledAccent"
android:textAllCaps="false"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"

11
app/src/main/res/layout/edit_merged_settings_item.xml
View File

@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/holder"
style="@style/Theme.Widget.CardView.Item"
android:padding="0dp">
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp"
app:cardForegroundColor="@color/draggable_card_foreground">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -135,4 +138,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>

36
app/src/main/res/layout/eh_dialog_categories.xml
View File

@ -6,13 +6,11 @@
android:layout_column="0"
android:padding="16dp"
android:showDividers="middle"
android:divider="@color/backgroundDark">
android:divider="?attr/colorOnBackground">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:showDividers="middle"
android:divider="@color/backgroundDark">
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"
@ -44,8 +42,7 @@
android:id="@+id/doujinshi_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -64,8 +61,7 @@
android:id="@+id/manga_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -84,8 +80,7 @@
android:id="@+id/artist_cg_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -104,8 +99,7 @@
android:id="@+id/game_cg_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -124,8 +118,7 @@
android:id="@+id/western_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -144,8 +137,7 @@
android:id="@+id/non_h_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -164,8 +156,7 @@
android:id="@+id/image_set_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -184,8 +175,7 @@
android:id="@+id/cosplay_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -204,8 +194,7 @@
android:id="@+id/asian_porn_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
<TableRow
@ -224,7 +213,6 @@
android:id="@+id/misc_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Theme.Widget.BasicSwitch" />
android:layout_gravity="center" />
</TableRow>
</TableLayout>

8
app/src/main/res/layout/eh_dialog_languages.xml
View File

@ -4,15 +4,11 @@
android:layout_height="wrap_content"
android:layout_row="0"
android:layout_column="0"
android:padding="16dp"
android:showDividers="middle"
android:divider="@color/backgroundDark">
android:padding="16dp" >
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:showDividers="middle"
android:divider="@color/backgroundDark">
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"

2
app/src/main/res/layout/extension_card_item.xml
View File

@ -76,7 +76,7 @@
<Button
android:id="@+id/ext_button"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"

3
app/src/main/res/layout/extension_detail_header.xml
View File

@ -20,7 +20,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
android:elevation="2dp"
android:padding="16dp">
@ -98,7 +98,6 @@
<Button
android:id="@+id/extension_uninstall_button"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"

4
app/src/main/res/layout/global_search_controller_card.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/title_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background">
android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/title"
@ -67,7 +67,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

3
app/src/main/res/layout/global_search_controller_card_item.xml
View File

@ -22,7 +22,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -50,7 +50,6 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="4dp"
android:shadowColor="@color/textColorPrimaryLight"
app:layout_constraintEnd_toEndOf="@+id/card"
app:layout_constraintStart_toStartOf="@+id/card"
app:layout_constraintTop_toBottomOf="@+id/card"

6
app/src/main/res/layout/history_item.xml
View File

@ -9,7 +9,7 @@
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal">
<ImageView
@ -57,7 +57,7 @@
android:id="@+id/remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_resume"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
@ -70,7 +70,7 @@
android:id="@+id/resume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_resume"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"

4
app/src/main/res/layout/index_controller.xml
View File

@ -55,7 +55,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/latest_progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -120,7 +120,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/browse_progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/latest_controller.xml
View File

@ -27,7 +27,7 @@
android:background="?attr/colorSurface" />
<com.google.android.material.progressindicator.CircularProgressIndicator
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"

2
app/src/main/res/layout/latest_controller_card.xml
View File

@ -68,7 +68,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/library_controller.xml
View File

@ -12,7 +12,7 @@
<Button
android:id="@+id/btn_global_search"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"

2
app/src/main/res/layout/library_grid_recycler.xml
View File

@ -2,7 +2,7 @@
<eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/library_grid"
style="@style/Theme.Widget.GridView.Source"
style="@style/Widget.Tachiyomi.GridView.Source"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"

7
app/src/main/res/layout/main_activity.xml
View File

@ -17,13 +17,11 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:layout_scrollFlags="scroll|enterAlways" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -77,13 +75,10 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:itemIconTint="@color/nav_selector"
app:itemRippleColor="?attr/rippleSecondaryColor"
app:itemTextColor="@color/nav_selector"
app:itemRippleColor="@color/ripple_toolbar_fainter"
app:labelVisibilityMode="labeled"
app:layout_insetEdge="bottom"
app:menu="@menu/main_nav" />

6
app/src/main/res/layout/main_activity_fab.xml
View File

@ -2,7 +2,11 @@
<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"
style="@style/Theme.Widget.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_add_24dp"
tools:text="Action"

3
app/src/main/res/layout/main_activity_toolbar.xml
View File

@ -11,13 +11,10 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:layout_scrollFlags="scroll|enterAlways" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

6
app/src/main/res/layout/manga_chapters_header.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:paddingStart="16dp"
android:paddingTop="4dp"
android:paddingEnd="12dp"
@ -28,12 +28,12 @@
android:id="@+id/btn_chapters_filter"
android:layout_width="28dp"
android:layout_height="28dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_filter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_filter_list_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnBackground" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/manga_info_buttons.xml
View File

@ -7,7 +7,6 @@
<Button
android:id="@+id/merge_btn"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -21,7 +20,6 @@
<Button
android:id="@+id/recommend_btn"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

9
app/src/main/res/layout/manga_info_header.xml
View File

@ -136,7 +136,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_favorite"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -148,7 +148,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_tracking"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/manga_tracking_tab"
@ -161,7 +161,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_webview"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/action_web_view"
@ -175,7 +175,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_merge"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
@ -185,7 +185,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btn_webview"
app:layout_constraintTop_toBottomOf="@+id/manga_info"
app:rippleColor="?attr/rippleColor"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/manga_info_item.xml
View File

@ -36,7 +36,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_more"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
@ -48,7 +48,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_less"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"

2
app/src/main/res/layout/migration_bottom_sheet.xml
View File

@ -162,9 +162,9 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab"
style="@style/Theme.Widget.FAB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:layout_marginEnd="16dp"
android:text="@string/action_migrate"
app:icon="@drawable/ic_arrow_forward_24dp"

4
app/src/main/res/layout/migration_manga_card.xml
View File

@ -76,7 +76,7 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="8dp"
android:shadowColor="@color/textColorPrimaryLight"
android:shadowColor="@color/md_black_1000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="4"
@ -85,7 +85,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
app/src/main/res/layout/navigation_view_autocomplete.xml
View File

@ -23,7 +23,7 @@
<AutoCompleteTextView
android:id="@+id/nav_view_item"
style="@style/Theme.Widget.TextInputLayout.OutlinedBox"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@ -39,5 +39,5 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:chipSpacingVertical="4dp"
style="@style/Theme.Widget.Chip"/>
style="@style/Widget.Tachiyomi.Chip.Action"/>
</LinearLayout>

2
app/src/main/res/layout/navigation_view_checkbox.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_checkedtext.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_group.xml
View File

@ -24,6 +24,6 @@
android:id="@+id/expand_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnBackground" />
</LinearLayout>

19
app/src/main/res/layout/navigation_view_help_dialog.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:background="?attr/selectableItemBackground"
android:focusable="true">
<Button
android:id="@+id/dialog_open_button"
style="@style/Theme.Widget.Button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="Button" />
</LinearLayout>

2
app/src/main/res/layout/navigation_view_radio.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_spinner.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

4
app/src/main/res/layout/navigation_view_text.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:baselineAligned="false"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
@ -10,7 +10,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nav_view_item_wrapper"
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

4
app/src/main/res/layout/pref_account_login.xml
View File

@ -43,7 +43,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/login"
android:textColor="@android:color/white"
android:textColor="?attr/colorOnPrimary"
app:pb_colorNormal="?attr/colorPrimary"
app:pb_colorPressed="?attr/colorPrimary"
app:pb_textComplete="@string/login_success"
app:pb_textError="@string/invalid_login"
app:pb_textProgress="@string/loading" />

4
app/src/main/res/layout/pref_more_header.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
android:elevation="2dp"
android:padding="32dp">
@ -12,6 +12,6 @@
android:layout_height="56dp"
android:layout_gravity="center"
app:srcCompat="@drawable/ic_tachi"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</FrameLayout>

2
app/src/main/res/layout/pref_settings.xml
View File

@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/label_settings"
android:padding="8dp"
app:srcCompat="@drawable/ic_settings_24dp"

5
app/src/main/res/layout/pref_site_login_two_factor_auth.xml
View File

@ -48,7 +48,6 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/two_factor_holder"
style="@style/Theme.Widget.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
@ -76,7 +75,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/login"
android:textColor="@android:color/white"
android:textColor="?attr/colorOnPrimary"
app:pb_colorNormal="?attr/colorPrimary"
app:pb_colorPressed="?attr/colorPrimary"
app:pb_textComplete="@string/login_success"
app:pb_textError="@string/invalid_login"
app:pb_textProgress="@string/loading" />

50
app/src/main/res/layout/reader_activity.xml
View File

@ -63,7 +63,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
app:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -223,7 +223,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -250,7 +250,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -272,7 +272,7 @@
android:padding="@dimen/screen_edge_margin"
android:rotation="90"
app:srcCompat="@drawable/ic_skip_next_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</LinearLayout>
@ -315,7 +315,7 @@
android:contentDescription="@string/action_previous_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_previous_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<LinearLayout
android:id="@+id/reader_seekbar"
@ -331,7 +331,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
tools:text="1" />
@ -352,7 +352,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
tools:text="15" />
@ -367,7 +367,7 @@
android:contentDescription="@string/action_next_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_next_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</LinearLayout>
@ -375,13 +375,13 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary">
android:background="?attr/colorToolbar">
<ImageButton
android:id="@+id/action_chapter_list"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/custom_filter"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@+id/action_web_view"
@ -389,13 +389,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_format_list_numbered_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_web_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/custom_filter"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_reading_mode"
@ -403,13 +403,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_public_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_reading_mode"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/viewer"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
@ -417,13 +417,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_reader_default_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_crop_borders"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/pref_crop_borders"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_rotation"
@ -431,13 +431,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_crop_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_rotation"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/pref_rotation_type"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/double_page"
@ -445,13 +445,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_screen_rotation_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/double_page"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/page_layout"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/shift_page_button"
@ -459,13 +459,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_book_open_variant_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/shift_page_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/shift_double_pages"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_settings"
@ -473,13 +473,13 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_page_next_outline_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_settings"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_settings"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toEndOf="parent"
@ -487,7 +487,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_settings_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
app/src/main/res/layout/reader_page_sheet.xml
View File

@ -11,7 +11,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@ -38,7 +38,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
@ -65,7 +65,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@ -92,7 +92,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
@ -119,7 +119,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
@ -146,7 +146,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@ -173,7 +173,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
@ -200,7 +200,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"

2
app/src/main/res/layout/settings_search_controller_card.xml
View File

@ -4,7 +4,7 @@
android:id="@+id/title_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
android:padding="16dp">

4
app/src/main/res/layout/source_comfortable_grid_item.xml
View File

@ -114,7 +114,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -133,7 +133,7 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="4dp"
android:shadowColor="@color/textColorPrimaryLight"
android:textColor="@color/source_comfortable_item_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card"
tools:text="Sample name" />

4
app/src/main/res/layout/source_compact_grid_item.xml
View File

@ -122,7 +122,7 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="8dp"
android:shadowColor="@color/textColorPrimaryLight"
android:shadowColor="@color/md_black_1000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="4"
@ -131,7 +131,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/source_enhanced_ehentai_list_item.xml
View File

@ -29,7 +29,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/source_filter_mangadex_header.xml
View File

@ -6,7 +6,6 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/mangadex_random"
style="@style/Theme.Widget.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
@ -18,7 +17,6 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/mangadex_follows"
style="@style/Theme.Widget.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

4
app/src/main/res/layout/source_filter_sheet.xml
View File

@ -16,7 +16,7 @@
<Button
android:id="@+id/reset_btn"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_reset"
@ -26,7 +26,6 @@
<ImageButton
android:id="@+id/save_search_btn"
style="@style/Theme.Widget.Button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -41,7 +40,6 @@
<Button
android:id="@+id/filter_btn"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"

Some files were not shown because too many files have changed in this diff Show More