Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 13:19:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't show last chapter number when there are 0 chapters or chapters with no numbers.

Browse Source 
This prevents one shots from showing with -1 as last chapter and instead just leaves it blank
This commit is contained in:
Carlos Escobedo 2018-01-24 20:12:47 -05:00
parent b7903023b6
commit 431676acd1
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
View File

@ -7,7 +7,6 @@ import android.content.ClipboardManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Color
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
@ -91,7 +90,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
// Set SwipeRefresh to refresh manga data. // Set SwipeRefresh to refresh manga data.
swipe_refresh.refreshes().subscribeUntilDestroy { fetchMangaFromSource() } swipe_refresh.refreshes().subscribeUntilDestroy { fetchMangaFromSource() }
manga_full_title.longClicks().subscribeUntilDestroy{ manga_full_title.longClicks().subscribeUntilDestroy {
copyToClipboard(view.context.getString(R.string.title), manga_full_title.text.toString()) copyToClipboard(view.context.getString(R.string.title), manga_full_title.text.toString())
} }
@ -191,14 +190,14 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
} }
// If manga source is known update source TextView. // If manga source is known update source TextView.
manga_source.text = if(source == null) { manga_source.text = if (source == null) {
view.context.getString(R.string.unknown) view.context.getString(R.string.unknown)
} else { } else {
source.toString() source.toString()
} }
// Update genres list // Update genres list
if(manga.genre.isNullOrBlank().not()){ if (manga.genre.isNullOrBlank().not()) {
manga_genres_tags.setTags(manga.genre?.split(", ")) manga_genres_tags.setTags(manga.genre?.split(", "))
} }
@ -249,10 +248,12 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
* @param count number of chapters. * @param count number of chapters.
*/ */
fun setChapterCount(count: Float) { fun setChapterCount(count: Float) {
manga_chapters?.text = DecimalFormat("#.#").format(count) if (count > 0f) {
manga_chapters?.text = DecimalFormat("#.#").format(count)
}
} }
fun setLastUpdateDate(date: Date){ fun setLastUpdateDate(date: Date) {
manga_last_update?.text = DateFormat.getDateInstance(DateFormat.SHORT).format(date) manga_last_update?.text = DateFormat.getDateInstance(DateFormat.SHORT).format(date)
} }
@ -381,7 +382,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
} }
} }
activity?.toast(activity?.getString(R.string.manga_added_library)) activity?.toast(activity?.getString(R.string.manga_added_library))
}else{ } else {
activity?.toast(activity?.getString(R.string.manga_removed_library)) activity?.toast(activity?.getString(R.string.manga_removed_library))
} }
} }
@ -465,8 +466,8 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
* @param label Label to show to the user describing the content * @param label Label to show to the user describing the content
* @param content the actual text to copy to the board * @param content the actual text to copy to the board
*/ */
private fun copyToClipboard(label: String, content: String){ private fun copyToClipboard(label: String, content: String) {
if(content.isBlank()) return if (content.isBlank()) return
val activity = activity ?: return val activity = activity ?: return
val view = view ?: return val view = view ?: return
@ -474,7 +475,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
clipboard.primaryClip = ClipData.newPlainText(label, content) clipboard.primaryClip = ClipData.newPlainText(label, content)
activity.toast( view.context.getString(R.string.copied_to_clipboard, content.truncateCenter(20)), activity.toast(view.context.getString(R.string.copied_to_clipboard, content.truncateCenter(20)),
Toast.LENGTH_SHORT) Toast.LENGTH_SHORT)
} }
@ -483,7 +484,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
* *
* @param query the search query to pass to the search controller * @param query the search query to pass to the search controller
*/ */
fun performGlobalSearch(query: String){ fun performGlobalSearch(query: String) {
val router = parentController?.router ?: return val router = parentController?.router ?: return
router.pushController(CatalogueSearchController(query).withFadeTransaction()) router.pushController(CatalogueSearchController(query).withFadeTransaction())
} }