feat(manga): Date and Scanlator in description

This commit is contained in:
aayush262 2024-02-29 20:43:30 +05:30
parent 89aaef8355
commit 1316d5a698
5 changed files with 67 additions and 4 deletions

View file

@ -13,6 +13,7 @@ data class MangaChapter(
var description: String? = null, var description: String? = null,
var sChapter: SChapter, var sChapter: SChapter,
val scanlator: String? = null, val scanlator: String? = null,
val date: Long? = null,
var progress: String? = "" var progress: String? = ""
) : Serializable { ) : Serializable {
constructor(chapter: MangaChapter) : this( constructor(chapter: MangaChapter) : this(
@ -21,7 +22,8 @@ data class MangaChapter(
chapter.title, chapter.title,
chapter.description, chapter.description,
chapter.sChapter, chapter.sChapter,
chapter.scanlator chapter.scanlator,
chapter.date
) )
private val images = mutableListOf<MangaImage>() private val images = mutableListOf<MangaImage>()

View file

@ -1,5 +1,6 @@
package ani.dantotsu.media.manga package ani.dantotsu.media.manga
import android.annotation.SuppressLint
import android.app.AlertDialog import android.app.AlertDialog
import android.util.TypedValue import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
@ -16,6 +17,9 @@ import ani.dantotsu.databinding.ItemChapterListBinding
import ani.dantotsu.databinding.ItemEpisodeCompactBinding import ani.dantotsu.databinding.ItemEpisodeCompactBinding
import ani.dantotsu.media.Media import ani.dantotsu.media.Media
import ani.dantotsu.setAnimation import ani.dantotsu.setAnimation
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -258,6 +262,7 @@ class MangaChapterAdapter(
} }
} }
@SuppressLint("SetTextI18n")
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (holder) { when (holder) {
is ChapterCompactViewHolder -> { is ChapterCompactViewHolder -> {
@ -290,6 +295,23 @@ class MangaChapterAdapter(
holder.bind(ep.number, ep.progress) holder.bind(ep.number, ep.progress)
setAnimation(fragment.requireContext(), holder.binding.root) setAnimation(fragment.requireContext(), holder.binding.root)
binding.itemChapterNumber.text = ep.number binding.itemChapterNumber.text = ep.number
if (ep.date != null) {
binding.itemChapterDateLayout.visibility = View.VISIBLE
val time = Date(ep.date)
val dateFormat = SimpleDateFormat("MMM/dd/yyyy", Locale.ENGLISH).format(time)
binding.itemChapterDate.text =
if (dateFormat != "Jan/01/1970") "$dateFormat" else ""
}
if (ep.scanlator != null) {
binding.itemChapterDateLayout.visibility = View.VISIBLE
binding.itemChapterScan.text = ep.scanlator.replaceFirstChar {
if (it.isLowerCase()) it.titlecase(
Locale.ROOT
) else it.toString()
}
}
if (ep.progress.isNullOrEmpty()) { if (ep.progress.isNullOrEmpty()) {
binding.itemChapterTitle.visibility = View.GONE binding.itemChapterTitle.visibility = View.GONE
} else binding.itemChapterTitle.visibility = View.VISIBLE } else binding.itemChapterTitle.visibility = View.VISIBLE

View file

@ -633,7 +633,8 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
sChapter.name, sChapter.name,
null, null,
sChapter.scanlator, sChapter.scanlator,
sChapter sChapter,
sChapter.date_upload
) )
} }

View file

@ -81,6 +81,7 @@ data class MangaChapter(
val description: String? = null, val description: String? = null,
val scanlator: String? = null, val scanlator: String? = null,
val sChapter: SChapter, val sChapter: SChapter,
val date: Long? = null,
) )
data class MangaImage( data class MangaImage(

View file

@ -32,7 +32,7 @@
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textColor="?attr/colorOnBackground" android:textColor="?attr/colorOnBackground"
android:textSize="16sp" android:textSize="16sp"
tools:text="1" /> tools:text="Chapter: 1" />
<ImageButton <ImageButton
android:id="@+id/itemEpisodeViewed" android:id="@+id/itemEpisodeViewed"
@ -53,10 +53,47 @@
app:tint="?attr/colorOnBackground" /> app:tint="?attr/colorOnBackground" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/itemChapterDateLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginTop="-20dp"
android:layout_marginBottom="10dp"
android:layout_marginEnd="100dp"
android:visibility="gone"
android:orientation="horizontal">
<TextView
android:id="@+id/itemChapterDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.6"
android:ellipsize="end"
android:fontFamily="@font/poppins_bold"
android:maxLines="1"
android:textSize="12dp"
tools:text="Aug/12/1969"
tools:visibility="visible"
tools:ignore="SpUsage" />
<TextView
android:id="@+id/itemChapterScan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.6"
android:ellipsize="end"
android:fontFamily="@font/poppins_bold"
android:maxLines="1"
android:textSize="12dp"
tools:text=" • Manga"
tools:visibility="visible"
tools:ignore="SpUsage" />
</LinearLayout>
<TextView <TextView
android:id="@+id/itemChapterTitle" android:id="@+id/itemChapterTitle"
android:layout_width="312dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="-10dp" android:layout_marginTop="-10dp"