agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Provide a better package structure for Room database related files.

Browse source
This commit is contained in:
Severiano Jaramillo 2018-12-01 09:25:25 -06:00
parent dd770fdb5b
commit 5ec8afbdb3
28 changed files with 58 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/cy/agorise/bitsybitshareswallet/activities/DatabaseLoadActivity.kt
View file

@ -89,11 +89,11 @@ class DatabaseLoadActivity: ConnectedActivity() {
* @param assetList The list of assets obtained in the last 'list_assets' API call. * @param assetList The list of assets obtained in the last 'list_assets' API call.
*/ */
private fun handlePlatformAssetBatch(assetList: List<Asset>) { private fun handlePlatformAssetBatch(assetList: List<Asset>) {
val assets = mutableListOf<cy.agorise.bitsybitshareswallet.entities.Asset>() val assets = mutableListOf<cy.agorise.bitsybitshareswallet.database.entities.Asset>()
// TODO find if there is a better way to convert to Bitsy Asset instances // TODO find if there is a better way to convert to Bitsy Asset instances
for (_asset in assetList) { for (_asset in assetList) {
val asset = cy.agorise.bitsybitshareswallet.entities.Asset( val asset = cy.agorise.bitsybitshareswallet.database.entities.Asset(
_asset.objectId, _asset.objectId,
_asset.symbol, _asset.symbol,
_asset.precision, _asset.precision,

4
app/src/main/java/cy/agorise/bitsybitshareswallet/activities/ImportBrainkeyActivity.kt
View file

@ -9,7 +9,7 @@ import android.widget.Toast
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.list.listItemsSingleChoice import com.afollestad.materialdialogs.list.listItemsSingleChoice
import cy.agorise.bitsybitshareswallet.R 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.AuthorityRepository
import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository
import cy.agorise.bitsybitshareswallet.utils.Constants import cy.agorise.bitsybitshareswallet.utils.Constants
@ -235,7 +235,7 @@ class ImportBrainkeyActivity : ConnectedActivity() {
val name = accountProperties.name val name = accountProperties.name
val isLTM = accountProperties.membership_expiration_date == Constants.LIFETIME_EXPIRATION_DATE 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) val userAccountRepository = UserAccountRepository(application)
userAccountRepository.insert(userAccount) userAccountRepository.insert(userAccount)

2
app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
View file

@ -10,7 +10,7 @@ import android.widget.Toast
import androidx.collection.LongSparseArray import androidx.collection.LongSparseArray
import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomnavigation.BottomNavigationView
import cy.agorise.bitsybitshareswallet.R 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.BalancesFragment
import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment
import cy.agorise.bitsybitshareswallet.processors.TransfersLoader import cy.agorise.bitsybitshareswallet.processors.TransfersLoader

2
app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/BalancesAdapter.kt
View file

@ -8,7 +8,7 @@ import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedList import androidx.recyclerview.widget.SortedList
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.entities.Balance import cy.agorise.bitsybitshareswallet.database.entities.Balance
class BalancesAdapter(private val context: Context) : class BalancesAdapter(private val context: Context) :
RecyclerView.Adapter<BalancesAdapter.ViewHolder>() { RecyclerView.Adapter<BalancesAdapter.ViewHolder>() {

2
app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/TransactionsAdapter.kt
View file

@ -11,7 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedList import androidx.recyclerview.widget.SortedList
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.entities.Transfer import cy.agorise.bitsybitshareswallet.database.entities.Transfer
class TransactionsAdapter(private val context: Context) : class TransactionsAdapter(private val context: Context) :
RecyclerView.Adapter<TransactionsAdapter.ViewHolder>() { RecyclerView.Adapter<TransactionsAdapter.ViewHolder>() {

20
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/BitsyDatabase.kt
View file

@ -1,19 +1,21 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database
import android.content.Context import android.content.Context
import androidx.room.Database import androidx.room.Database
import androidx.room.Room import androidx.room.Room
import androidx.room.RoomDatabase import androidx.room.RoomDatabase
import cy.agorise.bitsybitshareswallet.entities.* import cy.agorise.bitsybitshareswallet.database.daos.*
import cy.agorise.bitsybitshareswallet.database.entities.*
@Database(entities = [ @Database(entities = [
Asset::class, Asset::class,
Authority::class, Authority::class,
Balance::class, Balance::class,
EquivalentValue::class, EquivalentValue::class,
Transfer::class, Transfer::class,
UserAccount::class UserAccount::class
], version = 1, exportSchema = false) ],
version = 1, exportSchema = false)
abstract class BitsyDatabase : RoomDatabase() { abstract class BitsyDatabase : RoomDatabase() {
abstract fun assetDao(): AssetDao abstract fun assetDao(): AssetDao

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AssetDao.kt
View file

@ -1,11 +1,11 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.Asset import cy.agorise.bitsybitshareswallet.database.entities.Asset
@Dao @Dao
interface AssetDao { interface AssetDao {

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/AuthorityDao.kt
View file

@ -1,10 +1,10 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.Authority import cy.agorise.bitsybitshareswallet.database.entities.Authority
import io.reactivex.Single import io.reactivex.Single
@Dao @Dao

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/BalanceDao.kt
View file

@ -1,11 +1,11 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.Balance import cy.agorise.bitsybitshareswallet.database.entities.Balance
@Dao @Dao
interface BalanceDao { interface BalanceDao {

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/EquivalentValueDao.kt
View file

@ -1,10 +1,10 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.EquivalentValue import cy.agorise.bitsybitshareswallet.database.entities.EquivalentValue
@Dao @Dao
interface EquivalentValueDao { interface EquivalentValueDao {

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/TransferDao.kt
View file

@ -1,11 +1,11 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.Transfer import cy.agorise.bitsybitshareswallet.database.entities.Transfer
import io.reactivex.Single import io.reactivex.Single
@Dao @Dao

4
app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/daos/UserAccountDao.kt
View file

@ -1,10 +1,10 @@
package cy.agorise.bitsybitshareswallet.daos package cy.agorise.bitsybitshareswallet.database.daos
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.Query import androidx.room.Query
import cy.agorise.bitsybitshareswallet.entities.UserAccount import cy.agorise.bitsybitshareswallet.database.entities.UserAccount
@Dao @Dao
interface UserAccountDao { interface UserAccountDao {

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Asset.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Asset.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Authority.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Authority.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Balance.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Balance.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/EquivalentValue.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/EquivalentValue.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/Transfer.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/Transfer.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

2
app/src/main/java/cy/agorise/bitsybitshareswallet/entities/UserAccount.kt → app/src/main/java/cy/agorise/bitsybitshareswallet/database/entities/UserAccount.kt
View file

@ -1,4 +1,4 @@
package cy.agorise.bitsybitshareswallet.entities package cy.agorise.bitsybitshareswallet.database.entities
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity

6
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt
View file

@ -14,9 +14,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.adapters.BalancesAdapter import cy.agorise.bitsybitshareswallet.adapters.BalancesAdapter
import cy.agorise.bitsybitshareswallet.adapters.TransactionsAdapter import cy.agorise.bitsybitshareswallet.adapters.TransactionsAdapter
import cy.agorise.bitsybitshareswallet.entities.Balance import cy.agorise.bitsybitshareswallet.database.entities.Balance
import cy.agorise.bitsybitshareswallet.entities.Transfer import cy.agorise.bitsybitshareswallet.database.entities.Transfer
import cy.agorise.bitsybitshareswallet.entities.UserAccount import cy.agorise.bitsybitshareswallet.database.entities.UserAccount
import cy.agorise.bitsybitshareswallet.utils.Constants import cy.agorise.bitsybitshareswallet.utils.Constants
import cy.agorise.bitsybitshareswallet.viewmodels.BalanceViewModel import cy.agorise.bitsybitshareswallet.viewmodels.BalanceViewModel
import cy.agorise.bitsybitshareswallet.viewmodels.TransactionViewModel import cy.agorise.bitsybitshareswallet.viewmodels.TransactionViewModel

2
app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt
View file

@ -10,7 +10,7 @@ import android.util.Log
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.OnLifecycleEvent 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.models.HistoricalOperationEntry
import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository
import cy.agorise.bitsybitshareswallet.repositories.TransferRepository import cy.agorise.bitsybitshareswallet.repositories.TransferRepository

6
app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AssetRepository.kt
View file

@ -2,9 +2,9 @@ package cy.agorise.bitsybitshareswallet.repositories
import android.app.Application import android.app.Application
import android.os.AsyncTask import android.os.AsyncTask
import cy.agorise.bitsybitshareswallet.daos.AssetDao import cy.agorise.bitsybitshareswallet.database.daos.AssetDao
import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase import cy.agorise.bitsybitshareswallet.database.BitsyDatabase
import cy.agorise.bitsybitshareswallet.entities.Asset import cy.agorise.bitsybitshareswallet.database.entities.Asset
class AssetRepository internal constructor(application: Application) { class AssetRepository internal constructor(application: Application) {

6
app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/AuthorityRepository.kt
View file

@ -2,9 +2,9 @@ package cy.agorise.bitsybitshareswallet.repositories
import android.content.Context import android.content.Context
import android.os.AsyncTask import android.os.AsyncTask
import cy.agorise.bitsybitshareswallet.daos.AuthorityDao import cy.agorise.bitsybitshareswallet.database.daos.AuthorityDao
import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase import cy.agorise.bitsybitshareswallet.database.BitsyDatabase
import cy.agorise.bitsybitshareswallet.entities.Authority import cy.agorise.bitsybitshareswallet.database.entities.Authority
import io.reactivex.Single import io.reactivex.Single
class AuthorityRepository internal constructor(context: Context) { class AuthorityRepository internal constructor(context: Context) {

6
app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/BalanceRepository.kt
View file

@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories
import android.content.Context import android.content.Context
import android.os.AsyncTask import android.os.AsyncTask
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.daos.BalanceDao import cy.agorise.bitsybitshareswallet.database.daos.BalanceDao
import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase import cy.agorise.bitsybitshareswallet.database.BitsyDatabase
import cy.agorise.bitsybitshareswallet.entities.Balance import cy.agorise.bitsybitshareswallet.database.entities.Balance
class BalanceRepository internal constructor(context: Context) { class BalanceRepository internal constructor(context: Context) {

6
app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/TransferRepository.kt
View file

@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories
import android.content.Context import android.content.Context
import android.os.AsyncTask import android.os.AsyncTask
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase import cy.agorise.bitsybitshareswallet.database.BitsyDatabase
import cy.agorise.bitsybitshareswallet.daos.TransferDao import cy.agorise.bitsybitshareswallet.database.daos.TransferDao
import cy.agorise.bitsybitshareswallet.entities.Transfer import cy.agorise.bitsybitshareswallet.database.entities.Transfer
import io.reactivex.Single import io.reactivex.Single
class TransferRepository internal constructor(context: Context) { class TransferRepository internal constructor(context: Context) {

6
app/src/main/java/cy/agorise/bitsybitshareswallet/repositories/UserAccountRepository.kt
View file

@ -3,9 +3,9 @@ package cy.agorise.bitsybitshareswallet.repositories
import android.app.Application import android.app.Application
import android.os.AsyncTask import android.os.AsyncTask
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.daos.BitsyDatabase import cy.agorise.bitsybitshareswallet.database.BitsyDatabase
import cy.agorise.bitsybitshareswallet.daos.UserAccountDao import cy.agorise.bitsybitshareswallet.database.daos.UserAccountDao
import cy.agorise.bitsybitshareswallet.entities.UserAccount import cy.agorise.bitsybitshareswallet.database.entities.UserAccount
class UserAccountRepository internal constructor(application: Application) { class UserAccountRepository internal constructor(application: Application) {

2
app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/BalanceViewModel.kt
View file

@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels
import android.app.Application import android.app.Application
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.entities.Balance import cy.agorise.bitsybitshareswallet.database.entities.Balance
import cy.agorise.bitsybitshareswallet.repositories.BalanceRepository import cy.agorise.bitsybitshareswallet.repositories.BalanceRepository

2
app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionViewModel.kt
View file

@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels
import android.app.Application import android.app.Application
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.entities.Transfer import cy.agorise.bitsybitshareswallet.database.entities.Transfer
import cy.agorise.bitsybitshareswallet.repositories.TransferRepository import cy.agorise.bitsybitshareswallet.repositories.TransferRepository
class TransactionViewModel(application: Application) : AndroidViewModel(application) { class TransactionViewModel(application: Application) : AndroidViewModel(application) {

2
app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/UserAccountViewModel.kt
View file

@ -3,7 +3,7 @@ package cy.agorise.bitsybitshareswallet.viewmodels
import android.app.Application import android.app.Application
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.bitsybitshareswallet.entities.UserAccount import cy.agorise.bitsybitshareswallet.database.entities.UserAccount
import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository import cy.agorise.bitsybitshareswallet.repositories.UserAccountRepository
class UserAccountViewModel(application: Application) : AndroidViewModel(application) { class UserAccountViewModel(application: Application) : AndroidViewModel(application) {