Merge tag '1.4.8' into develop

norbertschuler · norbertschuler · commit 7edc81e722a9 · 2022-08-02T11:40:30.000+07:00
no message
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -157,8 +157,8 @@ android {
         applicationId "org.pftp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 50
-        versionName "1.4.7"
+        versionCode 53
+        versionName "1.4.8"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         if (isNewArchitectureEnabled()) {
             // We configure the NDK build only if you decide to opt-in for the New Architecture.
@@ -290,8 +290,9 @@ android {
             def versionCodes = ["armeabi-v7a": 5, "x86": 6, "arm64-v8a": 7, "x86_64": 8]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
-                  defaultConfig.versionCode * 1000 + versionCodes.get(abi)
+                output.versionCodeOverride =  versionCodes.get(abi) * 10000 + defaultConfig.versionCode
+            } else {
+                output.versionCodeOverride = 9 * 100000 + defaultConfig.versionCode
             }
         }
     }
diff --git a/app/components/EditUserProfile/index.native.js b/app/components/EditUserProfile/index.native.js
@@ -60,11 +60,11 @@ export default class EditUserProfile extends Component {
           key: 'desc',
           title: i18n.t('label.description')
         },
+        {
+          key: 'security',
+          title: i18n.t('label.profile_security')
+        },
         /* disabled functionality at July 16th
-          {
-            key: 'security',
-            title: i18n.t('label.profile_security')
-          },
           {
             key: 'following',
             title: i18n.t('label.subscribed')
@@ -184,44 +184,44 @@ export default class EditUserProfile extends Component {
                 treeCounter.followeeIds &&
                 this.props.followeeList &&
                 this.props.followeeList.length > 0 ? (
-                  <View>
-                    {this.props.followeeList.map(follow => (
-                      <View key={follow.id} style={styles.followerRow}>
-                        <UserProfileImage
-                          profileImage={follow.userProfile.image}
-                        />
-                        <TouchableItem
-                          style={styles.followerCol}
-                          onPress={() => {
-                            setTimeout(() => {
-                              this.props.navigation.navigate(
-                                getLocalRoute('app_treecounter'),
-                                {
-                                  treeCounterId: follow.id,
-                                  titleParam: follow.displayName
-                                }
-                              );
-                            }, 0);
-                          }}
-                        >
-                          <Text>{follow.displayName}</Text>
-                        </TouchableItem>
+                <View>
+                  {this.props.followeeList.map(follow => (
+                    <View key={follow.id} style={styles.followerRow}>
+                      <UserProfileImage
+                        profileImage={follow.userProfile.image}
+                      />
+                      <TouchableItem
+                        style={styles.followerCol}
+                        onPress={() => {
+                          setTimeout(() => {
+                            this.props.navigation.navigate(
+                              getLocalRoute('app_treecounter'),
+                              {
+                                treeCounterId: follow.id,
+                                titleParam: follow.displayName
+                              }
+                            );
+                          }, 0);
+                        }}
+                      >
+                        <Text>{follow.displayName}</Text>
+                      </TouchableItem>
 
-                        <FollowLabelButton
-                          label={i18n.t('label.unsubscribe')}
-                          isSubscribed
-                          onClick={() => {
-                            this.props.unfollowUser(follow.id);
-                          }}
-                        />
-                      </View>
-                    ))}
-                  </View>
-                ) : this.props.followeeList ? (
-                  <Text>{i18n.t('label.not_following_anybody')}</Text>
-                ) : (
-                    <LoadingIndicator contentLoader screen="profileLoader" />
-                  )}
+                      <FollowLabelButton
+                        label={i18n.t('label.unsubscribe')}
+                        isSubscribed
+                        onClick={() => {
+                          this.props.unfollowUser(follow.id);
+                        }}
+                      />
+                    </View>
+                  ))}
+                </View>
+              ) : this.props.followeeList ? (
+                <Text>{i18n.t('label.not_following_anybody')}</Text>
+              ) : (
+                <LoadingIndicator contentLoader screen="profileLoader" />
+              )}
             </ScrollView>
           </CardLayout>
         );
@@ -391,6 +391,7 @@ class SecurityTabView extends React.PureComponent {
     const { emailButtonPress, changPassworsdButtonPress } = this.state;
     return (
       <KeyboardAwareScrollView enableOnAndroid>
+        {/* disabled functionality at July 23th 2022
         <CardLayout style={{ flex: 1 }}>
           <View {...this.props}>
             <Form
@@ -461,6 +462,19 @@ class SecurityTabView extends React.PureComponent {
             {i18n.t('label.delete_profile')}
           </PrimaryButton>
         </CardLayout>
+        */}
+        <CardLayout style={{ flex: 1 }}>
+          <PrimaryButton
+            buttonStyle={styles.deleteProfileButton}
+            onClick={() => {
+              this.props.navigation.navigate('delete_profile_confirm', {
+                deleteProfile: this.props.deleteProfile
+              });
+            }}
+          >
+            {i18n.t('label.delete_profile')}
+          </PrimaryButton>
+        </CardLayout>
       </KeyboardAwareScrollView>
     );
   }
diff --git a/app/components/Redemption/index.native.js b/app/components/Redemption/index.native.js
@@ -16,7 +16,7 @@ import {
 } from 'react-native';
 import { TextField } from 'react-native-material-textfield';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
-// import { SafeAreaView } from 'react-navigation';
+import { SafeAreaView } from 'react-navigation';
 import { Formik } from 'formik';
 import { updateStaticRoute } from '../../helpers/routerHelper';
 import HeaderNew from './../Header/HeaderNew.native';
@@ -66,9 +66,18 @@ export default function Redemption(props) {
 
   const lockedButton = 'rgba(137, 181, 58, 0.19)';
 
+  const style = {
+    backgroundColor: "white",
+    flex: 1,
+    padding: 20,
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center"
+  };
+
   return (
+    /*
     <View style={styles.mainContainer}>
-      {/* <View style={styles.mainContainer}> */}
       <HeaderNew title={''} navigation={props.navigation} />
       <Formik
         initialValues={{
@@ -247,8 +256,33 @@ export default function Redemption(props) {
           </>
         )}
       </Formik>
-      {/* </View> */}
     </View>
+    */
+    <SafeAreaView style={{ flex: 1, backgroundColor: colors.WHITE }}>
+      <HeaderNew
+        navigation={props.navigation}
+        title={i18n.t('label.redeem_trees')}
+      />
+      <View style={style}>
+        <View style={{ paddingBottom: 20 }}>
+          <Image
+            source={require("../../assets/images/gifts.png")}
+            style={{ width: 220, height: 220 }}
+          />
+        </View>
+
+        <Text
+          style={{
+            fontSize: 16,
+            color: "#4d5153",
+            fontFamily: "OpenSans-Regular",
+            textAlign: "center"
+          }}
+        >
+          {i18n.t("label.changed_challenge_workflow")}
+        </Text>
+      </View>
+    </SafeAreaView>
   );
 }
 
diff --git a/app/containers/Navigators/AppDrawerNavigatorContainer.js b/app/containers/Navigators/AppDrawerNavigatorContainer.js
@@ -9,29 +9,8 @@ import { loadUserProfile } from '../../actions/loadUserProfileAction';
 import { currentUserProfileSelector } from '../../selectors';
 import LoadingIndicator from '../../components/Common/LoadingIndicator';
 import { View } from 'react-native';
-import EStyleSheet from 'react-native-extended-stylesheet';
 import { fetchpledgeEventsAction } from '../../actions/pledgeEventsAction';
-EStyleSheet.build({
-  // always call EStyleSheet.build() even if you don't use global variables!
-  $primary: '#b9d384',
-  $textColor: '#686060',
-  $placeholderColor: '#e9e9e9',
-  $colorPrimary: '#b7d37f',
-  $colorPrimaryDark: '#b7d37f',
-  $colorPrimaryAccent: '#e86f56',
-  $colorPrimaryAccentLight: '#ec6453',
-  $borderColor: '#aba2a2',
-  $inputBorderColor: '#dad7d7',
-  $backgroundScreen: '#f1f1f1',
-  $colorError: '#ff0033',
-  $colorRedeemBorder: '#9fc356',
-  $colorRedeemInside: '#f5fbe8',
-  $cardTextColor: '#686060',
-  $lightTextColor: '#9c9b9b',
 
-  $newPrimary: '#89b53a',
-  $greyColor: '#d3d3d3'
-});
 
 class AppDrawerNavigatorContainer extends Component {
   _AppNavigator = undefined;
diff --git a/index.js b/index.js
@@ -1,7 +1,5 @@
 import { AppRegistry } from 'react-native';
 import App from './app/components/App';
-
-/* app.js */
 import EStyleSheet from 'react-native-extended-stylesheet';
 
 // import {
@@ -20,9 +18,21 @@ EStyleSheet.build({
   $colorPrimary: '#b7d37f',
   $colorPrimaryDark: '#b7d37f',
   $colorPrimaryAccent: '#e86f56',
-  $colorPrimaryAccentLight: '#ec6453'
+  $colorPrimaryAccentLight: '#ec6453',
+  $borderColor: '#aba2a2',
+  $inputBorderColor: '#dad7d7',
+  $backgroundScreen: '#f1f1f1',
+  $colorError: '#ff0033',
+  $colorRedeemBorder: '#9fc356',
+  $colorRedeemInside: '#f5fbe8',
+  $cardTextColor: '#686060',
+  $lightTextColor: '#9c9b9b',
+
+  $newPrimary: '#89b53a',
+  $greyColor: '#d3d3d3'
 });
 
+
 // const customTextProps = {
 //   style: {
 //     fontFamily: Platform.OS === 'ios' ? 'HelveticaNeue' : 'Roboto'
diff --git a/index.native.js b/index.native.js
@@ -1,9 +1,32 @@
 import { AppRegistry } from 'react-native';
 import 'react-native-get-random-values';
 import App from './app/components/App';
+import EStyleSheet from 'react-native-extended-stylesheet';
 import './ReactotronConfig';
 import { name as appName } from './app.json';
 
+EStyleSheet.build({
+    // always call EStyleSheet.build() even if you don't use global variables!
+    $primary: '#b9d384',
+    $textColor: '#686060',
+    $placeholderColor: '#e9e9e9',
+    $colorPrimary: '#b7d37f',
+    $colorPrimaryDark: '#b7d37f',
+    $colorPrimaryAccent: '#e86f56',
+    $colorPrimaryAccentLight: '#ec6453',
+    $borderColor: '#aba2a2',
+    $inputBorderColor: '#dad7d7',
+    $backgroundScreen: '#f1f1f1',
+    $colorError: '#ff0033',
+    $colorRedeemBorder: '#9fc356',
+    $colorRedeemInside: '#f5fbe8',
+    $cardTextColor: '#686060',
+    $lightTextColor: '#9c9b9b',
+
+    $newPrimary: '#89b53a',
+    $greyColor: '#d3d3d3'
+  });
+
 console.disableYellowBox = true;
 console.ignoredYellowBox = ['Warning: Each', 'Warning: Failed'];
 //GLOBAL.XMLHttpRequest = GLOBAL.originalXMLHttpRequest || GLOBAL.XMLHttpRequest;
diff --git a/ios/TreecounterApp.xcodeproj/project.pbxproj b/ios/TreecounterApp.xcodeproj/project.pbxproj
@@ -687,7 +687,7 @@
 				CODE_SIGN_ENTITLEMENTS = TreecounterApp/TreecounterApp.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UYRJ8SA699;
 				ENABLE_BITCODE = NO;
@@ -698,7 +698,7 @@
 				INFOPLIST_PREFIX_HEADER = "${BUILD_DIR}/GeneratedInfoPlistDotEnv.h";
 				INFOPLIST_PREPROCESS = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.49.57;
+				MARKETING_VERSION = 1.49.58;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -725,7 +725,7 @@
 				CODE_SIGN_ENTITLEMENTS = TreecounterApp/TreecounterApp.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UYRJ8SA699;
 				HEADER_SEARCH_PATHS = "$(inherited)";
@@ -734,7 +734,7 @@
 				INFOPLIST_PREFIX_HEADER = "${BUILD_DIR}/GeneratedInfoPlistDotEnv.h";
 				INFOPLIST_PREPROCESS = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.49.57;
+				MARKETING_VERSION = 1.49.58;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "treecounterapp",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "build": "1",
   "private": true,
   "scripts": {
diff --git a/release/upload-native-source-maps.sh b/release/upload-native-source-maps.sh
@@ -44,7 +44,7 @@ react-native bundle \
 # For now we have to set this manually here with every release :-(
 bugsnag-source-maps upload-react-native \
    --api-key "$BUGSNAG_API_KEY" \
-   --app-version "1.49.57" \
+   --app-version "1.49.58" \
    --platform ios \
    --source-map ios-release.bundle.map \
    --bundle ios-release.bundle

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "treecounterapp",`
`3`		`- "version": "1.4.7",`
	`3`	`+ "version": "1.4.8",`
`4`	`4`	`"build": "1",`
`5`	`5`	`"private": true,`
`6`	`6`	`"scripts": {`