From 87473c66338396ab1e8586e938000f1d71e3a2fa Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Mon, 5 Dec 2022 19:35:46 +0530
Subject: [PATCH 1/2] fix: formatting and add build folders to gitignore

---
 app/.gitignore                         | 1 +
 app/src/main/res/values-it/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/.gitignore b/app/.gitignore
index a2def884f0..b32e2630c3 100755
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1,3 @@
 /build
 google-services.json
+api*/
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2f7d4343ec..e03429b426 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -148,4 +148,4 @@
     <string name="notification_badge_warning">Per poter vedere il numero delle notifiche sulle icone delle App, devi concedere al launcher l\'accesso alle notifiche.</string>
     <string name="perm_required">Permesso richiesto</string>
     <string name="weather_refresh_15min">15 minuti</string>
-</resources>
\ No newline at end of file
+</resources>
-- 
GitLab


From 003847f57956e6b5632f9d912a3bbf0855ff6c2d Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Wed, 7 Dec 2022 17:14:05 +0530
Subject: [PATCH 2/2] fix: close folder if forceReload is called

---
 .../blisslauncher/features/launcher/LauncherActivity.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
index 8e811cce0b..13fab3b4d5 100755
--- a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
+++ b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
@@ -3325,6 +3325,14 @@ public class LauncherActivity extends AppCompatActivity
     }
 
     public void forceReload() {
+        /**
+         * Return to homescreen if [forceReload] is called to prevent the icons from
+         * applying wrong dimensions
+         */
+        if (mFolderWindowContainer.getVisibility() == View.VISIBLE) {
+            returnToHomeScreen();
+        }
+
         allAppsDisplayed = false;
         BlissLauncher.getApplication(this).getAppProvider().getAppsRepository()
                 .updateAppsRelay(Collections.emptyList());
-- 
GitLab