Merge branch 'fix/ios13-android-issues' into 'release/3.12.0'

Fix ios 13 and android issues

See merge request !424

App.js

@@ -25,6 +25,7 @@ import {
   Text,
   Alert,
   Clipboard,
+  StatusBar,
 } from 'react-native';
 
 import FlashMessage from 'react-native-flash-message';
@@ -64,6 +65,8 @@ import boostedContentService from './src/common/services/boosted-content.service
 
 let deepLinkUrl = '';
 
+const statusBarStyle = Platform.OS === 'ios' ? 'dark-content' : 'default';
+
 // init push service
 pushService.init();
 
@@ -140,13 +143,10 @@ sessionService.onLogin(async () => {
 
 //on app logout
 sessionService.onLogout(() => {
+
   // clear app badge
   badgeService.setUnreadConversations(0);
   badgeService.setUnreadNotifications(0);
-
-  // clear minds settings
-  mindsService.clear();
-
   // clear offline cache
   entitiesStorage.removeAll();
   feedsStorage.removeAll();
@@ -295,6 +295,7 @@ export default class App extends Component<Props, State> {
     const app = (
       <Provider key="app" {...stores}>
         <ErrorBoundary message="An error occurred" containerStyle={CS.centered}>
+          <StatusBar barStyle={statusBarStyle} />
           <NavigationStack
             ref={navigatorRef => {
               NavigationService.setTopLevelNavigator(navigatorRef);

android/app/src/main/java/com/minds/mobile/MainActivity.java

@@ -47,7 +47,7 @@ public class MainActivity extends ReactActivity implements OnImagePickerPermissi
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+        super.onCreate(null);
         RNBootSplash.show(R.drawable.bootsplash, MainActivity.this);
     }
 

index.android.js

-// created this file because the bundler is not reading index for some reason
-import 'react-native-gesture-handler'; // fix ongesture handler error
-import "@hawkingnetwork/node-libs-react-native/globals";
-import "./global";
-
-import { AppRegistry } from 'react-native';
-import App from './App';
-import { useScreens } from 'react-native-screens';
-useScreens();
-
-// const modules = require.getModules();
-// const moduleIds = Object.keys(modules);
-// const loadedModuleNames = moduleIds
-//   .filter(moduleId => modules[moduleId].isInitialized)
-//   .map(moduleId => modules[moduleId].verboseName);
-// const waitingModuleNames = moduleIds
-//   .filter(moduleId => !modules[moduleId].isInitialized)
-//   .map(moduleId => modules[moduleId].verboseName);
-
-// // make sure that the modules you expect to be waiting are actually waiting
-// console.log(
-//   'loaded:',
-//   loadedModuleNames.length,
-//   'waiting:',
-//   waitingModuleNames.length
-// );
-
-// // grab this text blob, and put it in a file named packager/modulePaths.js
-// console.log(`module.exports = ${JSON.stringify(loadedModuleNames.sort())};`);
-
-AppRegistry.registerComponent('Minds', () => App);
\ No newline at end of file

index.js

-// created this file because the bundler is not reading index for some reason
 import 'react-native-gesture-handler'; // fix ongesture handler error
 import "@hawkingnetwork/node-libs-react-native/globals";
 import "./global";
 
-import { AppRegistry } from 'react-native';
+import { AppRegistry, Platform } from 'react-native';
 import App from './App';
 import { useScreens } from 'react-native-screens';
-useScreens();
+useScreens(Platform.OS !== 'ios');
 
 // const modules = require.getModules();
 // const moduleIds = Object.keys(modules);

ios/Minds/Info.plist

@@ -22,6 +22,8 @@
 	<string>3.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -36,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>201907230145</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

ios/Podfile.lock

@@ -279,7 +279,7 @@ PODS:
     - React
   - RNReanimated (1.4.0):
     - React
-  - RNScreens (1.0.0-alpha.23):
+  - RNScreens (2.0.0-alpha.11):
     - React
   - RNSentry (1.0.9):
     - React
@@ -527,7 +527,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: a4ddde1ffc6e590c8127b8b7eabfdade45475c74
   RNLocalize: 07eb7a91d10021cdf59d80061ebf3adb8a5b5688
   RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
-  RNScreens: f28b48b8345f2f5f39ed6195518291515032a788
+  RNScreens: ad3661f864ef18d952e9a4799b6791683e33c1fc
   RNSentry: 2803ba8c8129dcf26b79e9b4d8c80168be6e4390
   RNShare: 8b171d4b43c1d886917fdd303bf7a4b87167b05c
   RNSVG: f6177f8d7c095fada7cfee2e4bb7388ba426064c

package.json

@@ -64,7 +64,7 @@
     "react-native-qrcode-svg": "^5.2.0",
     "react-native-randombytes": "^3.5.3",
     "react-native-reanimated": "^1.3.0",
-    "react-native-screens": "^1.0.0-alpha.23",
+    "react-native-screens": "^2.0.0-alpha.11",
     "react-native-share": "^2.0.0",
     "react-native-snap-carousel": "^3.8.2",
     "react-native-sqlite-storage": "^4.1.0",

src/auth/LoginForm.js

@@ -55,7 +55,6 @@ export default class LoginForm extends Component {
    * Render
    */
   render() {
-    console.log('IST',Platform.isTesting);
     const msg = this.state.msg ? (
       <Animatable.Text animation="bounceInLeft" style={[CommonStyle.colorLight, { textAlign: 'center' }]} testID="loginMsg">{this.state.msg}</Animatable.Text>
     ) : null;

yarn.lock

@@ -8797,13 +8797,20 @@ react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.6:
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-"react-native-screens@^1.0.0 || ^1.0.0-alpha", react-native-screens@^1.0.0-alpha.23:
+"react-native-screens@^1.0.0 || ^1.0.0-alpha":
   version "1.0.0-alpha.23"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0"
   integrity sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==
   dependencies:
     debounce "^1.2.0"
 
+react-native-screens@^2.0.0-alpha.11:
+  version "2.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.11.tgz#077674284e0f80130cf971ba8eacc4f969724eea"
+  integrity sha512-Sw01mMTvqMgNl4stk7rdcE8LRiISTx7DhXMeBgvmlI4uF1rIZBFcTV5tH/wZ8ld6Pa/H5ASKWAiaaMMxgv1fBw==
+  dependencies:
+    debounce "^1.2.0"
+
 react-native-scrollable-mixin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-native-scrollable-mixin/-/react-native-scrollable-mixin-1.0.1.tgz#34a32167b64248594154fd0d6a8b03f22740548e"