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

Target sdk 26. Dependency updates.

Browse Source
This commit is contained in:
len
2017-09-23 17:14:04 +02:00
parent 54c8b3ef29
commit 75c41b645a
19 changed files with 67 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/ProgressItem.kt
View File

@@ -45,8 +45,8 @@ class ProgressItem : AbstractFlexibleItem<ProgressItem.Holder>() {
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val progressBar = view.findViewById(R.id.progress_bar) as ProgressBar
val progressMessage = view.findViewById(R.id.progress_message) as TextView
val progressBar: ProgressBar = view.findViewById(R.id.progress_bar)
val progressMessage: TextView = view.findViewById(R.id.progress_message)
}
}

8
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt
View File

@@ -32,10 +32,8 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem<Chec
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is CheckboxItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as CheckboxItem).filter
}
override fun hashCode(): Int {
@@ -44,6 +42,6 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem<Chec
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val check = itemView.findViewById(R.id.nav_view_item) as CheckBox
val check: CheckBox = itemView.findViewById(R.id.nav_view_item)
}
}

10
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt
View File

@@ -34,10 +34,8 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is GroupItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as GroupItem).filter
}
override fun hashCode(): Int {
@@ -46,8 +44,8 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
open class Holder(view: View, adapter: FlexibleAdapter<*>) : ExpandableViewHolder(view, adapter, true) {
val title = itemView.findViewById(R.id.title) as TextView
val icon = itemView.findViewById(R.id.expand_icon) as ImageView
val title: TextView = itemView.findViewById(R.id.title)
val icon: ImageView = itemView.findViewById(R.id.expand_icon)
override fun shouldNotifyParentOnClick(): Boolean {
return true

6
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/HeaderItem.kt
View File

@@ -29,10 +29,8 @@ class HeaderItem(val filter: Filter.Header) : AbstractHeaderItem<HeaderItem.Hold
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is HeaderItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as HeaderItem).filter
}
override fun hashCode(): Int {

24
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SectionItems.kt
View File

@@ -15,10 +15,8 @@ class TriStateSectionItem(filter: Filter.TriState) : TriStateItem(filter), ISect
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is TriStateSectionItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as TriStateSectionItem).filter
}
override fun hashCode(): Int {
@@ -38,10 +36,8 @@ class TextSectionItem(filter: Filter.Text) : TextItem(filter), ISectionable<Text
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is TextSectionItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as TextSectionItem).filter
}
override fun hashCode(): Int {
@@ -61,10 +57,8 @@ class CheckboxSectionItem(filter: Filter.CheckBox) : CheckboxItem(filter), ISect
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is CheckboxSectionItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as CheckboxSectionItem).filter
}
override fun hashCode(): Int {
@@ -84,10 +78,8 @@ class SelectSectionItem(filter: Filter.Select<*>) : SelectItem(filter), ISection
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is SelectSectionItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as SelectSectionItem).filter
}
override fun hashCode(): Int {

10
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SelectItem.kt
View File

@@ -40,10 +40,8 @@ open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<Selec
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is SelectItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as SelectItem).filter
}
override fun hashCode(): Int {
@@ -52,7 +50,7 @@ open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<Selec
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val text = itemView.findViewById(R.id.nav_view_item_text) as TextView
val spinner = itemView.findViewById(R.id.nav_view_item) as Spinner
val text: TextView = itemView.findViewById(R.id.nav_view_item_text)
val spinner: Spinner = itemView.findViewById(R.id.nav_view_item)
}
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt
View File

@@ -27,10 +27,8 @@ class SeparatorItem(val filter: Filter.Separator) : AbstractHeaderItem<Separator
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is SeparatorItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as SeparatorItem).filter
}
override fun hashCode(): Int {

6
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt
View File

@@ -32,10 +32,8 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem<SortGrou
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is SortGroup) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as SortGroup).filter
}
override fun hashCode(): Int {

9
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortItem.kt
View File

@@ -54,10 +54,9 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is SortItem) {
return name == other.name && group == other.group
}
return false
if (javaClass != other?.javaClass) return false
other as SortItem
return name == other.name && group == other.group
}
override fun hashCode(): Int {
@@ -68,7 +67,7 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val text = itemView.findViewById(R.id.nav_view_item) as CheckedTextView
val text: CheckedTextView = itemView.findViewById(R.id.nav_view_item)
}
}

10
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt
View File

@@ -34,10 +34,8 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is TextItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as TextItem).filter
}
override fun hashCode(): Int {
@@ -46,7 +44,7 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val wrapper = itemView.findViewById(R.id.nav_view_item_wrapper) as TextInputLayout
val edit = itemView.findViewById(R.id.nav_view_item) as EditText
val wrapper: TextInputLayout = itemView.findViewById(R.id.nav_view_item_wrapper)
val edit: EditText = itemView.findViewById(R.id.nav_view_item)
}
}

8
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt
View File

@@ -51,10 +51,8 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other is TriStateItem) {
return filter == other.filter
}
return false
if (javaClass != other?.javaClass) return false
return filter == (other as TriStateItem).filter
}
override fun hashCode(): Int {
@@ -63,7 +61,7 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
val text = itemView.findViewById(TR.id.nav_view_item) as CheckedTextView
val text: CheckedTextView = itemView.findViewById(TR.id.nav_view_item)
init {
// Align with native checkbox

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

@@ -99,7 +99,7 @@ class MainActivity : BaseActivity() {
true
}
val container = findViewById(R.id.controller_container) as ViewGroup
val container: ViewGroup = findViewById(R.id.controller_container)
router = Conductor.attachRouter(this, container, savedInstanceState)
if (!router.hasRootController()) {

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
View File

@@ -43,7 +43,7 @@ class SetTrackChaptersDialog<T> : DialogController
val view = dialog.customView
if (view != null) {
// Remove focus to update selected number
val np = view.findViewById(R.id.chapters_picker) as NumberPicker
val np: NumberPicker = view.findViewById(R.id.chapters_picker)
np.clearFocus()
(targetController as? Listener)?.setChaptersRead(item, np.value)
@@ -53,7 +53,7 @@ class SetTrackChaptersDialog<T> : DialogController
val view = dialog.customView
if (view != null) {
val np = view.findViewById(R.id.chapters_picker) as NumberPicker
val np: NumberPicker = view.findViewById(R.id.chapters_picker)
// Set initial value
np.value = item.track?.last_chapter_read ?: 0
// Don't allow to go from 0 to 9999

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
View File

@@ -43,7 +43,7 @@ class SetTrackScoreDialog<T> : DialogController
val view = dialog.customView
if (view != null) {
// Remove focus to update selected number
val np = view.findViewById(R.id.score_picker) as NumberPicker
val np: NumberPicker = view.findViewById(R.id.score_picker)
np.clearFocus()
(targetController as? Listener)?.setScore(item, np.value)
@@ -53,7 +53,7 @@ class SetTrackScoreDialog<T> : DialogController
val view = dialog.customView
if (view != null) {
val np = view.findViewById(R.id.score_picker) as NumberPicker
val np: NumberPicker = view.findViewById(R.id.score_picker)
val scores = item.service.getScoreList().toTypedArray()
np.maxValue = scores.size - 1
np.displayedValues = scores

2
app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/DateItem.kt
View File

@@ -41,7 +41,7 @@ class DateItem(val date: Date) : AbstractHeaderItem<DateItem.Holder>() {
private val now = Date().time
val section_text = view.findViewById(R.id.section_text) as TextView
val section_text: TextView = view.findViewById(R.id.section_text)
fun bind(item: DateItem) {
section_text.text = DateUtils.getRelativeTimeSpanString(item.date.time, now, DateUtils.DAY_IN_MILLIS)