ostelco · havard024 · Oct 16, 2018 · Oct 16, 2018 · Oct 16, 2018 · Oct 16, 2018
diff --git a/App.js b/App.js
@@ -63,8 +63,9 @@ export default class App extends React.Component {
   _handleAppStateChange = async (nextAppState) => {
     // Get remote config when app enters foreground
     if (this.state.appState === 'active' && nextAppState.match(/inactive|background/)) {
-      SplashScreen.show();
+
     } else if (this.state.appState.match(/inactive|background/) && nextAppState === 'active') {
+      SplashScreen.show();
       getRemoteConfig(_getRemoteConfigCallback);
       setBundlesTimer()
       const loginStatus = await autoLogin();

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -125,8 +125,8 @@ android {
         applicationId "digital.telenor.panacea"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 22
-        versionName "2.12.0"
+        versionCode 26
+        versionName "2.13.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -190,15 +190,15 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
-    implementation "com.google.firebase:firebase-analytics:15.0.2"
+    implementation "com.google.firebase:firebase-analytics:16.0.4"
     implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
         transitive = true
     }
-    implementation "com.google.firebase:firebase-perf:15.1.0"
-    implementation "com.google.firebase:firebase-crash:15.0.2"
-    implementation "com.google.firebase:firebase-config:15.0.2"
-    implementation "com.google.firebase:firebase-messaging:15.0.2"
-    implementation "com.google.firebase:firebase-invites:15.0.1"
+    implementation "com.google.firebase:firebase-perf:16.1.2"
+    implementation "com.google.firebase:firebase-crash:16.2.1"
+    implementation "com.google.firebase:firebase-config:16.0.1"
+    implementation "com.google.firebase:firebase-messaging:17.3.3"
+    implementation "com.google.firebase:firebase-invites:16.0.4"
 
 }
 

diff --git a/android/app/src/main/java/digital/telenor/panacea/MainActivity.java b/android/app/src/main/java/digital/telenor/panacea/MainActivity.java
@@ -17,7 +17,7 @@ protected String getMainComponentName() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen.show(this);
+        SplashScreen.show(this, true);
         super.onCreate(savedInstanceState);
     }
 }
diff --git a/android/app/src/main/res/drawable-land-hdpi/launch_screen.png b/android/app/src/main/res/drawable-land-hdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-land-ldpi/launch_screen.png b/android/app/src/main/res/drawable-land-ldpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-land-mdpi/launch_screen.png b/android/app/src/main/res/drawable-land-mdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-land-xhdpi/launch_screen.png b/android/app/src/main/res/drawable-land-xhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-land-xxhdpi/launch_screen.png b/android/app/src/main/res/drawable-land-xxhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/launch_screen.png b/android/app/src/main/res/drawable-land-xxxhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-hdpi/launch_screen.png b/android/app/src/main/res/drawable-port-hdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-ldpi/launch_screen.png b/android/app/src/main/res/drawable-port-ldpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-mdpi/launch_screen.png b/android/app/src/main/res/drawable-port-mdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-xhdpi/launch_screen.png b/android/app/src/main/res/drawable-port-xhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-xxhdpi/launch_screen.png b/android/app/src/main/res/drawable-port-xxhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/launch_screen.png b/android/app/src/main/res/drawable-port-xxxhdpi/launch_screen.png
diff --git a/android/app/src/main/res/drawable/launch_screen_bitmap.xml b/android/app/src/main/res/drawable/launch_screen_bitmap.xml
@@ -1,4 +1,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@android:color/white" />
+    </shape>
+  </item>
   <item>
     <bitmap
       android:orientation="vertical" android:layout_width="match_parent"

diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@drawable/launch_screen">
+              android:layout_width="match_parent"
+              android:background="@color/splashBackground"
+               android:layout_height="match_parent">
+    <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/launch_screen" />
 </LinearLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="splashBackground" type="color">#FC9CA8</item>
+    <item name="splashBackground" type="color">#ffffff</item>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -2,5 +2,8 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
         <item name="android:windowBackground">@drawable/launch_screen_bitmap</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">#ffffff</item>
+        <item name="colorPrimaryDark">#400101</item>
     </style>
 </resources>
diff --git a/app/components/AppHeader/styles.js b/app/components/AppHeader/styles.js
@@ -3,6 +3,6 @@ import {colors} from "../../config/colors";
 
 export default StyleSheet.create({
   header: {
-    backgroundColor: colors.rosa
+    backgroundColor: colors.lipstick
   }
 });
diff --git a/app/config/colors.js b/app/config/colors.js
@@ -5,5 +5,6 @@ export const colors = {
   duskBlue: "#214577",
   brownishGrey: "#646464",
   whiteTwo: "#f6f6f6",
-  black: "#000000"
+  black: "#000000",
+  lipstick: "#bf1d42"
 };
diff --git a/app/config/fonts.js b/app/config/fonts.js
@@ -129,7 +129,7 @@ export const textStyles = StyleSheet.create({
     lineHeight: 28,
     letterSpacing: 0,
     textAlign: "left",
-    color: colors.rosa
+    color: colors.lipstick
   },
   textStyle6: {
     // fontFamily: "Nudista",

diff --git a/app/containers/GDPR/styles.js b/app/containers/GDPR/styles.js
@@ -40,7 +40,7 @@ export default StyleSheet.create({
     justifyContent: 'center',
     height: 60,
     borderRadius: 5,
-    backgroundColor: colors.rosa
+    backgroundColor: colors.lipstick
   },
   privacyTextContainer: {
     flex: 1,

diff --git a/app/containers/Home/Home.js b/app/containers/Home/Home.js
@@ -46,7 +46,7 @@ const Home = props => {
         </View>
       ) : null}
       <ReferralMessageModal isDialogVisible={showReferralMessage} goBack={closeReferralMessage} itemDescription={'1 GB'} closeButtonLabel={'Much Appreciated!'} />
-      <Header noShadow androidStatusBarColor={'rgba(0,0,0,0.5)'} style={styles.header}>
+      <Header noShadow androidStatusBarColor={'rgba(0,0,0,0.95)'} style={styles.header}>
         <Left></Left>
         <Body>
           <Title style={textStyles.textStyle11}>
@@ -82,7 +82,7 @@ const Home = props => {
             </Body>
           </ListItem>
         </List>
-        <RoundedBorder color={colors.rosa} />
+        <RoundedBorder color={colors.lipstick} />
         { specialOffer ? (
           <View style={styles.specialOfferContainer}>
             <View style={styles.specialOffer}>
@@ -142,8 +142,15 @@ const ReferralFooterContainer = compose(
   lifecycle({
     async componentDidMount() {
       const { referralId, setReferralLink, profile } = this.props;
-      const referralLink = await getReferralLink(referralId, profile.data.name)
-      setReferralLink(referralLink);
+      try {
+        const referralLink = await getReferralLink(referralId, profile.data.name)
+        console.log('ref link', referralLink)
+        setReferralLink(referralLink);
+      } catch (err) {
+        console.log('Failed to create referral link', err);
+        alert('Failed to create referral link.')
+      }
+
     }
   }),
   branch(({ referralLink}) => referralLink === '', renderNothing)

diff --git a/app/containers/Home/Referral.js b/app/containers/Home/Referral.js
@@ -8,7 +8,7 @@ const Referral = (props) => {
   const { referralLink, name } = props;
 
   return (
-    <TouchableOpacity style={{ flex: 1, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', paddingHorizontal: 30, paddingVertical: 12, backgroundColor: colors.rosa }} onPress={() => {
+    <TouchableOpacity style={{ flex: 1, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', paddingHorizontal: 30, paddingVertical: 12, backgroundColor: colors.lipstick }} onPress={() => {
       Share.share({
         title: 'Share the love',
         message: `Hi there, just sending you the share link to the awesome service I mentioned.\n${name ? `Sincerely ${name}.` : '' }${ Platform.OS === 'ios' ? '' : `\n${referralLink}`}`,

diff --git a/app/containers/Home/components/ReferralMessageModal/styles.js b/app/containers/Home/components/ReferralMessageModal/styles.js
@@ -23,7 +23,7 @@ export default StyleSheet.create({
   button: {
     height: 60,
     borderRadius: 5,
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     justifyContent: 'center'
   }
 });
diff --git a/app/containers/Home/styles.js b/app/containers/Home/styles.js
@@ -6,7 +6,7 @@ export default StyleSheet.create({
     backgroundColor: colors.whiteTwo
   },
   header: {
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     borderBottomWidth: 0,
     zIndex: 1
   },
@@ -20,7 +20,7 @@ export default StyleSheet.create({
     flex: 1
   },
   topContentContainer: {
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     zIndex: 1
   },
   staticOfferContainer: {
@@ -58,7 +58,7 @@ export default StyleSheet.create({
     width: 220,
     height: 60,
     borderRadius: 5,
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     paddingHorizontal: 40,
     flexDirection: 'row',
     justifyContent: 'center'
@@ -68,7 +68,7 @@ export default StyleSheet.create({
     justifyContent: 'center'
   },
   emptyOfferIcon: {
-    color: colors.rosa
+    color: colors.lipstick
   },
   footer: {
     padding: 0

diff --git a/app/containers/OnBoarding/OnBoarding.js b/app/containers/OnBoarding/OnBoarding.js
@@ -12,10 +12,13 @@ const OnBoarding = (props) => {
   const { showTermsAndConditions, signIn, style, textStyles, androidStatusBarColor, loginButtonLabel, termsAndConditionsLabel, onBoardingDescriptionLabel, loginButtonIconName, title } = props;
   return (
     <Container>
-      <Image source={require('../../../assets/sweets.jpg')} style={style.containerImage} />
-      <Header androidStatusBarColor={androidStatusBarColor} style={style.header} noShadow>
+      <Image source={require('../../../assets/bg.png')} style={style.containerImage} />
+      <View style={{ position: 'absolute', bottom: 5, right: 5 }}>
+        <AppVersion />
+      </View>
+      <Header androidStatusBarColor={androidStatusBarColor} style={style.header} noShadow transparent>
         <Body style={style.headerContent}>
-          <Title style={textStyles.textStyle11}>{title} <AppVersion /> </Title>
+          <Title style={textStyles.textStyle11}>{title}</Title>
         </Body>
       </Header>
       <Content contentContainerStyle={style.contentContainer}>
@@ -51,7 +54,7 @@ OnBoarding.propTypes = {
 };
 
 OnBoarding.defaultProps = {
-  androidStatusBarColor: 'rgba(0,0,0,0.5)',
+  androidStatusBarColor: 'rgba(0,0,0,0.95)',
   style: styles,
   textStyles,
 };

diff --git a/app/containers/Payment/components/PaymentSuccessModal/styles.js b/app/containers/Payment/components/PaymentSuccessModal/styles.js
@@ -23,7 +23,7 @@ export default StyleSheet.create({
   button: {
     height: 60,
     borderRadius: 5,
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     justifyContent: 'center'
   }
 });
diff --git a/app/containers/Payment/styles.js b/app/containers/Payment/styles.js
@@ -60,7 +60,7 @@ export default StyleSheet.create({
     width: '100%',
     height: 60,
     borderRadius: 5,
-    backgroundColor: colors.rosa,
+    backgroundColor: colors.lipstick,
     justifyContent: 'center'
   }
 });
diff --git a/app/containers/Settings/Settings.js b/app/containers/Settings/Settings.js
@@ -26,7 +26,7 @@ const Settings = props => {
       <Content>
         <View style={styles.topButtonContainer}>
           <TouchableOpacity onPress={showUserDetails} style={styles.flex}>
-            <IconButton iconName="person" label="Personal details" color={colors.rosa} />
+            <IconButton iconName="person" label="Personal details" color={colors.lipstick} />
           </TouchableOpacity>
           <TouchableOpacity onPress={showPrivacy} style={styles.flex}>
             <IconButton iconName="shirt" label="Privacy" color={colors.duskBlue} />

diff --git a/app/containers/UserDetailsEdit/styles.js b/app/containers/UserDetailsEdit/styles.js
@@ -27,7 +27,7 @@ export default StyleSheet.create({
     borderRadius: 0
   },
   submitButton: {
-    backgroundColor: colors.rosa
+    backgroundColor: colors.lipstick
   },
   cancelButton: {
     backgroundColor: colors.white

diff --git a/app/helper/referral.js b/app/helper/referral.js
@@ -3,11 +3,14 @@ import { AsyncStorage } from "react-native";
 import URI from 'urijs';
 
 export const getReferralLink = async (uid, name) => {
-  let shareLink = `https://digital.telenor.panacea/invite?uid=${encodeURI(uid)}`;
 
+  console.log('1');
+  let shareLink = `https://digital.telenor.panacea/invite?uid=${encodeURI(uid)}`;
+  console.log('2');
   if (name) {
     shareLink += `&name=${encodeURI(name)}`
   }
+  console.log('3');
 
   const link = new firebase.links.DynamicLink(shareLink, 'wm3db.app.goo.gl')
   .ios.setBundleId('digital.telenor.panacea')
@@ -17,7 +20,7 @@ export const getReferralLink = async (uid, name) => {
   .social.setImageUrl('https://picsum.photos/400/300?image=0')
   .social.setTitle('FREE DATA!!!')
   .social.setDescriptionText('Join our service and get 1 GB free data on signup.');
-
+  console.log('4');
   // link.android.setMinimumVersion(14);
 
   return firebase.links().createShortDynamicLink(link, 'UNGUESSABLE')

diff --git a/assets/bg.png b/assets/bg.png
diff --git a/assets/splash.png b/assets/splash.png
diff --git a/ios/PanaceaReactNativeClient-tvOS/Info.plist b/ios/PanaceaReactNativeClient-tvOS/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.12.0</string>
+	<string>2.13.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>36</string>
+	<string>38</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/ios/PanaceaReactNativeClient-tvOSTests/Info.plist b/ios/PanaceaReactNativeClient-tvOSTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.12.0</string>
+	<string>2.13.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>36</string>
+	<string>38</string>
 </dict>
 </plist>
diff --git a/ios/PanaceaReactNativeClient.xcodeproj/project.pbxproj b/ios/PanaceaReactNativeClient.xcodeproj/project.pbxproj
@@ -1620,7 +1620,7 @@
 				CODE_SIGN_ENTITLEMENTS = PanaceaReactNativeClient/PanaceaReactNativeClient.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 38;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = G4VMYY2CK5;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1660,7 +1660,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 38;
 				DEVELOPMENT_TEAM = G4VMYY2CK5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/ios/PanaceaReactNativeClient/Info.plist b/ios/PanaceaReactNativeClient/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.12.0</string>
+	<string>2.13.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>36</string>
+	<string>38</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/ios/PanaceaReactNativeClientTests/Info.plist b/ios/PanaceaReactNativeClientTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.12.0</string>
+	<string>2.13.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>36</string>
+	<string>38</string>
 </dict>
 </plist>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PanaceaReactNativeClient",
-  "version": "2.12.0",
+  "version": "2.13.1",
   "private": true,
   "devDependencies": {
     "@babel/core": "^7.0.0",