Ignore BCacheFS patch and update branding components

This commit removes BCacheFS support by deleting the `001-exclude-bcachefs.sh` patch and updates branding components by changing colors in `branding.desc` and removing slideshow images. This update also comes with some small changes to ensure that grub-mkconfig performs properly

Signed-off-by: shadichy <hotrobb360web@gmail.com>

Author: shadichy

patches/001-exclude-bcachefs.sh renamed to patches/001-exclude-bcachefs.sh.disabled

@@ -175,10 +175,10 @@ images:
 # branding component also ships a stylesheet.qss. Then they are
 # the corresponding CSS attributes of #sidebarApp.
 style:
-   SidebarBackground:        "#292F34"
-   SidebarText:              "#FFFFFF"
-   SidebarTextCurrent:       "#292F34"
-   SidebarBackgroundCurrent: "#00CED1"
+   SidebarBackground:        "#18001A"
+   SidebarText:              "#F1DCF2"
+   SidebarTextCurrent:       "#1A0700"
+   SidebarBackgroundCurrent: "#ECA3E5"
 ### SLIDESHOW
 #
 # The slideshow is displayed during execution steps (e.g. when the

src/branding/blissos/branding.desc

@@ -89,36 +89,6 @@ Presentation
         }
     }
 
-    Slide {
-        anchors.fill: parent
-        anchors.verticalCenterOffset: 0
-
-        Image {
-            id: background5
-            source: "slide5.png"
-            width: parent.width; height: parent.height
-            horizontalAlignment: Image.AlignCenter
-            verticalAlignment: Image.AlignTop
-            fillMode: Image.Stretch
-            anchors.fill: parent
-        }
-    }
-
-    Slide {
-        anchors.fill: parent
-        anchors.verticalCenterOffset: 0
-
-        Image {
-            id: background6
-            source: "slide6.png"
-            width: parent.width; height: parent.height
-            horizontalAlignment: Image.AlignCenter
-            verticalAlignment: Image.AlignTop
-            fillMode: Image.Stretch
-            anchors.fill: parent
-        }
-    }
-
 
     // When this slideshow is loaded as a V1 slideshow, only
     // activatedInCalamares is set, which starts the timer (see above).

src/branding/blissos/show.qml

@@ -63,7 +63,7 @@
           description: "VOLD_USE_NTFS3=1"
         - name: "Boot & Set NTFS3 as default on vold"
           description: "USE_NTFS3=1"
-    - name: "Miscs"
+    - name: "Miscellaneous"
       options:
         - name: "Disable SDCardFS/ESDFS bind mounting"
           description: "SDCARDFS_DISABLE=1"

src/branding/blissos/slide5.png

@@ -55,9 +55,13 @@ ROOT_UUID=$(${grub_probe} --device "$ROOT_DEVICE" --target=fs_uuid 2>/dev/null)
 [ "$ROOT_UUID" ] && ROOT_DEVICE="UUID=$ROOT_UUID"
 
 android_entry() {
-	local extra_title=$1
-	shift
-	local extra_args=$*
+	local extra_title extra_args
+
+	# shellcheck disable=SC2015
+	extra_title=$1 &&
+		shift &&
+		extra_args=$* ||
+		:
 
 	echo "menuentry '$(echo "$TITLE${extra_title:+ - $extra_title}" | grub_quote)' ${CLASS} \$menuentry_id_option '$OS-${TITLE// /_}-\$SLOT${extra_args:+-${extra_args// /_}}' {"
 
@@ -95,7 +99,7 @@ export CMDLINE
 EOF
 
 submenu_indentation=""
-entry ""
+android_entry
 
 submenu_indentation=$grub_tab