From 2d7e6a7e90db19f8feff22b5b760bdd055bbade7 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Wed, 6 Apr 2022 03:46:35 +0200 Subject: [PATCH] Update: Rename some entities fields --- src/main/kotlin/com/looker/droidify/Common.kt | 6 ++-- .../com/looker/droidify/database/DAOs.kt | 34 +++++++++---------- .../droidify/database/entity/Category.kt | 8 ++--- .../droidify/database/entity/Installed.kt | 4 +-- .../looker/droidify/database/entity/Lock.kt | 4 +-- .../droidify/database/entity/Product.kt | 11 +++--- .../looker/droidify/service/SyncService.kt | 2 +- .../droidify/ui/adapters/AppDetailAdapter.kt | 2 +- .../ui/fragments/AppDetailFragment.kt | 2 +- .../looker/droidify/ui/fragments/AppSheetX.kt | 2 +- .../droidify/ui/fragments/ExploreFragment.kt | 2 +- 11 files changed, 37 insertions(+), 40 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt index 2a4c90a7..cc51e778 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/looker/droidify/Common.kt @@ -10,14 +10,14 @@ const val NOTIFICATION_ID_UPDATES = 2 const val NOTIFICATION_ID_DOWNLOADING = 3 const val NOTIFICATION_ID_INSTALLER = 4 -const val ROW_REPOSITORY_ID = "repository_id" -const val ROW_PACKAGE_NAME = "package_name" +const val ROW_REPOSITORY_ID = "repositoryId" +const val ROW_PACKAGE_NAME = "packageName" const val ROW_NAME = "name" const val ROW_SUMMARY = "summary" const val ROW_DESCRIPTION = "description" const val ROW_ADDED = "added" const val ROW_UPDATED = "updated" -const val ROW_VERSION_CODE = "version_code" +const val ROW_VERSION_CODE = "versionCode" const val ROW_SIGNATURES = "signatures" const val ROW_COMPATIBLE = "compatible" const val ROW_ICON = "icon" diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt index 36d3dfd6..47289972 100644 --- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt +++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt @@ -62,19 +62,19 @@ interface RepositoryDao : BaseDao { @Dao interface ProductDao : BaseDao { - @Query("SELECT COUNT(*) FROM product WHERE repository_id = :id") + @Query("SELECT COUNT(*) FROM product WHERE repositoryId = :id") fun countForRepository(id: Long): Long - @Query("SELECT COUNT(*) FROM product WHERE repository_id = :id") + @Query("SELECT COUNT(*) FROM product WHERE repositoryId = :id") fun countForRepositoryLive(id: Long): LiveData - @Query("SELECT * FROM product WHERE package_name = :packageName") + @Query("SELECT * FROM product WHERE packageName = :packageName") fun get(packageName: String): List - @Query("SELECT * FROM product WHERE package_name = :packageName") + @Query("SELECT * FROM product WHERE packageName = :packageName") fun getLive(packageName: String): LiveData> - @Query("DELETE FROM product WHERE repository_id = :id") + @Query("DELETE FROM product WHERE repositoryId = :id") fun deleteById(id: Long): Int @RawQuery @@ -244,24 +244,24 @@ interface ReleaseDao : BaseDao { @Dao interface CategoryDao : BaseDao { @get:Query( - """SELECT DISTINCT category.name + """SELECT DISTINCT category.label FROM category AS category JOIN repository AS repository - ON category.repository_id = repository._id + ON category.repositoryId = repository._id WHERE repository.enabled != 0""" ) val allNames: List @get:Query( - """SELECT DISTINCT category.name + """SELECT DISTINCT category.label FROM category AS category JOIN repository AS repository - ON category.repository_id = repository._id + ON category.repositoryId = repository._id WHERE repository.enabled != 0""" ) val allNamesLive: LiveData> - @Query("DELETE FROM category WHERE repository_id = :id") + @Query("DELETE FROM category WHERE repositoryId = :id") fun deleteById(id: Long): Int } @@ -275,13 +275,13 @@ interface InstalledDao : BaseDao { @get:Query("SELECT * FROM memory_installed") val allLive: LiveData> - @Query("SELECT * FROM memory_installed WHERE package_name = :packageName") + @Query("SELECT * FROM memory_installed WHERE packageName = :packageName") fun get(packageName: String): Installed? - @Query("SELECT * FROM memory_installed WHERE package_name = :packageName") + @Query("SELECT * FROM memory_installed WHERE packageName = :packageName") fun getLive(packageName: String): LiveData - @Query("DELETE FROM memory_installed WHERE package_name = :packageName") + @Query("DELETE FROM memory_installed WHERE packageName = :packageName") fun delete(packageName: String) @Query("DELETE FROM memory_installed") @@ -290,7 +290,7 @@ interface InstalledDao : BaseDao { @Dao interface LockDao : BaseDao { - @Query("DELETE FROM memory_lock WHERE package_name = :packageName") + @Query("DELETE FROM memory_lock WHERE packageName = :packageName") fun delete(packageName: String) } @@ -335,9 +335,9 @@ interface ProductTempDao : BaseDao { }) it.categories.forEach { category -> insertCategory(CategoryTemp().apply { - repository_id = it.repositoryId - package_name = it.packageName - name = category + repositoryId = it.repositoryId + packageName = it.packageName + label = category }) } } diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Category.kt b/src/main/kotlin/com/looker/droidify/database/entity/Category.kt index 15d853ff..eb45acca 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Category.kt +++ b/src/main/kotlin/com/looker/droidify/database/entity/Category.kt @@ -2,11 +2,11 @@ package com.looker.droidify.database.entity import androidx.room.Entity -@Entity(tableName = "category", primaryKeys = ["repository_id", "package_name", "name"]) +@Entity(tableName = "category", primaryKeys = ["repositoryId", "packageName", "label"]) open class Category { - var repository_id: Long = 0 - var package_name = "" - var name = "" + var repositoryId: Long = 0 + var packageName = "" + var label = "" } @Entity(tableName = "temporary_category") diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt b/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt index a9132fde..1dcdb428 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt +++ b/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt @@ -6,8 +6,8 @@ import androidx.room.PrimaryKey @Entity(tableName = "memory_installed") data class Installed( @PrimaryKey - var package_name: String = "", + var packageName: String = "", var version: String = "", - var version_code: Long = 0L, + var versionCode: Long = 0L, var signature: String = "" ) \ No newline at end of file diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Lock.kt b/src/main/kotlin/com/looker/droidify/database/entity/Lock.kt index 98cabd93..17832a3f 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Lock.kt +++ b/src/main/kotlin/com/looker/droidify/database/entity/Lock.kt @@ -6,6 +6,6 @@ import androidx.room.PrimaryKey @Entity(tableName = "memory_lock") data class Lock( @PrimaryKey - var package_name: String = "", - var version_code: Long = 0L + var packageName: String = "", + var versionCode: Long = 0L ) \ No newline at end of file diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt b/src/main/kotlin/com/looker/droidify/database/entity/Product.kt index 5c0235d4..97a0bd68 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt +++ b/src/main/kotlin/com/looker/droidify/database/entity/Product.kt @@ -6,27 +6,27 @@ import com.looker.droidify.entity.Donate import com.looker.droidify.entity.ProductItem import com.looker.droidify.entity.Screenshot -@Entity(tableName = "product", primaryKeys = ["repository_id", "package_name"]) open class Product { - var repository_id = 0L - var package_name = "" var name = "" var summary = "" var description = "" var added = 0L var updated = 0L - var version_code = 0L var signatures = "" var compatible = 0 var icon = "" var metadataIcon = "" +@Entity(tableName = "product", primaryKeys = ["repositoryId", "packageName"]) + var repositoryId: Long, + var packageName: String var releases: List = emptyList() var categories: List = emptyList() var antiFeatures: List = emptyList() var licenses: List = emptyList() var donates: List = emptyList() var screenshots: List = emptyList() + var versionCode: Long = 0L // TODO Remove in next iteration @ColumnInfo(typeAffinity = ColumnInfo.BLOB) @@ -44,9 +44,6 @@ open class Product { val version: String get() = displayRelease?.version.orEmpty() - val versionCode: Long - get() = selectedReleases.firstOrNull()?.versionCode ?: 0L - fun toItem(installed: Installed? = null): ProductItem = ProductItem( repositoryId, diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt index 453ad5e9..bfc38386 100644 --- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt @@ -458,8 +458,8 @@ class SyncService : ConnectionService() { val repository = installedRepository.third!! val productRepository = db.productDao.get(packageName) - .filter { product -> product?.repository_id == repository.id } .map { product -> Pair(product?.data!!, repository) } + .filter { product -> product.repositoryId == repository.id } scope.launch { Utils.startUpdate( diff --git a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt index 0ea3a6d6..9200654f 100644 --- a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt @@ -1322,7 +1322,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) : val incompatibility = item.release.incompatibilities.firstOrNull() val singlePlatform = if (item.release.platforms.size == 1) item.release.platforms.first() else null - val installed = installed?.version_code == item.release.versionCode && + val installed = installed?.versionCode == item.release.versionCode && installed?.signature == item.release.signature val suggested = incompatibility == null && item.release.selected && item.selectedRepository diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt index 48b52389..19c3e791 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt @@ -538,7 +538,7 @@ class AppDetailFragment() : ScreenFragment(), AppDetailAdapter.Callbacks { ) ).show(childFragmentManager) } - installedItem != null && installedItem.version_code > release.versionCode -> { + installedItem != null && installedItem.versionCode > release.versionCode -> { MessageDialog(MessageDialog.Message.ReleaseOlder).show(childFragmentManager) } installedItem != null && installedItem.signature != release.signature -> { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt index 234bacd2..11b2e3a7 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt @@ -415,7 +415,7 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), AppDetailAdapter.Call ) ).show(childFragmentManager) } - installedItem != null && installedItem.version_code > release.versionCode -> { + installedItem != null && installedItem.versionCode > release.versionCode -> { MessageDialog(MessageDialog.Message.ReleaseOlder).show(childFragmentManager) } installedItem != null && installedItem.signature != release.signature -> { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt index b38da044..ee6ed117 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -87,7 +87,7 @@ class ExploreFragment : MainNavFragmentX() { check( children.filterNotNull() .find { child -> - child is Chip && selectedSection is Category && child.text == selectedSection.name + child is Chip && selectedSection is Category && child.text == selectedSection.label }?.id ?: R.id.SHOW_ALL ) }