mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 19:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Info shows last chapter instead of chapter count. Resolves #765

Browse Source
This commit is contained in:
len 2017-05-14 19:55:48 +02:00
parent ff190e02d4
commit 0da2f91771
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ class MangaController : RxController, TabbedController {
val fromCatalogue = args.getBoolean(FROM_CATALOGUE_EXTRA, false) val fromCatalogue = args.getBoolean(FROM_CATALOGUE_EXTRA, false)
val chapterCountRelay: BehaviorRelay<Int> = BehaviorRelay.create() val chapterCountRelay: BehaviorRelay<Float> = BehaviorRelay.create()
val mangaFavoriteRelay: PublishRelay<Boolean> = PublishRelay.create() val mangaFavoriteRelay: PublishRelay<Boolean> = PublishRelay.create()

5
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
View File

@ -28,7 +28,7 @@ import uy.kohesive.injekt.api.get
class ChaptersPresenter( class ChaptersPresenter(
val manga: Manga, val manga: Manga,
val source: Source, val source: Source,
private val chapterCountRelay: BehaviorRelay<Int>, private val chapterCountRelay: BehaviorRelay<Float>,
private val mangaFavoriteRelay: PublishRelay<Boolean>, private val mangaFavoriteRelay: PublishRelay<Boolean>,
val preferences: PreferencesHelper = Injekt.get(), val preferences: PreferencesHelper = Injekt.get(),
private val db: DatabaseHelper = Injekt.get(), private val db: DatabaseHelper = Injekt.get(),
@ -92,7 +92,8 @@ class ChaptersPresenter(
observeDownloads() observeDownloads()
// Emit the number of chapters to the info tab. // Emit the number of chapters to the info tab.
chapterCountRelay.call(chapters.size) chapterCountRelay.call(chapters.maxBy { it.chapter_number }?.chapter_number
?: 0f)
} }
.subscribe { chaptersRelay.call(it) }) .subscribe { chaptersRelay.call(it) })
} }

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

@ -38,6 +38,7 @@ import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers import rx.schedulers.Schedulers
import rx.subscriptions.Subscriptions import rx.subscriptions.Subscriptions
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.text.DecimalFormat
/** /**
* Fragment that shows manga information. * Fragment that shows manga information.
@ -171,8 +172,8 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
* *
* @param count number of chapters. * @param count number of chapters.
*/ */
fun setChapterCount(count: Int) { fun setChapterCount(count: Float) {
view?.manga_chapters?.text = count.toString() view?.manga_chapters?.text = DecimalFormat("#.#").format(count)
} }
/** /**

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
View File

@ -27,7 +27,7 @@ import uy.kohesive.injekt.api.get
class MangaInfoPresenter( class MangaInfoPresenter(
val manga: Manga, val manga: Manga,
val source: Source, val source: Source,
private val chapterCountRelay: BehaviorRelay<Int>, private val chapterCountRelay: BehaviorRelay<Float>,
private val mangaFavoriteRelay: PublishRelay<Boolean>, private val mangaFavoriteRelay: PublishRelay<Boolean>,
private val db: DatabaseHelper = Injekt.get(), private val db: DatabaseHelper = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get(), private val downloadManager: DownloadManager = Injekt.get(),

2
app/src/main/res/layout/fragment_manga_info.xml
View File

@ -134,7 +134,7 @@
style="@style/TextAppearance.Medium.Body2" style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_chapters_label" android:text="@string/manga_info_last_chapter_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" app:layout_constraintTop_toBottomOf="@+id/manga_artist_label"
app:layout_constraintLeft_toLeftOf="parent"/> app:layout_constraintLeft_toLeftOf="parent"/>

1
app/src/main/res/values/strings.xml
View File

@ -289,6 +289,7 @@
<string name="manga_info_author_label">Author</string> <string name="manga_info_author_label">Author</string>
<string name="manga_info_artist_label">Artist</string> <string name="manga_info_artist_label">Artist</string>
<string name="manga_info_chapters_label">Chapters</string> <string name="manga_info_chapters_label">Chapters</string>
<string name="manga_info_last_chapter_label">Last chapter</string>
<string name="manga_info_status_label">Status</string> <string name="manga_info_status_label">Status</string>
<string name="manga_info_source_label">Source</string> <string name="manga_info_source_label">Source</string>
<string name="manga_info_genres_label">Genres</string> <string name="manga_info_genres_label">Genres</string>