Moved the usecases to a separate package, so the ui package is purely…

… UI only.
CodemateLtd · Feb 1, 2017 · 0b9daab · 0b9daab
1 parent bdfd0d8
commit 0b9daab
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/app/src/main/java/com/codemate/koffeemate/di/modules/AppModule.kt b/app/src/main/java/com/codemate/koffeemate/di/modules/AppModule.kt
@@ -25,9 +25,9 @@ import com.codemate.koffeemate.data.local.CoffeeEventRepository
 import com.codemate.koffeemate.data.local.CoffeePreferences
 import com.codemate.koffeemate.data.local.UserRepository
 import com.codemate.koffeemate.data.network.SlackApi
-import com.codemate.koffeemate.ui.userselector.LoadUsersUseCase
-import com.codemate.koffeemate.ui.main.PostAccidentUseCase
-import com.codemate.koffeemate.ui.main.SendCoffeeAnnouncementUseCase
+import com.codemate.koffeemate.usecases.LoadUsersUseCase
+import com.codemate.koffeemate.usecases.PostAccidentUseCase
+import com.codemate.koffeemate.usecases.SendCoffeeAnnouncementUseCase
 import dagger.Module
 import dagger.Provides
 import rx.android.schedulers.AndroidSchedulers

diff --git a/app/src/main/java/com/codemate/koffeemate/ui/main/MainPresenter.kt b/app/src/main/java/com/codemate/koffeemate/ui/main/MainPresenter.kt
@@ -7,6 +7,8 @@ import com.codemate.koffeemate.data.local.CoffeeEventRepository
 import com.codemate.koffeemate.data.local.CoffeePreferences
 import com.codemate.koffeemate.data.models.User
 import com.codemate.koffeemate.ui.base.BasePresenter
+import com.codemate.koffeemate.usecases.PostAccidentUseCase
+import com.codemate.koffeemate.usecases.SendCoffeeAnnouncementUseCase
 import okhttp3.ResponseBody
 import retrofit2.Response
 import rx.Subscriber

diff --git a/app/src/main/java/com/codemate/koffeemate/ui/userselector/UserSelectorPresenter.kt b/app/src/main/java/com/codemate/koffeemate/ui/userselector/UserSelectorPresenter.kt
@@ -2,6 +2,7 @@ package com.codemate.koffeemate.ui.userselector
 
 import com.codemate.koffeemate.data.models.User
 import com.codemate.koffeemate.ui.base.BasePresenter
+import com.codemate.koffeemate.usecases.LoadUsersUseCase
 import rx.Subscriber
 import javax.inject.Inject
 

diff --git a/...emate/ui/userselector/LoadUsersUseCase.kt → ...e/koffeemate/usecases/LoadUsersUseCase.kt b/...emate/ui/userselector/LoadUsersUseCase.kt → ...e/koffeemate/usecases/LoadUsersUseCase.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.userselector
+package com.codemate.koffeemate.usecases
 
 import com.codemate.koffeemate.BuildConfig
 import com.codemate.koffeemate.data.local.UserRepository

diff --git a/...koffeemate/ui/main/PostAccidentUseCase.kt → ...offeemate/usecases/PostAccidentUseCase.kt b/...koffeemate/ui/main/PostAccidentUseCase.kt → ...offeemate/usecases/PostAccidentUseCase.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.main
+package com.codemate.koffeemate.usecases
 
 import android.graphics.Bitmap
 import com.codemate.koffeemate.common.AwardBadgeCreator

diff --git a/.../ui/main/SendCoffeeAnnouncementUseCase.kt → ...usecases/SendCoffeeAnnouncementUseCase.kt b/.../ui/main/SendCoffeeAnnouncementUseCase.kt → ...usecases/SendCoffeeAnnouncementUseCase.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.main
+package com.codemate.koffeemate.usecases
 
 import com.codemate.koffeemate.data.network.SlackApi
 import okhttp3.ResponseBody

diff --git a/app/src/test/java/com/codemate/koffeemate/ui/main/MainPresenterTest.kt b/app/src/test/java/com/codemate/koffeemate/ui/main/MainPresenterTest.kt
@@ -12,6 +12,8 @@ import com.codemate.koffeemate.data.models.CoffeeBrewingEvent
 import com.codemate.koffeemate.data.network.SlackApi
 import com.codemate.koffeemate.testutils.fakeUser
 import com.codemate.koffeemate.testutils.getResourceFile
+import com.codemate.koffeemate.usecases.PostAccidentUseCase
+import com.codemate.koffeemate.usecases.SendCoffeeAnnouncementUseCase
 import com.nhaarman.mockito_kotlin.*
 import okhttp3.MediaType
 import okhttp3.ResponseBody

diff --git a/app/src/test/java/com/codemate/koffeemate/ui/userselector/UserSelectorPresenterTest.kt b/app/src/test/java/com/codemate/koffeemate/ui/userselector/UserSelectorPresenterTest.kt
@@ -8,6 +8,7 @@ import com.codemate.koffeemate.data.models.UserListResponse
 import com.codemate.koffeemate.data.network.SlackApi
 import com.codemate.koffeemate.testutils.fakeUser
 import com.codemate.koffeemate.testutils.getResourceFile
+import com.codemate.koffeemate.usecases.LoadUsersUseCase
 import com.nhaarman.mockito_kotlin.*
 import org.junit.Before
 import org.junit.Test

diff --git a/...e/ui/userselector/LoadUsersUseCaseTest.kt → ...ffeemate/usecases/LoadUsersUseCaseTest.kt b/...e/ui/userselector/LoadUsersUseCaseTest.kt → ...ffeemate/usecases/LoadUsersUseCaseTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.userselector
+package com.codemate.koffeemate.usecases
 
 import com.codemate.koffeemate.BuildConfig
 import com.codemate.koffeemate.data.local.UserRepository

diff --git a/...i/userselector/PostAccidentUseCaseTest.kt → ...emate/usecases/PostAccidentUseCaseTest.kt b/...i/userselector/PostAccidentUseCaseTest.kt → ...emate/usecases/PostAccidentUseCaseTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.userselector
+package com.codemate.koffeemate.usecases
 
 import android.content.SharedPreferences
 import android.graphics.Bitmap
@@ -27,7 +27,6 @@ import com.codemate.koffeemate.data.network.SlackService
 import com.codemate.koffeemate.testutils.RegexMatcher.Companion.matchesPattern
 import com.codemate.koffeemate.testutils.fakeUser
 import com.codemate.koffeemate.testutils.getResourceFile
-import com.codemate.koffeemate.ui.main.PostAccidentUseCase
 import com.nhaarman.mockito_kotlin.*
 import okhttp3.ResponseBody
 import okhttp3.mockwebserver.MockResponse

diff --git a/...main/SendCoffeeAnnouncementUseCaseTest.kt → ...ases/SendCoffeeAnnouncementUseCaseTest.kt b/...main/SendCoffeeAnnouncementUseCaseTest.kt → ...ases/SendCoffeeAnnouncementUseCaseTest.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.codemate.koffeemate.ui.main
+package com.codemate.koffeemate.usecases
 
 import com.codemate.koffeemate.BuildConfig
 import com.codemate.koffeemate.data.network.SlackApi
 import com.codemate.koffeemate.data.network.SlackService
-import okhttp3.Dispatcher
 import okhttp3.ResponseBody
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer