Minor Commit - 0.9.7

- Added support for 540p - Updated gradle
Sher1234 · Jan 7, 2021 · ecb109b · ecb109b
1 parent 8d74da5
commit ecb109b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git 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"
+  ]
 }
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
@@ -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
@@ -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<String>() {
 
@@ -14,7 +15,7 @@ object AppCachePreference: BasePreference<String>() {
             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
@@ -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
@@ -103,7 +103,7 @@ class ReleaseViewFragment: BottomSheetDialogFragment(), OnItemClickListener<Stri
                 val link = release?.SD
                 val xdcc = if (link?.xdcc.isNullOrBlank()) null else "https://subsplease.org/xdcc/?search=${Uri.encode(link?.xdcc)}"
                 adapter.reset(titles, arrayListOf(link?.magnet, link?.torrent, xdcc))
-                "HQ [360p] or SD [480p]"
+                "HQ [360p] or SD [480p/540p]"
             }
         }
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
-        classpath("com.android.tools.build:gradle:7.0.0-alpha03")
+        classpath("com.android.tools.build:gradle:7.0.0-alpha04")
         classpath("com.google.gms:google-services:4.3.4")
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 04 10:55:43 IST 2021
+#Thu Jan 07 17:01:04 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME