Skip to content

Commit 20b3d95

Browse files
RazeemanRazeeman
committed
change wear package structure
1 parent 441ddde commit 20b3d95

File tree

19 files changed

+33
-34
lines changed

19 files changed

+33
-34
lines changed

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/data/Messenger.kt ‎wear/src/main/java/com/example/util/simpletimetracker/data/Messenger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.data
6+
package com.example.util.simpletimetracker.data
77

88
import android.content.Context
99
import android.util.Log

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/data/WearRPCClient.kt ‎wear/src/main/java/com/example/util/simpletimetracker/data/WearRPCClient.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.data
6+
package com.example.util.simpletimetracker.data
77

88
import com.example.util.simpletimetracker.wear_api.WearActivity
99
import com.example.util.simpletimetracker.wear_api.WearCurrentActivity

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/data/WearRPCException.kt ‎wear/src/main/java/com/example/util/simpletimetracker/data/WearRPCException.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.data
6+
package com.example.util.simpletimetracker.data
77

88
// TODO catch exception and show error?
99
class WearRPCException(message: String) : Exception(message)

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/di/WearModule.kt ‎wear/src/main/java/com/example/util/simpletimetracker/di/WearModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.di
6+
package com.example.util.simpletimetracker.di
77

8-
import com.example.util.simpletimetracker.presentation.data.ContextMessenger
9-
import com.example.util.simpletimetracker.presentation.data.Messenger
8+
import com.example.util.simpletimetracker.data.ContextMessenger
9+
import com.example.util.simpletimetracker.data.Messenger
1010
import dagger.Binds
1111
import dagger.Module
1212
import dagger.hilt.InstallIn

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/mediators/CurrentActivitiesMediator.kt ‎wear/src/main/java/com/example/util/simpletimetracker/domain/CurrentActivitiesMediator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.example.util.simpletimetracker.presentation.mediators
1+
package com.example.util.simpletimetracker.domain
22

3-
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
3+
import com.example.util.simpletimetracker.data.WearRPCClient
44
import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
55
import com.example.util.simpletimetracker.wear_api.WearSettings
66
import com.example.util.simpletimetracker.wear_api.WearTag

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/mediators/StartActivityMediator.kt ‎wear/src/main/java/com/example/util/simpletimetracker/domain/StartActivityMediator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.mediators
6+
package com.example.util.simpletimetracker.domain
77

8-
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
8+
import com.example.util.simpletimetracker.data.WearRPCClient
99
import com.example.util.simpletimetracker.wear_api.WearActivity
1010
import com.example.util.simpletimetracker.wear_api.WearSettings
1111
import javax.inject.Inject

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/navigation/NavigationExtensions.kt ‎wear/src/main/java/com/example/util/simpletimetracker/navigation/NavigationExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.navigation
6+
package com.example.util.simpletimetracker.navigation
77

88
import androidx.navigation.NavHostController
99

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/navigation/README.md ‎wear/src/main/java/com/example/util/simpletimetracker/navigation/README.md

File renamed without changes.

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/navigation/WearNavigator.kt ‎wear/src/main/java/com/example/util/simpletimetracker/navigation/WearNavigator.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.navigation
6+
package com.example.util.simpletimetracker.navigation
77

88
import androidx.compose.runtime.Composable
99
import androidx.wear.compose.navigation.SwipeDismissableNavHost
1010
import androidx.wear.compose.navigation.composable
1111
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
12-
import com.example.util.simpletimetracker.presentation.screens.ActivitiesScreen
13-
import com.example.util.simpletimetracker.presentation.screens.TagsScreen
12+
import com.example.util.simpletimetracker.presentation.screens.activities.ActivitiesScreen
13+
import com.example.util.simpletimetracker.presentation.screens.tagsSelection.TagsScreen
1414

1515
object Route {
1616
const val Activities = "activities"

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package com.example.util.simpletimetracker.presentation
88
import android.os.Bundle
99
import androidx.activity.ComponentActivity
1010
import androidx.activity.compose.setContent
11-
import com.example.util.simpletimetracker.presentation.navigation.WearNavigator
11+
import com.example.util.simpletimetracker.navigation.WearNavigator
1212
import com.example.util.simpletimetracker.presentation.theme.WearTheme
1313
import dagger.hilt.android.AndroidEntryPoint
1414

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivitiesList.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import androidx.wear.compose.material.Text
1616
import androidx.wear.tooling.preview.devices.WearDevices
1717
import com.example.util.simpletimetracker.R
1818
import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
19-
import com.example.util.simpletimetracker.presentation.screens.ActivitiesViewModel
20-
import com.example.util.simpletimetracker.presentation.utils.getString
19+
import com.example.util.simpletimetracker.utils.getString
2120
import com.example.util.simpletimetracker.wear_api.WearActivity
2221
import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
2322

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagList.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.wear.compose.material.Text
1717
import androidx.wear.tooling.preview.devices.WearDevices
1818
import com.example.util.simpletimetracker.R
1919
import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
20-
import com.example.util.simpletimetracker.presentation.utils.getString
20+
import com.example.util.simpletimetracker.utils.getString
2121
import com.example.util.simpletimetracker.wear_api.WearTag
2222

2323
sealed interface TagListState {

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/ActivitiesScreen.kt ‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesScreen.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens
6+
package com.example.util.simpletimetracker.presentation.screens.activities
77

88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.collectAsState
1010
import androidx.compose.runtime.getValue
1111
import androidx.hilt.navigation.compose.hiltViewModel
1212
import com.example.util.simpletimetracker.presentation.components.ActivitiesList
13-
import com.example.util.simpletimetracker.presentation.screens.ActivitiesViewModel.Effect
14-
import com.example.util.simpletimetracker.presentation.utils.collectEffects
13+
import com.example.util.simpletimetracker.presentation.screens.activities.ActivitiesViewModel.Effect
14+
import com.example.util.simpletimetracker.utils.collectEffects
1515

1616
@Composable
1717
fun ActivitiesScreen(

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/ActivitiesViewModel.kt ‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesViewModel.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens
6+
package com.example.util.simpletimetracker.presentation.screens.activities
77

88
import android.util.Log
99
import androidx.lifecycle.ViewModel
1010
import androidx.lifecycle.viewModelScope
1111
import com.example.util.simpletimetracker.R
1212
import com.example.util.simpletimetracker.presentation.components.ActivitiesListState
13-
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
14-
import com.example.util.simpletimetracker.presentation.mediators.CurrentActivitiesMediator
15-
import com.example.util.simpletimetracker.presentation.mediators.StartActivityMediator
13+
import com.example.util.simpletimetracker.data.WearRPCClient
14+
import com.example.util.simpletimetracker.domain.CurrentActivitiesMediator
15+
import com.example.util.simpletimetracker.domain.StartActivityMediator
1616
import com.example.util.simpletimetracker.wear_api.WearActivity
1717
import dagger.hilt.android.lifecycle.HiltViewModel
1818
import kotlinx.coroutines.channels.BufferOverflow

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/TagsScreen.kt ‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/tagsSelection/TagsScreen.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens
6+
package com.example.util.simpletimetracker.presentation.screens.tagsSelection
77

88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.collectAsState
1010
import androidx.compose.runtime.getValue
1111
import androidx.hilt.navigation.compose.hiltViewModel
1212
import com.example.util.simpletimetracker.presentation.components.TagList
13-
import com.example.util.simpletimetracker.presentation.screens.TagsViewModel.Effect
14-
import com.example.util.simpletimetracker.presentation.utils.collectEffects
13+
import com.example.util.simpletimetracker.presentation.screens.tagsSelection.TagsViewModel.Effect
14+
import com.example.util.simpletimetracker.utils.collectEffects
1515

1616
@Composable
1717
fun TagsScreen(

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/TagsViewDataMapper.kt ‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/tagsSelection/TagsViewDataMapper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens
6+
package com.example.util.simpletimetracker.presentation.screens.tagsSelection
77

88
import com.example.util.simpletimetracker.R
99
import com.example.util.simpletimetracker.presentation.components.TagListState

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/TagsViewModel.kt ‎wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/tagsSelection/TagsViewModel.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens
6+
package com.example.util.simpletimetracker.presentation.screens.tagsSelection
77

88
import androidx.lifecycle.ViewModel
99
import androidx.lifecycle.viewModelScope
1010
import com.example.util.simpletimetracker.presentation.components.TagListState
11-
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
12-
import com.example.util.simpletimetracker.presentation.mediators.CurrentActivitiesMediator
11+
import com.example.util.simpletimetracker.data.WearRPCClient
12+
import com.example.util.simpletimetracker.domain.CurrentActivitiesMediator
1313
import com.example.util.simpletimetracker.wear_api.WearSettings
1414
import com.example.util.simpletimetracker.wear_api.WearTag
1515
import dagger.hilt.android.lifecycle.HiltViewModel

‎wear/src/main/java/com/example/util/simpletimetracker/presentation/utils/Extensions.kt ‎wear/src/main/java/com/example/util/simpletimetracker/utils/Extensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.utils
6+
package com.example.util.simpletimetracker.utils
77

88
import android.annotation.SuppressLint
99
import androidx.annotation.StringRes

‎wear/src/test/java/com/example/util/simpletimetracker/wear/StartActivityMediatorTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package com.example.util.simpletimetracker.wear
77

8-
import com.example.util.simpletimetracker.presentation.mediators.StartActivityMediator
8+
import com.example.util.simpletimetracker.domain.StartActivityMediator
99
import com.example.util.simpletimetracker.wear_api.WearActivity
1010
import com.example.util.simpletimetracker.wear_api.MockWearCommunicationAPI
1111
import com.example.util.simpletimetracker.wear_api.WearSettings

0 commit comments

Comments
 (0)