release v1.0.4

Strides-APP/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
 
-def myVersionName = "1.0.3" //★★★★★版本号★★★★★
+def myVersionName = "1.0.4" //★★★★★版本号★★★★★
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).
@@ -193,6 +193,9 @@ android {
             signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            ndk {
+                abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"
+            }
         }
     }
 

Strides-APP/android/app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
           android:label="@string/app_name"
           android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
           android:launchMode="singleTask"
-          android:windowSoftInputMode="adjustResize">
+          android:windowSoftInputMode="adjustResize"
+          android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -70,9 +71,14 @@
         <meta-data
           android:name="com.dieam.reactnativepushnotification.notification_color"
           android:resource="@color/white"/>
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
         <receiver
+          android:exported="true"
+          android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"/>
+        <receiver
+          android:exported="true"
+          android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
+        <receiver
+          android:exported="true"
           android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon Jan 16 10:53:35 CST 2023
-VERSION_CODE=80
+#Sun Jan 29 14:54:53 CST 2023
+VERSION_CODE=88

Strides-APP/android/build.gradle

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        buildToolsVersion = "30.0.3"
+        buildToolsVersion = "31.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         playServicesVersion = "17.0.0"
         firebaseMessagingVersion = "21.1.0"
         ndkVersion = "20.1.5948944"

Strides-APP/app.json

@@ -1,8 +1,8 @@
 {
   "name": "JuicePlus",
   "displayName": "ChargEco",
-  "versionCode": 80,
-  "versionName": "V1.0.3",
+  "versionCode": 85,
+  "versionName": "V1.0.4",
   "product": true,
   "debug": false
 }

Strides-APP/app/pages/About.js

@@ -7,7 +7,7 @@ import { View, Text, Image, StyleSheet } from 'react-native';
 import app from '../../app.json';
 import { PageList } from './Router';
 
-const author = 2022;
+const author = 2023;
 
 export default About = () => {
   return (

Strides-APP/app/pages/Router.js

@@ -84,7 +84,7 @@ export var PageList = {
     component: Profile
   },
   'condition': {
-    title: 'Terms and Use',
+    title: 'Terms of Use',
     component: Condition
   },
   'summary': {

Strides-APP/app/pages/charge/Details.js

@@ -29,9 +29,9 @@ export default class Details extends Component {
         title: 'Site Information'
       }, {
         title: 'Charge'
-      }, {
+      }, /*{
         title: 'Reserve'
-      }],
+      }*/],
       refreshId: 0,
       refreshing: false,
       showContent: false,

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

@@ -183,9 +183,11 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
             onClick={() => {
               startPage(PageList.profile)
             }}>
-            <Image
+            <MaterialCommunityIcons
               style={styles.icon}
-              source={require('../../images/icon/draw-user.png')}/>
+              name="account-outline"
+              color="#333"
+              size={26}/>
             <Text style={styles.label}>Profile Settings</Text>
           </Button>
         : <Button
@@ -194,9 +196,11 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
             onClick={() => {
               startPage(PageList.login); 
             }}>
-            <Image
-              style={styles.icon}
-              source={require('../../images/icon/draw-user.png')}/>
+            <MaterialCommunityIcons
+              style={styles.icon2}
+              name="login-variant"
+              color="#333"
+              size={24}/>
             <Text style={styles.label}>Sign In</Text>
           </Button>
       }
@@ -207,9 +211,11 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
         onClick={() => {
           navigation.toggleDrawer();
         }}>
-        <Image
+        <MaterialCommunityIcons
           style={styles.icon}
-          source={require('../../images/icon/draw-home.png')}/>
+          name="home-outline"
+          color="#333"
+          size={26}/>
         <Text style={styles.label}>Home</Text>
       </Button>
 
@@ -218,38 +224,51 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
             style={styles.itemButton}
             viewStyle={styles.itemView}
             onClick={() => getCharging()}>
-            <Image
+            {/* <Image
               style={styles.icon}
-              source={require('../../images/icon/draw-charge.png')}/>
+              source={require('../../images/icon/draw-charge.png')}/> */}
+            <MaterialCommunityIcons
+              style={styles.icon}
+              name="car-electric-outline"
+              color="#333"
+              size={26}
+            />
             <Text style={styles.label}>Charging</Text>
           </Button>
         : <View
             style={styles.disableItem}>
-            <Image
+            <MaterialCommunityIcons
               style={styles.icon}
-              source={require('../../images/icon/draw-charge-no.png')}/>
+              name="car-electric-outline"
+              color="#999"
+              size={26}
+            />
+            {/* <Image
+              style={styles.icon}
+              source={require('../../images/icon/draw-charge-no.png')}/> */}
             <Text style={styles.disable}>Charging</Text>
           </View>
       }
-      { isLogin
-        ? <Button
-            style={styles.itemButton}
-            viewStyle={styles.itemView}
-            onClick={() => {
-              startPage(PageList.wallet);
-            }}>
-            <Image
-              style={styles.icon}
-              source={require('../../images/icon/draw-transaction.png')}/>
-            <Text style={styles.label}>Transactions</Text>
-          </Button>
-        : <View
-            style={styles.disableItem}>
-            <Image
-              style={styles.icon}
-              source={require('../../images/icon/draw-transaction-no.png')}/>
-            <Text style={styles.disable}>Transactions</Text>
-          </View>
+      { isLogin &&
+        <Button
+          style={styles.itemButton}
+          viewStyle={styles.itemView}
+          onClick={() => {
+            startPage(PageList.wallet);
+          }}>
+          <Image
+            style={styles.icon}
+            source={require('../../images/icon/draw-transaction.png')}/>
+          <Text style={styles.label}>Transactions</Text>
+        </Button>
+      }
+      {/* <View
+          style={styles.disableItem}>
+          <Image
+            style={styles.icon}
+            source={require('../../images/icon/draw-transaction-no.png')}/>
+          <Text style={styles.disable}>Transactions</Text>
+        </View> */
       }
 
       <Button
@@ -258,9 +277,11 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
         onClick={() => {
           startPage(PageList.feedback);
         }}>
-        <Image
+        <MaterialCommunityIcons
           style={styles.icon2}
-          source={require('../../images/icon/draw-feedback.png')}/>
+          name="message-alert-outline"
+          color="#222"
+          size={24}/>
         <Text style={styles.label}>Feedback</Text>
       </Button>
 
@@ -271,24 +292,26 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
           startPage(PageList.privacy);
         }}>
         <Image
-          style={styles.icon2}
+          style={styles.icon}
           source={require('../../images/icon/draw-privacy.png')}/>
         <Text style={styles.label}>Privacy Policy</Text>
       </Button>
+      <Button
+        style={styles.itemButton}
+        viewStyle={styles.itemView}
+        onClick={() => {
+          startPage(PageList.condition);
+        }}>
+        <MaterialCommunityIcons
+          style={styles.icon}
+          name="file-eye-outline"
+          color="#222"
+          size={26}/>
+        <Text style={styles.label}>Terms of Use</Text>
+      </Button>
 
       { DEBUG &&
       <>
-        <Button
-          style={styles.itemButton}
-          viewStyle={styles.itemView}
-          onClick={() => {
-            startPage(PageList.condition);
-          }}>
-          <Image
-            style={styles.icon2}
-            source={require('../../images/icon/draw-terms.png')}/>
-          <Text style={styles.label}>Terms and Conditions</Text>
-        </Button>
         <Button
           style={styles.itemButton}
           viewStyle={styles.itemView}
@@ -334,10 +357,11 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
           startPage(PageList.settings);
         }}>
         <Ionicons
-          style={styles.icon2}
-          name="settings-outline"
-          color="#333"
-          size={24}/>
+          style={styles.icon}
+          name="md-settings-outline"
+          color="#222"
+          size={25}
+        />
         <Text style={styles.label}>Settings</Text>
       </Button>
       <Button
@@ -346,9 +370,12 @@ const DrawerContent = ({isLogin, userInfo, onLogout, navigation}) => {
         onClick={() => {
           startPage(PageList.about);
         }}>
-        <Image
-          style={styles.icon2}
-          source={require('../../images/icon/draw-about.png')}/>
+        <MaterialCommunityIcons
+          style={styles.icon}
+          name="information-outline"
+          color="#333"
+          size={26}
+        />
         <Text style={styles.label}>About Us</Text>
       </Button>
 

Strides-APP/app/pages/home/maps/SearchTool.js

@@ -92,7 +92,7 @@ export default class SearchTool extends Component {
               onPress={() => {
                 startPage(PageList.search);
               }}>
-              Search using keywords
+              Search
             </Text>
           </View>
           { this.props.mapReady &&

Strides-APP/app/pages/sign/RegisterV2.js

@@ -445,7 +445,7 @@ import CheckBox from '../../components/CheckBox';
                </View>
                </>
              }
-             <View style={styles.referView}>
+             {/* <View style={styles.referView}>
                <Text style={styles.referTitle}>Have a referral code?</Text>
                <View style={styles.referText}>
                  <Text>You'll get</Text>
@@ -461,7 +461,7 @@ import CheckBox from '../../components/CheckBox';
                    onChangeText={v => this.changeInfo('referralCode', v)}
                  />
                </View>
-             </View>
+             </View> */}
              <View style={styles.agreeView}>
                <CheckBox
                  value={this.state.agree}