Merge pull request #276 from appdevforall/fix/ADFA-4910-getmore-storage

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

Author: luisguzman-adfa

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

@@ -148,17 +148,23 @@ 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,
+                        org.iiab.controller.util.ByteFormatter.humanGb(used),
+                        org.iiab.controller.util.ByteFormatter.humanGb(systemGb),
+                        org.iiab.controller.util.ByteFormatter.humanGb(picksGb),
+                        org.iiab.controller.util.ByteFormatter.humanGb(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;
     }

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

@@ -20,7 +20,6 @@
 import android.system.StructStat;
 
 import java.io.File;
-import java.util.Locale;
 
 public final class LibrarySize {
 
@@ -62,11 +61,9 @@ private static long du(File f) {
         return 0L;
     }
 
-    /** Compact size label: "1.7 GB" for >= 1 GB, else "820 MB". */
+    /** Compact size label: "1.7 GB" for >= 1 GB, "820 MB", or "512 KB". ADFA-4910: one standard
+     *  formatter shared with the rest of the UI. */
     public static String human(long bytes) {
-        double gb = bytes / (1024.0 * 1024.0 * 1024.0);
-        if (gb >= 1.0) return String.format(Locale.US, "%.1f GB", gb);
-        double mb = bytes / (1024.0 * 1024.0);
-        return String.format(Locale.US, "%.0f MB", mb);
+        return org.iiab.controller.util.ByteFormatter.humanGb(bytes / (1024.0 * 1024.0 * 1024.0));
     }
 }

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

@@ -36,7 +36,6 @@
 
 import org.iiab.controller.R;
 
-import java.util.Locale;
 
 public class MapsChooseFragment extends Fragment {
 
@@ -279,8 +278,7 @@ private void refresh() {
         download.setText(getString(R.string.k2go_maps_download, fmt(t)));
     }
 
-    private String fmt(long mb) {
-        if (mb >= 1024) return String.format(Locale.US, "%.1f GB", mb / 1024.0);
-        return mb + " MB";
+    private String fmt(long mb) {   // ADFA-4910: one standard size formatter for the whole UI
+        return org.iiab.controller.util.ByteFormatter.humanMb(mb);
     }
 }

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

@@ -27,7 +27,6 @@
 
 import org.iiab.controller.R;
 
-import java.util.Locale;
 
 public class MapsConfirmFragment extends Fragment {
 
@@ -73,6 +72,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 +84,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);
             }
         });
@@ -138,8 +138,7 @@ private View divider() {
         return d;
     }
 
-    private String fmt(long mb) {
-        if (mb >= 1024) return String.format(Locale.US, "%.1f GB", mb / 1024.0);
-        return mb + " MB";
+    private String fmt(long mb) {   // ADFA-4910: one standard size formatter for the whole UI
+        return org.iiab.controller.util.ByteFormatter.humanMb(mb);
     }
 }

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/java/org/iiab/controller/redesign/Step1SystemFragment.java

@@ -154,7 +154,9 @@ private void applyBar(double systemGb) {
         setWeight(barSystem, (float) systemGb);
         setWeight(barFree, (float) freeAfter);
         legend.setText(getString(R.string.k2go_legend_sys_free,
-                used, systemGb, freeAfter));
+                org.iiab.controller.util.ByteFormatter.humanGb(used),
+                org.iiab.controller.util.ByteFormatter.humanGb(systemGb),
+                org.iiab.controller.util.ByteFormatter.humanGb(freeAfter)));
     }
 
     private void setWeight(View v, float w) {

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

@@ -1,7 +1,6 @@
 package org.iiab.controller.redesign;
 
 import android.content.Context;
-import java.util.Locale;
 import java.util.Set;
 import org.iiab.controller.InstallationPlanner;
 import org.iiab.controller.R;
@@ -65,7 +64,6 @@ public static String primary(Set<String> selected) {
 
     public static String gb(double s) {
         if (s < 0) return "—";
-        if (s >= 1) return String.format(Locale.US, "%.1f GB", s);
-        return Math.round(s * 1000) + " MB";
+        return org.iiab.controller.util.ByteFormatter.humanGb(s);   // ADFA-4910: one standard formatter
     }
 }

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

@@ -380,8 +380,7 @@ private void pickLanguage() {
                 });
     }
 
-    private String gb(long mb) {
-        if (mb >= 1024) return String.format(Locale.US, "%.1f GB", mb / 1024.0);
-        return mb + " MB";
+    private String gb(long mb) {   // ADFA-4910: one standard size formatter for the whole UI
+        return org.iiab.controller.util.ByteFormatter.humanMb(mb);
     }
 }

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

@@ -28,7 +28,6 @@
 import androidx.fragment.app.Fragment;
 
 import java.util.LinkedHashMap;
-import java.util.Locale;
 import java.util.Map;
 
 import org.iiab.controller.R;
@@ -142,8 +141,7 @@ private View divider() {
         return d;
     }
 
-    private String gb(long mb) {
-        if (mb >= 1024) return String.format(Locale.US, "%.1f GB", mb / 1024.0);
-        return mb + " MB";
+    private String gb(long mb) {   // ADFA-4910: one standard size formatter for the whole UI
+        return org.iiab.controller.util.ByteFormatter.humanMb(mb);
     }
 }