From c15e136090804e37a1c1e2544466bda2bbcae982 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 23 Aug 2023 20:18:56 +0530 Subject: [PATCH] Resolve deprecation warnings related to string formatting for views Signed-off-by: Aayush Gupta --- .../java/com/aurora/store/util/CertUtil.kt | 2 +- .../view/custom/layouts/PermissionGroup.kt | 24 ++++++++++++++++--- .../store/view/epoxy/views/DownloadView.kt | 8 ++++++- .../view/epoxy/views/details/InfoView.kt | 8 ++++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/aurora/store/util/CertUtil.kt b/app/src/main/java/com/aurora/store/util/CertUtil.kt index 737c5c832..a8c7ec8eb 100644 --- a/app/src/main/java/com/aurora/store/util/CertUtil.kt +++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt @@ -82,7 +82,7 @@ object CertUtil { val cert = certificates[0] if (cert.subjectDN != null) { - val DN = cert.subjectDN.name.toUpperCase(Locale.getDefault()) + val DN = cert.subjectDN.name.uppercase(Locale.getDefault()) DN.contains(FDROID) || DN.contains(GUARDIAN) } else { false diff --git a/app/src/main/java/com/aurora/store/view/custom/layouts/PermissionGroup.kt b/app/src/main/java/com/aurora/store/view/custom/layouts/PermissionGroup.kt index 6367fd3e4..98b3f000e 100644 --- a/app/src/main/java/com/aurora/store/view/custom/layouts/PermissionGroup.kt +++ b/app/src/main/java/com/aurora/store/view/custom/layouts/PermissionGroup.kt @@ -118,7 +118,13 @@ class PermissionGroup : LinearLayout { title = "Android" } - title = title.capitalize(Locale.getDefault()) + title = title.replaceFirstChar { + if (it.isLowerCase()) { + it.titlecase(Locale.getDefault()) + } else { + it.toString() + } + } context.showDialog(title, description) } @@ -154,10 +160,22 @@ class PermissionGroup : LinearLayout { return it.replace(it, "") .replace("_", " ") .lowercase(Locale.getDefault()) - .capitalize(Locale.getDefault()) + .replaceFirstChar { + if (it.isLowerCase()) { + it.titlecase(Locale.getDefault()) + } else { + it.toString() + } + } } } - return label.capitalize(Locale.getDefault()) + return label.replaceFirstChar { + if (it.isLowerCase()) { + it.titlecase(Locale.getDefault()) + } else { + it.toString() + } + } } } diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt index ec97e8880..0607f3c25 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt @@ -90,7 +90,13 @@ class DownloadView : RelativeLayout { B.txtStatus.text = download.status.name .lowercase(Locale.getDefault()) - .capitalize(Locale.getDefault()) + .replaceFirstChar { + if (it.isLowerCase()) { + it.titlecase(Locale.getDefault()) + } else { + it.toString() + } + } B.txtSize.text = StringBuilder() .append(humanReadableByteValue(download.downloaded, true)) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/InfoView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/InfoView.kt index 7d4e46c77..168842a02 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/InfoView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/InfoView.kt @@ -64,7 +64,13 @@ class InfoView : RelativeLayout { B.txtTitle.text = info.key .replace("_", " ") .lowercase(Locale.getDefault()) - .capitalize(Locale.getDefault()) + .replaceFirstChar { + if (it.isLowerCase()) { + it.titlecase(Locale.getDefault()) + } else { + it.toString() + } + } B.txtSubtitle.text = info.value }