ADFA-4910: Books download confirmation screen

Add a review step between the Books landing and the add/download action,
mirroring ZIM/Maps Confirm. The landing 'Review (N)' button hands the
selection to a new BooksConfirmFragment (list of picks + total count +
honest one-at-a-time note); the primary button banks to BooksWishlist in
the wizard or starts BooksDownloadService live, then returns via the hub.

Author: luisguzman-adfa

controller/app/src/main/java/org/iiab/controller/redesign/BooksConfirmFragment.java

@@ -0,0 +1,114 @@
+/*
+ * ============================================================================
+ * Name        : BooksConfirmFragment.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : ADFA-4910. Books Confirm — a review step between the Books landing and the
+ *               download/bank action, mirroring ZimConfirmFragment. Lists the picked books
+ *               (title + author), a total count, an honest note, and a primary button. Books
+ *               carry no per-item size, so this shows a count (not GB). In the wizard the button
+ *               banks the picks to BooksWishlist and returns to the Get More hub; live, it hands
+ *               the picks to BooksDownloadService and opens the downloads screen. Reads the
+ *               selection cart from SetupLibraryActivity.
+ * ============================================================================
+ */
+package org.iiab.controller.redesign;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.iiab.controller.R;
+
+public class BooksConfirmFragment extends Fragment {
+
+    private int px(int dp) { return Math.round(dp * getResources().getDisplayMetrics().density); }
+
+    /** Selection cart from the activity: gutenberg_id -> {title, author, download_url}. */
+    private LinkedHashMap<String, String[]> cart() {
+        return (getActivity() instanceof SetupLibraryActivity)
+                ? ((SetupLibraryActivity) getActivity()).getBooksCart() : new LinkedHashMap<>();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle s) {
+        View root = inflater.inflate(R.layout.fragment_k2go_books_confirm, container, false);
+
+        TextView back = root.findViewById(R.id.k2go_bconf_back);
+        back.setText("‹ " + getString(R.string.k2go_books_back_title));
+        back.setOnClickListener(v -> requireActivity().getSupportFragmentManager().popBackStack());
+
+        LinkedHashMap<String, String[]> cart = cart();
+        LinearLayout box = root.findViewById(R.id.k2go_bconf_list);
+        for (Map.Entry<String, String[]> e : cart.entrySet()) {
+            String[] v = e.getValue();
+            String title = v != null && v.length > 0 ? v[0] : "";
+            String author = v != null && v.length > 1 ? v[1] : "";
+            box.addView(row(title, author, false));
+            box.addView(divider());
+        }
+        box.addView(row(getString(R.string.k2go_books_total_fmt, cart.size()), "", true));
+
+        boolean wiz = (getActivity() instanceof SetupLibraryActivity) && ((SetupLibraryActivity) getActivity()).isBooksWizard();
+        Button add = root.findViewById(R.id.k2go_bconf_add);
+        add.setText(getString(wiz ? R.string.k2go_books_add_setup_fmt : R.string.k2go_books_add_fmt, cart.size()));
+        add.setEnabled(!cart.isEmpty());
+        add.setOnClickListener(v -> {
+            if (!(getActivity() instanceof SetupLibraryActivity)) return;
+            SetupLibraryActivity a = (SetupLibraryActivity) getActivity();
+            if (a.isBooksWizard()) a.booksWizardConfirm();   // pre-install: bank the selection
+            else a.startBooksDownload();                     // live: download now
+        });
+
+        return root;
+    }
+
+    private View row(String name, String sub, boolean totalRow) {
+        LinearLayout r = new LinearLayout(requireContext());
+        r.setOrientation(LinearLayout.HORIZONTAL);
+        r.setGravity(Gravity.CENTER_VERTICAL);
+        r.setPadding(0, px(10), 0, px(10));
+
+        LinearLayout text = new LinearLayout(requireContext());
+        text.setOrientation(LinearLayout.VERTICAL);
+        TextView n = new TextView(requireContext());
+        n.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyLarge);
+        n.setText(name);
+        n.setTextColor(ContextCompat.getColor(requireContext(), totalRow ? R.color.k2go_teal : R.color.k2go_ink));
+        if (totalRow) n.setTypeface(n.getTypeface(), Typeface.BOLD);
+        text.addView(n);
+        if (!sub.isEmpty()) {
+            TextView subv = new TextView(requireContext());
+            subv.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodySmall);
+            subv.setText(sub);
+            subv.setTextColor(ContextCompat.getColor(requireContext(), R.color.k2go_muted));
+            text.addView(subv);
+        }
+        r.addView(text, new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f));
+        return r;
+    }
+
+    private View divider() {
+        View d = new View(requireContext());
+        d.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 1));
+        d.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.k2go_hairline));
+        return d;
+    }
+}

controller/app/src/main/java/org/iiab/controller/redesign/BooksLandingFragment.java

@@ -116,7 +116,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         });
 
         buildChips();
-        addBtn.setOnClickListener(v -> startDownloads());
+        addBtn.setOnClickListener(v -> reviewSelection());
         downloadsLink.setOnClickListener(v -> openDownloads());
 
         loadLanguages();
@@ -391,36 +391,29 @@ private void refreshFooter() {
             addBtn.setVisibility(View.VISIBLE);
             int n = selected.size();
             addBtn.setEnabled(n > 0);
-            int fmt = wizard ? R.string.k2go_books_add_setup_fmt : R.string.k2go_books_add_fmt;
-            addBtn.setText(n > 0 ? getString(fmt, n) : getString(R.string.k2go_books_add_none));
+            // ADFA-4910: the landing now leads to a Confirm/review step, not a direct add.
+            addBtn.setText(n > 0 ? getString(R.string.k2go_books_review_fmt, n) : getString(R.string.k2go_books_add_none));
         }
         if (wizard) { downloadsLink.setVisibility(View.GONE); return; }   // no live downloads pre-install
         boolean active = BooksDownloadService.hasSession();
         downloadsLink.setVisibility(active ? View.VISIBLE : View.GONE);
         if (active) downloadsLink.setText(getString(R.string.k2go_books_view_downloads));
     }
 
-    private void startDownloads() {
+    /** ADFA-4910: hand the current selection to the activity cart and open the Confirm/review
+     *  screen. Confirm is the single place that banks (wizard) or downloads (live), so both flows
+     *  share one review step. The picks stay in {@code selected} so returning here keeps the state. */
+    private void reviewSelection() {
         if (selected.isEmpty()) return;
-        if (wizard) {   // pre-install: record the picks into the wishlist; provisioned after install
-            for (JSONObject b : selected.values()) {
-                BooksWishlist.add(requireContext(), b.optString("gutenberg_id", ""),
-                        b.optString("title", ""), b.optString("download_url", ""));
-            }
-            selected.clear();
-            render();   // picked books now show the "Added" band
-            return;
-        }
-        List<String> ids = new ArrayList<>(), titles = new ArrayList<>(), urls = new ArrayList<>();
+        if (!(getActivity() instanceof SetupLibraryActivity)) return;
+        LinkedHashMap<String, String[]> cart = new LinkedHashMap<>();
         for (JSONObject b : selected.values()) {
-            ids.add(b.optString("gutenberg_id", ""));
-            titles.add(b.optString("title", ""));
-            urls.add(b.optString("download_url", ""));
+            cart.put(b.optString("gutenberg_id", ""), new String[]{
+                    b.optString("title", ""), b.optString("author", ""), b.optString("download_url", "")});
         }
-        BooksDownloadService.start(requireContext().getApplicationContext(),
-                ids.toArray(new String[0]), titles.toArray(new String[0]), urls.toArray(new String[0]));
-        selected.clear();
-        openDownloads();
+        SetupLibraryActivity a = (SetupLibraryActivity) getActivity();
+        a.setBooksCart(cart);
+        a.openBooksConfirm();
     }
 
     private void openDownloads() {

controller/app/src/main/java/org/iiab/controller/redesign/SetupLibraryActivity.java

@@ -44,6 +44,14 @@ public class SetupLibraryActivity extends AppCompatActivity {
     // banks the per-layer selection to MapsWishlist instead of starting a live runrole.
     private boolean mapsWizard = false;
 
+    // ADFA-4910: true while the Books flow runs inside the wizard (pre-install). The Confirm step then
+    // banks the picks to BooksWishlist instead of starting a live download.
+    private boolean booksWizard = false;
+
+    // ADFA-4910: the Books selection handed from the landing to the Confirm screen:
+    // gutenberg_id -> {title, author, download_url}.
+    private final java.util.LinkedHashMap<String, String[]> booksCart = new java.util.LinkedHashMap<>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -123,6 +131,7 @@ private InstallationPlanner.Tier readInstalledTier() {
     public void openContentType(String key, String title) {
         zimWizard = false;   // live (post-install) path; the ZIM terminal downloads, not wishlists
         mapsWizard = false;  // ADFA-4900: live (post-install) path; Maps installs, not wishlists
+        booksWizard = false; // ADFA-4910: live (post-install) path; Books download, not wishlists
         androidx.fragment.app.Fragment f;
         if ("maps".equals(key)) f = new MapsLandingFragment();
         else if ("wikipedia".equals(key)) f = new ZimLandingFragment();   // Wikipedia & ZIM content
@@ -226,12 +235,61 @@ public void zimWizardConfirm() {
 
     /** ADFA-4853: open Books in wizard mode (pre-install, offline catalog -> wishlist). */
     public void openBooksWizard() {
+        booksWizard = true;
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.k2go_setup_host, BooksLandingFragment.newInstance(true))
                 .addToBackStack("wizard_books")
                 .commit();
     }
 
+    public boolean isBooksWizard() { return booksWizard; }
+
+    /** ADFA-4910: the Books selection cart (gutenberg_id -> {title, author, download_url}), set by
+     *  the landing when the user taps "Review" and read by BooksConfirmFragment. */
+    public java.util.LinkedHashMap<String, String[]> getBooksCart() { return booksCart; }
+    public void setBooksCart(java.util.LinkedHashMap<String, String[]> picks) {
+        booksCart.clear();
+        if (picks != null) booksCart.putAll(picks);
+    }
+
+    /** ADFA-4910: Books landing "Review" -> Confirm (list + total + honest note). */
+    public void openBooksConfirm() {
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.k2go_setup_host, new BooksConfirmFragment())
+                .addToBackStack("books_confirm")
+                .commit();
+    }
+
+    /** ADFA-4910: Books Confirm terminal in wizard mode — bank the picks and return to the hub. */
+    public void booksWizardConfirm() {
+        for (java.util.Map.Entry<String, String[]> e : booksCart.entrySet()) {
+            String[] v = e.getValue();
+            String title = v != null && v.length > 0 ? v[0] : "";
+            String url = v != null && v.length > 2 ? v[2] : "";
+            BooksWishlist.add(this, e.getKey(), title, url);
+        }
+        booksCart.clear();
+        getSupportFragmentManager().popBackStack("wizard_books",
+                androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
+    }
+
+    /** ADFA-4910: Books Confirm terminal in live mode — hand the picks to the download service and
+     *  open the downloads screen (per-book checklist + retry). */
+    public void startBooksDownload() {
+        java.util.List<String> ids = new java.util.ArrayList<>(), titles = new java.util.ArrayList<>(),
+                urls = new java.util.ArrayList<>();
+        for (java.util.Map.Entry<String, String[]> e : booksCart.entrySet()) {
+            String[] v = e.getValue();
+            ids.add(e.getKey());
+            titles.add(v != null && v.length > 0 ? v[0] : "");
+            urls.add(v != null && v.length > 2 ? v[2] : "");
+        }
+        booksCart.clear();
+        BooksDownloadService.start(getApplicationContext(),
+                ids.toArray(new String[0]), titles.toArray(new String[0]), urls.toArray(new String[0]));
+        openBooksDownloads();
+    }
+
     /** ADFA-4850: Books landing -> the download manager screen (per-book checklist + retry). */
     public void openBooksDownloads() {
         getSupportFragmentManager().beginTransaction()

controller/app/src/main/res/layout/fragment_k2go_books_confirm.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- ADFA-4910: Books Confirm. A review step between the Books landing and the download/bank
+     action, mirroring ZIM/Maps Confirm: list of picked books (title + author), a total count,
+     an honest "one at a time" note, and the primary button. Books carry no per-item size, so
+     this shows a count, not GB. Button text/behaviour depends on wizard (bank) vs live (download). -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="20dp"
+        android:paddingBottom="24dp">
+
+        <TextView
+            android:id="@+id/k2go_bconf_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="4dp"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="@color/k2go_teal" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/k2go_books_confirm_title"
+            android:textAppearance="?attr/textAppearanceHeadlineMedium"
+            android:textColor="@color/k2go_ink" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="@string/k2go_books_confirm_sub"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="@color/k2go_muted" />
+
+        <LinearLayout
+            android:id="@+id/k2go_bconf_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:background="@drawable/k2go_card_bg" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:orientation="vertical"
+            android:padding="14dp"
+            android:background="@drawable/k2go_info_bg">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/k2go_books_confirm_note_title"
+                android:textStyle="bold"
+                android:textAppearance="?attr/textAppearanceTitleSmall"
+                android:textColor="@color/k2go_teal" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/k2go_books_dl_sub"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="@color/k2go_teal" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/k2go_bconf_add"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="16dp"
+            android:textColor="@android:color/white"
+            android:textAllCaps="false"
+            android:backgroundTint="@color/k2go_teal" />
+    </LinearLayout>
+</ScrollView>

controller/app/src/main/res/values/strings_k2go.xml

@@ -493,6 +493,13 @@
     <string name="k2go_books_added" translatable="false">Added</string>
     <string name="k2go_books_add_none" translatable="false">Select books to add</string>
     <string name="k2go_books_view_downloads" translatable="false">View downloads</string>
+    <!-- ADFA-4910: Books Confirm (review step between landing and download/bank). -->
+    <string name="k2go_books_review_fmt" translatable="false">Review selection (%1$d)</string>
+    <string name="k2go_books_back_title" translatable="false">Books</string>
+    <string name="k2go_books_confirm_title" translatable="false">Ready to add these books?</string>
+    <string name="k2go_books_confirm_sub" translatable="false">Your selection.</string>
+    <string name="k2go_books_confirm_note_title" translatable="false">One at a time</string>
+    <string name="k2go_books_total_fmt" translatable="false">%1$d books</string>
     <string name="k2go_books_dl_title" translatable="false">Downloads</string>
     <string name="k2go_books_dl_sub" translatable="false">Added one at a time — kind to Project Gutenberg.</string>
     <string name="k2go_books_dl_detail_fmt" translatable="false">%1$d of %2$d books</string>