Merge branch 'master' into MD2

This commit is contained in:
Jay 2020-02-13 23:33:56 -08:00
commit 743893f8c2
5 changed files with 17 additions and 6 deletions

View File

@ -4,7 +4,7 @@ Tachiyomi is a free and open source manga reader for Android 5.0 and above.
![screenshots of app](./.github/readme-images/theming-screenshots.gif) ![screenshots of app](./.github/readme-images/theming-screenshots.gif)
## Newest Release ## Newest Release
[v0.9.8](https://github.com/Jays2Kings/tachiyomi/releases) [v0.9.81](https://github.com/Jays2Kings/tachiyomi/releases)
## Features ## Features

View File

@ -38,8 +38,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 59 versionCode 60
versionName '0.9.8' versionName '0.9.81'
buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\"" buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\"" buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""

View File

@ -29,7 +29,9 @@ internal class ExtensionGithubApi {
suspend fun findExtensions(): List<Extension.Available> { suspend fun findExtensions(): List<Extension.Available> {
val call = GET("$REPO_URL/index.json") val call = GET("$REPO_URL/index.json")
return parseResponse(network.client.newCall(call).await()) return withContext(Dispatchers.IO) {
parseResponse(network.client.newCall(call).await())
}
} }
suspend fun checkforUpdates(context: Context): List<Extension.Installed> { suspend fun checkforUpdates(context: Context): List<Extension.Installed> {

View File

@ -328,7 +328,10 @@ class LibraryController(
activeCategory activeCategory
categories.find { it.id == 0 }?.let { categories.find { it.id == 0 }?.let {
it.name = resources?.getString(R.string.default_columns) ?: "Default" it.name = resources?.getString(
if (categories.size == 1) R.string.pref_category_library
else R.string.default_columns
) ?: "Default"
} }
// Set the categories // Set the categories
adapter.categories = categories adapter.categories = categories

View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<changelog bulletedList="true"> <changelog bulletedList="true">
<changelogversion versionName="v0.9.78" changeDate=""> <changelogversion versionName="v0.9.81" changeDate="">
<changelogtext>Fixed Extensions list sometimes not loading</changelogtext>
<changelogtext>Fixed Catalogue list resetting to the top</changelogtext>
<changelogtext>Fixed those without a category seeing "Updating Default"</changelogtext>
</changelogversion>
<changelogversion versionName="v0.9.8" changeDate="">
<changelogtext>Hide categories and show your library in a single list in filters</changelogtext> <changelogtext>Hide categories and show your library in a single list in filters</changelogtext>
<changelogtext>Option to set date format</changelogtext> <changelogtext>Option to set date format</changelogtext>
<changelogtext>You can now pull to refresh on multiple categories, they will be added to the queue</changelogtext> <changelogtext>You can now pull to refresh on multiple categories, they will be added to the queue</changelogtext>