mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-14 17:05:07 +01:00
adding compatToolTipText helper + using unused strings
This commit is contained in:
parent
074f41ca7e
commit
0a3d6bd8f5
@ -112,6 +112,13 @@ class EditMangaDialog : DialogController {
|
|||||||
infoController.changeCover()
|
infoController.changeCover()
|
||||||
}
|
}
|
||||||
binding.resetTags.setOnClickListener { resetTags() }
|
binding.resetTags.setOnClickListener { resetTags() }
|
||||||
|
binding.resetTags.text = resources?.getString(
|
||||||
|
if (manga.genre.isNullOrBlank() || manga.source == LocalSource.ID) {
|
||||||
|
R.string.clear_tags
|
||||||
|
} else {
|
||||||
|
R.string.reset_tags
|
||||||
|
}
|
||||||
|
)
|
||||||
binding.resetCover.visibleIf(!isLocal)
|
binding.resetCover.visibleIf(!isLocal)
|
||||||
binding.resetCover.setOnClickListener {
|
binding.resetCover.setOnClickListener {
|
||||||
binding.mangaCover.loadAny(
|
binding.mangaCover.loadAny(
|
||||||
|
@ -43,10 +43,6 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
|
|||||||
layoutResource = R.layout.themes_preference
|
layoutResource = R.layout.themes_preference
|
||||||
fastAdapter = FastAdapter.with(itemAdapter)
|
fastAdapter = FastAdapter.with(itemAdapter)
|
||||||
fastAdapter.setHasStableIds(true)
|
fastAdapter.setHasStableIds(true)
|
||||||
val enumConstants = ThemeUtil.Themes::class.java.enumConstants
|
|
||||||
val currentLightTheme = preferences.lightTheme().get()
|
|
||||||
val currentDarkTheme = preferences.darkTheme().get()
|
|
||||||
val nightMode = preferences.nightMode().get()
|
|
||||||
selectExtension = fastAdapter.getSelectExtension().apply {
|
selectExtension = fastAdapter.getSelectExtension().apply {
|
||||||
isSelectable = true
|
isSelectable = true
|
||||||
multiSelect = true
|
multiSelect = true
|
||||||
@ -78,6 +74,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val enumConstants = ThemeUtil.Themes::class.java.enumConstants
|
||||||
itemAdapter.set(enumConstants?.map(::ThemeItem).orEmpty())
|
itemAdapter.set(enumConstants?.map(::ThemeItem).orEmpty())
|
||||||
isSelectable = false
|
isSelectable = false
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.source.LocalSource
|
|||||||
import eu.kanade.tachiyomi.source.icon
|
import eu.kanade.tachiyomi.source.icon
|
||||||
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
|
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
|
||||||
import eu.kanade.tachiyomi.util.system.getResourceColor
|
import eu.kanade.tachiyomi.util.system.getResourceColor
|
||||||
|
import eu.kanade.tachiyomi.util.view.compatToolTipText
|
||||||
import eu.kanade.tachiyomi.util.view.gone
|
import eu.kanade.tachiyomi.util.view.gone
|
||||||
import eu.kanade.tachiyomi.util.view.visible
|
import eu.kanade.tachiyomi.util.view.visible
|
||||||
|
|
||||||
@ -40,6 +41,7 @@ class SourceHolder(view: View, val adapter: SourceAdapter) :
|
|||||||
else android.R.attr.textColorSecondary
|
else android.R.attr.textColorSecondary
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
compatToolTipText = context.getString(if (isPinned) R.string.unpin else R.string.pin)
|
||||||
setImageResource(
|
setImageResource(
|
||||||
if (isPinned) R.drawable.ic_pin_24dp
|
if (isPinned) R.drawable.ic_pin_24dp
|
||||||
else R.drawable.ic_pin_outline_24dp
|
else R.drawable.ic_pin_outline_24dp
|
||||||
|
@ -20,6 +20,7 @@ import androidx.annotation.IdRes
|
|||||||
import androidx.annotation.Px
|
import androidx.annotation.Px
|
||||||
import androidx.appcompat.view.menu.MenuBuilder
|
import androidx.appcompat.view.menu.MenuBuilder
|
||||||
import androidx.core.graphics.ColorUtils
|
import androidx.core.graphics.ColorUtils
|
||||||
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearSmoothScroller
|
import androidx.recyclerview.widget.LinearSmoothScroller
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
@ -336,3 +337,13 @@ fun RecyclerView.smoothScrollToTop() {
|
|||||||
scrollToPosition(0)
|
scrollToPosition(0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var View.compatToolTipText: CharSequence?
|
||||||
|
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
tooltipText
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
}
|
||||||
|
set(value) {
|
||||||
|
ViewCompat.setTooltipText(this, value)
|
||||||
|
}
|
||||||
|
@ -102,7 +102,8 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintDimensionRatio="1:1"
|
app:layout_constraintDimensionRatio="1:1"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:contentDescription="@string/pin" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_migration_guide"
|
android:id="@+id/action_migration_guide"
|
||||||
android:title="@string/help"
|
android:title="@string/source_migration_guide"
|
||||||
android:icon="@drawable/ic_help_24dp"
|
android:icon="@drawable/ic_help_24dp"
|
||||||
app:showAsAction="ifRoom"/>
|
app:showAsAction="ifRoom"/>
|
||||||
</menu>
|
</menu>
|
Loading…
Reference in New Issue
Block a user