Merge pull request #7 from troberts-28/patch-v1.1.4

Add base text style

Author: troberts-28

README.md

@@ -326,7 +326,7 @@ The following custom styles can be supplied to re-style the component in any way
 | :-------------------: | :------------------------------------- | :-----------------------------------: |
 | theme                 | Theme of the component                 | "light" \| "dark"                     |
 | backgroundColor       | Main background color                  | string                                |
-| textColor             | Color for the text elements            | string                                |
+| text                  | Base text style                        | TextStyle                            |
 | pickerContainer       | Main container for the picker          | ViewStyle                             |
 | pickerLabelContainer  | Container for the picker's labels      | ViewStyle                             |
 | pickerLabel           | Style for the picker's labels          | TextStyle                             |
@@ -365,9 +365,9 @@ The following custom styles can be supplied to re-style the component in any way
 | container         | Main container's style                 | ViewStyle |
 | contentContainer  | Style for the content's container      | ViewStyle |
 | buttonContainer   | Style for the container around the buttons | ViewStyle |
-| button            | General style for both buttons         | ViewStyle |
-| cancelButton      | Style for the cancel button            | ViewStyle |
-| confirmButton     | Style for the confirm button           | ViewStyle |
+| button            | General style for both buttons         | TextStyle |
+| cancelButton      | Style for the cancel button            | TextStyle |
+| confirmButton     | Style for the confirm button           | TextStyle |
 | modalTitle        | Style for the title of the modal       | TextStyle |
 
 

package.json

@@ -6,7 +6,7 @@
         "url": "https://github.com/troberts-28"
     },
     "license": "MIT",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {

src/components/TimerPicker/TimerPicker.styles.ts

@@ -4,7 +4,7 @@ import { StyleSheet } from "react-native";
 export interface CustomTimerPickerStyles {
     theme?: "light" | "dark";
     backgroundColor?: string;
-    textColor?: string;
+    text?: any;
     pickerContainer?: any;
     pickerLabelContainer?: any;
     pickerLabel?: any;
@@ -46,10 +46,10 @@ export const generateStyles = (
             fontWeight: "bold",
             marginTop: (customStyles?.pickerItem?.fontSize ?? 25) / 6,
             color:
-                customStyles?.textColor ??
-                (customStyles?.theme === "dark"
+                customStyles?.theme === "dark"
                     ? DARK_MODE_TEXT_COLOR
-                    : LIGHT_MODE_TEXT_COLOR),
+                    : LIGHT_MODE_TEXT_COLOR,
+            ...customStyles?.text,
             ...customStyles?.pickerLabel,
         },
         pickerItemContainer: {
@@ -63,10 +63,10 @@ export const generateStyles = (
             textAlignVertical: "center",
             fontSize: 25,
             color:
-                customStyles?.textColor ??
-                (customStyles?.theme === "dark"
+                customStyles?.theme === "dark"
                     ? DARK_MODE_TEXT_COLOR
-                    : LIGHT_MODE_TEXT_COLOR),
+                    : LIGHT_MODE_TEXT_COLOR,
+            ...customStyles?.text,
             ...customStyles?.pickerItem,
         },
         pickerGradientOverlay: {

src/components/TimerPickerModal.styles.ts

@@ -3,8 +3,7 @@ import { StyleSheet } from "react-native";
 
 import type { CustomTimerPickerStyles } from "./TimerPicker/TimerPicker.styles";
 
-export interface CustomTimerPickerModalStyles
-    extends CustomTimerPickerStyles {
+export interface CustomTimerPickerModalStyles extends CustomTimerPickerStyles {
     container?: any;
     contentContainer?: any;
     buttonContainer?: any;
@@ -53,36 +52,36 @@ export const generateStyles = (
             borderRadius: 10,
             fontSize: 16,
             overflow: "hidden",
+            ...customStyles?.text,
             ...customStyles?.button,
         },
         cancelButton: {
             borderColor: "gray",
             color:
-                customStyles?.textColor ?? customStyles?.theme === "dark"
-                    ? DARK_MODE_TEXT_COLOR
-                    : "gray",
+                customStyles?.theme === "dark" ? DARK_MODE_TEXT_COLOR : "gray",
             backgroundColor:
                 customStyles?.theme === "dark" ? "gray" : undefined,
+            ...customStyles?.text,
             ...customStyles?.cancelButton,
         },
         confirmButton: {
             borderColor: "green",
             color:
-                customStyles?.textColor ?? customStyles?.theme === "dark"
-                    ? DARK_MODE_TEXT_COLOR
-                    : "green",
+                customStyles?.theme === "dark" ? DARK_MODE_TEXT_COLOR : "green",
             backgroundColor:
                 customStyles?.theme === "dark" ? "green" : undefined,
+            ...customStyles?.text,
             ...customStyles?.confirmButton,
         },
         modalTitle: {
             fontSize: 24,
             fontWeight: "bold",
             marginBottom: 15,
             color:
-                customStyles?.textColor ?? customStyles?.theme === "dark"
+                customStyles?.theme === "dark"
                     ? DARK_MODE_TEXT_COLOR
                     : LIGHT_MODE_TEXT_COLOR,
+            ...customStyles?.text,
             ...customStyles?.modalTitle,
         },
     });