gui: Remade theme apply mechanism

SHRP · Mar 16, 2023 · 5012e0a · 5012e0a
1 parent cb27a86
commit 5012e0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/gui/action.cpp b/gui/action.cpp
@@ -1660,7 +1660,6 @@ int GUIAction::decrypt(std::string arg __unused)
 #ifdef SHRP_EXPRESS
 			Express::init();
 			SHRP::handleLock();
-			GUIAction::reload("dummy");
 #endif
 #endif
 		}

diff --git a/twrp.cpp b/twrp.cpp
@@ -98,15 +98,6 @@ static void Decrypt_Page(bool SkipDecryption, bool datamedia) {
 				gui_loadCustomResources();
 			}
 		}
-#ifdef SHRP_EXPRESS
-		else {
-			LOGINFO("Request a reload to apply shrp theme");
-			PageManager::RequestReload();
-		}
-	} if (DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0) {
-			LOGINFO("Request a reload to apply shrp theme");
-			PageManager::RequestReload();
-#endif
 	} else if (datamedia) {
 		PartitionManager.Update_System_Details();
 		TWFunc::check_selinux_support();
@@ -477,7 +468,9 @@ int main(int argc, char **argv) {
 	TWFunc::checkforapp(); //Checking compatibility for TWRP app
 
 	// Launch the main GUI
-	gui_start();
+	PageManager::RequestCustomReload("main");
+	gui_startPage("dasboard", 1, 0);
+	//gui_start();
 	delete adb_bu_fifo;
 	TWFunc::Update_Intent_File(startup.Get_Intent());
 	reboot();