Cleanup and fixes
This commit is contained in:
parent
5df0eb7ed1
commit
ede0892cda
@ -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()
|
||||||
}
|
}
|
||||||
|
@ -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>()
|
||||||
|
@ -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) }
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user