Skip to content

Commit b2885b1

Browse files
RazeemanRazeeman
committed
rename wearrpc module to wear_api
1 parent b2a2dbe commit b2885b1

File tree

28 files changed

+51
-52
lines changed

28 files changed

+51
-52
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Simple app that helps track how much time you spend on all the useless activitie
105105
├── domain # Business logic.
106106
├── navigation # Navigation interfaces and screen params.
107107
├── wear # WearOS app.
108-
├── wearrpc # Mobile <--> WearOS communication
108+
├── wear_api # Mobile - WearOS communication
109109
├── features
110110
│ ├── feature_archive # Screen for archived data.
111111
│ ├── feature_base_adapter # Shared recycler adapters.

‎features/feature_wear/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717

1818
dependencies {
1919
implementation(project(":core"))
20-
implementation(project(":wearrpc"))
20+
implementation(project(":wear_api"))
2121
implementation(Deps.Google.services)
2222
implementation(Deps.Google.gson)
2323
implementation(Deps.Google.dagger)

‎features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearCommunicationInteractor.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
1616
import com.example.util.simpletimetracker.domain.model.AppColor
1717
import com.example.util.simpletimetracker.domain.model.RecordTag
1818
import com.example.util.simpletimetracker.domain.model.RunningRecord
19-
import com.example.util.simpletimetracker.wearrpc.Activity
20-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
21-
import com.example.util.simpletimetracker.wearrpc.Settings
22-
import com.example.util.simpletimetracker.wearrpc.WearCommunicationAPI
23-
import com.example.util.simpletimetracker.wearrpc.Tag
19+
import com.example.util.simpletimetracker.wear_api.Activity
20+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
21+
import com.example.util.simpletimetracker.wear_api.Settings
22+
import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
23+
import com.example.util.simpletimetracker.wear_api.Tag
2424
import javax.inject.Inject
2525

2626
class WearCommunicationInteractor @Inject constructor(

‎features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearRPCServer.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
package com.example.util.simpletimetracker.feature_wear
77

8-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
9-
import com.example.util.simpletimetracker.wearrpc.Request
10-
import com.example.util.simpletimetracker.wearrpc.WearCommunicationAPI
8+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
9+
import com.example.util.simpletimetracker.wear_api.Request
10+
import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
1111
import com.google.gson.Gson
1212
import com.google.gson.reflect.TypeToken
1313
import timber.log.Timber

‎features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WidgetModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.util.simpletimetracker.feature_wear
22

3-
import com.example.util.simpletimetracker.wearrpc.WearCommunicationAPI
3+
import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
44
import dagger.Binds
55
import dagger.Module
66
import dagger.hilt.InstallIn

‎features/feature_wear/src/test/java/com/example/util/simpletimetracker/feature_wear/WearRPCServerTest.kt

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

8-
import com.example.util.simpletimetracker.wearrpc.Activity
9-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
8+
import com.example.util.simpletimetracker.wear_api.Activity
9+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
1010
import com.example.util.simpletimetracker.presentation.data.Messenger
11-
import com.example.util.simpletimetracker.wearrpc.MockWearCommunicationAPI
12-
import com.example.util.simpletimetracker.wearrpc.Settings
13-
import com.example.util.simpletimetracker.wearrpc.Tag
11+
import com.example.util.simpletimetracker.wear_api.MockWearCommunicationAPI
12+
import com.example.util.simpletimetracker.wear_api.Settings
13+
import com.example.util.simpletimetracker.wear_api.Tag
1414
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
1515
import kotlinx.coroutines.test.runTest
1616
import org.junit.Assert.assertArrayEquals

‎settings.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ include(
66
"navigation",
77
"data_local",
88
"resources",
9+
"wear",
10+
"wear_api",
911
)
1012

1113
file("features").walkTopDown().maxDepth(1).forEach { dir ->
@@ -14,5 +16,3 @@ file("features").walkTopDown().maxDepth(1).forEach { dir ->
1416
project(":${dir.name}").projectDir = dir
1517
}
1618
}
17-
include(":wear")
18-
include(":wearrpc")

‎wear/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
implementation("com.google.android.horologist:horologist-compose-layout:0.2.7")
7070
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
7171
implementation("androidx.compose.material:material-icons-core:1.6.1")
72-
implementation(project(":wearrpc"))
72+
implementation(project(":wear_api"))
7373
implementation(project(":resources"))
7474

7575
// Dev Dependencies

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import androidx.wear.compose.material.Text
1515
import androidx.wear.tooling.preview.devices.WearDevices
1616
import com.example.util.simpletimetracker.R
1717
import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
18-
import com.example.util.simpletimetracker.wearrpc.Activity
19-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
18+
import com.example.util.simpletimetracker.wear_api.Activity
19+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
2020

2121
@Composable
2222
fun ActivitiesList(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import androidx.wear.compose.material.Text
2626
import androidx.wear.compose.material.ToggleChipDefaults
2727
import androidx.wear.tooling.preview.devices.WearDevices
2828
import com.example.util.simpletimetracker.presentation.remember.rememberDurationSince
29-
import com.example.util.simpletimetracker.wearrpc.Activity
30-
import com.example.util.simpletimetracker.wearrpc.Tag
29+
import com.example.util.simpletimetracker.wear_api.Activity
30+
import com.example.util.simpletimetracker.wear_api.Tag
3131
import java.time.Duration
3232
import java.time.Instant
3333

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.wear.compose.material.SplitToggleChip
2525
import androidx.wear.compose.material.Text
2626
import androidx.wear.compose.material.ToggleChipDefaults
2727
import androidx.wear.tooling.preview.devices.WearDevices
28-
import com.example.util.simpletimetracker.wearrpc.Tag
28+
import com.example.util.simpletimetracker.wear_api.Tag
2929

3030
enum class TagSelectionMode {
3131
SINGLE, MULTI,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.wear.compose.material.Text
1919
import androidx.wear.tooling.preview.devices.WearDevices
2020
import com.example.util.simpletimetracker.R
2121
import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
22-
import com.example.util.simpletimetracker.wearrpc.Tag
22+
import com.example.util.simpletimetracker.wear_api.Tag
2323

2424
@Composable
2525
fun TagList(

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66
package com.example.util.simpletimetracker.presentation.data
77

8-
import com.example.util.simpletimetracker.wearrpc.Activity
9-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
10-
import com.example.util.simpletimetracker.wearrpc.Request
11-
import com.example.util.simpletimetracker.wearrpc.Settings
12-
import com.example.util.simpletimetracker.wearrpc.Tag
13-
import com.example.util.simpletimetracker.wearrpc.WearCommunicationAPI
8+
import com.example.util.simpletimetracker.wear_api.Activity
9+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
10+
import com.example.util.simpletimetracker.wear_api.Request
11+
import com.example.util.simpletimetracker.wear_api.Settings
12+
import com.example.util.simpletimetracker.wear_api.Tag
13+
import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
1414
import com.google.gson.Gson
1515
import com.google.gson.reflect.TypeToken
1616
import javax.inject.Inject

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.example.util.simpletimetracker.presentation.mediators
22

3-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
4-
import com.example.util.simpletimetracker.wearrpc.Settings
5-
import com.example.util.simpletimetracker.wearrpc.Tag
3+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
4+
import com.example.util.simpletimetracker.wear_api.Settings
5+
import com.example.util.simpletimetracker.wear_api.Tag
66
import com.example.util.simpletimetracker.presentation.data.WearRPCClient
77

88
class CurrentActivitiesMediator(

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
package com.example.util.simpletimetracker.presentation.mediators
77

8-
import com.example.util.simpletimetracker.wearrpc.Activity
9-
import com.example.util.simpletimetracker.wearrpc.Settings
10-
import com.example.util.simpletimetracker.wearrpc.WearCommunicationAPI
8+
import com.example.util.simpletimetracker.wear_api.Activity
9+
import com.example.util.simpletimetracker.wear_api.Settings
10+
import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
1111

1212
class StartActivityMediator(
1313
private val api: WearCommunicationAPI,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableIntStateOf
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15-
import com.example.util.simpletimetracker.wearrpc.Activity
15+
import com.example.util.simpletimetracker.wear_api.Activity
1616
import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.async
1818

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableIntStateOf
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15-
import com.example.util.simpletimetracker.wearrpc.CurrentActivity
15+
import com.example.util.simpletimetracker.wear_api.CurrentActivity
1616
import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.async
1818

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import androidx.compose.runtime.mutableIntStateOf
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15-
import com.example.util.simpletimetracker.wearrpc.Settings
16-
import com.example.util.simpletimetracker.wearrpc.Tag
15+
import com.example.util.simpletimetracker.wear_api.Settings
1716
import kotlinx.coroutines.Dispatchers
1817
import kotlinx.coroutines.async
1918

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableIntStateOf
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15-
import com.example.util.simpletimetracker.wearrpc.Tag
15+
import com.example.util.simpletimetracker.wear_api.Tag
1616
import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.async
1818

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import com.example.util.simpletimetracker.presentation.mediators.CurrentActiviti
1414
import com.example.util.simpletimetracker.presentation.remember.rememberActivities
1515
import com.example.util.simpletimetracker.presentation.remember.rememberCurrentActivities
1616
import com.example.util.simpletimetracker.presentation.remember.rememberRPCClient
17-
import com.example.util.simpletimetracker.wearrpc.Activity
17+
import com.example.util.simpletimetracker.wear_api.Activity
1818
import com.example.util.simpletimetracker.presentation.mediators.StartActivityMediator
1919
import kotlinx.coroutines.Dispatchers
2020
import kotlinx.coroutines.launch

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package com.example.util.simpletimetracker.wear
77

88
import com.example.util.simpletimetracker.presentation.mediators.StartActivityMediator
9-
import com.example.util.simpletimetracker.wearrpc.Activity
10-
import com.example.util.simpletimetracker.wearrpc.MockWearCommunicationAPI
11-
import com.example.util.simpletimetracker.wearrpc.Settings
12-
import com.example.util.simpletimetracker.wearrpc.Tag
9+
import com.example.util.simpletimetracker.wear_api.Activity
10+
import com.example.util.simpletimetracker.wear_api.MockWearCommunicationAPI
11+
import com.example.util.simpletimetracker.wear_api.Settings
12+
import com.example.util.simpletimetracker.wear_api.Tag
1313
import kotlinx.coroutines.test.runTest
1414
import org.junit.Assert.assertEquals
1515
import org.junit.Before

‎wearrpc/.gitignore ‎wear_api/.gitignore

File renamed without changes.

‎wearrpc/build.gradle.kts ‎wear_api/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
applyAndroidLibrary()
1717

1818
android {
19-
namespace = "${Base.namespace}.wearrpc"
19+
namespace = "${Base.namespace}.wear_api"
2020
}
2121

2222
dependencies {

‎wearrpc/src/main/AndroidManifest.xml ‎wear_api/src/main/AndroidManifest.xml

File renamed without changes.

‎wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/DTO.kt ‎wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/DTO.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.wearrpc
6+
package com.example.util.simpletimetracker.wear_api
77

88
import android.os.Parcelable
99
import kotlinx.parcelize.Parcelize

‎wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/MockWearCommunicationAPI.kt ‎wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/MockWearCommunicationAPI.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.util.simpletimetracker.wearrpc
1+
package com.example.util.simpletimetracker.wear_api
22

33
class MockWearCommunicationAPI : WearCommunicationAPI {
44

‎wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/Request.kt ‎wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/Request.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.wearrpc
6+
package com.example.util.simpletimetracker.wear_api
77

88
object Request {
99
const val PATH = "/stt"

‎wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/WearCommunicationAPI.kt ‎wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/WearCommunicationAPI.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.wearrpc
6+
package com.example.util.simpletimetracker.wear_api
77

88
interface WearCommunicationAPI {
99
/**

0 commit comments

Comments
 (0)