Merge pull request #15 from NemoOudeis/codestyle

Codestyle

Author: kmmraj

.travis.yml

@@ -89,4 +89,5 @@ install:
 
 script:
   - cp local.properties.ci local.properties
-  - "./gradlew assembleRelease bintrayUpload"
+  - ./gradlew check
+  - if [ TRAVIS_BRANCH == "master" ]; then ./gradlew assembleRelease bintrayUpload; fi

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationAction.kt

@@ -2,15 +2,13 @@ package org.rekotlinrouter
 
 import org.rekotlin.Action
 
-
 class SetRouteAction(var route: Route,
                      var animated: Boolean = true,
-                     action: StandardAction? = null): StandardActionConvertible {
+                     action: StandardAction? = null) : StandardActionConvertible {
 
     companion object {
         const val type = "RE_KOTLIN_ROUTER_SET_ROUTE"
     }
-    
 
     init {
         // TODO: Convert the below to ArrayList
@@ -23,16 +21,13 @@ class SetRouteAction(var route: Route,
 
     override fun toStandardAction(): StandardAction {
 
-        val payloadMap: HashMap<String,Any> = HashMap()
-        payloadMap.put("route",this.route)
-        payloadMap.put("animated",this.animated)
+        val payloadMap: HashMap<String, Any> = HashMap()
+        payloadMap.put("route", this.route)
+        payloadMap.put("animated", this.animated)
         return StandardAction(type = SetRouteAction.type,
                 payload = payloadMap,
-                isTypedAction = true) 
+                isTypedAction = true)
     }
-
-
-
 }
 
-class SetRouteSpecificData ( val route: Route, val data: Any): Action
+class SetRouteSpecificData(val route: Route, val data: Any) : Action

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationReducer.kt

@@ -2,8 +2,6 @@ package org.rekotlinrouter
 
 import org.rekotlin.Action
 
-
-
 /**
 The Navigation Reducer handles the state slice concerned with storing the current navigation
 information. Note, that this reducer is **not** a *top-level* reducer, you need to use it within
@@ -15,20 +13,20 @@ class NavigationReducer {
     companion object NavRed {
 
         fun handleAction(action: Action, state: NavigationState?): NavigationState {
-          var navigationState = state ?: NavigationState()
+            var navigationState = state ?: NavigationState()
 
-          when(action)  {
-            is SetRouteAction -> {
-                navigationState = setRoute(navigationState,action)
-            }
-            is SetRouteSpecificData -> {
-                navigationState = setRouteSpecificData(navigationState, action.route,  action.data)
-            }
-            else -> {
-                navigationState = NavigationState()
+            when (action) {
+                is SetRouteAction -> {
+                    navigationState = setRoute(navigationState, action)
+                }
+                is SetRouteSpecificData -> {
+                    navigationState = setRouteSpecificData(navigationState, action.route, action.data)
+                }
+                else -> {
+                    navigationState = NavigationState()
+                }
             }
-          }
-          return navigationState
+            return navigationState
         }
 
         fun setRoute(state: NavigationState, setRouteAction: SetRouteAction): NavigationState {
@@ -49,7 +47,8 @@ class NavigationReducer {
         }
 
         fun reduce(action: Action, oldState: NavigationState?): NavigationState {
-            val state =  oldState ?: NavigationReducer.handleAction(action = action, state = oldState)
+            val state = oldState
+                    ?: NavigationReducer.handleAction(action = action, state = oldState)
             when (action) {
                 is SetRouteAction -> {
                     return NavigationReducer.handleAction(action = action, state = state)
@@ -63,4 +62,4 @@ class NavigationReducer {
         }
 
     }
-}
+}

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationState.kt

@@ -1,20 +1,16 @@
 package org.rekotlinrouter
 
-
-
 class FullRoute(route: Route) {
     val routeString: String
 
     init {
         this.routeString = route.joinToString(separator = "/")
     }
-
 }
 
-data class NavigationState(var route: Route = arrayListOf() ,
-                       var routeSpecificState: HashMap<String,Any> = HashMap() ,
-                       var changeRouteAnimated: Boolean = true) {
-
+data class NavigationState(var route: Route = arrayListOf(),
+                           var routeSpecificState: HashMap<String, Any> = HashMap(),
+                           var changeRouteAnimated: Boolean = true) {
 
     fun <T> getRouteSpecificState(givenRoutes: Route): T? {
         val fullroute = FullRoute(givenRoutes)
@@ -24,8 +20,6 @@ data class NavigationState(var route: Route = arrayListOf() ,
     }
 }
 
-
-
 interface HasNavigationState {
     var navigationState: NavigationState
-}
+}