From 77d99e77c39afa65fc33874ca8ecb7e2a1a58080 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 20 Aug 2020 10:08:58 +0200 Subject: [PATCH] updating gradle, commons, target SDK to 30 --- app/build.gradle | 8 ++++---- .../applauncher/activities/MainActivity.kt | 15 +++++---------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1a6ab7b..012ce0d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,13 +9,12 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 defaultConfig { applicationId "com.simplemobiletools.applauncher" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 25 versionName "5.2.0" multiDexEnabled true @@ -57,7 +56,8 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.28.23' + implementation 'com.simplemobiletools:commons:5.30.1' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' } diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt index aea44fa..632dd93 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt @@ -18,6 +18,7 @@ import com.simplemobiletools.commons.extensions.appLaunched import com.simplemobiletools.commons.extensions.checkWhatsNew import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.helpers.LICENSE_STETHO +import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.models.FAQItem import com.simplemobiletools.commons.models.Release @@ -65,7 +66,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { launchers_fastscroller.apply { updatePrimaryColor() updateBubbleColors() - allowBubbleDisplay = true } } @@ -96,8 +96,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { val licenses = LICENSE_STETHO val faqItems = arrayListOf( - FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), - FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons) + FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), + FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons) ) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, false) @@ -123,18 +123,13 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } launchers_grid.adapter = adapter - launchers_fastscroller.allowBubbleDisplay = true launchers_fastscroller.setViews(launchers_grid) { launchers_fastscroller.updateBubbleText(displayedLaunchers.getOrNull(it)?.getBubbleText() ?: "") } - fillNotDisplayedLaunchers() - } - - private fun fillNotDisplayedLaunchers() { - Thread { + ensureBackgroundThread { notDisplayedLaunchers = getNotDisplayedLaunchers(displayedLaunchers) - }.start() + } } private fun checkInvalidApps() { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 537c6eb..155d7bd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 22 10:22:32 CET 2020 +#Thu Aug 20 10:01:27 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip