Added Cancel button in configuration screen and empty collection hand…

…ling in CardAnalysisWidget.
xenonnn4w · Aug 31, 2024 · 3e844ff · 3e844ff
1 parent c13d3d1
commit 3e844ff
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt b/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
@@ -26,6 +26,7 @@ import android.view.View
 import android.widget.RemoteViews
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.CrashReportService
+import com.ichi2.anki.DeckUtils
 import com.ichi2.anki.R
 import com.ichi2.anki.Reviewer
 import com.ichi2.anki.analytics.UsageAnalytics
@@ -78,6 +79,12 @@ class CardAnalysisWidget : AnalyticsWidgetProvider() {
                 return
             }
             AnkiDroidApp.applicationScope.launch {
+                val isCollectionEmpty = DeckUtils.isCollectionEmpty()
+                if (isCollectionEmpty) {
+                    showCollectionDeck(context, appWidgetManager, appWidgetId, remoteViews)
+                    return@launch
+                }
+
                 val deckData = getDeckNameAndStats(deckId)
 
                 if (deckData == null) {
@@ -90,6 +97,20 @@ class CardAnalysisWidget : AnalyticsWidgetProvider() {
             }
         }
 
+        private fun showCollectionDeck(
+            context: Context,
+            appWidgetManager: AppWidgetManager,
+            appWidgetId: Int,
+            remoteViews: RemoteViews
+        ) {
+            remoteViews.setTextViewText(R.id.empty_widget, context.getString(R.string.app_not_initialized_new))
+            remoteViews.setViewVisibility(R.id.empty_widget, View.VISIBLE)
+            remoteViews.setViewVisibility(R.id.cardAnalysisDataHolder, View.GONE)
+            remoteViews.setViewVisibility(R.id.deckNameCardAnalysis, View.GONE)
+
+            appWidgetManager.updateAppWidget(appWidgetId, remoteViews)
+        }
+
         private fun showMissingDeck(
             context: Context,
             appWidgetManager: AppWidgetManager,

diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt b/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt
@@ -127,6 +127,7 @@ class CardAnalysisWidgetConfig : AnkiActivity(), DeckSelectionListener, BaseSnac
             showSnackbar(R.string.deck_removed_from_widget)
             updateViewVisibility()
             updateFabVisibility()
+            updateSubmitButtonText()
             hasUnsavedChanges = true
             setUnsavedChanges(true)
         }
@@ -136,7 +137,13 @@ class CardAnalysisWidgetConfig : AnkiActivity(), DeckSelectionListener, BaseSnac
             adapter = this@CardAnalysisWidgetConfig.deckAdapter
         }
 
-        findViewById<Button>(R.id.submit_button).visibility = View.GONE
+        // Find and update the submit button text based on the initial deck selection state
+        val submitButton = findViewById<Button>(R.id.submit_button)
+        updateSubmitButtonText()
+
+        submitButton.setOnClickListener {
+            finish() // Close the configuration screen when the button is clicked
+        }
 
         findViewById<FloatingActionButton>(R.id.fabWidgetDeckPicker).setOnClickListener {
             showDeckSelectionDialog()
@@ -169,6 +176,17 @@ class CardAnalysisWidgetConfig : AnkiActivity(), DeckSelectionListener, BaseSnac
         }
     }
 
+    /** Updates the text of the submit button based on the selected deck count. */
+    private fun updateSubmitButtonText() {
+        val submitButton = findViewById<Button>(R.id.submit_button)
+        if (deckAdapter.itemCount > 0) {
+            submitButton.text = getString(R.string.dialog_cancel)
+            submitButton.visibility = View.VISIBLE
+        } else {
+            submitButton.visibility = View.GONE
+        }
+    }
+
     private fun showDiscardChangesDialog() {
         DiscardChangesDialog.showDialog(
             context = this@CardAnalysisWidgetConfig,
@@ -222,6 +240,7 @@ class CardAnalysisWidgetConfig : AnkiActivity(), DeckSelectionListener, BaseSnac
             selectedDecks.forEach { deckAdapter.addDeck(it) }
             updateViewVisibility()
             updateFabVisibility()
+            updateSubmitButtonText()
         }
     }