From 61c489dc68e947246833a5a66f443d1075794609 Mon Sep 17 00:00:00 2001 From: Willi Ye Date: Mon, 29 Mar 2021 20:40:48 +0200 Subject: [PATCH] Increase trigger distance of swipe to refresh --- app/build.gradle | 17 ++++++++--------- app/src/main/java/emu/skyline/MainActivity.kt | 3 ++- build.gradle | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c828abc0..a64ff370 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,10 @@ android { sourceCompatibility = javaVersion targetCompatibility = javaVersion } + kotlinOptions { + jvmTarget = javaVersion.toString() + } + buildTypes { release { debuggable true @@ -48,6 +52,10 @@ android { shrinkResources false } } + buildFeatures { + prefab true + viewBinding true + } /* Linting */ lintOptions { @@ -56,7 +64,6 @@ android { /* NDK */ ndkVersion '22.0.7026061' - externalNativeBuild { cmake { version '3.18.1+' @@ -67,14 +74,6 @@ android { aaptOptions { ignoreAssetsPattern "*.md" } - - kotlinOptions { - jvmTarget = javaVersion.toString() - } - buildFeatures { - viewBinding true - prefab true - } } dependencies { diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt index cb91c40f..2786e6d7 100644 --- a/app/src/main/java/emu/skyline/MainActivity.kt +++ b/app/src/main/java/emu/skyline/MainActivity.kt @@ -41,6 +41,7 @@ import emu.skyline.loader.RomFormat import emu.skyline.utils.Settings import javax.inject.Inject import kotlin.math.ceil +import kotlin.math.roundToInt @AndroidEntryPoint class MainActivity : AppCompatActivity() { @@ -111,7 +112,7 @@ class MainActivity : AppCompatActivity() { binding.swipeRefreshLayout.apply { setProgressBackgroundColorSchemeColor(obtainStyledAttributes(intArrayOf(R.attr.colorPrimary)).use { it.getColor(0, Color.BLACK) }) setColorSchemeColors(obtainStyledAttributes(intArrayOf(R.attr.colorAccent)).use { it.getColor(0, Color.BLACK) }) - post { setDistanceToTriggerSync(binding.swipeRefreshLayout.height / 3) } + post { setDistanceToTriggerSync((binding.swipeRefreshLayout.height / 2.5f).roundToInt()) } setOnRefreshListener { loadRoms(false) } } diff --git a/build.gradle b/build.gradle index 23ec4c87..9f7d8824 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ buildscript { repositories { google() - jcenter() mavenCentral() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:4.1.2'