diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt index 2f00bfda..019e4d93 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/looker/droidify/Common.kt @@ -39,3 +39,5 @@ const val JOB_ID_SYNC = 1 const val PREFS_LANGUAGE = "languages" const val PREFS_LANGUAGE_DEFAULT = "system" + +const val EXTRA_REPOSITORY_ID = "repositoryId" \ No newline at end of file diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt index 839666ff..2f62c267 100644 --- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt +++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt @@ -70,7 +70,7 @@ interface RepositoryDao : BaseDao { val allDisabledDeleted: List @Query("DELETE FROM repository WHERE _id = :id") - fun deleteById(vararg id: Long): Int + fun deleteById(id: Long): Int // TODO optimize @Update(onConflict = OnConflictStrategy.REPLACE) @@ -91,7 +91,7 @@ interface ProductDao : BaseDao { fun get(packageName: String): List @Query("DELETE FROM product WHERE repository_id = :id") - fun deleteById(vararg id: Long): Int + fun deleteById(id: Long): Int @RawQuery fun query( @@ -288,9 +288,10 @@ interface CategoryDao : BaseDao { val allNames: List @Query("DELETE FROM category WHERE repository_id = :id") - fun deleteById(vararg id: Long): Int + fun deleteById(id: Long): Int } +// TODO make sure that apps that not uninstalled by Droid-ify still get removed @Dao interface InstalledDao : BaseDao { fun put(vararg isntalled: com.looker.droidify.entity.InstalledItem) { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt index 1bc9104f..eb765d9d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt @@ -14,6 +14,7 @@ import androidx.fragment.app.viewModels import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.looker.droidify.EXTRA_REPOSITORY_ID import com.looker.droidify.R import com.looker.droidify.databinding.SheetRepositoryBinding import com.looker.droidify.screen.MessageDialog @@ -33,10 +34,6 @@ class RepositorySheetX() : BottomSheetDialogFragment() { RepositoryViewModelX.Factory((requireActivity() as PrefsActivityX).db, repositoryId) } - companion object { - private const val EXTRA_REPOSITORY_ID = "repositoryId" - } - constructor(repositoryId: Long = 0) : this() { arguments = Bundle().apply { putLong(EXTRA_REPOSITORY_ID, repositoryId) diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt index d085bb15..682510e1 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt @@ -70,6 +70,7 @@ class MainNavFragmentViewModelX(val db: DatabaseX, primarySource: Source, second mSections, mOrder ) + // TODO differentiate between updated and new (e.g. number of releases) Source.UPDATED -> Request.ProductsUpdated( mSearchQuery, mSections,