mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-03 23:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to MaterialComponents themes

Browse Source
This commit is contained in:
arkon
2020-03-11 19:08:57 -04:00
parent 2615b067e2
commit 7d0ea614da
42 changed files with 174 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class CatalogueAdapter(val controller: CatalogueController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
init {
setDisplayHeadersAtStartUp(true)

2
app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class ExtensionAdapter(val controller: ExtensionController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
init {
setDisplayHeadersAtStartUp(true)

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class SourceAdapter(val controller: MigrationController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
private var items: List<IFlexible<*>>? = null

2
app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
View File

@@ -50,7 +50,7 @@ abstract class LoginDialogPreference(private val usernameLabel: String? = null,
}
if (!usernameLabel.isNullOrEmpty()) {
username_label.text = usernameLabel
username_label.hint = usernameLabel
}
login.setMode(ActionProcessButton.Mode.ENDLESS)

3
app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt
View File

@@ -1,9 +1,7 @@
package eu.kanade.tachiyomi.widget.preference
import android.annotation.TargetApi
import android.content.Context
import android.content.res.TypedArray
import android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH
import android.util.AttributeSet
import android.view.View
import android.widget.Checkable
@@ -41,7 +39,6 @@ class SwitchPreferenceCategory @JvmOverloads constructor(
syncSwitchView(switchView)
}
@TargetApi(ICE_CREAM_SANDWICH)
private fun syncSwitchView(view: View) {
if (view is Checkable) {
val isChecked = view.isChecked

2
app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLoginDialog.kt
View File

@@ -35,7 +35,7 @@ class TrackLoginDialog(usernameLabel: String? = null, bundle: Bundle? = null) :
requestSubscription?.unsubscribe()
v?.apply {
if (username.text.isEmpty() || password.text.isEmpty())
if (username.text.isNullOrEmpty() || password.text.isNullOrEmpty())
return
login.progress = 1