Merge pull request #14 from Trendyol/fix-resource-override

Fix resource override
Trendyol · Dec 24, 2020 · babad9e · babad9e
2 parents b59cff3 + 6e62ab4
commit babad9e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 39 deletions.
diff --git a/library/src/main/java/com/trendyol/showcase/ui/tooltip/TooltipViewState.kt b/library/src/main/java/com/trendyol/showcase/ui/tooltip/TooltipViewState.kt
@@ -38,11 +38,11 @@ data class TooltipViewState(
 
     fun getDescriptionVisibility() = descriptionText.isNotEmpty()
 
-    fun getTopArrowResource() = if (arrowResource == Constants.DEFAULT_ARROW_RESOURCE) R.drawable.ic_arrow_up else arrowResource
+    fun getTopArrowResource() = if (arrowResource == Constants.DEFAULT_ARROW_RESOURCE) R.drawable.ic_showcase_arrow_up else arrowResource
 
     fun getTopArrowVisibility() = if (arrowPosition == ArrowPosition.UP) View.VISIBLE else View.GONE
 
-    fun getBottomArrowResource() = if (arrowResource == Constants.DEFAULT_ARROW_RESOURCE) R.drawable.ic_arrow_down else arrowResource
+    fun getBottomArrowResource() = if (arrowResource == Constants.DEFAULT_ARROW_RESOURCE) R.drawable.ic_showcase_arrow_down else arrowResource
 
     fun getBottomArrowVisibility() = if (arrowPosition == ArrowPosition.DOWN) View.VISIBLE else View.GONE
 

diff --git a/library/src/main/res/drawable/ic_custom_arrow_down.xml b/library/src/main/res/drawable/ic_custom_arrow_down.xml
diff --git a/...y/src/main/res/drawable/ic_arrow_down.xml → ...n/res/drawable/ic_showcase_arrow_down.xml b/...y/src/main/res/drawable/ic_arrow_down.xml → ...n/res/drawable/ic_showcase_arrow_down.xml
diff --git a/...ary/src/main/res/drawable/ic_arrow_up.xml → ...ain/res/drawable/ic_showcase_arrow_up.xml b/...ary/src/main/res/drawable/ic_arrow_up.xml → ...ain/res/drawable/ic_showcase_arrow_up.xml
diff --git a/library/src/main/res/drawable/ic_close.xml → ...c/main/res/drawable/ic_showcase_close.xml b/library/src/main/res/drawable/ic_close.xml → ...c/main/res/drawable/ic_showcase_close.xml
diff --git a/library/src/main/res/layout/layout_tooltip.xml b/library/src/main/res/layout/layout_tooltip.xml
@@ -31,7 +31,7 @@
             bind:arrowHorizontalPosition="@{tooltipViewState.arrowMargin}"
             bind:arrowPercentage="@{tooltipViewState.arrowPercentage}"
             bind:drawableRes="@{tooltipViewState.topArrowResource}"
-            tools:srcCompat="@drawable/ic_arrow_up" />
+            tools:srcCompat="@drawable/ic_showcase_arrow_up" />
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_content"
@@ -74,7 +74,7 @@
                     android:visibility="@{tooltipViewState.getCloseButtonVisibility()}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_close"
+                    app:srcCompat="@drawable/ic_showcase_close"
                     app:tint="@{tooltipViewState.closeButtonColor}" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -133,7 +133,7 @@
             bind:arrowHorizontalPosition="@{tooltipViewState.arrowMargin}"
             bind:arrowPercentage="@{tooltipViewState.arrowPercentage}"
             bind:drawableRes="@{tooltipViewState.bottomArrowResource}"
-            tools:srcCompat="@drawable/ic_arrow_down" />
+            tools:srcCompat="@drawable/ic_showcase_arrow_down" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
diff --git a/library/src/test/java/com/trendyol/showcase/ui/tooltip/TooltipViewStateFactory.kt b/library/src/test/java/com/trendyol/showcase/ui/tooltip/TooltipViewStateFactory.kt
@@ -1,18 +1,19 @@
 package com.trendyol.showcase.ui.tooltip
 
+import android.graphics.Color
 import com.trendyol.showcase.R
 
 object TooltipViewStateFactory {
 
     fun getInstance() = TooltipViewState(
         titleText = "",
         descriptionText = "",
-        titleTextColor = R.color.black,
-        descriptionTextColor = R.color.black,
-        backgroundColor = R.color.white,
-        closeButtonColor = R.color.black,
+        titleTextColor = Color.BLACK,
+        descriptionTextColor = Color.BLACK,
+        backgroundColor = Color.WHITE,
+        closeButtonColor = Color.BLACK,
         showCloseButton = true,
-        arrowResource = R.drawable.ic_custom_arrow_down,
+        arrowResource = R.drawable.ic_showcase_arrow_down,
         arrowPosition = ArrowPosition.DOWN,
         arrowPercentage = 50,
         arrowMargin = 0,

diff --git a/library/src/test/java/com/trendyol/showcase/ui/tooltip/TooltipViewStateTest.kt b/library/src/test/java/com/trendyol/showcase/ui/tooltip/TooltipViewStateTest.kt
@@ -122,7 +122,7 @@ class TooltipViewStateTest {
         val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = DEFAULT_ARROW_RESOURCE)
 
         //then
-        val expectedResult = R.drawable.ic_arrow_up
+        val expectedResult = R.drawable.ic_showcase_arrow_up
         val actualResult = tooltipViewState.getTopArrowResource()
 
         actualResult `should be` expectedResult
@@ -131,13 +131,13 @@ class TooltipViewStateTest {
     @Test
     fun `when arrowResource is not DEFAULT_ARROW_RESOURCE then getTopArrowResource() returns arrowResource`() {
         //when
-        val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = R.drawable.ic_custom_arrow_down)
+        val givenArrowResource = android.R.drawable.arrow_down_float
+        val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = givenArrowResource)
 
         //then
-        val expectedResult = R.drawable.ic_custom_arrow_down
         val actualResult = tooltipViewState.getTopArrowResource()
 
-        actualResult `should be` expectedResult
+        actualResult `should be` givenArrowResource
     }
 
     @Test
@@ -170,7 +170,7 @@ class TooltipViewStateTest {
         val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = DEFAULT_ARROW_RESOURCE)
 
         //then
-        val expectedResult = R.drawable.ic_arrow_down
+        val expectedResult = R.drawable.ic_showcase_arrow_down
         val actualResult = tooltipViewState.getBottomArrowResource()
 
         actualResult `should be` expectedResult
@@ -179,13 +179,13 @@ class TooltipViewStateTest {
     @Test
     fun `when arrowResource is not DEFAULT_ARROW_RESOURCE then getBottomArrowResource() returns arrowResource`() {
         //when
-        val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = R.drawable.ic_custom_arrow_down)
+        val givenArrowResource = android.R.drawable.arrow_down_float
+        val tooltipViewState = TooltipViewStateFactory.getInstance().copy(arrowResource = givenArrowResource)
 
         //then
-        val expectedResult = R.drawable.ic_custom_arrow_down
         val actualResult = tooltipViewState.getBottomArrowResource()
 
-        actualResult `should be` expectedResult
+        actualResult `should be` givenArrowResource
     }
 
     @Test

diff --git a/sample/src/main/java/com/trendyol/sample/MainActivity.java b/sample/src/main/java/com/trendyol/sample/MainActivity.java
@@ -76,7 +76,7 @@ public void onClick(View v) {
                     .titleText("Title without a description")
                     .titleTextSize(16)
                     .showCloseButton(true)
-                    .arrowResource(R.drawable.ic_custom_arrow_down)
+                    .arrowResource(android.R.drawable.arrow_down_float)
                     .arrowPosition(ArrowPosition.AUTO)
                     .highlightType(HighlightType.RECTANGLE)
                     .highlightPadding(8F)

diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
@@ -3,4 +3,6 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="black">#000000</color>
+    <color name="white">#ffffff</color>
 </resources>