Enhancement ViewArticle, ViewCampaign

https://dev.wormwood.com.sg/zentao/task-view-20.html

Strides-APP/app/pages/alert/ViewArticle.js

@@ -10,6 +10,7 @@ import { ElevationObject } from '../../components/Button';
 import HeaderTitle from '../../components/HeaderTitle';
 import TextView from '../../components/TextView';
 import utils from '../../utils/utils';
+import { PagerView } from './ViewUtil';
 
 export default class ViewArticle extends Component {
   constructor(props) {
@@ -74,7 +75,7 @@ export default class ViewArticle extends Component {
             style={{height: $width}}
             autoplay={true}
             autoplayTimeout={5}
-            renderPagination={() => <></>}
+            renderPagination={(index,total) => <PagerView index={index+1} total={total}/> }
             removeClippedSubviews={false}>
             { this.state.messageInfo.articleImages.map((item, index) => {
               return (

Strides-APP/app/pages/alert/ViewCampaign.js

@@ -10,6 +10,7 @@ import { ElevationObject } from '../../components/Button';
  import HeaderTitle from '../../components/HeaderTitle';
  import TextView from '../../components/TextView';
  import utils from '../../utils/utils';
+import { PagerView } from './ViewUtil';
 
 export default class ViewCampaign extends Component {
   constructor(props) {
@@ -86,7 +87,7 @@ export default class ViewCampaign extends Component {
             style={{height: $width}}
             autoplay={true}
             autoplayTimeout={5}
-            renderPagination={() => <></>}
+            renderPagination={(index,total) => <PagerView index={index+1} total={total}/> }
             removeClippedSubviews={false}>
             { this.state.messageInfo.articleImages.map((item, index) => {
               return (

Strides-APP/app/pages/alert/ViewUtil.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+export const PagerView = ({index=0,total=0}) => (
+  <View style={styles.pagerView}>
+    <View style={styles.pagerContent}>
+      <Text style={styles.pagerText} numberOfLines={1}>{index}</Text>
+      <Text style={styles.pagerText} numberOfLines={1}>{"/"}</Text>
+      <Text style={styles.pagerText} numberOfLines={1}>{total}</Text>
+    </View>
+  </View>
+);
+
+const styles = StyleSheet.create({
+  pagerView: {
+    left: 0,
+    right: 0,
+    bottom: 8,
+    alignItems: 'center',
+    position: 'absolute',
+  },
+  pagerContent: {
+    paddingTop: 2,
+    paddingLeft: 8,
+    paddingRight: 8,
+    paddingBottom: 2,
+    borderRadius: 30,
+    alignItems: 'center',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    backgroundColor: 'rgba(0,0,0,.4)'
+  },
+  pagerText: {
+    color: textLight,
+    fontSize: 12,
+    padding: 1
+  }
+})

Strides-APP/app/pages/vehicles/VehicleDetail.js

@@ -313,12 +313,12 @@ export default class VehicleDetail extends Component {
           }
         </View>
         <View style={styles.buttonView}>
-        <Button
-          text={$t('common.save')}
-          elevation={1.5}
-          onClick={() => {
-            this.validate();
-          }}/>
+          <Button
+            text={$t('common.save')}
+            elevation={1.5}
+            onClick={() => {
+              this.validate();
+            }}/>
         </View>
       </ScrollView>
     );