Skip to content

Commit a82bfcb

Browse files
aleksey-saenkoaleksey-saenko
committed
Added Russian translation, fixes for English translation, renaming in code.
1 parent a403d34 commit a82bfcb

File tree

41 files changed

+462
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+462
-324
lines changed

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/adapter/AdapterPreferencesRepository.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AdapterPreferencesRepository @Inject constructor(
1616
private val preferencesRepositoryDo: PreferencesRepositoryDo,
1717
private val preferencesMapper: Mapper<UserPreferencesDo, UserPreferences>,
1818
private val requiredServicesMapper: BidirectionalMapper<RequiredServicesDo, RequiredServices>,
19-
private val schedulePolicyMapper: BidirectionalMapper<SchedulePolicyDo, SchedulePolicy>
19+
private val fallbackPolicyMapper: BidirectionalMapper<FallbackPolicyDo, FallbackPolicy>
2020
) : PreferencesRepository {
2121

2222
override val userPreferencesFlow: Flow<UserPreferences>
@@ -49,9 +49,9 @@ class AdapterPreferencesRepository @Inject constructor(
4949
)
5050
}
5151

52-
override suspend fun setSchedulePolicy(schedulePolicy: SchedulePolicy) {
53-
preferencesRepositoryDo.setSchedulePolicy(
54-
schedulePolicyMapper.reverseMap(schedulePolicy)
52+
override suspend fun setFallbackPolicy(fallbackPolicy: FallbackPolicy) {
53+
preferencesRepositoryDo.setFallbackPolicy(
54+
fallbackPolicyMapper.reverseMap(fallbackPolicy)
5555
)
5656
}
5757

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/di/MapperModule.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package com.mrsep.musicrecognizer.glue.preferences.di
22

33
import com.mrsep.musicrecognizer.core.common.BidirectionalMapper
44
import com.mrsep.musicrecognizer.core.common.Mapper
5-
import com.mrsep.musicrecognizer.data.preferences.ScheduleActionDo
5+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
66
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo
77
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.*
8-
import com.mrsep.musicrecognizer.feature.preferences.domain.ScheduleAction
8+
import com.mrsep.musicrecognizer.feature.preferences.domain.FallbackAction
99
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences
1010
import com.mrsep.musicrecognizer.glue.preferences.mapper.PreferencesMapper
1111
import com.mrsep.musicrecognizer.glue.preferences.mapper.RequiredServicesMapper
12-
import com.mrsep.musicrecognizer.glue.preferences.mapper.ScheduleActionMapper
13-
import com.mrsep.musicrecognizer.glue.preferences.mapper.SchedulePolicyMapper
12+
import com.mrsep.musicrecognizer.glue.preferences.mapper.FallbackActionMapper
13+
import com.mrsep.musicrecognizer.glue.preferences.mapper.FallbackPolicyMapper
1414
import dagger.Binds
1515
import dagger.Module
1616
import dagger.hilt.InstallIn
@@ -30,12 +30,12 @@ interface MapperModule {
3030
BidirectionalMapper<RequiredServicesDo, UserPreferences.RequiredServices>
3131

3232
@Binds
33-
fun bindScheduleActionMapper(implementation: ScheduleActionMapper):
34-
BidirectionalMapper<ScheduleActionDo, ScheduleAction>
33+
fun bindFallbackActionMapper(implementation: FallbackActionMapper):
34+
BidirectionalMapper<FallbackActionDo, FallbackAction>
3535

3636
@Binds
37-
fun bindSchedulePolicyMapper(implementation: SchedulePolicyMapper):
38-
BidirectionalMapper<SchedulePolicyDo, UserPreferences.SchedulePolicy>
37+
fun bindFallbackPolicyMapper(implementation: FallbackPolicyMapper):
38+
BidirectionalMapper<FallbackPolicyDo, UserPreferences.FallbackPolicy>
3939

4040

4141
}

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/mapper/FallbackActionMapper.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.mrsep.musicrecognizer.glue.preferences.mapper
2+
3+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
4+
import com.mrsep.musicrecognizer.core.common.BidirectionalMapper
5+
import com.mrsep.musicrecognizer.feature.preferences.domain.FallbackAction
6+
import javax.inject.Inject
7+
8+
class FallbackActionMapper @Inject constructor() :
9+
BidirectionalMapper<FallbackActionDo, FallbackAction> {
10+
11+
override fun map(input: FallbackActionDo): FallbackAction {
12+
return when (input) {
13+
FallbackActionDo.Ignore -> FallbackAction.Ignore
14+
FallbackActionDo.Save -> FallbackAction.Save
15+
FallbackActionDo.SaveAndLaunch -> FallbackAction.SaveAndLaunch
16+
}
17+
}
18+
19+
override fun reverseMap(input: FallbackAction): FallbackActionDo {
20+
return when (input) {
21+
FallbackAction.Ignore -> FallbackActionDo.Ignore
22+
FallbackAction.Save -> FallbackActionDo.Save
23+
FallbackAction.SaveAndLaunch -> FallbackActionDo.SaveAndLaunch
24+
}
25+
}
26+
27+
}

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/mapper/SchedulePolicyMapper.kt renamed to ‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/mapper/FallbackPolicyMapper.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
package com.mrsep.musicrecognizer.glue.preferences.mapper
22

33
import com.mrsep.musicrecognizer.core.common.BidirectionalMapper
4-
import com.mrsep.musicrecognizer.data.preferences.ScheduleActionDo
5-
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.SchedulePolicyDo
6-
import com.mrsep.musicrecognizer.feature.preferences.domain.ScheduleAction
7-
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences.SchedulePolicy
4+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
5+
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.FallbackPolicyDo
6+
import com.mrsep.musicrecognizer.feature.preferences.domain.FallbackAction
7+
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences.FallbackPolicy
88
import javax.inject.Inject
99

10-
class SchedulePolicyMapper @Inject constructor(
11-
private val actionMapper: BidirectionalMapper<ScheduleActionDo, ScheduleAction>
12-
): BidirectionalMapper<SchedulePolicyDo, SchedulePolicy> {
10+
class FallbackPolicyMapper @Inject constructor(
11+
private val actionMapper: BidirectionalMapper<FallbackActionDo, FallbackAction>
12+
): BidirectionalMapper<FallbackPolicyDo, FallbackPolicy> {
1313

14-
override fun map(input: SchedulePolicyDo): SchedulePolicy {
15-
return SchedulePolicy(
14+
override fun map(input: FallbackPolicyDo): FallbackPolicy {
15+
return FallbackPolicy(
1616
noMatches = actionMapper.map(input.noMatches),
1717
badConnection = actionMapper.map(input.badConnection),
1818
anotherFailure = actionMapper.map(input.anotherFailure)
1919
)
2020
}
2121

22-
override fun reverseMap(input: SchedulePolicy): SchedulePolicyDo {
23-
return SchedulePolicyDo(
22+
override fun reverseMap(input: FallbackPolicy): FallbackPolicyDo {
23+
return FallbackPolicyDo(
2424
noMatches = actionMapper.reverseMap(input.noMatches),
2525
badConnection = actionMapper.reverseMap(input.badConnection),
2626
anotherFailure = actionMapper.reverseMap(input.anotherFailure)

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/mapper/PreferencesMapper.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package com.mrsep.musicrecognizer.glue.preferences.mapper
33
import com.mrsep.musicrecognizer.core.common.BidirectionalMapper
44
import com.mrsep.musicrecognizer.core.common.Mapper
55
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo
6-
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.SchedulePolicyDo
6+
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.FallbackPolicyDo
77
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo.RequiredServicesDo
88
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences
9-
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences.SchedulePolicy
9+
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences.FallbackPolicy
1010
import com.mrsep.musicrecognizer.feature.preferences.domain.UserPreferences.RequiredServices
1111
import javax.inject.Inject
1212

1313
class PreferencesMapper @Inject constructor(
14-
private val schedulePolicyMapper: BidirectionalMapper<SchedulePolicyDo, SchedulePolicy>,
14+
private val fallbackPolicyMapper: BidirectionalMapper<FallbackPolicyDo, FallbackPolicy>,
1515
private val requiredServicesMapper: BidirectionalMapper<RequiredServicesDo, RequiredServices>
1616
) :
1717
Mapper<UserPreferencesDo, UserPreferences> {
@@ -24,7 +24,7 @@ class PreferencesMapper @Inject constructor(
2424
dynamicColorsEnabled = input.dynamicColorsEnabled,
2525
developerModeEnabled = input.developerModeEnabled,
2626
requiredServices = requiredServicesMapper.map(input.requiredServices),
27-
schedulePolicy = schedulePolicyMapper.map(input.schedulePolicy)
27+
fallbackPolicy = fallbackPolicyMapper.map(input.fallbackPolicy)
2828
)
2929
}
3030

‎app/src/main/java/com/mrsep/musicrecognizer/glue/preferences/mapper/ScheduleActionMapper.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎app/src/main/java/com/mrsep/musicrecognizer/glue/recognition/di/MapperModule.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import com.mrsep.musicrecognizer.core.common.Mapper
55
import com.mrsep.musicrecognizer.data.audiorecord.RecognitionSchemeDo
66
import com.mrsep.musicrecognizer.data.enqueued.model.EnqueuedRecognitionEntityWithTrack
77
import com.mrsep.musicrecognizer.data.player.PlayerStatusDo
8-
import com.mrsep.musicrecognizer.data.preferences.ScheduleActionDo
8+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
99
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo
1010
import com.mrsep.musicrecognizer.data.remote.RemoteRecognitionResultDo
1111
import com.mrsep.musicrecognizer.data.track.TrackEntity
1212
import com.mrsep.musicrecognizer.feature.recognition.domain.model.RecognitionScheme
1313
import com.mrsep.musicrecognizer.feature.recognition.domain.model.EnqueuedRecognition
1414
import com.mrsep.musicrecognizer.feature.recognition.domain.model.PlayerStatus
1515
import com.mrsep.musicrecognizer.feature.recognition.domain.model.RemoteRecognitionResult
16-
import com.mrsep.musicrecognizer.feature.recognition.domain.model.ScheduleAction
16+
import com.mrsep.musicrecognizer.feature.recognition.domain.model.FallbackAction
1717
import com.mrsep.musicrecognizer.feature.recognition.domain.model.Track
1818
import com.mrsep.musicrecognizer.feature.recognition.domain.model.UserPreferences
1919
import com.mrsep.musicrecognizer.glue.recognition.mapper.*
@@ -46,8 +46,8 @@ interface MapperModule {
4646
Mapper<RecognitionScheme, RecognitionSchemeDo>
4747

4848
@Binds
49-
fun bindScheduleActionMapper(implementation: ScheduleActionMapper):
50-
Mapper<ScheduleActionDo, ScheduleAction>
49+
fun bindFallbackActionMapper(implementation: FallbackActionMapper):
50+
Mapper<FallbackActionDo, FallbackAction>
5151

5252
@Binds
5353
fun bindPlayerStatusMapper(implementation: PlayerStatusMapper):

‎app/src/main/java/com/mrsep/musicrecognizer/glue/recognition/mapper/FallbackActionMapper.kt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.mrsep.musicrecognizer.glue.recognition.mapper
2+
3+
import com.mrsep.musicrecognizer.core.common.Mapper
4+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
5+
import com.mrsep.musicrecognizer.feature.recognition.domain.model.FallbackAction
6+
import javax.inject.Inject
7+
8+
class FallbackActionMapper @Inject constructor(): Mapper<FallbackActionDo, FallbackAction> {
9+
10+
override fun map(input: FallbackActionDo): FallbackAction {
11+
return when (input) {
12+
FallbackActionDo.Save -> FallbackAction.Save
13+
FallbackActionDo.SaveAndLaunch -> FallbackAction.SaveAndLaunch
14+
FallbackActionDo.Ignore -> FallbackAction.Ignore
15+
}
16+
}
17+
18+
}

‎app/src/main/java/com/mrsep/musicrecognizer/glue/recognition/mapper/ScheduleActionMapper.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/src/main/java/com/mrsep/musicrecognizer/glue/recognition/mapper/UserPreferencesMapper.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.mrsep.musicrecognizer.glue.recognition.mapper
22

33
import com.mrsep.musicrecognizer.core.common.Mapper
4-
import com.mrsep.musicrecognizer.data.preferences.ScheduleActionDo
4+
import com.mrsep.musicrecognizer.data.preferences.FallbackActionDo
55
import com.mrsep.musicrecognizer.data.preferences.UserPreferencesDo
6-
import com.mrsep.musicrecognizer.feature.recognition.domain.model.ScheduleAction
6+
import com.mrsep.musicrecognizer.feature.recognition.domain.model.FallbackAction
77
import com.mrsep.musicrecognizer.feature.recognition.domain.model.UserPreferences
88
import javax.inject.Inject
99

1010
class UserPreferencesMapper @Inject constructor(
11-
private val scheduleActionMapper: Mapper<ScheduleActionDo, ScheduleAction>
11+
private val fallbackActionMapper: Mapper<FallbackActionDo, FallbackAction>
1212
) :
1313
Mapper<UserPreferencesDo, UserPreferences> {
1414

@@ -28,10 +28,10 @@ class UserPreferencesMapper @Inject constructor(
2828
napster = input.requiredServices.napster,
2929
musicbrainz = input.requiredServices.musicbrainz
3030
),
31-
schedulePolicy = UserPreferences.SchedulePolicy(
32-
noMatches = scheduleActionMapper.map(input.schedulePolicy.noMatches),
33-
badConnection = scheduleActionMapper.map(input.schedulePolicy.badConnection),
34-
anotherFailure = scheduleActionMapper.map(input.schedulePolicy.anotherFailure)
31+
fallbackPolicy = UserPreferences.FallbackPolicy(
32+
noMatches = fallbackActionMapper.map(input.fallbackPolicy.noMatches),
33+
badConnection = fallbackActionMapper.map(input.fallbackPolicy.badConnection),
34+
anotherFailure = fallbackActionMapper.map(input.fallbackPolicy.anotherFailure)
3535
)
3636
)
3737
}

0 commit comments

Comments
 (0)