From 5ec8afbdb311e6943dd166ca0509d173475dedbb Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Sat, 1 Dec 2018 09:25:25 -0600 Subject: [PATCH] Provide a better package structure for Room database related files. --- .../activities/DatabaseLoadActivity.kt | 4 ++-- .../activities/ImportBrainkeyActivity.kt | 4 ++-- .../activities/MainActivity.kt | 2 +- .../adapters/BalancesAdapter.kt | 2 +- .../adapters/TransactionsAdapter.kt | 2 +- .../{daos => database}/BitsyDatabase.kt | 20 ++++++++++--------- .../{ => database}/daos/AssetDao.kt | 4 ++-- .../{ => database}/daos/AuthorityDao.kt | 4 ++-- .../{ => database}/daos/BalanceDao.kt | 4 ++-- .../{ => database}/daos/EquivalentValueDao.kt | 4 ++-- .../{ => database}/daos/TransferDao.kt | 4 ++-- .../{ => database}/daos/UserAccountDao.kt | 4 ++-- .../{ => database}/entities/Asset.kt | 2 +- .../{ => database}/entities/Authority.kt | 2 +- .../{ => database}/entities/Balance.kt | 2 +- .../entities/EquivalentValue.kt | 2 +- .../{ => database}/entities/Transfer.kt | 2 +- .../{ => database}/entities/UserAccount.kt | 2 +- .../fragments/BalancesFragment.kt | 6 +++--- .../processors/TransfersLoader.kt | 2 +- .../repositories/AssetRepository.kt | 6 +++--- .../repositories/AuthorityRepository.kt | 6 +++--- .../repositories/BalanceRepository.kt | 6 +++--- .../repositories/TransferRepository.kt | 6 +++--- .../repositories/UserAccountRepository.kt | 6 +++--- .../viewmodels/BalanceViewModel.kt | 2 +- .../viewmodels/TransactionViewModel.kt | 2 +- .../viewmodels/UserAccountViewModel.kt | 2 +- 28 files changed, 58 insertions(+), 56 deletions(-) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{daos => database}/BitsyDatabase.kt (75%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/AssetDao.kt (77%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/AuthorityDao.kt (80%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/BalanceDao.kt (77%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/EquivalentValueDao.kt (72%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/TransferDao.kt (84%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/daos/UserAccountDao.kt (77%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/Asset.kt (88%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/Authority.kt (90%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/Balance.kt (86%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/EquivalentValue.kt (92%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/Transfer.kt (94%) rename app/src/main/java/cy/agorise/bitsybitshareswallet/{ => database}/entities/UserAccount.kt (84%) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/DatabaseLoadActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/DatabaseLoadActivity.kt index 3da27ad..d429788 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/DatabaseLoadActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/DatabaseLoadActivity.kt @@ -89,11 +89,11 @@ class DatabaseLoadActivity: ConnectedActivity() { * @param assetList The list of assets obtained in the last 'list_assets' API call. */ private fun handlePlatformAssetBatch(assetList: List) { - val assets = mutableListOf() + val assets = mutableListOf() // TODO find if there is a better way to convert to Bitsy Asset instances for (_asset in assetList) { - val asset = cy.agorise.bitsybitshareswallet.entities.Asset( + val asset = cy.agorise.bitsybitshareswallet.database.entities.Asset( _asset.objectId, _asset.symbol, _asset.precision, diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/ImportBrainkeyActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/ImportBrainkeyActivity.kt index 23abe45..da16885 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/ImportBrainkeyActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/ImportBrainkeyActivity.kt @@ -9,7 +9,7 @@ import android.widget.Toast import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.list.listItemsSingleChoice import cy.agorise.bitsybitshareswallet.R -import cy.agorise.bitsybitshareswallet.entities.Authority +import cy.agorise.bitsybitshareswallet.database.entities.Authority import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository import cy.agorise.bitsybitshareswallet.utils.Constants @@ -235,7 +235,7 @@ class ImportBrainkeyActivity : ConnectedActivity() { val name = accountProperties.name val isLTM = accountProperties.membership_expiration_date == Constants.LIFETIME_EXPIRATION_DATE - val userAccount = cy.agorise.bitsybitshareswallet.entities.UserAccount(id, name, isLTM) + val userAccount = cy.agorise.bitsybitshareswallet.database.entities.UserAccount(id, name, isLTM) val userAccountRepository = UserAccountRepository(application) userAccountRepository.insert(userAccount) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt index 202f60e..7ba4517 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt @@ -10,7 +10,7 @@ import android.widget.Toast import androidx.collection.LongSparseArray import com.google.android.material.bottomnavigation.BottomNavigationView import cy.agorise.bitsybitshareswallet.R -import cy.agorise.bitsybitshareswallet.entities.Balance +import cy.agorise.bitsybitshareswallet.database.entities.Balance import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment import cy.agorise.bitsybitshareswallet.processors.TransfersLoader diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/BalancesAdapter.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/BalancesAdapter.kt index dc2ad19..47a1d57 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/BalancesAdapter.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/BalancesAdapter.kt @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SortedList import cy.agorise.bitsybitshareswallet.R -import cy.agorise.bitsybitshareswallet.entities.Balance +import cy.agorise.bitsybitshareswallet.database.entities.Balance class BalancesAdapter(private val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/TransactionsAdapter.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/TransactionsAdapter.kt index dc70930..cf9d490 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/TransactionsAdapter.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/TransactionsAdapter.kt @@ -11,7 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SortedList import cy.agorise.bitsybitshareswallet.R -import cy.agorise.bitsybitshareswallet.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.entities.Transfer class TransactionsAdapter(private val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/BitsyDatabase.kt similarity index 75% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/BitsyDatabase.kt index c0e965c..fc5205a 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/BitsyDatabase.kt @@ -1,19 +1,21 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase -import cy.agorise.bitsybitshareswallet.entities.* +import cy.agorise.bitsybitshareswallet.database.daos.* +import cy.agorise.bitsybitshareswallet.database.entities.* @Database(entities = [ - Asset::class, - Authority::class, - Balance::class, - EquivalentValue::class, - Transfer::class, - UserAccount::class - ], version = 1, exportSchema = false) + Asset::class, + Authority::class, + Balance::class, + EquivalentValue::class, + Transfer::class, + UserAccount::class + ], + version = 1, exportSchema = false) abstract class BitsyDatabase : RoomDatabase() { abstract fun assetDao(): AssetDao diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AssetDao.kt similarity index 77% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AssetDao.kt index 89c88f8..03a0eaa 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AssetDao.kt @@ -1,11 +1,11 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.Asset +import cy.agorise.bitsybitshareswallet.database.entities.Asset @Dao interface AssetDao { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AuthorityDao.kt similarity index 80% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AuthorityDao.kt index b17b2da..5956e15 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AuthorityDao.kt @@ -1,10 +1,10 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.Authority +import cy.agorise.bitsybitshareswallet.database.entities.Authority import io.reactivex.Single @Dao diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/BalanceDao.kt similarity index 77% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/BalanceDao.kt index 277b14c..13826bd 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/BalanceDao.kt @@ -1,11 +1,11 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.Balance +import cy.agorise.bitsybitshareswallet.database.entities.Balance @Dao interface BalanceDao { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/EquivalentValueDao.kt similarity index 72% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/EquivalentValueDao.kt index bb4622e..314c18a 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/EquivalentValueDao.kt @@ -1,10 +1,10 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.EquivalentValue +import cy.agorise.bitsybitshareswallet.database.entities.EquivalentValue @Dao interface EquivalentValueDao { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/TransferDao.kt similarity index 84% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/TransferDao.kt index 48b1092..f61a9e5 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/TransferDao.kt @@ -1,11 +1,11 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.entities.Transfer import io.reactivex.Single @Dao diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/UserAccountDao.kt similarity index 77% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/UserAccountDao.kt index 3c5d146..9d77877 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/UserAccountDao.kt @@ -1,10 +1,10 @@ -package cy.agorise.bitsybitshareswallet.daos +package cy.agorise.bitsybitshareswallet.database.daos import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.Query -import cy.agorise.bitsybitshareswallet.entities.UserAccount +import cy.agorise.bitsybitshareswallet.database.entities.UserAccount @Dao interface UserAccountDao { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Asset.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Asset.kt similarity index 88% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Asset.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Asset.kt index 874968e..80af4de 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Asset.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Asset.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Authority.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Authority.kt similarity index 90% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Authority.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Authority.kt index 7ea9c74..50d22c2 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Authority.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Authority.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Balance.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Balance.kt similarity index 86% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Balance.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Balance.kt index be42d04..b0ae9ad 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Balance.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Balance.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/EquivalentValue.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/EquivalentValue.kt similarity index 92% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/EquivalentValue.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/EquivalentValue.kt index 2ff4bd3..a702950 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/EquivalentValue.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/EquivalentValue.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Transfer.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Transfer.kt similarity index 94% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Transfer.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Transfer.kt index 4f3166c..f8caf61 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Transfer.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Transfer.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/UserAccount.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/UserAccount.kt similarity index 84% rename from app/src/main/java/cy/agorise/bitsybitshareswallet/entities/UserAccount.kt rename to app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/UserAccount.kt index 011b4ee..df063d2 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/entities/UserAccount.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/UserAccount.kt @@ -1,4 +1,4 @@ -package cy.agorise.bitsybitshareswallet.entities +package cy.agorise.bitsybitshareswallet.database.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt index 8da9ba0..0a3a5f7 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt @@ -14,9 +14,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.adapters.BalancesAdapter import cy.agorise.bitsybitshareswallet.adapters.TransactionsAdapter -import cy.agorise.bitsybitshareswallet.entities.Balance -import cy.agorise.bitsybitshareswallet.entities.Transfer -import cy.agorise.bitsybitshareswallet.entities.UserAccount +import cy.agorise.bitsybitshareswallet.database.entities.Balance +import cy.agorise.bitsybitshareswallet.database.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.entities.UserAccount import cy.agorise.bitsybitshareswallet.utils.Constants import cy.agorise.bitsybitshareswallet.viewmodels.BalanceViewModel import cy.agorise.bitsybitshareswallet.viewmodels.TransactionViewModel diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt index 11cf6f2..2f1df3d 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt @@ -10,7 +10,7 @@ import android.util.Log import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.OnLifecycleEvent -import cy.agorise.bitsybitshareswallet.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.entities.Transfer import cy.agorise.bitsybitshareswallet.models.HistoricalOperationEntry import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository import cy.agorise.bitsybitshareswallet.repositories.TransferRepository diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AssetRepository.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AssetRepository.kt index 8b7c83b..a3cdc1a 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AssetRepository.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AssetRepository.kt @@ -2,9 +2,9 @@ package cy.agorise.bitsybitshareswallet.repositories import android.app.Application import android.os.AsyncTask -import cy.agorise.bitsybitshareswallet.daos.AssetDao -import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase -import cy.agorise.bitsybitshareswallet.entities.Asset +import cy.agorise.bitsybitshareswallet.database.daos.AssetDao +import cy.agorise.bitsybitshareswallet.database.BitsyDatabase +import cy.agorise.bitsybitshareswallet.database.entities.Asset class AssetRepository internal constructor(application: Application) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AuthorityRepository.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AuthorityRepository.kt index 69f7b45..46ad1f3 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AuthorityRepository.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AuthorityRepository.kt @@ -2,9 +2,9 @@ package cy.agorise.bitsybitshareswallet.repositories import android.content.Context import android.os.AsyncTask -import cy.agorise.bitsybitshareswallet.daos.AuthorityDao -import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase -import cy.agorise.bitsybitshareswallet.entities.Authority +import cy.agorise.bitsybitshareswallet.database.daos.AuthorityDao +import cy.agorise.bitsybitshareswallet.database.BitsyDatabase +import cy.agorise.bitsybitshareswallet.database.entities.Authority import io.reactivex.Single class AuthorityRepository internal constructor(context: Context) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/BalanceRepository.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/BalanceRepository.kt index 201979c..0f36bac 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/BalanceRepository.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/BalanceRepository.kt @@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories import android.content.Context import android.os.AsyncTask import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.daos.BalanceDao -import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase -import cy.agorise.bitsybitshareswallet.entities.Balance +import cy.agorise.bitsybitshareswallet.database.daos.BalanceDao +import cy.agorise.bitsybitshareswallet.database.BitsyDatabase +import cy.agorise.bitsybitshareswallet.database.entities.Balance class BalanceRepository internal constructor(context: Context) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/TransferRepository.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/TransferRepository.kt index 361a61e..9c27bd2 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/TransferRepository.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/TransferRepository.kt @@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories import android.content.Context import android.os.AsyncTask import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase -import cy.agorise.bitsybitshareswallet.daos.TransferDao -import cy.agorise.bitsybitshareswallet.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.BitsyDatabase +import cy.agorise.bitsybitshareswallet.database.daos.TransferDao +import cy.agorise.bitsybitshareswallet.database.entities.Transfer import io.reactivex.Single class TransferRepository internal constructor(context: Context) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/UserAccountRepository.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/UserAccountRepository.kt index 569913e..b1a47b8 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/UserAccountRepository.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/UserAccountRepository.kt @@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories import android.app.Application import android.os.AsyncTask import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase -import cy.agorise.bitsybitshareswallet.daos.UserAccountDao -import cy.agorise.bitsybitshareswallet.entities.UserAccount +import cy.agorise.bitsybitshareswallet.database.BitsyDatabase +import cy.agorise.bitsybitshareswallet.database.daos.UserAccountDao +import cy.agorise.bitsybitshareswallet.database.entities.UserAccount class UserAccountRepository internal constructor(application: Application) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/BalanceViewModel.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/BalanceViewModel.kt index 5949a78..5c4a0b8 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/BalanceViewModel.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/BalanceViewModel.kt @@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.entities.Balance +import cy.agorise.bitsybitshareswallet.database.entities.Balance import cy.agorise.bitsybitshareswallet.repositories.BalanceRepository diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionViewModel.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionViewModel.kt index f489b8e..6590fa2 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionViewModel.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionViewModel.kt @@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.entities.Transfer +import cy.agorise.bitsybitshareswallet.database.entities.Transfer import cy.agorise.bitsybitshareswallet.repositories.TransferRepository class TransactionViewModel(application: Application) : AndroidViewModel(application) { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/UserAccountViewModel.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/UserAccountViewModel.kt index ac764d6..1fdf87e 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/UserAccountViewModel.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/UserAccountViewModel.kt @@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData -import cy.agorise.bitsybitshareswallet.entities.UserAccount +import cy.agorise.bitsybitshareswallet.database.entities.UserAccount import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository class UserAccountViewModel(application: Application) : AndroidViewModel(application) {