From 98dbea3455f87d3ab1098c53cccb6f6724a9eabf Mon Sep 17 00:00:00 2001
From: kra-mo <93832451+kra-mo@users.noreply.github.com>
Date: Sat, 17 Dec 2022 18:30:33 +0100
Subject: [PATCH] Add apps and update UI

---
 recipe.json                                 | 106 ++++++++++++++++++--
 vanilla_first_setup/layouts/applications.py |   2 +
 2 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/recipe.json b/recipe.json
index 0e3a3bd..cca8a05 100644
--- a/recipe.json
+++ b/recipe.json
@@ -37,33 +37,117 @@
                     "subtitle": "Core GNOME apps like Calendar or Calculator.",
                     "default": true,
                     "applications" : [
+                        {
+                            "name" : "Calculator",
+                            "icon" :  "org.gnome.Calculator",
+                            "flatpak-id" : "org.gnome.Calculator",
+                            "snap-id" : "gnome-calculator"
+                        },
                         {
                             "name" : "Calendar",
-                            "icon" :  "org.gnome.Calendar-symbolic"
+                            "icon" :  "org.gnome.Calendar",
+                            "flatpak-id" : "org.gnome.Calendar"
                         },
                         {
-                            "name" : "Calculator",
-                            "icon" :  "org.gnome.Calculator-symbolic"
+                            "name" : "Characters",
+                            "icon" :  "org.gnome.Characters",
+                            "flatpak-id" : "org.gnome.Characters",
+                            "snap-id" : "gnome-characters"
                         },
                         {
                             "name" : "Cheese",
-                            "icon" :  "org.gnome.Cheese-symbolic"
+                            "icon" :  "org.gnome.Cheese",
+                            "flatpak-id" : "org.gnome.Cheese",
+                            "snap-id" : "cheese"
+                        },
+                        {
+                            "name" : "Clocks",
+                            "icon" :  "org.gnome.clocks",
+                            "flatpak-id" : "org.gnome.clocks",
+                            "snap-id" : "gnome-clocks"
+                        },
+                        {
+                            "name" : "Contacts",
+                            "icon" :  "org.gnome.Contacts",
+                            "flatpak-id" : "org.gnome.Contacts",
+                            "snap-id" : "gnome-contacts"
+                        },
+                        {
+                            "name" : "Disk Usage Analyzer",
+                            "icon" :  "org.gnome.baobab",
+                            "flatpak-id" : "org.gnome.baobab"
+                        },
+                        {
+                            "name" : "Document Viewer",
+                            "icon" :  "org.gnome.Evince",
+                            "flatpak-id" : "org.gnome.Evince",
+                            "snap-id" : "evince"
+                        },
+                        {
+                            "name" : "Extensions",
+                            "icon" :  "org.gnome.Extensions",
+                            "flatpak-id" : "org.gnome.Extensions"
+                        },
+                        {
+                            "name" : "Fonts",
+                            "icon" :  "org.gnome.font-viewer",
+                            "flatpak-id" : "org.gnome.font-viewer"
+                        },
+                        {
+                            "name" : "Image Viewer",
+                            "icon" :  "org.gnome.eog",
+                            "flatpak-id" : "org.gnome.eog",
+                            "snap-id" : "eog"
+                        },
+                        {
+                            "name" : "Logs",
+                            "icon" :  "org.gnome.Logs",
+                            "flatpak-id" : "org.gnome.Logs",
+                            "snap-id" : "gnome-logs"
+                        },
+                        {
+                            "name" : "Maps",
+                            "icon" :  "org.gnome.Maps",
+                            "flatpak-id" : "org.gnome.Maps"
+                        },
+                        {
+                            "name" : "Music",
+                            "icon" :  "org.gnome.Music",
+                            "flatpak-id" : "org.gnome.Music"
+                        },
+                        {
+                            "name" : "Photos",
+                            "icon" :  "org.gnome.Photos",
+                            "flatpak-id" : "org.gnome.Photos"
+                        },
+                        {
+                            "name" : "Text Editor",
+                            "icon" :  "org.gnome.TextEditor",
+                            "flatpak-id" : "org.gnome.TextEditor"
+                        },
+                        {
+                            "name" : "Videos",
+                            "icon" :  "org.gnome.Totem",
+                            "flatpak-id" : "org.gnome.Totem"
+                        },
+                        {
+                            "name" : "Weather",
+                            "icon" :  "org.gnome.Weather",
+                            "flatpak-id" : "org.gnome.Weather",
+                            "snap-id" : "gnome-weather"
                         }
                     ]
                 },
                 {
                     "id": "utilities",
                     "title": "Common Utilities",
-                    "subtitle": "Useful utilities like Disks or Fonts.",
+                    "subtitle": "Useful utilities like Bottles.",
                     "default": true,
                     "applications" : [
                         {
-                            "name" : "Disks",
-                            "icon" :  "org.gnome.DiskUtility-symbolic"
-                        },
-                        {
-                            "name" : "Fonts",
-                            "icon" :  "org.gnome.font-viewer-symbolic"
+                            "name" : "Bottles",
+                            "icon" :  "com.usebottles.bottles",
+                            "flatpak-id" : "com.usebottles.bottles"
                         }
                     ]
                 }
diff --git a/vanilla_first_setup/layouts/applications.py b/vanilla_first_setup/layouts/applications.py
index 7fb8b4b..69498f4 100644
--- a/vanilla_first_setup/layouts/applications.py
+++ b/vanilla_first_setup/layouts/applications.py
@@ -72,6 +72,7 @@ class VanillaLayoutApplications(Adw.Bin):
             _header_bar.set_show_start_title_buttons(False)
 
             _apps_list = Adw.PreferencesGroup()
+            _apps_list.set_description("The following list includes only applications available in your preferred package manager.")
             _apps_page = Adw.PreferencesPage()
             _apps_page.add(_apps_list)
 
@@ -80,6 +81,7 @@ class VanillaLayoutApplications(Adw.Bin):
             _box.append(_apps_page)
 
             _selection_dialog.set_content(_box)
+            _selection_dialog.set_default_size(500, 600)
             selection_dialogs.append(_selection_dialog)
 
             _action_row = Adw.ActionRow(