Merge pull request #174 from brudaswen/fix/issue-173-ignore-transpare…

…nt-pixels
usefulness · May 17, 2021 · 34c71ec · 34c71ec
2 parents 7822032 + 1e93e8d
commit 34c71ec
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/filter/ColorRibbonFilter.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/filter/ColorRibbonFilter.kt
@@ -72,7 +72,7 @@ class ColorRibbonFilter(
         // draw the ribbon
         graphics.color = ribbonColor
         if (drawingOptions.contains(DrawingOption.IGNORE_TRANSPARENT_PIXELS) && !adaptive) {
-            graphics.composite = AlphaComposite.getInstance(AlphaComposite.SRC_IN, 1f)
+            graphics.composite = AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 1f)
         }
 
         if (gravity == Gravity.TOP || gravity == Gravity.BOTTOM) {

diff --git a/sample/example-icon-round/build.gradle b/sample/example-icon-round/build.gradle
@@ -10,6 +10,29 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    flavorDimensions "transparentPixels"
+    productFlavors {
+        keep {
+            dimension "transparentPixels"
+        }
+        ignore {
+            dimension "transparentPixels"
+        }
+    }
+}
+
+easylauncher {
+    productFlavors {
+        ignore {
+            filters = customRibbon(
+                    label: "debug",
+                    ribbonColor: "#99007200",
+                    position: "topLeft",
+                    drawingOptions: ["IgnoreTransparentPixels"],
+            )
+        }
+    }
 }
 
 dependencies {

diff --git a/sample/example-icon-round/screenshots/Icons_default(ignore-default).png b/sample/example-icon-round/screenshots/Icons_default(ignore-default).png
diff --git a/...nd/screenshots/Icons_default(default).png → ...reenshots/Icons_default(keep-default).png b/...nd/screenshots/Icons_default(default).png → ...reenshots/Icons_default(keep-default).png
diff --git a/sample/example-icon-round/screenshots/Icons_round(ignore-round).png b/sample/example-icon-round/screenshots/Icons_round(ignore-round).png
diff --git a/...-round/screenshots/Icons_round(round).png → ...d/screenshots/Icons_round(keep-round).png b/...-round/screenshots/Icons_round(round).png → ...d/screenshots/Icons_round(keep-round).png
diff --git a/...xample-icon-round/src/androidTest/kotlin/com/starter/easylauncher/screenshot/IconsTest.kt b/...xample-icon-round/src/androidTest/kotlin/com/starter/easylauncher/screenshot/IconsTest.kt
@@ -3,6 +3,7 @@ package com.starter.easylauncher.screenshot
 import android.Manifest
 import androidx.test.rule.GrantPermissionRule
 import com.example.custom.adaptive.MainActivity
+import com.example.simple.BuildConfig
 import com.example.simple.R
 import com.starter.easylauncher.recordScreenshot
 import org.junit.Rule
@@ -15,11 +16,11 @@ internal class IconsTest {
 
     @Test
     fun default() {
-        recordScreenshot<MainActivity>("default", iconName = R.mipmap.ic_launcher)
+        recordScreenshot<MainActivity>("${BuildConfig.FLAVOR}-default", iconName = R.mipmap.ic_launcher)
     }
 
     @Test
     fun round() {
-        recordScreenshot<MainActivity>("round", iconName = R.mipmap.ic_launcher_round)
+        recordScreenshot<MainActivity>("${BuildConfig.FLAVOR}-round", iconName = R.mipmap.ic_launcher_round)
     }
 }