Set axes color and added AxesTextColor property

appinventor/appengine/src/com/google/appinventor/client/youngandroid/YoungAndroidFormUpgrader.java

@@ -865,6 +865,10 @@ private static int upgradeChartProperties(Map<String, JSONValue> componentProper
       // The ExtendDomainToInclude and ExtendRangeToInclude methods were added.
       srcCompVersion = 3;
     }
+    if (srcCompVersion < 4) {
+      // The axesTextColor and dataLabelColor properties were added.
+      srcCompVersion = 4;
+    }
     return srcCompVersion;
   }
 

appinventor/blocklyeditor/src/versioning.js

@@ -1853,12 +1853,15 @@ Blockly.Versioning.AllUpgradeMaps =
     // AI2: The SetDomain and SetRange methods were added.
     2: "noUpgrade",
     // AI2: The ExtendDomainToInclude and ExtendRangeToInclude methods were added.
-    3: "noUpgrade"
+    3: "noUpgrade",
+    // AI2: The property axesTextColor and method setAxesTextColor were added.
+    4: "noUpgrade"
 
   }, // End Chart upgraders
 
   "ChartData2D": {
-
+    // - The property dataLabelColor and method setDataLabelColor were added.
+    2: "noUpgrade"
   }, // End ChartData2D upgraders
 
   "ChatBot" : {

appinventor/components-ios/src/AxisChartView.swift

@@ -47,6 +47,7 @@ open class AxisChartView : ChartView {
       (chart as? BarLineChartViewBase)?.leftAxis.granularity = 1
     }
   }
+
 
   // sets whether the X origin should be fixed to 0
   public func setXMinimum (zero: Bool) {

appinventor/components-ios/src/Chart.swift

@@ -52,11 +52,14 @@ import DGCharts
   var _gridEnabled = true
   var _labels = [String]()
   var _dataComponents: Array<ChartDataBase> = []
+
+  var _axesTextColor: UIColor
 
   @objc public override init(_ parent: ComponentContainer) {
     XFromZero = false
     YFromZero = false
-    _backgroundColor = parent.form?.isDarkTheme == true ? UIColor.black : UIColor.white
+    _backgroundColor = parent.form?.isDarkTheme == true ? UIColor.white : UIColor.black
+    _axesTextColor = parent.form?.isDarkTheme == true ? UIColor.white : UIColor.black
     super.init(parent)
     setDelegate(self)
     parent.add(self)
@@ -112,6 +115,21 @@ import DGCharts
       _chartView?.backgroundColor = _backgroundColor
     }
   }
+
+  @objc open var AxesTextColor: Int32 {
+    get {
+      return colorToArgb(_axesTextColor)
+    }
+    set {
+      _axesTextColor = argbToColor(newValue)
+      print("changing label color to")
+      print(_axesTextColor)
+      if let chartView = _chartView?.chart as? BarLineChartViewBase {
+        chartView.xAxisRenderer.axis.labelTextColor = _axesTextColor
+        chartView.leftYAxisRenderer.axis.labelTextColor = _axesTextColor
+      }
+    }
+  }
 
   @objc open var Description: String {
     get {
@@ -287,6 +305,8 @@ import DGCharts
     Labels = _labels
     LegendEnabled = _legendEnabled
     PieRadius = _pieRadius
+
+    AxesTextColor = colorToArgb(_axesTextColor)
   }
 
   func addDataComponent(_ dataComponent: ChartDataBase) {

appinventor/components-ios/src/ChartDataBase.swift

@@ -12,6 +12,8 @@ import DGCharts
   var _color: Int32 = AIComponentKit.Color.black.int32
   var _colors: [UIColor] = []
   var _label: String?
+
+  var _dataLabelColor: Int32 = AIComponentKit.Color.black.int32
 
   var dataFileColumns: Array<String> = []
   var _lineType = AIComponentKit.LineType.Linear
@@ -54,6 +56,7 @@ import DGCharts
       ElementsFromPairs = elements
     }
     _chartDataModel?.setColor(argbToColor(_color))
+    _chartDataModel?.setDataLabelColor(argbToColor(_dataLabelColor))
     if !_colors.isEmpty {
       _chartDataModel?.setColors(_colors)
     }
@@ -94,6 +97,18 @@ import DGCharts
      onDataChange()
     }
   }
+
+  @objc open var DataLabelColor: Int32 {
+    get {
+      return _dataLabelColor
+    }
+    set {
+      _dataLabelColor = newValue
+      _chartDataModel?.dataset?.valueTextColor = argbToColor(newValue)
+      print("changing data text color", _dataLabelColor)
+      refreshChart()
+    }
+  }
 
   func initChartData() {
     print("in initChartData")
@@ -102,6 +117,7 @@ import DGCharts
     // set default values
     _chartDataModel?.setColor(argbToColor(_color))
     _chartDataModel?.setLabel(_label ?? "")
+    _chartDataModel?.setDataLabelColor(argbToColor(_dataLabelColor))
   }
 
   @objc open var LineType: LineType {

appinventor/components-ios/src/ChartDataModel.swift

@@ -46,6 +46,10 @@ open class ChartDataModel {
     print("got in here")
     dataset?.label = text
   }
+
+  func setDataLabelColor(_ argb: UIColor) {
+    dataset?.valueTextColor = argb
+  }
 
   func setElements(_ elements: String) {
     let tupleSize = 2

appinventor/components-ios/src/TinyDB.swift

@@ -11,8 +11,8 @@ open class TinyDB: NonvisibleComponent {
 
   fileprivate var _database: Connection!
   fileprivate var _table = Table("TinyDB1")
-  fileprivate let _key = Expression<String>("_key")
-  fileprivate let _value = Expression<String>("_value")
+  fileprivate let _key = SQLite.Expression<String>("_key")
+  fileprivate let _value = SQLite.Expression<String>("_value")
   private var _namespace = "TinyDB1"
 
   public override init(_ parent: ComponentContainer) {

appinventor/components/src/com/google/appinventor/components/common/YaVersion.java

@@ -887,9 +887,15 @@ private YaVersion() {
   // For CHART_COMPONENT_VERSION 3:
   // - The ExtendDomainToInclude and ExtendRangeToInclude methods were added
   // - The Type getter block was made visible
-  public static final int CHART_COMPONENT_VERSION = 3;
-
-  public static final int CHART_DATA_2D_COMPONENT_VERSION = 1;
+  // For CHART_COMPONENT_VERSION 4:
+  // - The axesTextColor property was added
+  // - The setAxesTextColor method was added
+  public static final int CHART_COMPONENT_VERSION = 4;
+
+  // For CHART_DATA_2D_COMPONENT_VERSION 2:
+  // - The dataLabelColor property was added
+  // - The setDataLabelColor method was added
+  public static final int CHART_DATA_2D_COMPONENT_VERSION = 2;
 
   // For CHATBOT_COMPONENT_VERSION: Initial Version
   // For CHATBOT_COMPONENT_VERSION 2:

appinventor/components/src/com/google/appinventor/components/runtime/Chart.java

@@ -68,6 +68,8 @@ public class Chart extends AndroidViewComponent
   private boolean zeroY;
   private YailList labels;
 
+  private int axesTextColor;
+
   // Synced tick value across all Data Series (used for real-time entries)
   // Start the value from 1 (in contrast to starting from 0 as in Chart
   // Data Base) to lessen off-by-one offsets for multiple Chart Data Series.
@@ -104,6 +106,8 @@ public Chart(ComponentContainer container) {
     XFromZero(false);
     YFromZero(false);
 
+    AxesTextColor(Component.COLOR_DEFAULT);
+
     // Register onInitialize event of the Chart
     $form().registerForOnInitialize(this);
   }
@@ -234,6 +238,8 @@ private void reinitializeChart() {
     LegendEnabled(legendEnabled);
     GridEnabled(gridEnabled);
     Labels(labels);
+
+    AxesTextColor(axesTextColor);
   }
 
   /**
@@ -289,6 +295,37 @@ public void BackgroundColor(int argb) {
     chartView.setBackgroundColor(argb);
   }
 
+  /**
+   * Returns the chart's axes text color as an alpha-red-green-blue
+   * integer.
+   *
+   * @return axes text RGB color with alpha
+   */
+  @SimpleProperty(
+      category = PropertyCategory.APPEARANCE)
+  public int AxesTextColor() {
+    return axesTextColor;
+  }
+
+  /**
+   * Specifies the chart's axes text color as an alpha-red-green-blue
+   * integer.
+   *
+   * @param argb background RGB color with alpha
+   */
+  @DesignerProperty(editorType = PropertyTypeConstants.PROPERTY_TYPE_COLOR,
+      defaultValue = Component.DEFAULT_VALUE_COLOR_DEFAULT)
+  @SimpleProperty
+  public void AxesTextColor(int argb) {
+    if (argb == Component.COLOR_DEFAULT) {
+      argb = $form().isDarkTheme() ? Component.COLOR_BLACK : Component.COLOR_WHITE;
+    }
+    axesTextColor = argb;
+    if (chartView instanceof PointChartView){
+      ((PointChartView) chartView).setAxesTextColor(argb);
+    }
+  }
+
   /**
    * Sets the Pie Radius of the Chart. If the current type is
    * not the Pie Chart, the value has no effect.

appinventor/components/src/com/google/appinventor/components/runtime/ChartDataBase.java

@@ -29,6 +29,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.github.mikephil.charting.data.ChartData;
+
 /**
  * Base class for Chart Data components. Contains functionality common
  * to any Chart Data component. The component corresponds to a single
@@ -45,6 +47,8 @@ public abstract class ChartDataBase extends DataCollection<Chart, ChartDataModel
   private int color;
   private YailList colors;
 
+  private int dataLabelColor;
+
   /**
    * Creates a new Chart Data component.
    */
@@ -57,6 +61,8 @@ protected ChartDataBase(Chart chartContainer) {
     Color(Component.COLOR_BLACK);
     DataSourceKey("");
     Label("");
+
+    DataLabelColor(Component.COLOR_BLACK);
   }
 
   /**
@@ -160,6 +166,31 @@ public void Colors(YailList colors) {
     onDataChange();
   }
 
+  /**
+   * Returns the data label color as an alpha-red-green-blue integer.
+   *
+   * @return background RGB color with alpha
+   */
+  @SimpleProperty(
+      category = PropertyCategory.APPEARANCE)
+  public int DataLabelColor() {
+    return dataLabelColor;
+  }
+
+  /**
+   * Specifies the data points label color as an alpha-red-green-blue integer.
+   *
+   * @param argb background RGB color with alpha
+   */
+  @DesignerProperty(editorType = PropertyTypeConstants.PROPERTY_TYPE_COLOR,
+      defaultValue = Component.DEFAULT_VALUE_COLOR_BLACK)
+  @SimpleProperty
+  public void DataLabelColor(int argb) {
+    dataLabelColor = argb;
+    dataModel.setDataLabelColor(argb);
+    onDataChange();
+  }
+
   /**
    * Returns the label text of the data series.
    *

appinventor/components/src/com/google/appinventor/components/runtime/ChartDataModel.java

@@ -104,6 +104,15 @@ public void setColors(List<Integer> colors) {
     }
   }
 
+  /**
+   * Changes the color of the labels of the data set.
+   *
+   * @param argb new color
+   */
+  public void setDataLabelColor(int argb) {
+    data.setValueTextColor(argb);
+  }
+
   /**
    * Changes the label of the data set.
    *

appinventor/components/src/com/google/appinventor/components/runtime/LineChartBaseDataModel.java

@@ -99,6 +99,7 @@ public void setColor(int argb) {
     }
   }
 
+
   @Override
   public void setColors(List<Integer> colors) {
     super.setColors(colors);

appinventor/components/src/com/google/appinventor/components/runtime/PointChartView.java

@@ -11,6 +11,8 @@
 import com.github.mikephil.charting.charts.BarLineChartBase;
 import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData;
 import com.github.mikephil.charting.data.Entry;
+import com.github.mikephil.charting.renderer.XAxisRenderer;
+import com.github.mikephil.charting.renderer.YAxisRenderer;
 
 import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet;
 
@@ -51,4 +53,14 @@ protected void initializeDefaultSettings() {
   public View getView() {
     return chart;
   }
+  /**
+   * Sets the color of the axes text of the Point Chart.
+   *
+   * @param color color to set text to.
+   */
+  public void setAxesTextColor(int color){
+    System.out.println("the color is" + color);
+    XAxisRenderer xAxisRenderer = chart.getRendererXAxis();
+    xAxisRenderer.getPaintAxisLabels().setColor(color);
+  }
 }

appinventor/docs/markdown/reference/components/charts.md

@@ -26,6 +26,10 @@ The Chart component plots data originating from it's attached Data components. F
 
 {:.properties}
 
+{:id="Chart.AxesTextColor" .color} *AxesTextColor*
+: Specifies the chart's axes text color as an alpha-red-green-blue
+ integer.
+
 {:id="Chart.BackgroundColor" .color} *BackgroundColor*
 : Specifies the chart's background color as an alpha-red-green-blue
  integer.
@@ -160,6 +164,9 @@ A ChartData2D component represents a single two-dimensional Data Series in the C
  for the y values. If a value here is not specified, default values for the
  y values will be generated instead.
 
+{:id="ChartData2D.DataLabelColor" .color} *DataLabelColor*
+: Specifies the data points label color as an alpha-red-green-blue integer.
+
 {:id="ChartData2D.DataSourceKey" .text .wo .do} *DataSourceKey*
 : Sets the Data Source key identifier for the value to import from the
  attached Data Source.