diff --git a/android/src/main/java/com/henninghall/date_picker/pickers/AndroidNative.java b/android/src/main/java/com/henninghall/date_picker/pickers/AndroidNative.java
index 5b511ea..813c265 100644
--- a/android/src/main/java/com/henninghall/date_picker/pickers/AndroidNative.java
+++ b/android/src/main/java/com/henninghall/date_picker/pickers/AndroidNative.java
@@ -1,7 +1,9 @@
 package com.henninghall.date_picker.pickers;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.Build;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -48,12 +50,14 @@ public class AndroidNative extends NumberPicker implements Picker {
     }
 
     @Override
-    public void setNormalTextColor(int color) {
-        // Not needed for this picker. It auto fades the color
-    }
+    public void setTextColor(String stringColor) {
+        int color = Color.parseColor(stringColor);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            setTextColor(color);
+            return;
+        }
 
-    @Override
-    public void setSelectedTextColor(int color) {
         try {
             Field selectorWheelPaintField = getClass().getSuperclass()
                     .getDeclaredField("mSelectorWheelPaint");
diff --git a/android/src/main/java/com/henninghall/date_picker/pickers/IosClone.java b/android/src/main/java/com/henninghall/date_picker/pickers/IosClone.java
index 5d70c8c..5f8292b 100644
--- a/android/src/main/java/com/henninghall/date_picker/pickers/IosClone.java
+++ b/android/src/main/java/com/henninghall/date_picker/pickers/IosClone.java
@@ -1,6 +1,7 @@
 package com.henninghall.date_picker.pickers;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.util.AttributeSet;
 import android.view.View;
 import cn.carbswang.android.numberpickerview.library.NumberPickerView;
@@ -19,6 +20,14 @@ public class IosClone extends NumberPickerView implements Picker {
         super(context, attrs, defStyleAttr);
     }
 
+    @Override
+    public void setTextColor(String color) {
+        int fullColor= Color.parseColor(color);
+        int fadedColor = Color.parseColor("#70"+ color.substring(1));
+        setNormalTextColor(fadedColor);
+        setSelectedTextColor(fullColor);
+    }
+
     @Override
     public void setOnValueChangeListenerInScrolling(final Picker.OnValueChangeListenerInScrolling listener) {
         final Picker self = this;
diff --git a/android/src/main/java/com/henninghall/date_picker/pickers/Picker.java b/android/src/main/java/com/henninghall/date_picker/pickers/Picker.java
index 0b4a49a..5977354 100644
--- a/android/src/main/java/com/henninghall/date_picker/pickers/Picker.java
+++ b/android/src/main/java/com/henninghall/date_picker/pickers/Picker.java
@@ -14,8 +14,7 @@ public interface Picker {
     void setDisplayedValues(String[] value);
     int getValue();
     void setValue(int value);
-    void setNormalTextColor(int value);
-    void setSelectedTextColor(int value);
+    void setTextColor(String value);
     void setOnValueChangeListenerInScrolling(Picker.OnValueChangeListenerInScrolling listener);
     void setOnValueChangedListener(Picker.OnValueChangeListener onValueChangeListener);
     void setShownCount(int count);
diff --git a/android/src/main/java/com/henninghall/date_picker/wheelFunctions/TextColor.java b/android/src/main/java/com/henninghall/date_picker/wheelFunctions/TextColor.java
index 2dafa78..6ff3c49 100644
--- a/android/src/main/java/com/henninghall/date_picker/wheelFunctions/TextColor.java
+++ b/android/src/main/java/com/henninghall/date_picker/wheelFunctions/TextColor.java
@@ -14,10 +14,7 @@ public class TextColor implements WheelFunction {
 
     @Override
     public void apply(Wheel wheel) {
-        int fullColor= Color.parseColor(color);
-        int fadedColor = Color.parseColor("#70"+ color.substring(1));
-        wheel.picker.setNormalTextColor(fadedColor);
-        wheel.picker.setSelectedTextColor(fullColor);
+        wheel.picker.setTextColor(color);
     }
 }
 
diff --git a/examples/detox/android/app/build.gradle b/examples/detox/android/app/build.gradle
index fa69093..29dd576 100644
--- a/examples/detox/android/app/build.gradle
+++ b/examples/detox/android/app/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId "com.detox.rn.example"
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/examples/detox/android/build.gradle b/examples/detox/android/build.gradle
index dfd3eba..2af24a6 100644
--- a/examples/detox/android/build.gradle
+++ b/examples/detox/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlinVersion = '1.3.10'
-    ext.compileSdkVersion = 28
+    ext.compileSdkVersion = 30
     ext.buildToolsVersion = '28.0.3'
 
     ext.detoxKotlinVersion = ext.kotlinVersion
diff --git a/examples/detox/src/examples/Minimal.js b/examples/detox/src/examples/Minimal.js
index 27bc566..2a4dad5 100644
--- a/examples/detox/src/examples/Minimal.js
+++ b/examples/detox/src/examples/Minimal.js
@@ -7,7 +7,7 @@ export default class MinimalExample extends Component {
   render = () => (
     <DatePicker
       date={this.state.date}
-      onDateChange={date => this.setState({ date })}
+      onDateChange={(date) => this.setState({ date })}
     />
   )
 }