#13095 Enhance App UI

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Fri May 19 11:33:17 CST 2023
-VERSION_CODE=227
+#Tue Jun 13 10:35:34 CST 2023
+VERSION_CODE=228

Strides-APP/app/pages/Settings.js

@@ -126,7 +126,7 @@ export default class Settings extends Component {
           style={styles.itemButton}
           viewStyle={styles.itemView}
           onClick={() => this.changeNotifySwitch("notifyLowBalance", !userInfo.notifyLowBalance)}>
-          <Text style={styles.buttonText}>Notify me when wallet is low balance</Text>
+          <Text style={styles.buttonText}>Notify me when credits is low balance</Text>
           <Switch 
             value={this.state.userInfo.notifyLowBalance}
             trackColor={isIOS ? { false: "#B2B2B2", true: colorAccent } : null}

Strides-APP/app/pages/chargeV2/Payment.js

@@ -13,7 +13,7 @@ export const CHARGE_PAYTYPE = [/*{
   icon: "PAYNOW"
 }, */{
   // 钱包余额支付
-  name: "Credit Wallet",
+  name: "Credits",
   type: PAYTYPE.CREDIT_WALLET,
   icon: "WALLET",
   balance: true

Strides-APP/app/pages/home/Drawer.js

@@ -307,7 +307,7 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
             size={26}
             name={"wallet-outline"}
             color={colorDark}/>
-          <Text style={styles.label}>Wallet</Text>
+          <Text style={styles.label}>Credits</Text>
           <Text style={styles.balanceText2}>{currency}{userInfo.credit}</Text>
         </Button></>
       }

Strides-APP/app/pages/my/Profile.js

@@ -174,7 +174,7 @@ export default class Profile extends Component {
                 startPage(PageList.wallet);
               }}>
               <Text style={styles.cardPrimary}>{currency}{userInfo.credit}</Text>
-              <Text style={styles.cardLabel}>Credit Wallet</Text>
+              <Text style={styles.cardLabel}>Credits</Text>
             </Pressable>
           </View>
         </View>
@@ -244,7 +244,7 @@ export default class Profile extends Component {
             onPress={() => {
               this.changeSwitch("notifyLowBalance", !userInfo.notifyLowBalance);
             }}>
-            <Text style={styles.notiLabel}>Notify me when wallet is low balance</Text>
+            <Text style={styles.notiLabel}>Notify me when credits is low balance</Text>
             <Switch 
               value={this.state.userInfo.notifyLowBalance}
               trackColor={isIOS ? { false: "#B2B2B2", true: colorAccent } : null}

Strides-APP/app/pages/my/ProfileV2.js

@@ -163,7 +163,7 @@ export default class ProfileV2 extends Component {
             style={styles.cardIcon}
             source={require('../../images/user/card-wallet.png')}/>
           <View style={styles.cardInfo}>
-            <Text style={styles.cardLabel}>Credit Wallet: </Text>
+            <Text style={styles.cardLabel}>Credits: </Text>
             <Text style={styles.cardPrimary}>{currency}{this.state.userInfo.credit}</Text>
           </View>
           <FontAwesome

Strides-APP/app/pages/payment/PayNow.js

@@ -134,7 +134,7 @@ export default class PayNow extends Component {
         </ViewShot>
         <Text style={styles.title}>Top Up Amount: {currency + ' ' + this.state.amount}</Text>
         <Text style={styles.tips}>Please save the QR Code, and use your bank app to scan the QR Code.</Text>
-        <Text style={styles.tips}>Once the payment is completed, the top up amount will be credited into your credit wallet automatically.</Text>
+        <Text style={styles.tips}>Once the payment is completed, the top up amount will be credited into your credits automatically.</Text>
         <View style={styles.button2}>
           <Button
             text='Save QR Code to Gallery'

Strides-APP/app/pages/payment/PaymentMethod.js

@@ -19,13 +19,13 @@ export default class PaymentMethod extends Component {
       cIndex: 0,
       selectIndex: 0,
       paymentOptions: [{
-        title: "Credit Wallet",
+        title: "Credits",
         desc: '',
         value: PAYTYPE.CREDIT_WALLET,
         icon: require('../../images/icon/draw-wallet.png')
       }],
       paymentOptionsWallet: [{
-        title: "Credit Wallet",
+        title: "Credits",
         desc: '',
         value: PAYTYPE.CREDIT_WALLET,
         icon: require('../../images/icon/draw-wallet.png')
@@ -41,7 +41,7 @@ export default class PaymentMethod extends Component {
         value: PAYTYPE.PAY_PER_USE,
         icon: require('../../images/wallet/ic_payperuse.png')
       }, {
-        title: "Credit Wallet",
+        title: "Credits",
         desc: '',
         value: PAYTYPE.CREDIT_WALLET,
         icon: require('../../images/icon/draw-wallet.png')

Strides-APP/app/pages/search/SearchV2.js

@@ -38,6 +38,7 @@ export default class SearchV2 extends Component {
       this.searchStation(latlng);
     }, error => {
       console.warn("getGeoLocation", error);
+      this.searchStation(this.state.latlng);
     });
   }
 

Strides-APP/app/pages/wallet/Overview.js

@@ -188,25 +188,25 @@ export default class Overview extends Component {
         }
         <View style={styles.statisticView}>
           <View style={ui.flexcw}>
-            <Text style={styles.sectionTitle}>For the week of</Text>
+            <Text style={styles.sectionTitle}>Summary for the week</Text>
             {/* <Text style={styles.linkText}>1st Jan to 8th Jan </Text> */}
           </View>
           <View style={styles.overviewRow}>
             <View style={ui.flex1}>
               {/* <Text style={styles.valueText}>{this.state.glanceData.averageCharge ?? 0}</Text> */}
-              <Text style={styles.titleText}>{this.state.glanceData.averageCharge ?? 0} kWh/Week</Text>
+              <Text style={styles.titleText}>{this.state.glanceData.averageCharge ?? 0} kWh</Text>
               <Text style={styles.subTitleText}>Average Charge</Text>
             </View>
             <View style={styles.overviewDivide}></View>
             <View style={ui.flex1}>
               {/* <Text style={styles.valueText}>{this.state.glanceData.averageSpend ?? 0}</Text> */}
-              <Text style={styles.titleText}>{currency}{this.state.glanceData.averageSpend ?? 0}/Week</Text>
+              <Text style={styles.titleText}>{currency} {this.state.glanceData.averageSpend ?? 0}</Text>
               <Text style={styles.subTitleText}>Average Spend</Text>
             </View>
             <View style={styles.overviewDivide}></View>
             <View style={ui.flex1}>
               {/* <Text style={styles.valueText}>{utils.hour2HHmm(this.state.glanceData.averageTime)}</Text> */}
-              <Text style={styles.titleText}>{utils.hour2HHmm(this.state.glanceData.averageTime)}/Week</Text>
+              <Text style={styles.titleText}>{utils.hour2HHmm(this.state.glanceData.averageTime)}</Text>
               <Text style={styles.subTitleText}>Average Time</Text>
             </View>
           </View>

Strides-APP/app/pages/wallet/Payment.js

@@ -17,7 +17,7 @@ export const PaymentDefault = {
   is2c2p: false,
   DEFAULT: {
     payType: "CreditWallet",
-    payName: "Credit Wallet",
+    payName: "Credits",
     isWallet: true,
     isPayPerUse: false
   },
@@ -121,7 +121,7 @@ export const Balance = ({balance, action="View History", page=PageList.wallet})
       <Image
         style={styles.balanceIcon}
         source={require('../../images/user/card-wallet.png')}/>
-      <Text style={styles.balanceTitle}>Credit Wallet:</Text>
+      <Text style={styles.balanceTitle}>Credits:</Text>
       <Text style={styles.balanceValue}>{currency}{getBalance(utils.isNotEmpty(balance) ? balance : userInfo.credit)}</Text>
       <Text style={styles.actionText}>{action}</Text>
       <FontAwesome

Strides-APP/app/pages/wallet/Wallet.js

@@ -99,7 +99,7 @@ export default class Wallet extends Component {
         </View> */}
         <Balance
           balance={this.state.balance}
-          action={"Purchase Credits"/*"Top Up"*/}
+          action={"Purchase"/*"Top Up"*/}
           page={PageList.topupNew}
         />
         <View style={styles.contentView}>