Merge pull request #85 from infinitered/saga-updates

[Base] Saga version and method updates + others

Author: GantMan

ignite-base/App/Containers/AllComponentsScreen.js

@@ -44,7 +44,7 @@ export default class AllComponentsScreen extends React.Component {
     // Request premissions only if the user has logged in.
     const { loggedIn } = nextProps
     if (loggedIn) {
-      console.log('Requesting push notification permissions.')
+      if (__DEV__) console.log('Requesting push notification permissions.')
       PushNotification.requestPermissions()
     }
   }

ignite-base/App/Containers/LoginScreen.js

@@ -111,7 +111,7 @@ class LoginScreen extends Component {
     const textInputStyle = editable ? Styles.textInput : Styles.textInputReadonly
     return (
       <View style={[Styles.container, {height: this.state.visibleHeight}]}>
-        <Image source={Images.logo} style={[Styles.topLogo, this.state.topLogo]}/>
+        <Image source={Images.logo} style={[Styles.topLogo, this.state.topLogo]} />
         <View style={Styles.form}>
           <View style={Styles.row}>
             <Text style={Styles.rowLabel}>{I18n.t('username')}</Text>

ignite-base/App/Navigation/NavigationBarRouteMapper.js

@@ -1,5 +1,4 @@
-import React from 'react-native'
-import { Text, View } from 'react-native'
+import React, { Text, View } from 'react-native'
 // For some reason using this causes a crash: Investigate
 // import { MapButton } from '../Components/Buttons/MapButton'
 import NavButtons from './NavButtons'
@@ -8,8 +7,8 @@ import styles from './Styles/NavigationStyle'
 
 export default {
 
-  CreateButton (button_id, navigator) {
-    switch (button_id) {
+  CreateButton (buttonId, navigator) {
+    switch (buttonId) {
       // case 'SEARCH':
       //   return NavButtons.searchButton(navigator.state.tapSearch)
       // case 'MAP':

ignite-base/App/Navigation/Router.js

@@ -1,4 +1,4 @@
-import React from 'react-native'
+import React from 'react'
 import { Transitions } from '../Themes/'
 
 export default {

ignite-base/App/Root.js

@@ -16,12 +16,12 @@ PushNotification.configure({
 
   // (optional) Called when Token is generated (iOS and Android)
   onRegister: (token) => {
-    console.log('TOKEN:', token)
+    if (__DEV__) console.log('TOKEN:', token)
   },
 
   // (required) Called when a remote or local notification is opened or received
   onNotification: (notification) => {
-    console.log('NOTIFICATION:', notification)
+    if (__DEV__) console.log('NOTIFICATION:', notification)
   },
 
   // ANDROID ONLY: (optional) GCM Sender ID.

ignite-base/App/Sagas/index.js

@@ -1,3 +1,4 @@
+import { fork } from 'redux-saga/effects'
 import API from '../Services/Api'
 import { watchStartup } from './StartupSaga'
 import { watchLoginAttempt } from './LoginSaga'
@@ -9,8 +10,8 @@ import getCityWeather from './GetCityWeatherSaga'
 const api = API.create()
 
 // start the daemons
-export default [
-  watchStartup,
-  watchLoginAttempt,
-  getCityWeather(api).watcher
-]
+export default function * root () {
+  yield fork(watchStartup)
+  yield fork(watchLoginAttempt)
+  yield fork(getCityWeather(api).watcher)
+}

ignite-base/App/Store/Store.js

@@ -4,7 +4,7 @@ import { AsyncStorage } from 'react-native'
 import createLogger from 'redux-logger'
 import rootReducer, { persistentStoreBlacklist } from '../Reducers/'
 import Config from '../Config/DebugSettings'
-import sagaMiddleware from 'redux-saga'
+import createSagaMiddleware from 'redux-saga'
 import sagas from '../Sagas/'
 import R from 'ramda'
 import immutablePersistenceTransform from './ImmutablePersistenceTransform'
@@ -19,11 +19,13 @@ const logger = createLogger({
   predicate: (getState, { type }) => USE_LOGGING && R.not(R.contains(type, SAGA_LOGGING_BLACKLIST))
 })
 
-let middleware = [sagaMiddleware(...sagas)]
+let middleware = []
+const sagaMiddleware = createSagaMiddleware()
+middleware.push(sagaMiddleware)
 
 // Don't ship these
 if (__DEV__) {
-  middleware.push[logger]
+  middleware.push(logger)
 }
 
 // a function which can create our store and auto-persist the data
@@ -61,5 +63,8 @@ export default () => {
     )
   }
 
+  // run sagas
+  sagaMiddleware.run(sagas)
+
   return store
 }

ignite-base/android/app/app.iml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

ignite-base/android/app/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip