From 97793a7fc81952f08dd8ac308210b0aba1a58837 Mon Sep 17 00:00:00 2001 From: davidoskky Date: Tue, 7 Feb 2023 20:45:41 +0100 Subject: [PATCH] Use source stats in the home to filter since it is available in public mode --- .../apps/readerforselfossv2/android/SourcesActivity.kt | 2 +- .../apps/readerforselfossv2/android/UpsertSourceActivity.kt | 2 +- .../android/adapters/SourcesListAdapter.kt | 2 +- .../android/fragments/FilterSheetFragment.kt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt index d8019a0..c677952 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt @@ -55,7 +55,7 @@ class SourcesActivity : AppCompatActivity(), DIAware { binding.recyclerView.layoutManager = mLayoutManager CoroutineScope(Dispatchers.Main).launch { - val response = repository.getSources() + val response = repository.getSourcesDetails() if (response.isNotEmpty()) { items = response val mAdapter = SourcesListAdapter( diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt index 882ff1b..d166d90 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt @@ -68,7 +68,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { private fun initFields(items: Map) { binding.nameInput.setText(existingSource!!.title) - binding.tags.setText(existingSource!!.tags.joinToString(", ")) + binding.tags.setText(existingSource!!.tags?.joinToString(", ")) binding.sourceUri.setText(existingSource!!.params?.url) binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout)) binding.progress.visibility = View.GONE diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt index 4bf3436..49e3a3c 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt @@ -61,7 +61,7 @@ class SourcesListAdapter( c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage) } - if (itm.error.isNotBlank()) { + if (itm.error.isNullOrBlank()) { binding.errorText.visibility = View.VISIBLE binding.errorText.text = itm.error } else { diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt index 2831031..832906b 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt @@ -84,7 +84,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { ) { val sourceGroup = binding.sourcesGroup - repository.getSources().forEach { source -> + repository.getSourcesStats().forEach { source -> val c = Chip(context) c.ellipsize = TextUtils.TruncateAt.END @@ -141,9 +141,9 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { selectedChip = c } - c.isEnabled = source.error.isBlank() + c.isEnabled = source.error.isNullOrBlank() - if (source.error.isNotBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (!source.error.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { c.tooltipText = source.error }