prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup data classes

Browse Source
This commit is contained in:
Koitharu
2021-11-12 19:24:12 +02:00
parent 51cd88eded
commit 1569aa5dd5
41 changed files with 168 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

@@ -14,7 +14,6 @@
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>

4
app/build.gradle
View File

@@ -13,8 +13,8 @@ android {
applicationId 'org.koitharu.kotatsu'
minSdkVersion 21
targetSdkVersion 31
versionCode 370
versionName '2.0-b2'
versionCode 371
versionName '2.0-b3'
generatedDensities = []
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
app/proguard-rules.pro vendored
View File

@@ -5,9 +5,7 @@
public static void checkReturnedValueIsNotNull(...);
public static void checkFieldIsNotNull(...);
public static void checkParameterIsNotNull(...);
public static void checkNotNullParameter(...);
}
-keep class org.koitharu.kotatsu.core.db.entity.* { *; }
-keepclassmembers public class * extends org.koitharu.kotatsu.core.parser.MangaRepository {
public <init>(...);
}
-dontwarn okhttp3.internal.platform.ConscryptPlatform

2
app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
View File

@@ -5,7 +5,7 @@ import android.net.Uri
import android.os.Bundle
import org.koitharu.kotatsu.core.model.Manga
data class MangaIntent(
class MangaIntent(
val manga: Manga?,
val mangaId: Long,
val uri: Uri?

25
app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
View File

@@ -96,11 +96,32 @@ class ChipsView @JvmOverloads constructor(
}
}
data class ChipModel(
class ChipModel(
@DrawableRes val icon: Int,
val title: CharSequence,
val data: Any? = null
)
) {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as ChipModel
if (icon != other.icon) return false
if (title != other.title) return false
if (data != other.data) return false
return true
}
override fun hashCode(): Int {
var result = icon
result = 31 * result + title.hashCode()
result = 31 * result + data.hashCode()
return result
}
}
fun interface OnChipClickListener {

2
app/src/main/java/org/koitharu/kotatsu/core/backup/BackupEntry.kt
View File

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.backup
import org.json.JSONArray
data class BackupEntry(
class BackupEntry(
val name: String,
val data: JSONArray
) {

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
View File

@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.core.model.MangaState
import org.koitharu.kotatsu.core.model.MangaTag
@Entity(tableName = "manga")
data class MangaEntity(
class MangaEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "manga_id") val id: Long,
@ColumnInfo(name = "title") val title: String,

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaPrefsEntity.kt
View File

@@ -14,7 +14,7 @@ import androidx.room.PrimaryKey
onDelete = ForeignKey.CASCADE
)]
)
data class MangaPrefsEntity(
class MangaPrefsEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "manga_id") val mangaId: Long,
@ColumnInfo(name = "mode") val mode: Int

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
View File

@@ -20,7 +20,7 @@ import androidx.room.ForeignKey
)
]
)
data class MangaTagsEntity(
class MangaTagsEntity(
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
@ColumnInfo(name = "tag_id", index = true) val tagId: Long
)

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
View File

@@ -5,7 +5,7 @@ import androidx.room.Junction
import androidx.room.Relation
import org.koitharu.kotatsu.utils.ext.mapToSet
data class MangaWithTags(
class MangaWithTags(
@Embedded val manga: MangaEntity,
@Relation(
parentColumn = "manga_id",

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/SuggestionEntity.kt
View File

@@ -16,7 +16,7 @@ import androidx.room.PrimaryKey
)
]
)
data class SuggestionEntity(
class SuggestionEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
@ColumnInfo(name = "relevance") val relevance: Float,

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
View File

@@ -8,7 +8,7 @@ import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.utils.ext.longHashCode
@Entity(tableName = "tags")
data class TagEntity(
class TagEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "tag_id") val id: Long,
@ColumnInfo(name = "title") val title: String,

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
View File

@@ -15,7 +15,7 @@ import androidx.room.PrimaryKey
)
]
)
data class TrackEntity(
class TrackEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "manga_id") val mangaId: Long,
@ColumnInfo(name = "chapters_total") val totalChapters: Int,

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogEntity.kt
View File

@@ -15,7 +15,7 @@ import androidx.room.PrimaryKey
)
]
)
data class TrackLogEntity(
class TrackLogEntity(
@PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "id") val id: Long = 0L,
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,

2
app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
View File

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.model.TrackingLogItem
import org.koitharu.kotatsu.utils.ext.mapToSet
import java.util.*
data class TrackLogWithManga(
class TrackLogWithManga(
@Embedded val trackLog: TrackLogEntity,
@Relation(
parentColumn = "manga_id",

28
app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt
View File

@@ -2,12 +2,12 @@ package org.koitharu.kotatsu.core.github
import java.util.*
data class VersionId(
class VersionId(
val major: Int,
val minor: Int,
val build: Int,
val variantType: String,
val variantNumber: Int
val variantNumber: Int,
) : Comparable<VersionId> {
override fun compareTo(other: VersionId): Int {
@@ -30,6 +30,30 @@ data class VersionId(
return variantNumber.compareTo(other.variantNumber)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as VersionId
if (major != other.major) return false
if (minor != other.minor) return false
if (build != other.build) return false
if (variantType != other.variantType) return false
if (variantNumber != other.variantNumber) return false
return true
}
override fun hashCode(): Int {
var result = major
result = 31 * result + minor
result = 31 * result + build
result = 31 * result + variantType.hashCode()
result = 31 * result + variantNumber
return result
}
companion object {
private fun variantWeight(variantType: String) =

13
app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
View File

@@ -9,8 +9,13 @@ data class MangaChapter(
val name: String,
val number: Int,
val url: String,
val scanlator: String? = null,
val scanlator: String?,
val uploadDate: Long,
val branch: String? = null,
val source: MangaSource
) : Parcelable
val branch: String?,
val source: MangaSource,
) : Parcelable, Comparable<MangaChapter> {
override fun compareTo(other: MangaChapter): Int {
return number.compareTo(other.number)
}
}

2
app/src/main/java/org/koitharu/kotatsu/core/model/MangaHistory.kt
View File

@@ -10,5 +10,5 @@ data class MangaHistory(
val updatedAt: Date,
val chapterId: Long,
val page: Int,
val scroll: Int
val scroll: Int,
) : Parcelable

4
app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
View File

@@ -8,6 +8,6 @@ data class MangaPage(
val id: Long,
val url: String,
val referer: String,
val preview: String? = null,
val source: MangaSource
val preview: String?,
val source: MangaSource,
) : Parcelable

2
app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
View File

@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
enum class MangaSource(
val title: String,
val locale: String?,
val cls: Class<out MangaRepository>
val cls: Class<out MangaRepository>,
) : Parcelable {
LOCAL("Local", null, LocalMangaRepository::class.java),
READMANGA_RU("ReadManga", "ru", ReadmangaRepository::class.java),

2
app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
View File

@@ -7,5 +7,5 @@ import kotlinx.parcelize.Parcelize
data class MangaTag(
val title: String,
val key: String,
val source: MangaSource
val source: MangaSource,
) : Parcelable

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
View File

@@ -87,8 +87,10 @@ class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
name = "Глава " + a.selectFirst("a")?.text().orEmpty(),
number = i + 1,
url = href,
scanlator = null,
branch = null,
uploadDate = 0L,
source = source
source = source,
)
}
)
@@ -115,8 +117,9 @@ class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
MangaPage(
id = generateUid(url),
url = url,
preview = null,
referer = fullUrl,
source = source
source = source,
)
}
}

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
View File

@@ -88,8 +88,10 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
name = tr.selectFirst("a")?.text().orEmpty(),
number = i + 1,
url = href,
scanlator = null,
branch = null,
uploadDate = dateFormat.tryParse(tr.selectFirst("div.date")?.text()),
source = source
source = source,
)
}
)
@@ -117,8 +119,9 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
MangaPage(
id = generateUid(url),
url = url,
preview = null,
referer = fullUrl,
source = source
source = source,
)
}
}

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
View File

@@ -101,7 +101,9 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
url = "$baseChapterUrl$chid",
uploadDate = it.getLong("date") * 1000,
name = if (title.isEmpty()) volChap else "$volChap: $title",
number = totalChapters - i
number = totalChapters - i,
scanlator = null,
branch = null,
)
}.reversed()
)
@@ -116,8 +118,9 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
MangaPage(
id = generateUid(jo.getLong("id")),
referer = fullUrl,
preview = null,
source = chapter.source,
url = jo.getString("img")
url = jo.getString("img"),
)
}
}

2
app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
View File

@@ -143,6 +143,8 @@ class ExHentaiRepository(
url = url,
uploadDate = 0L,
source = source,
scanlator = null,
branch = null,
)
}
chapters

6
app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
View File

@@ -142,7 +142,8 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
url = href,
uploadDate = dateFormat.tryParse(tr.selectFirst("td.d-none")?.text()),
scanlator = translators,
source = source
source = source,
branch = null,
)
}
)
@@ -167,8 +168,9 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
MangaPage(
id = generateUid(url),
url = url,
preview = null,
referer = chapter.url,
source = source
source = source,
)
}
}

4
app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
View File

@@ -50,7 +50,9 @@ class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(load
source = source,
number = 1,
uploadDate = 0L,
name = manga.title
name = manga.title,
scanlator = null,
branch = null,
)
)
)

6
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
View File

@@ -118,7 +118,8 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
item.getString("chapter_created_at").substringBefore(" ")
),
scanlator = scanlator,
name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter"
branch = null,
name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter",
)
)
}
@@ -178,8 +179,9 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
MangaPage(
id = generateUid(pageUrl),
url = pageUrl,
preview = null,
referer = fullUrl,
source = source
source = source,
)
}
}

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
View File

@@ -101,8 +101,10 @@ class MangaOwlRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposit
name = a.select("label").text(),
number = i + 1,
url = href,
scanlator = null,
branch = null,
uploadDate = dateFormat.tryParse(li.selectFirst("small:last-of-type")?.text()),
source = MangaSource.MANGAOWL
source = MangaSource.MANGAOWL,
)
}
)
@@ -117,8 +119,9 @@ class MangaOwlRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposit
MangaPage(
id = generateUid(url),
url = url,
preview = null,
referer = fullUrl,
source = MangaSource.MANGAOWL
source = MangaSource.MANGAOWL,
)
}
}

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
View File

@@ -124,7 +124,9 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
dateFormat,
li.selectFirst("span.time")?.text()
),
name = name.ifEmpty { "${manga.title} - ${i + 1}" }
name = name.ifEmpty { "${manga.title} - ${i + 1}" },
scanlator = null,
branch = null,
)
}
)
@@ -143,8 +145,9 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
MangaPage(
id = generateUid(href),
url = href,
preview = null,
referer = fullUrl,
source = MangaSource.MANGATOWN
source = MangaSource.MANGATOWN,
)
} ?: parseFailed("Pages list not found")
}

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
View File

@@ -146,7 +146,9 @@ class MangareadRepository(
dateFormat,
doc2.selectFirst("span.chapter-release-date i")?.text()
),
source = MangaSource.MANGAREAD
source = MangaSource.MANGAREAD,
scanlator = null,
branch = null,
)
}
)
@@ -164,8 +166,9 @@ class MangareadRepository(
MangaPage(
id = generateUid(url),
url = url,
preview = null,
referer = fullUrl,
source = MangaSource.MANGAREAD
source = MangaSource.MANGAREAD,
)
}
}

2
app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
View File

@@ -114,6 +114,8 @@ abstract class NineMangaRepository(
url = href,
uploadDate = parseChapterDateByLang(li.selectFirst("span")?.text().orEmpty()),
source = source,
scanlator = null,
branch = null,
)
}
)

6
app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
View File

@@ -130,7 +130,8 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
},
uploadDate = dateFormat.tryParse(jo.getString("upload_date")),
scanlator = publishers.optJSONObject(0)?.getStringOrNull("name"),
source = MangaSource.REMANGA
source = MangaSource.REMANGA,
branch = null,
)
}.asReversed()
)
@@ -175,8 +176,9 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
private fun parsePage(jo: JSONObject, referer: String) = MangaPage(
id = generateUid(jo.getLong("id")),
url = jo.getString("link"),
preview = null,
referer = referer,
source = source
source = source,
)
private companion object {

4
app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
View File

@@ -30,7 +30,9 @@ class YaoiChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loa
number = i + 1,
url = href,
uploadDate = 0L,
source = source
source = source,
scanlator = null,
branch = null,
)
}
)

34
app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
View File

@@ -14,16 +14,35 @@ sealed class DateTimeAgo : ListModel {
}
}
data class MinutesAgo(val minutes: Int) : DateTimeAgo() {
class MinutesAgo(val minutes: Int) : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getQuantityString(R.plurals.minutes_ago, minutes, minutes)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as MinutesAgo
return minutes == other.minutes
}
override fun hashCode(): Int = minutes
}
data class HoursAgo(val hours: Int) : DateTimeAgo() {
class HoursAgo(val hours: Int) : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getQuantityString(R.plurals.hours_ago, hours, hours)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as HoursAgo
return hours == other.hours
}
override fun hashCode(): Int = hours
}
object Today : DateTimeAgo() {
@@ -38,10 +57,19 @@ sealed class DateTimeAgo : ListModel {
}
}
data class DaysAgo(val days: Int) : DateTimeAgo() {
class DaysAgo(val days: Int) : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getQuantityString(R.plurals.days_ago, days, days)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as DaysAgo
return days == other.days
}
override fun hashCode(): Int = days
}
object LongAgo : DateTimeAgo() {

2
app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
View File

@@ -8,7 +8,7 @@ import org.koitharu.kotatsu.core.model.SortOrder
import java.util.*
@Entity(tableName = "favourite_categories")
data class FavouriteCategoryEntity(
class FavouriteCategoryEntity(
@PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "category_id") val categoryId: Int,
@ColumnInfo(name = "created_at") val createdAt: Long,

2
app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
View File

@@ -21,7 +21,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
)
]
)
data class FavouriteEntity(
class FavouriteEntity(
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
@ColumnInfo(name = "category_id", index = true) val categoryId: Long,
@ColumnInfo(name = "created_at") val createdAt: Long

2
app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteManga.kt
View File

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
import org.koitharu.kotatsu.core.db.entity.TagEntity
data class FavouriteManga(
class FavouriteManga(
@Embedded val favourite: FavouriteEntity,
@Relation(
parentColumn = "manga_id",

4
app/src/main/java/org/koitharu/kotatsu/history/data/HistoryEntity.kt
View File

@@ -18,14 +18,14 @@ import java.util.*
)
]
)
data class HistoryEntity(
class HistoryEntity(
@PrimaryKey(autoGenerate = false)
@ColumnInfo(name = "manga_id") val mangaId: Long,
@ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis(),
@ColumnInfo(name = "updated_at") val updatedAt: Long,
@ColumnInfo(name = "chapter_id") val chapterId: Long,
@ColumnInfo(name = "page") val page: Int,
@ColumnInfo(name = "scroll") val scroll: Float
@ColumnInfo(name = "scroll") val scroll: Float,
) {
fun toMangaHistory() = MangaHistory(

2
app/src/main/java/org/koitharu/kotatsu/history/data/HistoryWithManga.kt
View File

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
import org.koitharu.kotatsu.core.db.entity.TagEntity
data class HistoryWithManga(
class HistoryWithManga(
@Embedded val history: HistoryEntity,
@Relation(
parentColumn = "manga_id",

3
app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
View File

@@ -69,8 +69,9 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
MangaPage(
id = entryUri.longHashCode(),
url = entryUri,
preview = null,
referer = chapter.url,
source = MangaSource.LOCAL
source = MangaSource.LOCAL,
)
}
}