Add resource version of some properties

mahozad · Aug 16, 2021 · 0885cf0 · 0885cf0
1 parent ff040d4
commit 0885cf0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 0 deletions.
diff --git a/piechart/src/androidTest/kotlin/ir/mahozad/android/PieChartAPITest.kt b/piechart/src/androidTest/kotlin/ir/mahozad/android/PieChartAPITest.kt
@@ -176,6 +176,31 @@ class PieChartAPITest {
         assertThat(pieChart.legendIconsHeight.px).isEqualTo(expected)
     }
 
+    @Test fun changeLegendsTitleResourceShouldChangeLegendsTitleAsWell() {
+        val resourceId = ir.mahozad.android.test.R.string.testLegendsTitle
+        val expected = resources.getString(resourceId)
+        pieChart.legendsTitleResource = resourceId
+        assertThat(pieChart.legendsTitle).isEqualTo(expected)
+    }
+
+    @Test fun changeChartLegendsMarginResourceShouldChangeLegendsMarginAsWell() {
+        val resourceId = ir.mahozad.android.test.R.dimen.testLegendsMargin
+        val expected = resources.getDimension(resourceId)
+        pieChart.legendsMarginResource = resourceId
+        assertThat(pieChart.legendsMargin.px).isEqualTo(expected)
+    }
+
+    @Test fun changeChartLegendsColorResourceShouldChangeLegendsColorAsWell() {
+        val resourceId = ir.mahozad.android.test.R.color.testLegendsColor
+        val expected = resources.getColor(resourceId, null)
+        pieChart.legendsColorResource = resourceId
+        assertThat(pieChart.legendsColor).isEqualTo(expected)
+    }
+
+
+
+
+
     @Test fun changeChartCenterBackgroundStatusResourceShouldChangeCenterBackgroundStatusAsWell() {
         val resourceId1 = ir.mahozad.android.test.R.bool.testCenterBackgroundEnabled
         val resourceId2 = ir.mahozad.android.test.R.bool.testCenterBackgroundDisabled

diff --git a/piechart/src/androidTest/res/values/colors.xml b/piechart/src/androidTest/res/values/colors.xml
@@ -1,5 +1,6 @@
 <resources>
   <color name="testCenterBackgroundColor">#a38f02</color>
+  <color name="testLegendsColor">#669148</color>
   <color name="testColor">#f0f</color>
   <array name="testColorArray">
     <item>#ff00AE28</item>

diff --git a/piechart/src/androidTest/res/values/dimens.xml b/piechart/src/androidTest/res/values/dimens.xml
@@ -5,6 +5,7 @@
   <dimen name="testLegendsSize">23sp</dimen>
   <dimen name="testLegendsPercentageSize">23sp</dimen>
   <dimen name="testLegendIconsHeight">27dp</dimen>
+  <dimen name="testLegendsMargin">31dp</dimen>
   <integer name="testStartAngle">88</integer>
   <fraction name="testHoleRatio">43%</fraction>
   <fraction name="testOverlayRatio">73%</fraction>

diff --git a/piechart/src/androidTest/res/values/strings.xml b/piechart/src/androidTest/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+  <string name="testLegendsTitle">aTestyO</string>
+</resources>
diff --git a/piechart/src/main/kotlin/ir/mahozad/android/PieChart.kt b/piechart/src/main/kotlin/ir/mahozad/android/PieChart.kt
@@ -345,6 +345,7 @@ class PieChart @JvmOverloads constructor(
         onSizeChanged(width, height, width, height)
     }
 
+    var legendsTitleResource by StringResource(::legendsTitle)
     var legendsTitle by Property(DEFAULT_LEGENDS_TITLE) {
         onSizeChanged(width, height, width, height)
     }
@@ -357,10 +358,12 @@ class PieChart @JvmOverloads constructor(
         onSizeChanged(width, height, width, height)
     }
 
+    var legendsMarginResource by DimensionResource(::legendsMargin)
     var legendsMargin by Property(DEFAULT_LEGENDS_MARGIN) {
         onSizeChanged(width, height, width, height)
     }
 
+    var legendsColorResource by ColorResource(::legendsColor)
     var legendsColor by Property(DEFAULT_LEGENDS_COLOR) {
         // TODO: No need to recalculate everything; provide a method in legend box for this
         onSizeChanged(width, height, width, height)

diff --git a/piechart/src/main/kotlin/ir/mahozad/android/Properties.kt b/piechart/src/main/kotlin/ir/mahozad/android/Properties.kt
@@ -52,6 +52,10 @@ class DimensionResource(override val mainProperty: KMutableProperty0<Dimension>)
     override fun resolveResourceValue(context: Context) = PX(context.resources.getDimension(resId))
 }
 
+class StringResource(override val mainProperty: KMutableProperty0<String>) : PropertyResource<String>() {
+    override fun resolveResourceValue(context: Context) = context.resources.getString(resId)
+}
+
 // class EnumResource<T : Enum<T>>(override val mainProperty: KMutableProperty0<T>) : PropertyResource<T>() {
 //     override fun resolveResourceValue(context: Context): T {
 //         context.withStyledAttributes(resId, R.styleable.PieChart) {