Skip to content

Commit c531c35

Browse files
authored
Move data layer files into correct folders and packages (#914)
* Move data layer files into correct folders and packages * Make test package strcture match main * Fix spotless issues
1 parent 42d65a6 commit c531c35

File tree

26 files changed

+45
-62
lines changed

26 files changed

+45
-62
lines changed

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
3232
import androidx.test.filters.MediumTest
3333
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
3434
import com.example.android.architecture.blueprints.todoapp.R
35-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
35+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
3636
import com.google.accompanist.appcompattheme.AppCompatTheme
3737
import dagger.hilt.android.testing.HiltAndroidRule
3838
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2424
import androidx.test.filters.MediumTest
2525
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
2626
import com.example.android.architecture.blueprints.todoapp.R
27-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
27+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
2828
import com.google.accompanist.appcompattheme.AppCompatTheme
2929
import dagger.hilt.android.testing.HiltAndroidRule
3030
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2828
import androidx.test.filters.MediumTest
2929
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
3030
import com.example.android.architecture.blueprints.todoapp.data.Task
31-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
31+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
3232
import com.google.accompanist.appcompattheme.AppCompatTheme
3333
import dagger.hilt.android.testing.HiltAndroidRule
3434
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.test.filters.LargeTest
3030
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
3131
import com.example.android.architecture.blueprints.todoapp.R
3232
import com.example.android.architecture.blueprints.todoapp.TodoNavGraph
33-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
33+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
3434
import com.google.accompanist.appcompattheme.AppCompatTheme
3535
import dagger.hilt.android.testing.HiltAndroidRule
3636
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2929
import androidx.test.filters.MediumTest
3030
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
3131
import com.example.android.architecture.blueprints.todoapp.R
32-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
32+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
3333
import com.google.accompanist.appcompattheme.AppCompatTheme
3434
import dagger.hilt.android.testing.HiltAndroidRule
3535
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import androidx.test.filters.LargeTest
3535
import com.example.android.architecture.blueprints.todoapp.HiltTestActivity
3636
import com.example.android.architecture.blueprints.todoapp.R
3737
import com.example.android.architecture.blueprints.todoapp.TodoNavGraph
38-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
38+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
3939
import com.google.accompanist.appcompattheme.AppCompatTheme
4040
import dagger.hilt.android.testing.HiltAndroidRule
4141
import dagger.hilt.android.testing.HiltAndroidTest

app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.lifecycle.ViewModel
2121
import androidx.lifecycle.viewModelScope
2222
import com.example.android.architecture.blueprints.todoapp.R
2323
import com.example.android.architecture.blueprints.todoapp.TodoDestinationsArgs
24-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
24+
import com.example.android.architecture.blueprints.todoapp.data.TasksRepository
2525
import dagger.hilt.android.lifecycle.HiltViewModel
2626
import javax.inject.Inject
2727
import kotlinx.coroutines.flow.MutableStateFlow
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.architecture.blueprints.todoapp.data.source
17+
package com.example.android.architecture.blueprints.todoapp.data
1818

19-
import com.example.android.architecture.blueprints.todoapp.data.Task
2019
import com.example.android.architecture.blueprints.todoapp.data.source.local.TasksDao
21-
import com.example.android.architecture.blueprints.todoapp.data.toExternalModel
22-
import com.example.android.architecture.blueprints.todoapp.data.toLocalModel
23-
import com.example.android.architecture.blueprints.todoapp.data.toNetworkModel
24-
import com.example.android.architecture.blueprints.todoapp.data.toTaskEntity
20+
import com.example.android.architecture.blueprints.todoapp.data.source.network.NetworkDataSource
2521
import kotlinx.coroutines.coroutineScope
2622
import kotlinx.coroutines.flow.Flow
2723
import kotlinx.coroutines.flow.map

app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/ModelMappingExt.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.example.android.architecture.blueprints.todoapp.data
1818

1919
import com.example.android.architecture.blueprints.todoapp.data.source.local.LocalTask
20-
import com.example.android.architecture.blueprints.todoapp.data.source.remote.NetworkTask
21-
import com.example.android.architecture.blueprints.todoapp.data.source.remote.TaskStatus
20+
import com.example.android.architecture.blueprints.todoapp.data.source.network.NetworkTask
21+
import com.example.android.architecture.blueprints.todoapp.data.source.network.TaskStatus
2222

2323
/**
2424
* Data model mapping extension functions. There are three model types:
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.architecture.blueprints.todoapp.data.source
17+
package com.example.android.architecture.blueprints.todoapp.data
1818

19-
import com.example.android.architecture.blueprints.todoapp.data.Task
2019
import kotlinx.coroutines.flow.Flow
2120

2221
/**

0 commit comments

Comments
 (0)