diff --git a/build.gradle.kts b/build.gradle.kts index 4bf41c41..ecfb871f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -162,7 +162,7 @@ buildConfig { packageName = project.group.toString() buildConfigField("boolean", "DEBUG", project.hasProperty("debugApp").toString()) - buildConfigField("String", "TACHIDESK_SP_VERSION", "v0.3.7") + buildConfigField("String", "TACHIDESK_SP_VERSION", "v0.4.1") } kotlinter { diff --git a/scripts/SetupUnix.sh b/scripts/SetupUnix.sh index 5f31be39..615ec0cb 100755 --- a/scripts/SetupUnix.sh +++ b/scripts/SetupUnix.sh @@ -10,7 +10,7 @@ echo "Getting latest Tachidesk build files" #TARBALL_LINK="$(curl -s "https://api.github.com/repos/Suwayomi/Tachidesk/releases/latest" | grep -o "https.*tarball\/[a-zA-Z0-9.]*")" #curl -L "$TARBALL_LINK" -o tmp/Tachidesk.tar -curl -L "https://github.com/Suwayomi/Tachidesk/archive/refs/tags/v0.3.7.tar.gz" -o tmp/Tachidesk.tar.gz +curl -L "https://github.com/Suwayomi/Tachidesk/archive/refs/tags/v0.4.1.tar.gz" -o tmp/Tachidesk.tar.gz tar -xvf tmp/Tachidesk.tar.gz -C tmp diff --git a/scripts/SetupWindows.ps1 b/scripts/SetupWindows.ps1 index 0b99e5ff..b8b0dff5 100644 --- a/scripts/SetupWindows.ps1 +++ b/scripts/SetupWindows.ps1 @@ -10,7 +10,7 @@ Write-Output "Getting latest Tachidesk build files" #Invoke-WebRequest -Uri $zipball.Matches.Value -OutFile tmp/Tachidesk.zip -UseBasicParsing -Invoke-WebRequest -Uri "https://github.com/Suwayomi/Tachidesk/archive/refs/tags/v0.3.7.zip" -OutFile tmp/Tachidesk.zip -UseBasicParsing +Invoke-WebRequest -Uri "https://github.com/Suwayomi/Tachidesk/archive/refs/tags/v0.4.1.zip" -OutFile tmp/Tachidesk.zip -UseBasicParsing Expand-Archive -Path "tmp/Tachidesk.zip" -DestinationPath "tmp" diff --git a/src/main/kotlin/ca/gosyer/data/models/Category.kt b/src/main/kotlin/ca/gosyer/data/models/Category.kt index bf9340ec..842c7d8c 100644 --- a/src/main/kotlin/ca/gosyer/data/models/Category.kt +++ b/src/main/kotlin/ca/gosyer/data/models/Category.kt @@ -13,5 +13,5 @@ data class Category( val id: Long, val order: Int, val name: String, - val landing: Boolean + val default: Boolean ) diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt index ab664402..6278bdbd 100644 --- a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt +++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt @@ -84,7 +84,7 @@ class CategoriesMenuViewModel @Inject constructor( } fun createCategory(name: String) { - _categories.value += MenuCategory(order = categories.value.size + 1, name = name, landing = false) + _categories.value += MenuCategory(order = categories.value.size + 1, name = name, default = false) } fun moveUp(category: MenuCategory) { @@ -105,9 +105,9 @@ class CategoriesMenuViewModel @Inject constructor( _categories.value = categories.sortedBy { it.order } } - fun Category.toMenuCategory() = MenuCategory(id, order, name, landing) + fun Category.toMenuCategory() = MenuCategory(id, order, name, default) - data class MenuCategory(val id: Long? = null, var order: Int, val name: String, val landing: Boolean = false) + data class MenuCategory(val id: Long? = null, var order: Int, val name: String, val default: Boolean = false) private companion object : CKLogger({}) }