From 647294daf2f1e05344eab75ba0c465924ba256d5 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Tue, 4 Aug 2020 17:50:07 +0900 Subject: [PATCH] what were i thinking?! --- app/build.gradle | 2 +- app/release/output-metadata.json | 2 +- .../pupil/ui/fragment/SettingsFragment.kt | 22 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 39d2fcea..d85819b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 57 - versionName "4.20-hotfix1" + versionName "4.20-hotfix2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 199e9ac9..dd0cc893 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "properties": [], "versionCode": 57, - "versionName": "4.20-hotfix1", + "versionName": "4.20-hotfix2", "enabled": true, "outputFile": "app-release.apk" } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt index 9754bd17..233d8465 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt @@ -111,7 +111,7 @@ class SettingsFragment : CoroutineScope(Dispatchers.IO).launch { getDirSize(dir).let { launch(Dispatchers.Main) { - this@with.summary = getDirSize(dir) + this@with.summary = it } } } @@ -134,7 +134,7 @@ class SettingsFragment : CoroutineScope(Dispatchers.IO).launch { getDirSize(dir).let { launch(Dispatchers.Main) { - this@with.summary = getDirSize(dir) + this@with.summary = it } } } @@ -302,11 +302,12 @@ class SettingsFragment : "delete_cache" -> { val dir = File(requireContext().cacheDir, "imageCache") + summary = getString(R.string.settings_storage_usage_loading) CoroutineScope(Dispatchers.IO).launch { - summary = getString(R.string.settings_storage_usage_loading) - - launch(Dispatchers.Main) { - this@with.summary = getDirSize(dir) + getDirSize(dir).let { + launch(Dispatchers.Main) { + this@with.summary = it + } } } @@ -315,11 +316,12 @@ class SettingsFragment : "delete_downloads" -> { val dir = getDownloadDirectory(requireContext()) + summary = getString(R.string.settings_storage_usage_loading) CoroutineScope(Dispatchers.IO).launch { - summary = getString(R.string.settings_storage_usage_loading) - - launch(Dispatchers.Main) { - this@with.summary = getDirSize(dir) + getDirSize(dir).let { + launch(Dispatchers.Main) { + this@with.summary = it + } } }