ADFA-4910: Get More storage projection counts maps + adaptive size units

'Your picks' summed only ZIM (real bytes) + a tiny books estimate, so a
maps-heavy selection still read 0.0 GB and small picks rounded to 0.0.

- Bank the maps selection's total size (from the catalog) into MapsWishlist
  and add it to picksGb() so maps counts toward the projection.
- Show KB/MB/GB adaptively in the legend so sub-GB picks are visible
  (switch the k2go_legend_your_picks placeholders from %.1f to %s across the
  base string and all locales to carry pre-formatted, unit-aware values).
- Books stay an estimate (the Gutenberg catalog exposes no per-book size).

Author: luisguzman-adfa

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

@@ -148,21 +148,33 @@ private void refreshStorage(View root) {
         setW(root.findViewById(R.id.k2go_gm_bar_picks), (float) picksGb);
         setW(root.findViewById(R.id.k2go_gm_bar_free), (float) freeAfter);
         ((TextView) root.findViewById(R.id.k2go_gm_legend)).setText(
-                getString(R.string.k2go_legend_your_picks, used, systemGb, picksGb, freeAfter));
+                getString(R.string.k2go_legend_your_picks,
+                        human(used), human(systemGb), human(picksGb), human(freeAfter)));
     }
 
-    /** GB the wizard picks will add: ZIM by real catalog bytes; books are tiny EPUBs (~few MB). */
+    /** GB the wizard picks will add: ZIM by real catalog bytes; maps by the banked catalog size;
+     *  books are tiny EPUBs (~few MB, estimated since the catalog has no per-book size). */
     private double picksGb() {
         double gb = 0;
         org.json.JSONArray z = ZimWishlist.all(requireContext());
         for (int i = 0; i < z.length(); i++) {
             org.json.JSONObject o = z.optJSONObject(i);
             if (o != null) gb += o.optLong("bytes", 0) / (1024.0 * 1024.0 * 1024.0);
         }
+        gb += MapsWishlist.mb(requireContext()) / 1024.0;     // ADFA-4910: count the banked maps size
         gb += BooksWishlist.size(requireContext()) * 0.003;
         return gb;
     }
 
+    /** ADFA-4910: adaptive size unit so small picks aren't rounded to "0.0 GB". Steps up at ~1024:
+     *  KB < 1 MB, MB < 1 GB, else GB. Input is in GB. */
+    private String human(double gb) {
+        double mb = gb * 1024.0;
+        if (mb >= 1024) return String.format(java.util.Locale.US, "%.1f GB", mb / 1024.0);
+        if (mb >= 1) return String.format(java.util.Locale.US, "%.0f MB", mb);
+        return String.format(java.util.Locale.US, "%.0f KB", Math.max(0, mb * 1024.0));
+    }
+
     private void setW(View v, float w) {
         LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) v.getLayoutParams();
         lp.weight = w;

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

@@ -73,6 +73,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         }
         box.addView(row(getString(R.string.k2go_maps_total), "", fmt(total), true));
 
+        final long totalMb = total;   // ADFA-4910: banked so Get More "Your picks" counts maps
         final String[] levels = a != null ? a.getStringArray(ARG_LEVELS) : null;
 
         // ADFA-4900: in the wizard (pre-install) Maps banks the selection; post-install it installs.
@@ -84,7 +85,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         start.setOnClickListener(v -> {
             if (getActivity() instanceof SetupLibraryActivity) {
                 SetupLibraryActivity act = (SetupLibraryActivity) getActivity();
-                if (act.isMapsWizard()) act.mapsWizardConfirm(levels);
+                if (act.isMapsWizard()) act.mapsWizardConfirm(levels, totalMb);
                 else act.openMapsPreparing(levels);
             }
         });

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

@@ -25,14 +25,17 @@ private static SharedPreferences prefs(Context ctx) {
     }
 
     /** Bank the wizard selection. Layer keys use the maps role's values; satellite/terrain "none"
-     *  = off, and {@code search} = the static pop-1k-cities engine on/off. */
-    public static void save(Context ctx, String base, String sat, String terrain, boolean search) {
+     *  = off, and {@code search} = the static pop-1k-cities engine on/off. {@code mb} is the total
+     *  download size of the selection (from the maps catalog), used by the Get More storage
+     *  projection so "Your picks" reflects the real maps size. */
+    public static void save(Context ctx, String base, String sat, String terrain, boolean search, long mb) {
         prefs(ctx).edit()
                 .putBoolean("has", true)
                 .putString("base", base == null ? "osm-z11" : base)
                 .putString("sat", sat == null ? "none" : sat)
                 .putString("terrain", terrain == null ? "none" : terrain)
                 .putBoolean("search", search)
+                .putLong("mb", Math.max(0, mb))
                 .apply();
     }
 
@@ -41,6 +44,8 @@ public static void save(Context ctx, String base, String sat, String terrain, bo
     public static String sat(Context ctx) { return prefs(ctx).getString("sat", "none"); }
     public static String terrain(Context ctx) { return prefs(ctx).getString("terrain", "none"); }
     public static boolean search(Context ctx) { return prefs(ctx).getBoolean("search", false); }
+    /** Total download size (MB) of the banked selection; 0 if unknown. */
+    public static long mb(Context ctx) { return prefs(ctx).getLong("mb", 0); }
 
     public static void clear(Context ctx) { prefs(ctx).edit().clear().apply(); }
 }

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

@@ -337,12 +337,12 @@ public void openMapsPreparing(String[] levels) {
 
     /** ADFA-4900: Maps Confirm terminal in wizard mode — bank the per-layer selection to MapsWishlist
      *  (MapsProvisioner applies it post-install) and return to the Get More hub. No live runrole. */
-    public void mapsWizardConfirm(String[] levels) {
+    public void mapsWizardConfirm(String[] levels, long totalMb) {
         String base = levels != null && levels.length > 0 && levels[0] != null ? levels[0] : "osm-z11";
         String sat = levels != null && levels.length > 1 && levels[1] != null ? levels[1] : "none";
         String ter = levels != null && levels.length > 2 && levels[2] != null ? levels[2] : "none";
         boolean search = levels != null && levels.length > 3 && levels[3] != null;
-        MapsWishlist.save(this, base, sat, ter, search);
+        MapsWishlist.save(this, base, sat, ter, search, totalMb);
         getSupportFragmentManager().popBackStack("getmore_maps",
                 androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }

controller/app/src/main/res/values-ar/strings.xml

@@ -802,7 +802,7 @@
     <string name="k2go_badge_copy">نسخ</string>
     <!-- ADFA-4795: storage bar legend l10n. machine translation. -->
     <string name="k2go_legend_sys_free">مستخدَم %1$.1f  ·  النظام %2$.1f  ·  خالٍ %3$.1f</string>
-    <string name="k2go_legend_your_picks">مستخدَم %1$.1f · النظام %2$.1f · اختياراتك %3$.1f · خالٍ %4$.1f</string>
+    <string name="k2go_legend_your_picks">مستخدَم %1$s · النظام %2$s · اختياراتك %3$s · خالٍ %4$s</string>
     <string name="k2go_legend_picks">مستخدَم %1$.1f · النظام %2$.1f · الاختيارات %3$.1f · خالٍ %4$.1f</string>
     <string name="k2go_perm_granted">تم المنح</string> <!-- machine translation -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. machine translation. -->

controller/app/src/main/res/values-az/strings.xml

@@ -809,7 +809,7 @@
     <string name="k2go_badge_copy">Kopyala</string>
     <!-- ADFA-4795: storage bar legend l10n. review — machine, verify. -->
     <string name="k2go_legend_sys_free">İstifadə %1$.1f  ·  Sistem %2$.1f  ·  Boş %3$.1f</string>
-    <string name="k2go_legend_your_picks">İstifadə %1$.1f · Sistem %2$.1f · Sizin seçimləriniz %3$.1f · Boş %4$.1f</string>
+    <string name="k2go_legend_your_picks">İstifadə %1$s · Sistem %2$s · Sizin seçimləriniz %3$s · Boş %4$s</string>
     <string name="k2go_legend_picks">İstifadə %1$.1f · Sistem %2$.1f · Seçimlər %3$.1f · Boş %4$.1f</string>
     <string name="k2go_perm_granted">Verildi</string> <!-- review — machine, verify -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. review — machine, verify. -->

controller/app/src/main/res/values-bg/strings.xml

@@ -809,7 +809,7 @@
     <string name="k2go_badge_copy">Копирай</string>
     <!-- ADFA-4795: storage bar legend l10n. machine translation. -->
     <string name="k2go_legend_sys_free">Използвано %1$.1f  ·  Система %2$.1f  ·  Свободно %3$.1f</string>
-    <string name="k2go_legend_your_picks">Използвано %1$.1f · Система %2$.1f · Вашият избор %3$.1f · Свободно %4$.1f</string>
+    <string name="k2go_legend_your_picks">Използвано %1$s · Система %2$s · Вашият избор %3$s · Свободно %4$s</string>
     <string name="k2go_legend_picks">Използвано %1$.1f · Система %2$.1f · Избор %3$.1f · Свободно %4$.1f</string>
     <string name="k2go_perm_granted">Предоставено</string> <!-- machine translation -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. machine translation. -->

controller/app/src/main/res/values-bn/strings.xml

@@ -802,7 +802,7 @@
     <string name="k2go_badge_copy">কপি করুন</string>
     <!-- ADFA-4795: storage bar legend l10n. review — machine, verify. -->
     <string name="k2go_legend_sys_free">ব্যবহৃত %1$.1f  ·  সিস্টেম %2$.1f  ·  ফাঁকা %3$.1f</string>
-    <string name="k2go_legend_your_picks">ব্যবহৃত %1$.1f · সিস্টেম %2$.1f · আপনার পছন্দ %3$.1f · ফাঁকা %4$.1f</string>
+    <string name="k2go_legend_your_picks">ব্যবহৃত %1$s · সিস্টেম %2$s · আপনার পছন্দ %3$s · ফাঁকা %4$s</string>
     <string name="k2go_legend_picks">ব্যবহৃত %1$.1f · সিস্টেম %2$.1f · পছন্দ %3$.1f · ফাঁকা %4$.1f</string>
     <string name="k2go_perm_granted">মঞ্জুর</string> <!-- review — machine, verify -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. review — machine, verify. -->

controller/app/src/main/res/values-cs/strings.xml

@@ -809,7 +809,7 @@
     <string name="k2go_badge_copy">Kopírovat</string>
     <!-- ADFA-4795: storage bar legend l10n. machine translation. -->
     <string name="k2go_legend_sys_free">Použito %1$.1f  ·  Systém %2$.1f  ·  Volné %3$.1f</string>
-    <string name="k2go_legend_your_picks">Použito %1$.1f · Systém %2$.1f · Váš výběr %3$.1f · Volné %4$.1f</string>
+    <string name="k2go_legend_your_picks">Použito %1$s · Systém %2$s · Váš výběr %3$s · Volné %4$s</string>
     <string name="k2go_legend_picks">Použito %1$.1f · Systém %2$.1f · Výběr %3$.1f · Volné %4$.1f</string>
     <string name="k2go_perm_granted">Uděleno</string> <!-- machine translation -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. machine translation. -->

controller/app/src/main/res/values-de/strings.xml

@@ -802,7 +802,7 @@
     <string name="k2go_badge_copy">Kopieren</string>
     <!-- ADFA-4795: storage bar legend l10n. machine translation. -->
     <string name="k2go_legend_sys_free">Belegt %1$.1f  ·  System %2$.1f  ·  Frei %3$.1f</string>
-    <string name="k2go_legend_your_picks">Belegt %1$.1f · System %2$.1f · Deine Auswahl %3$.1f · Frei %4$.1f</string>
+    <string name="k2go_legend_your_picks">Belegt %1$s · System %2$s · Deine Auswahl %3$s · Frei %4$s</string>
     <string name="k2go_legend_picks">Belegt %1$.1f · System %2$.1f · Auswahl %3$.1f · Frei %4$.1f</string>
     <string name="k2go_perm_granted">Erteilt</string> <!-- machine translation -->
     <!-- ADFA-4795: clone header/ready/step/hint, Soon, force-crash l10n. machine translation. -->