wudebin hai 1 mes
pai
achega
dc467bd432

+ 24 - 21
Strides-SPAPP/app/pages/alert/Notification.js

@@ -171,27 +171,30 @@ export default class Notification extends Component {
     }
     }
     if (this.state.pageAdapter.length > 0) {
     if (this.state.pageAdapter.length > 0) {
       return (
       return (
-        <Tab.Navigator
-          style={styles.container}
-          screenOptions={{
-            lazy: isIOS,
-            lazyPreloadDistance: 2,
-            ...this.tabBarStyle
-          }}
-          backBehavior={() => this.backPage()}>
-          { this.state.pageAdapter.map((item, index) => 
-            <Tab.Screen
-              key={index}
-              name={item.name}
-              component={item.component}
-              options={{
-                title: item.title,
-                tabBarAllowFontScaling: false,
-                tabBarBadge: () => this.getBadgeText(index)
-              }}
-            />
-          )}
-        </Tab.Navigator>
+        <View style={styles.container}>
+          <Tab.Navigator
+            style={styles.container}
+            screenOptions={{
+              lazy: isIOS,
+              lazyPreloadDistance: 2,
+              swipeEnabled: true,
+              ...this.tabBarStyle
+            }}
+            backBehavior={() => this.backPage()}>
+            { this.state.pageAdapter.map((item, index) => 
+              <Tab.Screen
+                key={index}
+                name={item.name}
+                component={item.component}
+                options={{
+                  title: item.title,
+                  tabBarAllowFontScaling: false,
+                  tabBarBadge: () => this.getBadgeText(index)
+                }}
+              />
+            )}
+          </Tab.Navigator>
+        </View>
       );
       );
     } else {
     } else {
       return <ListAlerts {...this.props} showUnread={true}/>
       return <ListAlerts {...this.props} showUnread={true}/>

+ 4 - 4
Strides-SPAPP/ios/ChargEco.xcodeproj/project.pbxproj

@@ -1282,7 +1282,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ChargEco/ChargEco.entitlements;
 				CODE_SIGN_ENTITLEMENTS = ChargEco/ChargEco.entitlements;
-				CURRENT_PROJECT_VERSION = 510;
+				CURRENT_PROJECT_VERSION = 512;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1403,7 +1403,7 @@
 					"$(inherited)",
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/Frameworks",
 				);
 				);
-				MARKETING_VERSION = 4.2.2;
+				MARKETING_VERSION = 4.2.3;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(inherited)",
 					"-ObjC",
 					"-ObjC",
@@ -1431,7 +1431,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ChargEco/ChargEco.entitlements;
 				CODE_SIGN_ENTITLEMENTS = ChargEco/ChargEco.entitlements;
-				CURRENT_PROJECT_VERSION = 510;
+				CURRENT_PROJECT_VERSION = 512;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				HEADER_SEARCH_PATHS = (
 				HEADER_SEARCH_PATHS = (
@@ -1551,7 +1551,7 @@
 					"$(inherited)",
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/Frameworks",
 				);
 				);
-				MARKETING_VERSION = 4.2.2;
+				MARKETING_VERSION = 4.2.3;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(inherited)",
 					"-ObjC",
 					"-ObjC",