Skip to content

Commit f663f82

Browse files
kirill-markinkirill-markin
authored
Merge pull request #115 from kirill-markin/codex/android-repository-package-cleanup
[codex] Clean up Android repository packages
2 parents 8cbcb0e + 94c7f2b commit f663f82

51 files changed

Lines changed: 101 additions & 60 deletions

File tree

Some content is hidden

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

‎apps/android/app/src/main/java/com/flashcardsopensourceapp/app/di/AppGraph.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ import com.flashcardsopensourceapp.data.local.review.SharedPreferencesReviewPref
3434
import com.flashcardsopensourceapp.data.local.repository.AiChatRepository
3535
import com.flashcardsopensourceapp.data.local.repository.AutoSyncEventRepository
3636
import com.flashcardsopensourceapp.data.local.repository.CardsRepository
37-
import com.flashcardsopensourceapp.data.local.repository.CloudIdentityResetCoordinator
38-
import com.flashcardsopensourceapp.data.local.repository.CloudGuestSessionCoordinator
39-
import com.flashcardsopensourceapp.data.local.repository.CloudOperationCoordinator
37+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudIdentityResetCoordinator
38+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudGuestSessionCoordinator
39+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudOperationCoordinator
4040
import com.flashcardsopensourceapp.data.local.repository.CloudAccountRepository
4141
import com.flashcardsopensourceapp.data.local.repository.DecksRepository
42-
import com.flashcardsopensourceapp.data.local.repository.LocalAiChatRepository
43-
import com.flashcardsopensourceapp.data.local.repository.LocalCloudAccountRepository
42+
import com.flashcardsopensourceapp.data.local.repository.ai.LocalAiChatRepository
43+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.LocalCloudAccountRepository
4444
import com.flashcardsopensourceapp.data.local.repository.LocalCardsRepository
4545
import com.flashcardsopensourceapp.data.local.repository.LocalDecksRepository
46-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
47-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressRepository
46+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
47+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressRepository
4848
import com.flashcardsopensourceapp.data.local.repository.LocalReviewRepository
49-
import com.flashcardsopensourceapp.data.local.repository.LocalSyncRepository
49+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.LocalSyncRepository
5050
import com.flashcardsopensourceapp.data.local.repository.LocalWorkspaceRepository
5151
import com.flashcardsopensourceapp.data.local.repository.ProgressRepository
5252
import com.flashcardsopensourceapp.data.local.repository.ReviewRepository

‎apps/android/app/src/main/java/com/flashcardsopensourceapp/app/notifications/ReviewNotificationsManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.flashcardsopensourceapp.data.local.notifications.buildFallbackInactiv
2929
import com.flashcardsopensourceapp.data.local.notifications.buildDailyReminderPayloads
3030
import com.flashcardsopensourceapp.data.local.notifications.buildInactivityReminderPayloads
3131
import com.flashcardsopensourceapp.data.local.notifications.makePersistedReviewFilter
32-
import com.flashcardsopensourceapp.data.local.repository.loadCurrentWorkspaceOrNull
32+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.loadCurrentWorkspaceOrNull
3333
import com.flashcardsopensourceapp.data.local.review.ReviewPreferencesStore
3434
import com.flashcardsopensourceapp.feature.review.reviewTextProvider
3535
import kotlinx.coroutines.CoroutineScope

‎apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/LocalDatabaseTestFixtures.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.flashcardsopensourceapp.data.local.repository.CardsRepository
1616
import com.flashcardsopensourceapp.data.local.repository.DecksRepository
1717
import com.flashcardsopensourceapp.data.local.repository.LocalCardsRepository
1818
import com.flashcardsopensourceapp.data.local.repository.LocalDecksRepository
19-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
19+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
2020
import com.flashcardsopensourceapp.data.local.repository.LocalReviewRepository
2121
import com.flashcardsopensourceapp.data.local.repository.LocalWorkspaceRepository
2222
import com.flashcardsopensourceapp.data.local.repository.ReviewRepository

‎apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/cloud/SyncLocalStoreContractTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.flashcardsopensourceapp.data.local.model.SyncEntityType
2222
import com.flashcardsopensourceapp.data.local.model.SyncOperationPayload
2323
import com.flashcardsopensourceapp.data.local.model.encodeSchedulerStepListJson
2424
import com.flashcardsopensourceapp.data.local.model.makeDefaultWorkspaceSchedulerSettings
25-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
25+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
2626
import com.flashcardsopensourceapp.data.local.repository.SystemTimeProvider
2727
import com.flashcardsopensourceapp.data.local.review.ReviewPreferencesStore
2828
import com.flashcardsopensourceapp.data.local.review.SharedPreferencesReviewPreferencesStore

‎apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/cloudidentity/CloudIdentityTestEnvironment.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import com.flashcardsopensourceapp.data.local.model.FsrsCardState
2424
import com.flashcardsopensourceapp.data.local.model.ReviewRating
2525
import com.flashcardsopensourceapp.data.local.model.encodeSchedulerStepListJson
2626
import com.flashcardsopensourceapp.data.local.model.makeDefaultWorkspaceSchedulerSettings
27-
import com.flashcardsopensourceapp.data.local.repository.CloudGuestSessionCoordinator
28-
import com.flashcardsopensourceapp.data.local.repository.CloudIdentityResetCoordinator
29-
import com.flashcardsopensourceapp.data.local.repository.CloudOperationCoordinator
30-
import com.flashcardsopensourceapp.data.local.repository.LocalCloudAccountRepository
31-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
32-
import com.flashcardsopensourceapp.data.local.repository.LocalSyncRepository
27+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudGuestSessionCoordinator
28+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudIdentityResetCoordinator
29+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudOperationCoordinator
30+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.LocalCloudAccountRepository
31+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
32+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.LocalSyncRepository
3333
import com.flashcardsopensourceapp.data.local.repository.SystemTimeProvider
3434
import com.flashcardsopensourceapp.data.local.review.ReviewPreferencesStore
3535
import com.flashcardsopensourceapp.data.local.review.SharedPreferencesReviewPreferencesStore

‎apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/cloudidentity/LocalCloudAccountRepositoryGuestUpgradeDrainTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import com.flashcardsopensourceapp.data.local.model.CloudWorkspaceLinkSelection
1414
import com.flashcardsopensourceapp.data.local.model.EffortLevel
1515
import com.flashcardsopensourceapp.data.local.model.FsrsCardState
1616
import com.flashcardsopensourceapp.data.local.model.SyncEntityType
17-
import com.flashcardsopensourceapp.data.local.repository.CloudSyncBlockedException
17+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudSyncBlockedException
1818
import kotlinx.coroutines.CompletableDeferred
1919
import kotlinx.coroutines.async
2020
import kotlinx.coroutines.runBlocking

‎apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/cloudidentity/LocalSyncRepositorySyncBlockingTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.flashcardsopensourceapp.data.local.database.OutboxEntryEntity
99
import com.flashcardsopensourceapp.data.local.database.SyncStateEntity
1010
import com.flashcardsopensourceapp.data.local.model.CloudAccountState
1111
import com.flashcardsopensourceapp.data.local.model.SyncStatus
12-
import com.flashcardsopensourceapp.data.local.repository.CloudSyncBlockedException
12+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.CloudSyncBlockedException
1313
import kotlinx.coroutines.flow.first
1414
import kotlinx.coroutines.runBlocking
1515
import org.json.JSONArray

‎apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/cloud/SyncLocalStore.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.flashcardsopensourceapp.data.local.model.CloudWorkspaceSummary
1111
import com.flashcardsopensourceapp.data.local.model.PersistedOutboxEntry
1212
import com.flashcardsopensourceapp.data.local.model.ReviewEventSyncPayload
1313
import com.flashcardsopensourceapp.data.local.model.SyncEntityType
14-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
14+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
1515
import com.flashcardsopensourceapp.data.local.repository.TimeProvider
1616
import com.flashcardsopensourceapp.data.local.review.ReviewPreferencesStore
1717
import kotlinx.coroutines.flow.Flow

‎apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/cloud/SyncReviewHistoryLocalStore.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.flashcardsopensourceapp.data.local.database.AppDatabase
55
import com.flashcardsopensourceapp.data.local.database.ReviewLogEntity
66
import com.flashcardsopensourceapp.data.local.model.ReviewRating
77
import com.flashcardsopensourceapp.data.local.model.parseIsoTimestamp
8-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
8+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
99
import kotlinx.coroutines.flow.Flow
1010
import kotlinx.coroutines.flow.MutableStateFlow
1111
import kotlinx.coroutines.flow.filterNotNull

‎apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/cloud/WorkspaceIdentityLocalStore.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import com.flashcardsopensourceapp.data.local.model.CloudWorkspaceSummary
1515
import com.flashcardsopensourceapp.data.local.model.SyncEntityType
1616
import com.flashcardsopensourceapp.data.local.model.encodeSchedulerStepListJson
1717
import com.flashcardsopensourceapp.data.local.model.makeDefaultWorkspaceSchedulerSettings
18-
import com.flashcardsopensourceapp.data.local.repository.LocalProgressCacheStore
19-
import com.flashcardsopensourceapp.data.local.repository.loadCurrentWorkspaceOrNull
18+
import com.flashcardsopensourceapp.data.local.repository.progress.LocalProgressCacheStore
19+
import com.flashcardsopensourceapp.data.local.repository.cloudsync.loadCurrentWorkspaceOrNull
2020
import com.flashcardsopensourceapp.data.local.review.ReviewPreferencesStore
2121
import java.util.UUID
2222

0 commit comments

Comments
 (0)