Move navigation and di packages inside core.

Author: android10

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!--Activities-->
     <activity
-        android:name=".navigation.RouteActivity"
+        android:name="com.fernandocejas.sample.core.navigation.RouteActivity"
         android:noHistory="true"
         android:theme="@style/AppTheme.Translucent">
         <intent-filter>

app/src/main/kotlin/com/fernandocejas/sample/AndroidApplication.kt

@@ -16,9 +16,9 @@
 package com.fernandocejas.sample
 
 import android.app.Application
-import com.fernandocejas.sample.di.ApplicationComponent
-import com.fernandocejas.sample.di.ApplicationModule
-import com.fernandocejas.sample.di.DaggerApplicationComponent
+import com.fernandocejas.sample.core.di.ApplicationComponent
+import com.fernandocejas.sample.core.di.ApplicationModule
+import com.fernandocejas.sample.core.di.DaggerApplicationComponent
 import com.squareup.leakcanary.LeakCanary
 
 class AndroidApplication : Application() {

app/src/main/kotlin/com/fernandocejas/sample/BaseFragment.kt

@@ -24,7 +24,7 @@ import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.fernandocejas.sample.di.ApplicationComponent
+import com.fernandocejas.sample.core.di.ApplicationComponent
 import com.fernandocejas.sample.core.extension.appContext
 import com.fernandocejas.sample.core.extension.viewContainer
 import kotlinx.android.synthetic.main.toolbar.progress

app/src/main/kotlin/com/fernandocejas/sample/di/ApplicationComponent.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/di/ApplicationComponent.kt

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.di
+package com.fernandocejas.sample.core.di
 
 import com.fernandocejas.sample.AndroidApplication
-import com.fernandocejas.sample.di.viewmodel.ViewModelModule
+import com.fernandocejas.sample.core.di.viewmodel.ViewModelModule
 import com.fernandocejas.sample.features.movies.MovieDetailsFragment
 import com.fernandocejas.sample.features.movies.MoviesFragment
-import com.fernandocejas.sample.navigation.RouteActivity
+import com.fernandocejas.sample.core.navigation.RouteActivity
 import dagger.Component
 import javax.inject.Singleton
 

app/src/main/kotlin/com/fernandocejas/sample/di/ApplicationModule.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/di/ApplicationModule.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.di
+package com.fernandocejas.sample.core.di
 
 import android.content.Context
 import com.fernandocejas.sample.AndroidApplication

app/src/main/kotlin/com/fernandocejas/sample/di/viewmodel/ViewModelFactory.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/di/viewmodel/ViewModelFactory.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.di.viewmodel
+package com.fernandocejas.sample.core.di.viewmodel
 
 import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider

app/src/main/kotlin/com/fernandocejas/sample/di/viewmodel/ViewModelKey.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/di/viewmodel/ViewModelKey.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.di.viewmodel
+package com.fernandocejas.sample.core.di.viewmodel
 
 import android.arch.lifecycle.ViewModel
 import dagger.MapKey

app/src/main/kotlin/com/fernandocejas/sample/di/viewmodel/ViewModelModule.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/di/viewmodel/ViewModelModule.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.di.viewmodel
+package com.fernandocejas.sample.core.di.viewmodel
 
 import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider

app/src/main/kotlin/com/fernandocejas/sample/navigation/Navigator.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/navigation/Navigator.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.navigation
+package com.fernandocejas.sample.core.navigation
 
 import android.content.ActivityNotFoundException
 import android.content.Context

app/src/main/kotlin/com/fernandocejas/sample/navigation/RouteActivity.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/navigation/RouteActivity.kt

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.navigation
+package com.fernandocejas.sample.core.navigation
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.fernandocejas.sample.AndroidApplication
-import com.fernandocejas.sample.di.ApplicationComponent
+import com.fernandocejas.sample.core.di.ApplicationComponent
 import javax.inject.Inject
 
 class RouteActivity : AppCompatActivity() {

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MoviesAdapter.kt

@@ -21,7 +21,7 @@ import android.view.ViewGroup
 import com.fernandocejas.sample.R
 import com.fernandocejas.sample.core.extension.inflate
 import com.fernandocejas.sample.core.extension.loadFromUrl
-import com.fernandocejas.sample.navigation.Navigator
+import com.fernandocejas.sample.core.navigation.Navigator
 import kotlinx.android.synthetic.main.row_movie.view.*
 import javax.inject.Inject
 import kotlin.properties.Delegates

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MoviesFragment.kt

@@ -30,7 +30,7 @@ import com.fernandocejas.sample.core.extension.invisible
 import com.fernandocejas.sample.core.extension.observe
 import com.fernandocejas.sample.core.extension.viewModel
 import com.fernandocejas.sample.core.extension.visible
-import com.fernandocejas.sample.navigation.Navigator
+import com.fernandocejas.sample.core.navigation.Navigator
 import kotlinx.android.synthetic.main.fragment_movies.emptyView
 import kotlinx.android.synthetic.main.fragment_movies.movieList
 import javax.inject.Inject

app/src/main/kotlin/com/fernandocejas/sample/features/movies/PlayMovie.kt

@@ -22,7 +22,7 @@ import com.fernandocejas.sample.core.functional.Either
 import com.fernandocejas.sample.core.functional.Either.Right
 import com.fernandocejas.sample.core.interactor.UseCase
 import com.fernandocejas.sample.core.interactor.UseCase.None
-import com.fernandocejas.sample.navigation.Navigator
+import com.fernandocejas.sample.core.navigation.Navigator
 import javax.inject.Inject
 
 class PlayMovie

app/src/test/kotlin/com/fernandocejas/sample/navigation/NavigatorTest.kt renamed to app/src/test/kotlin/com/fernandocejas/sample/core/navigation/NavigatorTest.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.sample.navigation
+package com.fernandocejas.sample.core.navigation
 
 import com.fernandocejas.sample.AndroidTest
 import com.fernandocejas.sample.features.login.Authenticator

app/src/test/kotlin/com/fernandocejas/sample/features/movies/PlayMovieTest.kt

@@ -16,7 +16,7 @@
 package com.fernandocejas.sample.features.movies
 
 import com.fernandocejas.sample.AndroidTest
-import com.fernandocejas.sample.navigation.Navigator
+import com.fernandocejas.sample.core.navigation.Navigator
 import com.nhaarman.mockito_kotlin.verify
 import org.junit.Before
 import org.junit.Test

build.gradle

@@ -56,6 +56,6 @@ task deployDebug(type: Exec, dependsOn: 'app:installDebug') {
     }
     def sdkDir = properties.getProperty('sdk.dir')
     def adb = "$sdkDir/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.fernandocejas.sample/com.fernandocejas.sample.navigation.RouteActivity'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.fernandocejas.sample/com.fernandocejas.sample.core.navigation.RouteActivity'
   }
 }