From 4b5cd4ed0dfde249817a746bdd4723d523e6d6f0 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 29 Jan 2022 19:22:24 +0100
Subject: [PATCH] Remove unused stuff
---
app/build.gradle.kts | 3 -
base/build.gradle.kts | 1 -
.../launcher2/licenses/OpenSourceLicenses.kt | 7 -
.../mm20/launcher2/view/ElevationImageView.kt | 135 ------------------
settings.gradle.kts | 8 --
ui/build.gradle.kts | 2 -
.../mm20/launcher2/ui/component/LottieIcon.kt | 28 ----
ui/src/main/res/layout/compact_music.xml | 62 --------
ui/src/main/res/layout/view_search_bar.xml | 74 ----------
9 files changed, 320 deletions(-)
delete mode 100644 base/src/main/java/de/mm20/launcher2/view/ElevationImageView.kt
delete mode 100644 ui/src/main/java/de/mm20/launcher2/ui/component/LottieIcon.kt
delete mode 100644 ui/src/main/res/layout/compact_music.xml
delete mode 100644 ui/src/main/res/layout/view_search_bar.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7e7cb4ba..d579f1e6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -105,9 +105,6 @@ dependencies {
implementation(libs.coil.core)
implementation(libs.coil.svg)
- implementation(libs.lottie.core)
-
-
implementation(libs.bundles.materialdialogs)
implementation(libs.draglinearlayout)
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 6d2a5a28..41246552 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -43,7 +43,6 @@ dependencies {
implementation(libs.androidx.palette)
- implementation(libs.lottie.core)
implementation(libs.bundles.materialdialogs)
implementation(project(":ktx"))
diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
index 005cf157..45ed8815 100644
--- a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
+++ b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
@@ -31,13 +31,6 @@ val OpenSourceLicenses = arrayOf(
licenseText = R.raw.license_apache_2,
url = "https://material.io/develop/android/"
),
- OpenSourceLibrary(
- name = "Lottie",
- description = "Lottie is a library for Android, iOS, Web, and Windows that parses Adobe After Effects animations exported as json with Bodymovin and renders them natively on mobile and on the web.",
- licenseName = R.string.apache_license_name,
- licenseText = R.raw.license_apache_2,
- url = "https://airbnb.io/lottie/"
- ),
OpenSourceLibrary(
name = "OkHttp",
description = "An HTTP & HTTP/2 client for Android and Java applications",
diff --git a/base/src/main/java/de/mm20/launcher2/view/ElevationImageView.kt b/base/src/main/java/de/mm20/launcher2/view/ElevationImageView.kt
deleted file mode 100644
index 79bec864..00000000
--- a/base/src/main/java/de/mm20/launcher2/view/ElevationImageView.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package de.mm20.launcher2.view
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.*
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.Icon
-import android.renderscript.Allocation
-import android.renderscript.Element
-import android.renderscript.RenderScript
-import android.renderscript.ScriptIntrinsicBlur
-import android.util.AttributeSet
-import android.view.View
-import com.airbnb.lottie.LottieDrawable
-import com.airbnb.lottie.LottieProperty
-import com.airbnb.lottie.model.KeyPath
-import kotlin.math.max
-import kotlin.math.min
-
-class ElevationImageView : androidx.appcompat.widget.AppCompatImageView {
-
- constructor(context: Context) : super(context)
- constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
- constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int) : super(context, attrs, defStyleRes)
-
-
- private val secondCanvas = Canvas()
- private var shadowBitmap: Bitmap? = null
- private var inAllocation: Allocation? = null
- private lateinit var renderScript : RenderScript
- private lateinit var blur : ScriptIntrinsicBlur
-
- val shadowPaint = Paint().also {
- it.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER)
- it.colorFilter = PorterDuffColorFilter(Color.BLACK, PorterDuff.Mode.SRC_ATOP)
- it.alpha = 66
- setLayerType(View.LAYER_TYPE_SOFTWARE, null)
- }
-
- val clearPaint = Paint().also {
- it.color = Color.TRANSPARENT
- it.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
- }
-
- override fun onDetachedFromWindow() {
- super.onDetachedFromWindow()
- blur.destroy()
- renderScript.destroy()
- }
-
- override fun onAttachedToWindow() {
- super.onAttachedToWindow()
- renderScript = RenderScript.create(context)
- blur = ScriptIntrinsicBlur.create(renderScript, Element.U8_4(renderScript))
- }
-
- override fun onDraw(canvas: Canvas) {
- secondCanvas.drawRect(0f, 0f, secondCanvas.width.toFloat(), secondCanvas.height.toFloat(), clearPaint)
-
- if (drawable == null) {
- return // couldn't resolve the URI
- }
-
- val drawableWidth = drawable.intrinsicWidth
- val drawableHeight = drawable.intrinsicHeight
-
- if (drawableWidth == 0 || drawableHeight == 0) {
- return // nothing to draw (empty bounds)
- }
-
- if (shadowBitmap?.width != width || shadowBitmap?.height != height) {
- shadowBitmap?.recycle()
- inAllocation?.destroy()
- if (z > 0f && width > 0 && height > 0) {
- shadowBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).also {
- secondCanvas.setBitmap(it)
- }
- inAllocation = shadowBitmap?.let { Allocation.createFromBitmap(renderScript, it) }
- }
- }
-
- val saveCount = canvas.saveCount
- val saveCount2 = secondCanvas.saveCount
- canvas.save()
- secondCanvas.save()
-
-
- canvas.translate(paddingLeft.toFloat(), paddingTop.toFloat())
- secondCanvas.translate(paddingLeft.toFloat(), paddingTop.toFloat() + getShadowTranslation())
-
- if (!imageMatrix.isIdentity) {
- canvas.concat(imageMatrix)
- secondCanvas.concat(imageMatrix)
- }
-
-
- drawable.draw(canvas)
- drawable.draw(secondCanvas)
- shadowBitmap = shadowBitmap?.let { blurBitmap(it) }
- canvas.restoreToCount(saveCount)
- secondCanvas.restoreToCount(saveCount2)
- shadowBitmap?.let { canvas.drawBitmap(it, 0f, 0f, shadowPaint) }
- }
-
- private fun blurBitmap(bitmap: Bitmap): Bitmap {
- val alloc = inAllocation ?: return bitmap
- if (z == 0f) return bitmap
- alloc.copyFrom(bitmap)
- blur.setRadius(max(0f, min(getShadowBlurRadius(), 25f)))
- blur.setInput(alloc)
- blur.forEach(alloc)
- alloc.copyTo(bitmap)
- return bitmap
- }
-
- override fun setColorFilter(cf: ColorFilter?) {
- super.setColorFilter(cf)
- val drawable = drawable
- if (drawable is LottieDrawable) {
- drawable.addValueCallback(KeyPath("**"), LottieProperty.COLOR_FILTER) {
- cf
- }
- }
- }
-
-
- private fun getShadowTranslation(): Float {
- return z * 0.5f
- }
-
- private fun getShadowBlurRadius(): Float {
- return z * 0.5f
- }
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8e62ef63..ce12d11e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -262,14 +262,6 @@ dependencyResolutionManagement {
.to("com.google.android.material", "compose-theme-adapter")
.version("1.1.1")
- version("lottie", "4.2.2")
- alias("lottie.core")
- .to("com.airbnb.android", "lottie")
- .versionRef("lottie")
- alias("lottie.compose")
- .to("com.airbnb.android", "lottie-compose")
- .versionRef("lottie")
-
alias("okhttp")
.to("com.squareup.okhttp3", "okhttp")
.version("4.9.1")
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 415aa06e..fddf861f 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -67,8 +67,6 @@ dependencies {
implementation(libs.composecolorpicker)
- implementation(libs.lottie.compose)
-
// Legacy dependencies
implementation(libs.androidx.transition)
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/LottieIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/LottieIcon.kt
deleted file mode 100644
index 5fdd33a4..00000000
--- a/ui/src/main/java/de/mm20/launcher2/ui/component/LottieIcon.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.mm20.launcher2.ui.component
-/*
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredSize
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.LocalContentAlpha
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.unit.dp
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieAnimationSpec
-import com.airbnb.lottie.compose.LottieAnimationState
-import com.airbnb.lottie.compose.rememberLottieAnimationState
-
-@Composable
-fun LottieIcon(
- spec: LottieAnimationSpec,
- modifier: Modifier = Modifier,
- animationState: LottieAnimationState = rememberLottieAnimationState(autoPlay = true),
-) {
- LottieAnimation(
- spec = spec,
- modifier = modifier.alpha(LocalContentAlpha.current).requiredSize(24.dp),
- animationState = animationState
- )
-}*/
\ No newline at end of file
diff --git a/ui/src/main/res/layout/compact_music.xml b/ui/src/main/res/layout/compact_music.xml
deleted file mode 100644
index 8f126a08..00000000
--- a/ui/src/main/res/layout/compact_music.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/src/main/res/layout/view_search_bar.xml b/ui/src/main/res/layout/view_search_bar.xml
deleted file mode 100644
index d38cd585..00000000
--- a/ui/src/main/res/layout/view_search_bar.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file