diff --git a/README.md b/README.md index 0a581f7..2b29dcc 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ an!me implements number of open source projects listed bellow: #### Release Updates ``` +Added support for 540p Minor Commit - Jan 07, 2021 Streamlined to WebsiteAPI changes for batches, Updated Dependencies Major Commit - Jan 05, 2021 Migrated to SubsPlease [Full Support], Updated Dependencies & UI Major Commit - Nov 30, 2020 Minor UI Tweaks, Fixed Release View (Horrible), Updated Dependencies Major Commit - June 28, 2020 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2600d3e..d82b185 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,10 +38,10 @@ android { defaultConfig { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" applicationId = "info.horriblesubs.sher" - versionName = "1.0.0-alpha1" + versionName = "1.0.0-alpha2" targetSdkVersion(30) minSdkVersion(21) - versionCode = 96 + versionCode = 97 buildConfigField("String", "BUILD_TIME", "\"$buildTime\"") } diff --git a/app/release/app-release.aab b/app/release/app-release.aab index 72563af..c220c87 100644 Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ diff --git a/app/release/app-release.apk b/app/release/app-release.apk index c26e118..83df6e1 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 17d8e6e..530eceb 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,10 +10,9 @@ { "type": "SINGLE", "filters": [], - "versionCode": 96, - "versionName": "1.0.0-alpha1", + "versionCode": 97, + "versionName": "1.0.0-alpha2", "outputFile": "app-release.apk" } - ], - "elementType": "File" + ] } \ No newline at end of file diff --git a/app/src/main/java/info/horriblesubs/sher/data/subsplease/api/model/ModelFun.kt b/app/src/main/java/info/horriblesubs/sher/data/subsplease/api/model/ModelFun.kt index dca8ffe..aaa11ea 100644 --- a/app/src/main/java/info/horriblesubs/sher/data/subsplease/api/model/ModelFun.kt +++ b/app/src/main/java/info/horriblesubs/sher/data/subsplease/api/model/ModelFun.kt @@ -26,7 +26,7 @@ val BookmarkedShow.imageUrl get() = if (image.contains("subsplease.org")) image val ItemRelease.SD: ItemRelease.Links? get() { var link: ItemRelease.Links? = null downloads.forEach { - if (it.res.contains("360") || it.res.contains("480")) + if (it.res.contains("360") || it.res.contains("480") || it.res.contains("540")) link = it } return link diff --git a/app/src/main/java/info/horriblesubs/sher/libs/preference/prefs/AppCachePreference.kt b/app/src/main/java/info/horriblesubs/sher/libs/preference/prefs/AppCachePreference.kt index d979e91..31482f8 100644 --- a/app/src/main/java/info/horriblesubs/sher/libs/preference/prefs/AppCachePreference.kt +++ b/app/src/main/java/info/horriblesubs/sher/libs/preference/prefs/AppCachePreference.kt @@ -3,6 +3,7 @@ package info.horriblesubs.sher.libs.preference.prefs import info.horriblesubs.sher.App import info.horriblesubs.sher.libs.preference.model.BasePreference import java.io.File +import kotlin.math.roundToInt object AppCachePreference: BasePreference() { @@ -14,7 +15,7 @@ object AppCachePreference: BasePreference() { var size = 0F size += getDirSize(App.get().externalCacheDir) size += getDirSize(App.get().cacheDir) - val float = ((size /1024)/1024) + val float = (((size*100)/1024)/1024).roundToInt().toFloat()/100F return "$float" } diff --git a/app/src/main/java/info/horriblesubs/sher/ui/_extras/adapters/horrible/LatestAdapter.kt b/app/src/main/java/info/horriblesubs/sher/ui/_extras/adapters/horrible/LatestAdapter.kt index 4136b4d..c7d6924 100644 --- a/app/src/main/java/info/horriblesubs/sher/ui/_extras/adapters/horrible/LatestAdapter.kt +++ b/app/src/main/java/info/horriblesubs/sher/ui/_extras/adapters/horrible/LatestAdapter.kt @@ -71,7 +71,7 @@ class LatestAdapter( release?.text = t.episode.parseAsHtml() title?.text = t.show.parseAsHtml() t.downloads.forEachIndexed { i, it -> - if (i == 0) sd?.visibility = if (it.res.contains("360") || it.res.contains("480")) View.VISIBLE else View.GONE + if (i == 0) sd?.visibility = if (it.res.contains("360") || it.res.contains("480") || it.res.contains("540")) View.VISIBLE else View.GONE if (i != 2) hd?.visibility = if (it.res.contains("720", true)) View.VISIBLE else View.GONE fhd?.visibility = if (it.res.contains("1080", true)) View.VISIBLE else View.GONE } diff --git a/app/src/main/java/info/horriblesubs/sher/ui/c/view/ReleaseViewFragment.kt b/app/src/main/java/info/horriblesubs/sher/ui/c/view/ReleaseViewFragment.kt index d4652a2..916a8d6 100644 --- a/app/src/main/java/info/horriblesubs/sher/ui/c/view/ReleaseViewFragment.kt +++ b/app/src/main/java/info/horriblesubs/sher/ui/c/view/ReleaseViewFragment.kt @@ -103,7 +103,7 @@ class ReleaseViewFragment: BottomSheetDialogFragment(), OnItemClickListener