diff --git a/app/build.gradle b/app/build.gradle index bd0fba222bdb666414e4225243824130d216d75a..fb5da052f89f9f4c4c5475d168e78096f7450936 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,10 +57,20 @@ android { productFlavors { apiNougat { dimension "api" + minSdkVersion 24 + compileSdkVersion 25 } apiOreo { dimension "api" minSdkVersion 26 + compileSdkVersion 28 + targetSdkVersion 28 + } + apiQ { + dimension "api" + minSdkVersion 29 + compileSdkVersion 29 + targetSdkVersion 29 } } @@ -78,13 +88,21 @@ android { lintOptions { abortOnError false } + + sourceSets { + apiQ { + java.srcDirs = ['src/apiOreo/java/foundation/e'] + res.srcDirs = ['src/apiOreo/res'] + } + } } dependencies { implementation 'me.relex:circleindicator:2.1.4' apiNougatImplementation 'org.cyanogenmod:platform.sdk:6.0' - apiOreoImplementation files('libs/lineage-sdk.jar') + apiOreoImplementation files('libs/lineage-sdk-oreo.jar') + apiQImplementation files('libs/lineage-sdk-q.jar') debugImplementation 'com.amitshekhar.android:debug-db:1.0.4' diff --git a/app/libs/lineage-sdk.jar b/app/libs/lineage-sdk-oreo.jar similarity index 100% rename from app/libs/lineage-sdk.jar rename to app/libs/lineage-sdk-oreo.jar diff --git a/app/libs/lineage-sdk-q.jar b/app/libs/lineage-sdk-q.jar new file mode 100644 index 0000000000000000000000000000000000000000..fd6157d28ca9d16262316e837877f1c6f2ac7791 Binary files /dev/null and b/app/libs/lineage-sdk-q.jar differ diff --git a/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlurBackgroundView.kt b/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlurBackgroundView.kt index 717aa39754749f86286a3c340196c6b92ba9d176..1022a8982eb1da45b3697b15643105f96c149b45 100644 --- a/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlurBackgroundView.kt +++ b/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlurBackgroundView.kt @@ -20,14 +20,14 @@ class BlurBackgroundView(context: Context, attrs: AttributeSet?) : View(context, private val blurDrawableCallback by lazy { object : Drawable.Callback { - override fun unscheduleDrawable(who: Drawable?, what: Runnable?) { + override fun unscheduleDrawable(who: Drawable, what: Runnable) { } - override fun invalidateDrawable(who: Drawable?) { + override fun invalidateDrawable(who: Drawable) { runOnMainThread { invalidate() } } - override fun scheduleDrawable(who: Drawable?, what: Runnable?, `when`: Long) { + override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) { } } } diff --git a/app/src/main/java/foundation/e/blisslauncher/core/customviews/pageindicators/PageIndicatorDots.kt b/app/src/main/java/foundation/e/blisslauncher/core/customviews/pageindicators/PageIndicatorDots.kt index 1272c8c71e861fa57caeccc237e4234f80dd5879..eb032fcb0039ae4f011cedeba8d4f0be7326bb6c 100644 --- a/app/src/main/java/foundation/e/blisslauncher/core/customviews/pageindicators/PageIndicatorDots.kt +++ b/app/src/main/java/foundation/e/blisslauncher/core/customviews/pageindicators/PageIndicatorDots.kt @@ -205,7 +205,7 @@ class PageIndicatorDots(context: Context?, attrs: AttributeSet?, defStyleAttr: I } // Dot is leaving the left circle. // dot is capturing the right circle. - private val activeRect: RectF? + private val activeRect: RectF get() { val startCircle: Float = mCurrentPosition var delta = mCurrentPosition - startCircle diff --git a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt index d7f98933d3bfd2bc734956c498ec57e8239faefd..5575c7e471e16c9e1ac049d904f9c215534eba9d 100644 --- a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt +++ b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt @@ -1,9 +1,9 @@ package foundation.e.blisslauncher.buildsrc object Versions { - const val compile_sdk = 28 + const val compile_sdk = 29 const val min_sdk = 24 - const val target_sdk = 28 + const val target_sdk = 29 const val android_gradle_plugin = "3.5.0" const val dexcount_gradle_plugin = "0.8.6" const val kotlin = "1.3.41"