K2GO-534 feat(library): open Content Exchange from the footer (Manage beside Get more)

controller/app/src/main/java/org/appdevforall/k2go/redesign/LibraryHomeFragment.java

@@ -165,6 +165,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         cardsHost = root.findViewById(R.id.k2go_cards);
         getMoreFooter = root.findViewById(R.id.k2go_get_more_footer);
         root.findViewById(R.id.k2go_get_more).setOnClickListener(v -> openGetMore());
+        root.findViewById(R.id.k2go_manage).setOnClickListener(v -> openContentManager());
         relayout();
         return root;
     }
@@ -262,7 +263,11 @@ private void buildCards(LayoutInflater inflater, LinearLayout host, int columns,
             applyState(c, c.state);   // keep the live status across a relayout
             cells.add(card);
         }
-        if (getMoreInGrid) cells.add(makeGetMoreCell(cardH));
+        if (getMoreInGrid) {
+            // ADFA-4799: the footer actions fold into the grid as the last cells on wide screens.
+            cells.add(makeActionCell(cardH, getString(R.string.k2go_get_more), v -> openGetMore()));
+            cells.add(makeActionCell(cardH, getString(R.string.k2go_manage), v -> openContentManager()));
+        }
 
         int i = 0, n = cells.size();
         while (i < n) {
@@ -289,17 +294,17 @@ private void buildCards(LayoutInflater inflater, LinearLayout host, int columns,
         }
     }
 
-    /** Card-shaped "Get more" cell used as the last grid cell in medium/expanded. */
-    private View makeGetMoreCell(int cardH) {
+    /** Card-shaped footer-action cell used as a last grid cell in medium/expanded (Get more, Manage). */
+    private View makeActionCell(int cardH, CharSequence label, View.OnClickListener onClick) {
         TextView t = new TextView(requireContext());
-        t.setText(getString(R.string.k2go_get_more));
+        t.setText(label);
         t.setGravity(Gravity.CENTER);
         t.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_TitleLarge);
         t.setTextColor(ContextCompat.getColor(requireContext(), R.color.k2go_teal));
         t.setBackgroundResource(R.drawable.k2go_getmore_bg);
         t.setClickable(true);
         t.setFocusable(true);
-        t.setOnClickListener(v -> openGetMore());
+        t.setOnClickListener(onClick);
         int m = Math.round(getResources().getDisplayMetrics().density * 8);
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, cardH);
         lp.setMargins(m, m, m, m);
@@ -349,6 +354,12 @@ private void openGetMore() {
         startActivity(i);
     }
 
+    // Manage: open the content manager (the contentexchange screen), the same target as
+    // Settings > Content manager. The Library is the direct access, beside "Get more".
+    private void openContentManager() {
+        startActivity(SetupLibraryActivity.contentManagerIntent(requireContext()));
+    }
+
     private void onCardClick(Card c) {
         if (CODE_DEV.equals(c.endpoint)) { openCodeDevSheet(); return; }   // K2GO-445: group tile -> members sheet
         // ADFA-5061: a card whose content is downloading opens the platform, whatever the

controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsFragment.java

@@ -46,11 +46,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             ctx.startActivity(i);
         });
         // K2GO-427: content manager (gestor) : list content by app, sizes, free disk, multi-select.
-        SettingsUi.row(ctx, list, getString(R.string.k2go_settings_content_mgr), getString(R.string.k2go_settings_content_mgr_sub), null, v -> {
-            android.content.Intent i = new android.content.Intent(ctx, SetupLibraryActivity.class);
-            i.putExtra(SetupLibraryActivity.EXTRA_CONTENT_MANAGER, true);
-            ctx.startActivity(i);
-        });
+        SettingsUi.row(ctx, list, getString(R.string.k2go_settings_content_mgr), getString(R.string.k2go_settings_content_mgr_sub), null,
+                v -> ctx.startActivity(SetupLibraryActivity.contentManagerIntent(ctx)));
         // ADFA-5169: always-visible entry to the queued content orders (finding 6). Shows a count, or
         // "None" when empty. Opens as a settings sub-screen (bottom nav stays), like Language/About.
         pendingRow = SettingsUi.row(ctx, list, getString(R.string.k2go_settings_pending), null, pendingValue(ctx), v -> {

controller/app/src/main/java/org/appdevforall/k2go/redesign/SetupLibraryActivity.java

@@ -45,6 +45,12 @@
     /** K2GO-427: open the content manager (gestor) directly, from Settings. */
     public static final String EXTRA_CONTENT_MANAGER = "contentManager";
 
+    /** K2GO-534: the one Intent that opens the content manager, shared by Settings and the Library
+     *  "Manage" button, so the extra is set in a single place. */
+    public static Intent contentManagerIntent(android.content.Context ctx) {
+        return new Intent(ctx, SetupLibraryActivity.class).putExtra(EXTRA_CONTENT_MANAGER, true);
+    }
+
     /**
      * ADFA-5150: the one way into recovery — restore a backup, install over the internet, or clone from
      * a peer, all three offered here. The route to it (this class + {@link #EXTRA_BACKUP_RESTORE}) was
@@ -696,7 +702,7 @@
      *  on purpose (not deleted): ADFA-4842 (reactivate proot modules via module management) may want
      *  to generalize a "install these proot modules now" path from here — 4842 decides whether to
      *  reuse/generalize or delete. Deleting now could remove something module management wants. */
     public void openMapsPreparing(String[] levels) {
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.k2go_setup_host, MapsPreparingFragment.newInstance(levels))
                 .addToBackStack("maps_preparing")
@@ -745,7 +751,7 @@
      *  the per-layer selection). InstallService writes the full maps_* local_vars and runs runrole
      *  with the shared success/failure verdict, revert-on-fail and observable progress. {@code levels}
      *  is aligned to the Choose groups [base, satellite, terrain, search]; null = off. */
     public void startMapsInstall(String[] levels) {
         String base = levels != null && levels.length > 0 && levels[0] != null ? levels[0] : "11";
         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] : "0-none";
@@ -767,7 +773,7 @@
      *  backToGetMoreHubZim, along with the ZIM live door that was the only thing calling it.)
      *  ADFA-4848: "Run in background" from Preparing -> drop the whole Maps flow off the back
      *  stack and return to the Get More hub; the build keeps running. */
     public void backToGetMoreHub() {
         getSupportFragmentManager().popBackStack("getmore_maps",
                 androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }

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

@@ -94,13 +94,15 @@
     </ScrollView>
 
     <!-- Pinned footer: Get more stays visible while the cards scroll (like Turn off in Settings).
-         ADFA-4799: shown in compact; in medium/expanded "Get more" becomes the last grid cell
-         and this footer is hidden. -->
+         ADFA-4799: shown in compact; in medium/expanded the actions become the last grid cells
+         and this footer is hidden.
+         Asymmetric row: "Get more" is the primary action (filled, wider); "Manage" opens the
+         content manager and is the secondary action (outlined, narrower) on the same row. -->
     <LinearLayout
         android:id="@+id/k2go_get_more_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:orientation="horizontal"
         android:background="@color/k2go_paper"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
@@ -109,10 +111,25 @@
 
         <Button
             android:id="@+id/k2go_get_more"
-            style="@style/Widget.K2Go.Button.Outlined"
-            android:layout_width="match_parent"
+            style="@style/Widget.K2Go.Button"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="3"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:text="@string/k2go_get_more" />
+
+        <Button
+            android:id="@+id/k2go_manage"
+            style="@style/Widget.K2Go.Button.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="2"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="@string/k2go_manage" />
     </LinearLayout>
 </LinearLayout>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">استنساخ</string>
     <string name="k2go_tab_settings">الإعدادات</string>
     <string name="k2go_get_more">+  المزيد</string>
+    <string name="k2go_manage">إدارة</string>
     <string name="k2go_perm_allow">سماح</string>
     <string name="k2go_connect_available">متاح أثناء فتح التطبيق.</string>
     <string name="k2go_back">رجوع</string>

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

@@ -532,6 +532,7 @@
     <string name="k2go_tab_clone">Klonla</string>
     <string name="k2go_tab_settings">Ayarlar</string>
     <string name="k2go_get_more">+  Daha çox</string>
+    <string name="k2go_manage">İdarə et</string>
     <string name="k2go_perm_allow">İcazə ver</string>
     <string name="k2go_connect_available">Tətbiq açıq olduqda əlçatandır.</string>
     <string name="k2go_back">Geri</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Клониране</string>
     <string name="k2go_tab_settings">Настройки</string>
     <string name="k2go_get_more">+  Още</string>
+    <string name="k2go_manage">Управление</string>
     <string name="k2go_perm_allow">Разреши</string>
     <string name="k2go_connect_available">Достъпно, докато приложението е отворено.</string>
     <string name="k2go_back">Назад</string>

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

@@ -525,6 +525,7 @@
     <string name="k2go_tab_clone">ক্লোন</string>
     <string name="k2go_tab_settings">সেটিংস</string>
     <string name="k2go_get_more">+  আরও নিন</string>
+    <string name="k2go_manage">পরিচালনা</string>
     <string name="k2go_perm_allow">অনুমতি দিন</string>
     <string name="k2go_connect_available">অ্যাপ খোলা থাকা অবস্থায় উপলব্ধ।</string>
     <string name="k2go_back">ফিরে যান</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Klonovat</string>
     <string name="k2go_tab_settings">Nastavení</string>
     <string name="k2go_get_more">+  Získat další</string>
+    <string name="k2go_manage">Spravovat</string>
     <string name="k2go_perm_allow">Povolit</string>
     <string name="k2go_connect_available">Dostupné, když je aplikace otevřená.</string>
     <string name="k2go_back">Zpět</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Klonen</string>
     <string name="k2go_tab_settings">Einstellungen</string>
     <string name="k2go_get_more">+  Mehr laden</string>
+    <string name="k2go_manage">Verwalten</string>
     <string name="k2go_perm_allow">Zulassen</string>
     <string name="k2go_connect_available">Verfügbar, solange die App geöffnet ist.</string>
     <string name="k2go_back">Zurück</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Κλωνοποίηση</string>
     <string name="k2go_tab_settings">Ρυθμίσεις</string>
     <string name="k2go_get_more">+  Αποκτήστε περισσότερα</string>
+    <string name="k2go_manage">Διαχείριση</string>
     <string name="k2go_perm_allow">Να επιτρέπεται</string>
     <string name="k2go_connect_available">Διαθέσιμο όσο η εφαρμογή είναι ανοιχτή.</string>
     <string name="k2go_back">Πίσω</string>

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

@@ -588,6 +588,7 @@
     <string name="k2go_tab_clone">Clonar</string>
     <string name="k2go_tab_settings">Ajustes</string>
     <string name="k2go_get_more">+  Obtener más</string>
+    <string name="k2go_manage">Gestionar</string>
     <string name="k2go_perm_allow">Permitir</string>
     <string name="k2go_connect_available">Disponible mientras la app está abierta.</string>
     <string name="k2go_back">Atrás</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">کلون</string>
     <string name="k2go_tab_settings">تنظیمات</string>
     <string name="k2go_get_more">+  دریافت بیشتر</string>
+    <string name="k2go_manage">مدیریت</string>
     <string name="k2go_perm_allow">اجازه دادن</string>
     <string name="k2go_connect_available">تا زمانی که برنامه باز است در دسترس است.</string>
     <string name="k2go_back">بازگشت</string>

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

@@ -589,6 +589,7 @@
     <string name="k2go_tab_clone">Cloner</string>
     <string name="k2go_tab_settings">Paramètres</string>
     <string name="k2go_get_more">+  Obtenir plus</string>
+    <string name="k2go_manage">Gérer</string>
     <string name="k2go_perm_allow">Autoriser</string>
     <string name="k2go_connect_available">Disponible tant que l\'appli est ouverte.</string>
     <string name="k2go_back">Retour</string>

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

@@ -525,6 +525,7 @@
     <string name="k2go_tab_clone">ક્લોન</string>
     <string name="k2go_tab_settings">સેટિંગ્સ</string>
     <string name="k2go_get_more">+  વધુ મેળવો</string>
+    <string name="k2go_manage">સંચાલિત કરો</string>
     <string name="k2go_perm_allow">મંજૂરી આપો</string>
     <string name="k2go_connect_available">ઍપ ખુલ્લી હોય ત્યાં સુધી ઉપલબ્ધ.</string>
     <string name="k2go_back">પાછળ</string>

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

@@ -589,6 +589,7 @@
     <string name="k2go_tab_clone">क्लोन</string>
     <string name="k2go_tab_settings">सेटिंग्स</string>
     <string name="k2go_get_more">+  और पाएँ</string>
+    <string name="k2go_manage">प्रबंधित करें</string>
     <string name="k2go_perm_allow">अनुमति दें</string>
     <string name="k2go_connect_available">ऐप खुले रहने तक उपलब्ध।</string>
     <string name="k2go_back">वापस</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Klónozás</string>
     <string name="k2go_tab_settings">Beállítások</string>
     <string name="k2go_get_more">+  Továbbiak</string>
+    <string name="k2go_manage">Kezelés</string>
     <string name="k2go_perm_allow">Engedélyezés</string>
     <string name="k2go_connect_available">Csak addig érhető el, amíg az app nyitva van.</string>
     <string name="k2go_back">Vissza</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Klon</string>
     <string name="k2go_tab_settings">Setelan</string>
     <string name="k2go_get_more">+  Dapatkan lagi</string>
+    <string name="k2go_manage">Kelola</string>
     <string name="k2go_perm_allow">Izinkan</string>
     <string name="k2go_connect_available">Tersedia selama aplikasi terbuka.</string>
     <string name="k2go_back">Kembali</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Clona</string>
     <string name="k2go_tab_settings">Impostazioni</string>
     <string name="k2go_get_more">+  Aggiungi altro</string>
+    <string name="k2go_manage">Gestisci</string>
     <string name="k2go_perm_allow">Consenti</string>
     <string name="k2go_connect_available">Disponibile mentre l\'app è aperta.</string>
     <string name="k2go_back">Indietro</string>

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

@@ -513,6 +513,7 @@
     <string name="k2go_tab_clone">クローン</string>
     <string name="k2go_tab_settings">設定</string>
     <string name="k2go_get_more">+  もっと入手</string>
+    <string name="k2go_manage">管理</string>
     <string name="k2go_perm_allow">許可</string>
     <string name="k2go_connect_available">アプリが開いている間に利用できます。</string>
     <string name="k2go_back">戻る</string>

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

@@ -513,6 +513,7 @@
     <string name="k2go_tab_clone">복제</string>
     <string name="k2go_tab_settings">설정</string>
     <string name="k2go_get_more">+  더 받기</string>
+    <string name="k2go_manage">관리</string>
     <string name="k2go_perm_allow">허용</string>
     <string name="k2go_connect_available">앱이 열려 있는 동안 사용할 수 있습니다.</string>
     <string name="k2go_back">뒤로</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Klonuoti</string>
     <string name="k2go_tab_settings">Nustatymai</string>
     <string name="k2go_get_more">+  Gauti daugiau</string>
+    <string name="k2go_manage">Tvarkyti</string>
     <string name="k2go_perm_allow">Leisti</string>
     <string name="k2go_connect_available">Pasiekiama, kol programa atidaryta.</string>
     <string name="k2go_back">Atgal</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Klonen</string>
     <string name="k2go_tab_settings">Instellingen</string>
     <string name="k2go_get_more">+  Meer ophalen</string>
+    <string name="k2go_manage">Beheren</string>
     <string name="k2go_perm_allow">Toestaan</string>
     <string name="k2go_connect_available">Beschikbaar terwijl de app open is.</string>
     <string name="k2go_back">Terug</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Klon</string>
     <string name="k2go_tab_settings">Innstillinger</string>
     <string name="k2go_get_more">+  Hent mer</string>
+    <string name="k2go_manage">Administrer</string>
     <string name="k2go_perm_allow">Tillat</string>
     <string name="k2go_connect_available">Tilgjengelig mens appen er åpen.</string>
     <string name="k2go_back">Tilbake</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Klonuj</string>
     <string name="k2go_tab_settings">Ustawienia</string>
     <string name="k2go_get_more">+  Pobierz więcej</string>
+    <string name="k2go_manage">Zarządzaj</string>
     <string name="k2go_perm_allow">Zezwól</string>
     <string name="k2go_connect_available">Dostępne, gdy aplikacja jest otwarta.</string>
     <string name="k2go_back">Wstecz</string>

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

@@ -591,6 +591,7 @@
     <string name="k2go_tab_clone">Clonar</string>
     <string name="k2go_tab_settings">Definições</string>
     <string name="k2go_get_more">+  Obter mais</string>
+    <string name="k2go_manage">Gerenciar</string>
     <string name="k2go_perm_allow">Permitir</string>
     <string name="k2go_connect_available">Disponível enquanto a app estiver aberta.</string>
     <string name="k2go_back">Voltar</string>

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

@@ -512,6 +512,7 @@
     <string name="k2go_tab_clone">Clonare</string>
     <string name="k2go_tab_settings">Setări</string>
     <string name="k2go_get_more">+  Mai multe</string>
+    <string name="k2go_manage">Gestionează</string>
     <string name="k2go_perm_allow">Permite</string>
     <string name="k2go_connect_available">Disponibil cât timp aplicația e deschisă.</string>
     <string name="k2go_back">Înapoi</string>

controller/app/src/main/res/values-ru-rRU/strings.xml

@@ -588,6 +588,7 @@
     <string name="k2go_tab_clone">Клонировать</string>
     <string name="k2go_tab_settings">Настройки</string>
     <string name="k2go_get_more">+  Добавить ещё</string>
+    <string name="k2go_manage">Управление</string>
     <string name="k2go_perm_allow">Разрешить</string>
     <string name="k2go_connect_available">Доступно, пока приложение открыто.</string>
     <string name="k2go_back">Назад</string>

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

@@ -519,6 +519,7 @@
     <string name="k2go_tab_clone">Klonovať</string>
     <string name="k2go_tab_settings">Nastavenia</string>
     <string name="k2go_get_more">+  Získať viac</string>
+    <string name="k2go_manage">Spravovať</string>
     <string name="k2go_perm_allow">Povoliť</string>
     <string name="k2go_connect_available">Dostupné, kým je aplikácia otvorená.</string>
     <string name="k2go_back">Späť</string>

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

@@ -525,6 +525,7 @@
     <string name="k2go_tab_clone">Клонирај</string>
     <string name="k2go_tab_settings">Подешавања</string>
     <string name="k2go_get_more">+  Преузми још</string>
+    <string name="k2go_manage">Управљај</string>
     <string name="k2go_perm_allow">Дозволи</string>
     <string name="k2go_connect_available">Доступно док је апликација отворена.</string>
     <string name="k2go_back">Назад</string>

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

@@ -532,6 +532,7 @@
     <string name="k2go_tab_clone">Nakili</string>
     <string name="k2go_tab_settings">Mipangilio</string>
     <string name="k2go_get_more">+  Pata zaidi</string>
+    <string name="k2go_manage">Dhibiti</string>
     <string name="k2go_perm_allow">Ruhusu</string>
     <string name="k2go_connect_available">Inapatikana wakati programu iko wazi.</string>
     <string name="k2go_back">Rudi</string>

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

@@ -532,6 +532,7 @@
     <string name="k2go_tab_clone">நகல்</string>
     <string name="k2go_tab_settings">அமைப்புகள்</string>
     <string name="k2go_get_more">+  மேலும் பெறு</string>
+    <string name="k2go_manage">நிர்வகி</string>
     <string name="k2go_perm_allow">அனுமதி</string>
     <string name="k2go_connect_available">செயலி திறந்திருக்கும் போது கிடைக்கும்.</string>
     <string name="k2go_back">பின்செல்</string>