Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and fixes

Browse Source
This commit is contained in:
Jobobby04 2021-04-11 20:43:34 -04:00
parent 5df0eb7ed1
commit ede0892cda
6 changed files with 5 additions and 7 deletions
app/src/main/java/eu/kanade/tachiyomi
data/updater/github
GithubUpdateChecker.kt
extension/api
ExtensionGithubApi.kt
ui
browse/source
SourceController.kt
main
MainActivity.kt
reader
ReaderActivity.kt
setting
SettingsDownloadController.kt

4
app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt

@ -32,8 +32,8 @@ class GithubUpdateChecker {
.parseAs<GithubRelease>() .parseAs<GithubRelease>()
.let { .let {
// Check if latest version is different from current version // Check if latest version is different from current version
if (/* SY --> */ isNewVersionSY(it.version) /* SY <-- */) { if (/* SY --> */ isNewVersionSY(it.version) /* SY <-- */) {
GithubUpdateResult.NewUpdate(it) GithubUpdateResult.NewUpdate(it)
} else { } else {
GithubUpdateResult.NoNewUpdate() GithubUpdateResult.NoNewUpdate()
} }

2
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt

@ -32,7 +32,7 @@ internal class ExtensionGithubApi {
.let { parseResponse(it) } .let { parseResponse(it) }
} /* SY --> */ + preferences.extensionRepos().get().flatMap { repoPath -> } /* SY --> */ + preferences.extensionRepos().get().flatMap { repoPath ->
val url = "$BASE_URL$repoPath/repo/" val url = "$BASE_URL$repoPath/repo/"
networkService.client networkService.client
.newCall(GET("${url}index.min.json")) .newCall(GET("${url}index.min.json"))
.await() .await()
.parseAs<JsonArray>() .parseAs<JsonArray>()

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt

@ -203,7 +203,7 @@ class SourceController(bundle: Bundle? = null) :
items.add( items.add(
Pair( Pair(
activity.getString(R.string.label_categories), activity.getString(R.string.categories),
{ addToCategories(item.source) } { addToCategories(item.source) }
) )
) )

1
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@ -25,7 +25,6 @@ import com.bluelinelabs.conductor.RouterTransaction
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.behavior.HideBottomViewOnScrollBehavior import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
import dev.chrisbanes.insetter.applyInsetter import dev.chrisbanes.insetter.applyInsetter
import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.notification.NotificationReceiver import eu.kanade.tachiyomi.data.notification.NotificationReceiver
import eu.kanade.tachiyomi.data.preference.asImmediateFlow import eu.kanade.tachiyomi.data.preference.asImmediateFlow

1
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@ -15,7 +15,6 @@ import android.view.Gravity
import android.view.KeyEvent import android.view.KeyEvent
import android.view.Menu import android.view.Menu
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.view.animation.Animation import android.view.animation.Animation
import android.view.animation.AnimationUtils import android.view.animation.AnimationUtils

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt

@ -338,7 +338,7 @@ class SettingsDownloadController : SettingsController() {
.toIntArray() .toIntArray()
return MaterialDialog(activity!!) return MaterialDialog(activity!!)
.title(R.string.pref_download_new_categories) .title(R.string.categories)
.listItemsMultiChoice( .listItemsMultiChoice(
items = items, items = items,
initialSelection = preselected initialSelection = preselected