vbea 3 years ago
parent
commit
2364352a45

+ 2 - 2
Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Thu Feb 09 16:27:26 CST 2023
-VERSION_CODE=101
+#Fri Feb 10 09:57:16 CST 2023
+VERSION_CODE=104

+ 1 - 1
Strides-APP/app/components/Dropdown.js

@@ -197,7 +197,7 @@ const styles = StyleSheet.create({
   },
   placeText: {
     flex: 1,
-    color: '#aaa'
+    color: textPlacehoder
   },
   iconStyle: {
     top: '50%',

+ 1 - 1
Strides-APP/app/pages/Router.js

@@ -160,7 +160,7 @@ export var PageList = {
           onPress={() => startPage(PageList.addVehicle)}>
           <MaterialCommunityIcons
             name='plus'
-            color='#fff'
+            color={pageTitleTint}
             size={24}
             style={Styles.iconOpacity}
           />

+ 1 - 0
Strides-APP/app/pages/charge/Charging.js

@@ -239,6 +239,7 @@ export const EnterStationDialog = ({visible, stationId, onConfirm, onClose}) =>
           style={styles.stationInput}
           defaultValue={inputStationId}
           placeholder='e.g: EVCTD0002-1'
+          placeholderTextColor={textPlacehoder}
           onChangeText={text => setInput(text)}
         />
         <View style={styles.dialogButtons}>

+ 3 - 3
Strides-APP/app/pages/charge/InfoDialog.js

@@ -159,8 +159,8 @@ export const RegisterDialog = ({address, onClose}) => {
           source={require('../../images/app-logo.png')}
           style={Styles.logo}
         />
-        <Text style={styles.regMessageText}>a confirmation email has been sent to</Text>
-        <Text style={styles.regMessageLink}>{address}</Text>
+        {/* <Text style={styles.regMessageText}>a confirmation email has been sent to</Text>
+        <Text style={styles.regMessageLink}>{address}</Text> */}
       </View>
       <View style={$padding(12,0)}>
         <Button
@@ -298,7 +298,7 @@ const styles = StyleSheet.create({
   },
   regTitleText: {
     color: '#000',
-    fontSize: 20,
+    fontSize: 16,
     ...$padding(32, 0, 16),
     textAlign: 'center'
   },

+ 1 - 0
Strides-APP/app/pages/chargeV2/ChargeAdapter.js

@@ -248,6 +248,7 @@ export default class ChargeAdapter extends Component {
           style={{minHeight: $vht(100)}}
           tabBarOptions={this.tabBarStyle}
           lazy={false}
+          initialRouteName={PagerList.tabCharge}
           lazyPreloadDistance={1}>
           { this.pageAdapter.map((item, index) => 
             <Tab.Screen

+ 1 - 0
Strides-APP/app/pages/chargeV2/Charging.js

@@ -315,6 +315,7 @@ export const EnterStationDialog = ({visible, stationId, onConfirm, onClose}) =>
           style={styles.stationInput}
           defaultValue={inputStationId}
           placeholder='e.g: LEMOC0002-1'
+          placeholderTextColor={textPlacehoder}
           onChangeText={text => setInput(text)}
         />
         <View style={styles.dialogButtons}>

+ 4 - 3
Strides-APP/app/pages/chargeV2/Summary.js

@@ -51,12 +51,12 @@ export default class Summary extends Component {
     this.props.navigation.addListener('focus', e => {
       this.canBack = false;
     });
-    /*this.props.navigation.addListener('beforeRemove', e => {
+    this.props.navigation.addListener('beforeRemove', e => {
       if (this.state.isActully && !this.canBack) {
         this.toRating();
         e.preventDefault();
       }
-    });*/
+    });
   }
 
   getSummaryData(chargingPk) {
@@ -90,7 +90,8 @@ export default class Summary extends Component {
 
   toRating() {
     this.canBack = true;
-    goBack();
+    //goBack();
+    startPage(PageList.home)
     //startPage(PageList.rating, this.state.stationInfo);
   }
 

+ 1 - 0
Strides-APP/app/pages/home/Search.js

@@ -132,6 +132,7 @@ export default class Search extends Component {
             returnKeyType={'search'}
             clearButtonMode={'while-editing'}
             placeholder='Search using location name or service provider'
+            placeholderTextColor={textPlacehoder}
             onChangeText={text => {
               this.searchWorld = text;
             }}

+ 3 - 0
Strides-APP/app/pages/my/AddVehicle.js

@@ -63,6 +63,7 @@ export default class AddVehicle extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Add text'
+            placeholderTextColor={textPlacehoder}
             maxLength={25}
             onChangeText={text => this.form.brand = text}
           />
@@ -72,6 +73,7 @@ export default class AddVehicle extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Add text'
+            placeholderTextColor={textPlacehoder}
             maxLength={50}
             onChangeText={text => this.form.model = text}
           />
@@ -81,6 +83,7 @@ export default class AddVehicle extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Add text'
+            placeholderTextColor={textPlacehoder}
             maxLength={20}
             onChangeText={text => this.form.licensePlate = text}
           />

+ 3 - 0
Strides-APP/app/pages/my/EditAddress.js

@@ -42,6 +42,7 @@ export default class EditAddress extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Street name and number'
+            placeholderTextColor={textPlacehoder}
             maxLength={50}
             defaultValue={this.state.addressDto?.street}
             onChangeText={text => this.state.addressDto.street = text}
@@ -52,6 +53,7 @@ export default class EditAddress extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Unit number'
+            placeholderTextColor={textPlacehoder}
             maxLength={15}
             defaultValue={this.state.addressDto?.houseNumber}
             onChangeText={text => this.state.addressDto.houseNumber = text}
@@ -62,6 +64,7 @@ export default class EditAddress extends Component {
           <TextInput
             style={styles.formInput}
             placeholder='Postal Code'
+            placeholderTextColor={textPlacehoder}
             maxLength={10}
             defaultValue={this.state.addressDto?.zipCode}
             onChangeText={text => this.state.addressDto.zipCode = text}

+ 3 - 0
Strides-APP/app/pages/my/EditVehicle.js

@@ -128,6 +128,7 @@ export default class EditVehicle extends Component {
               style={styles.formInput}
               defaultValue={this.state.vehicleInfo.brand}
               placeholder='Add text'
+              placeholderTextColor={textPlacehoder}
               maxLength={25}
               onChangeText={text => this.form.brand = text}
             />
@@ -138,6 +139,7 @@ export default class EditVehicle extends Component {
               style={styles.formInput}
               defaultValue={this.state.vehicleInfo.model}
               placeholder='Add text'
+              placeholderTextColor={textPlacehoder}
               maxLength={50}
               onChangeText={text => this.form.model = text}
             />
@@ -148,6 +150,7 @@ export default class EditVehicle extends Component {
               style={styles.formInput}
               defaultValue={this.state.vehicleInfo.licensePlate}
               placeholder='Add text'
+              placeholderTextColor={textPlacehoder}
               maxLength={20}
               onChangeText={text => this.form.licensePlate = text}
             />

+ 3 - 0
Strides-APP/app/pages/payment/FormCard.js

@@ -119,6 +119,7 @@ export default class FormCard extends Component {
             <TextInput
               style={styles.cardNameInput}
               placeholder={'Your name on card'}
+              placeholderTextColor={textPlacehoder}
               maxLength={50}
               onChangeText={text => this.form.nameOnCard = text}/>
           </View>
@@ -133,6 +134,7 @@ export default class FormCard extends Component {
               <TextInput
                 style={styles.cardNumber}
                 placeholder='Card Number'
+                placeholderTextColor={textPlacehoder}
                 maxLength={25}
                 keyboardType={'numeric'}
                 onChangeText={text => {
@@ -201,6 +203,7 @@ const TipInput = ({onChangeText, maxLength, placeholder, keyboardType, secureTex
       <TextInput
         style={styles.cardInput}
         placeholder={placeholder}
+        placeholderTextColor={textPlacehoder}
         maxLength={maxLength}
         secureTextEntry={secureTextEntry}
         keyboardType={keyboardType}

+ 1 - 0
Strides-APP/app/pages/search/Search.js

@@ -95,6 +95,7 @@ export default class Search extends Component {
             returnKeyType={'search'}
             clearButtonMode={'while-editing'}
             placeholder='Search using site name or service provider'
+            placeholderTextColor={textPlacehoder}
             onChangeText={text => {
               this.searchWorld = text;
             }}

+ 1 - 0
Strides-APP/app/pages/search/SearchV2.js

@@ -104,6 +104,7 @@ export default class SearchV2 extends Component {
             returnKeyType={'search'}
             clearButtonMode={'while-editing'}
             placeholder='Search using site name or service provider'
+            placeholderTextColor={textPlacehoder}
             onChangeText={text => {
               this.searchWorld = text;
             }}

+ 2 - 0
Strides-APP/app/pages/sign/Login.js

@@ -175,6 +175,7 @@ export default class Login extends React.Component {
               <TextInput
                 style={styles.inputText}
                 placeholder={"E-mail"}
+                placeholderTextColor={textPlacehoder}
                 keyboardType="email-address"
                 textContentType='emailAddress'
                 defaultValue={this.state.email}
@@ -195,6 +196,7 @@ export default class Login extends React.Component {
               <TextInput 
                 style={styles.inputText}
                 placeholder="Password"
+                placeholderTextColor={textPlacehoder}
                 textContentType='password'
                 secureTextEntry={true}
                 maxLength={20}

+ 2 - 0
Strides-APP/app/pages/sign/LoginV2.js

@@ -163,6 +163,7 @@ export default class Login extends React.Component {
               <TextInput 
                 style={styles.inputText}
                 placeholder={"E-mail"}
+                placeholderTextColor={textPlacehoder}
                 textContentType='emailAddress'
                 defaultValue={this.state.email}
                 maxLength={50}
@@ -177,6 +178,7 @@ export default class Login extends React.Component {
               <TextInput 
                 style={styles.inputText}
                 placeholder="Password"
+                placeholderTextColor={textPlacehoder}
                 textContentType='password'
                 secureTextEntry={true}
                 maxLength={20}

+ 7 - 0
Strides-APP/app/pages/sign/Register.js

@@ -284,6 +284,7 @@ export default class Register extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -293,6 +294,7 @@ export default class Register extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('email', v)}
               />
@@ -329,6 +331,7 @@ export default class Register extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -341,6 +344,7 @@ export default class Register extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -359,6 +363,7 @@ export default class Register extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -385,6 +390,7 @@ export default class Register extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -416,6 +422,7 @@ export default class Register extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 7 - 0
Strides-APP/app/pages/sign/RegisterDriver.js

@@ -241,6 +241,7 @@ export default class RegisterDriver extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -250,6 +251,7 @@ export default class RegisterDriver extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 keyboardType="email-address"
                 textContentType='emailAddress'
@@ -288,6 +290,7 @@ export default class RegisterDriver extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -300,6 +303,7 @@ export default class RegisterDriver extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -318,6 +322,7 @@ export default class RegisterDriver extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -344,6 +349,7 @@ export default class RegisterDriver extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -375,6 +381,7 @@ export default class RegisterDriver extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 7 - 0
Strides-APP/app/pages/sign/RegisterPublic.js

@@ -261,6 +261,7 @@ export default class RegisterPublic extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -270,6 +271,7 @@ export default class RegisterPublic extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 keyboardType="email-address"
                 textContentType='emailAddress'
@@ -308,6 +310,7 @@ export default class RegisterPublic extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -320,6 +323,7 @@ export default class RegisterPublic extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -338,6 +342,7 @@ export default class RegisterPublic extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -364,6 +369,7 @@ export default class RegisterPublic extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -395,6 +401,7 @@ export default class RegisterPublic extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 7 - 0
Strides-APP/app/pages/sign/RegisterV2.js

@@ -278,6 +278,7 @@ export default class Register extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -287,6 +288,7 @@ export default class Register extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('email', v)}
               />
@@ -323,6 +325,7 @@ export default class Register extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -335,6 +338,7 @@ export default class Register extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -353,6 +357,7 @@ export default class Register extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -379,6 +384,7 @@ export default class Register extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -410,6 +416,7 @@ export default class Register extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 7 - 0
Strides-APP/app/pages/sign/RegisterV3.js

@@ -269,6 +269,7 @@ export default class RegisterV3 extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -278,6 +279,7 @@ export default class RegisterV3 extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 keyboardType="email-address"
                 textContentType='emailAddress'
@@ -316,6 +318,7 @@ export default class RegisterV3 extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -328,6 +331,7 @@ export default class RegisterV3 extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -346,6 +350,7 @@ export default class RegisterV3 extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -372,6 +377,7 @@ export default class RegisterV3 extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -403,6 +409,7 @@ export default class RegisterV3 extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 8 - 0
Strides-APP/app/pages/sign/RegisterV4.js

@@ -308,6 +308,7 @@ export default class RegisterV4 extends React.Component {
               <TextInput
                 style={styles.inputView} 
                 placeholder='Display Name'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('nickName', v)}
               />
@@ -317,6 +318,7 @@ export default class RegisterV4 extends React.Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 keyboardType="email-address"
                 textContentType='emailAddress'
@@ -328,6 +330,7 @@ export default class RegisterV4 extends React.Component {
               <TextInput
                 style={[styles.inputView, {flex: 2.2, marginLeft: 2}]}
                 placeholder='OTP'
+                placeholderTextColor={textPlacehoder}
                 maxLength={6}
                 keyboardType="number-pad"
                 textContentType="telephoneNumber"
@@ -374,6 +377,7 @@ export default class RegisterV4 extends React.Component {
                 <TextInput
                   style={styles.contactView}
                   placeholder='Mobile Number'
+                  placeholderTextColor={textPlacehoder}
                   keyboardType='phone-pad'
                   maxLength={15}
                   onChangeText={v => this.changeInfo('phone', v)}
@@ -386,6 +390,7 @@ export default class RegisterV4 extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -404,6 +409,7 @@ export default class RegisterV4 extends React.Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -430,6 +436,7 @@ export default class RegisterV4 extends React.Component {
                 <TextInput
                   style={styles.inputView}
                   placeholder='PH Driver Vocational Licence'
+                  placeholderTextColor={textPlacehoder}
                   maxLength={20}
                   onChangeText={v => this.changeInfo('pdvLicence', v)}
                 />
@@ -461,6 +468,7 @@ export default class RegisterV4 extends React.Component {
                   style={styles.codeText}
                   maxLength={6}
                   placeholder='Referral Code'
+                  placeholderTextColor={textPlacehoder}
                   onChangeText={v => this.changeInfo('referralCode', v)}
                 />
               </View>

+ 4 - 0
Strides-APP/app/pages/sign/ResetPassword.js

@@ -174,6 +174,7 @@ export default class ResetPassword extends Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 onChangeText={v => this.changeInfo('email', v)}
               />
@@ -184,6 +185,7 @@ export default class ResetPassword extends Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => {
                   this.applyStrength(value);
@@ -211,6 +213,7 @@ export default class ResetPassword extends Component {
                 secureTextEntry={this.state.wrongCount < 3}
                 style={styles.inputView}
                 placeholder='Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />
@@ -220,6 +223,7 @@ export default class ResetPassword extends Component {
               <TextInput
                 style={[styles.inputView, {flex: 2.6, marginLeft: 2}]}
                 placeholder='Verification Code'
+                placeholderTextColor={textPlacehoder}
                 maxLength={6}
                 onChangeText={v => this.changeInfo('verificationCode', v)}
               />

+ 4 - 0
Strides-APP/app/pages/sign/ResetPasswordV2.js

@@ -187,6 +187,7 @@ export default class ResetPassword extends Component {
               <TextInput
                 style={styles.inputView}
                 placeholder='Email Address'
+                placeholderTextColor={textPlacehoder}
                 maxLength={50}
                 keyboardType="email-address"
                 textContentType='emailAddress'
@@ -203,6 +204,7 @@ export default class ResetPassword extends Component {
               <TextInput
                 style={[styles.inputView, {flex: 2.6, marginLeft: 2}]}
                 placeholder='OTP'
+                placeholderTextColor={textPlacehoder}
                 maxLength={6}
                 keyboardType="number-pad"
                 textContentType="telephoneNumber"
@@ -227,6 +229,7 @@ export default class ResetPassword extends Component {
                 secureTextEntry={this.state.wrongCount}
                 style={styles.inputView}
                 placeholder='New Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={(value) => this.applyStrength(value)}
               />
@@ -266,6 +269,7 @@ export default class ResetPassword extends Component {
                 secureTextEntry={this.state.wrongCount}
                 style={styles.inputView}
                 placeholder='Confirm Password'
+                placeholderTextColor={textPlacehoder}
                 maxLength={20}
                 onChangeText={v => this.changeInfo('password', v)}
               />

+ 3 - 0
Strides-APP/app/pages/wallet/AddCard.js

@@ -103,6 +103,7 @@ export default class AddCard extends Component {
           <TextInput
             style={styles.cardNameInput}
             placeholder={'Your name on card'}
+            placeholderTextColor={textPlacehoder}
             maxLength={50}
             onChangeText={text => this.form.nameOnCard = text}/>
         </View>
@@ -117,6 +118,7 @@ export default class AddCard extends Component {
             <TextInput
               style={styles.cardNumber}
               placeholder='Card Number'
+              placeholderTextColor={textPlacehoder}
               maxLength={25}
               keyboardType={'numeric'}
               onChangeText={text => {
@@ -225,6 +227,7 @@ const TipInput = ({onChangeText, maxLength, placeholder, keyboardType, value}) =
       <TextInput
         style={styles.cardInput}
         placeholder={placeholder}
+        placeholderTextColor={textPlacehoder}
         maxLength={maxLength}
         keyboardType={keyboardType}
         onChangeText={onChangeText}

+ 2 - 0
Strides-APP/app/utils/themes.js

@@ -20,6 +20,7 @@ global.textButton = "#FFFFFF";//#222
 global.textCancel = "#999999";
 global.textDark = "#000000";
 global.textLight = "#FFFFFF";
+global.textPlacehoder = "#999999";
 global.rippleColor = "rgba(0,0,0,.2)"
 
 global.darkMode = false;
@@ -41,6 +42,7 @@ if (Appearance.getColorScheme() == 'dark' && enableDarkMode) {
   global.textSecondary = '#E0E0E0';
   global.textDark = "#FFFFFF";
   global.textLight = "#000000";
+  global.textPlacehoder = "#EEEEEE";
   global.rippleColor = "rgba(200,200,200,.3)"
 }