@momo-kits/calculator-keyboard 0.77.23 → 0.77.24

package/components/KeyButton.tsx

@@ -1,12 +1,10 @@
 import React from 'react';
+import {StyleSheet, TouchableOpacity, View, Text} from 'react-native';
 import {
-  View,
-  TouchableOpacity,
-  StyleSheet,
-  Text,
-  ImageSourcePropType,
-} from 'react-native';
-import {Colors as ColorCore, Image as FastImage} from '@momo-kits/foundation';
+  Colors as ColorCore,
+  Image as FastImage,
+  scaleSize,
+} from '@momo-kits/foundation';
 import {Source} from 'react-native-fast-image';
 
 interface KeyButtonProps {
@@ -37,6 +35,12 @@ const styles = StyleSheet.create({
     flex: 1,
     borderRadius: 5,
   },
+  text: {
+    fontSize: scaleSize(24),
+    lineHeight: scaleSize(32),
+    fontFamily: 'SFProText-Semibold',
+    color: ColorCore.black_20,
+  },
 });
 
 const KeyButton: React.FC<KeyButtonProps> = ({
@@ -52,9 +56,11 @@ const KeyButton: React.FC<KeyButtonProps> = ({
 }) => {
   let content = null;
   if (icon) {
-    content = <FastImage source={icon} style={size} />;
+    content = (
+      <FastImage tintColor={ColorCore.black_20} source={icon} style={size} />
+    );
   } else {
-    content = <Text style={textStyle}>{text}</Text>;
+    content = <Text style={[textStyle, styles.text]}>{text}</Text>;
   }
 
   const buttonLongPress = () => onLongPress(text);

package/index.tsx

@@ -33,7 +33,7 @@ const isIphoneX = (): boolean =>
 
 const styles = StyleSheet.create({
   eqBtnWrapper: {
-    backgroundColor: '#ad076b',
+    backgroundColor: ColorCore.black_06,
   },
   specialBtnWrapper: {
     backgroundColor: '#FFF',
@@ -77,41 +77,33 @@ const CALCULATOR_BUTTONS = [
     {
       text: 'AC',
       icon: null,
-      backgroundColor: ColorCore.pink_08,
-      textWeight: 'bold',
-      textStyle: {
-        color: ColorCore.black_01,
-        fontSize: scaleSize(20),
-        fontWeight: 'bold',
-      },
+      backgroundColor: ColorCore.black_06,
     },
     {
       text: '÷',
       size: {width: 18, height: 18},
-      backgroundColor: ColorCore.pink_08,
-      textStyle: styles.textPink,
+      backgroundColor: ColorCore.black_06,
     },
     {
       text: '×',
       size: {width: 14, height: 14},
-      backgroundColor: ColorCore.pink_08,
-      textStyle: styles.textPink,
+      backgroundColor: ColorCore.black_06,
     },
   ],
   [
-    {text: '7', icon: null, textStyle: styles.textNormal},
-    {text: '8', icon: null, textStyle: styles.textNormal},
-    {text: '9', icon: null, textStyle: styles.textNormal},
+    {text: '7', icon: null},
+    {text: '8', icon: null},
+    {text: '9', icon: null},
   ],
   [
-    {text: '4', icon: null, textStyle: styles.textNormal},
-    {text: '5', icon: null, textStyle: styles.textNormal},
-    {text: '6', icon: null, textStyle: styles.textNormal},
+    {text: '4', icon: null},
+    {text: '5', icon: null},
+    {text: '6', icon: null},
   ],
   [
-    {text: '1', icon: null, textStyle: styles.textNormal},
-    {text: '2', icon: null, textStyle: styles.textNormal},
-    {text: '3', icon: null, textStyle: styles.textNormal},
+    {text: '1', icon: null},
+    {text: '2', icon: null},
+    {text: '3', icon: null},
   ],
 ];
 
@@ -231,12 +223,12 @@ const KeyboardCalculator: React.FC<KeyboardCalculatorProps> = ({onPress}) => {
             {renderBtn({
               width: BUTTON_WIDTH,
               text: 'REMOVE',
-              backgroundColor: ColorCore.pink_08,
+              backgroundColor: ColorCore.black_06,
               icon: REMOVE_ICON,
               size: {
                 width: 24,
                 height: 24,
-                tintColor: ColorCore.black_01,
+                tintColor: ColorCore.black_20,
               },
             })}
           </Row>
@@ -244,7 +236,7 @@ const KeyboardCalculator: React.FC<KeyboardCalculatorProps> = ({onPress}) => {
             {renderBtn({
               width: BUTTON_WIDTH,
               text: '-',
-              backgroundColor: ColorCore.pink_08,
+              backgroundColor: ColorCore.black_06,
               textStyle: styles.textPink,
             })}
           </Row>
@@ -252,7 +244,7 @@ const KeyboardCalculator: React.FC<KeyboardCalculatorProps> = ({onPress}) => {
             {renderBtn({
               width: BUTTON_WIDTH,
               text: '+',
-              backgroundColor: ColorCore.pink_08,
+              backgroundColor: ColorCore.black_06,
               textStyle: styles.textPink,
             })}
           </Row>
@@ -262,7 +254,7 @@ const KeyboardCalculator: React.FC<KeyboardCalculatorProps> = ({onPress}) => {
             {renderBtn({
               width: BUTTON_WIDTH,
               text: '=',
-              backgroundColor: ColorCore.pink_03,
+              backgroundColor: ColorCore.black_06,
               textStyle: styles.textEqual,
             })}
           </Row>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/calculator-keyboard",
-  "version": "0.77.23",
+  "version": "0.77.24",
   "private": false,
   "main": "index.tsx",
   "peerDependencies": {