Skip to content

Commit

Permalink
libtwrpgui: convert gui to use new ziparchive library
Browse files Browse the repository at this point in the history 
Change-Id: Iea94855257c6d02c2f663c25d390cb1cfb91a727
  • Loading branch information
@bigbiff
bigbiff committed Apr 24, 2021
1 parent 28653c9 commit d81833a
Show file tree
Hide file tree
Showing 48 changed files with 660 additions and 777 deletions.
16 changes: 8 additions & 8 deletions Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ endif

include $(CLEAR_VARS)

TWRES_PATH := /twres/
TWHTCD_PATH := $(TWRES_PATH)htcd/

TARGET_RECOVERY_GUI := true

LOCAL_STATIC_LIBRARIES :=
Expand Down Expand Up @@ -88,7 +85,6 @@ LOCAL_C_INCLUDES += \
system/gsid/include/ \
system/core/init/ \
system/extras/ext4_utils/include \
$(LOCAL_PATH)/twinstall/include

ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
Expand All @@ -114,14 +110,18 @@ LOCAL_C_INCLUDES += \
external/boringssl/include \
external/libcxx/include \
external/libselinux/include \
external/libpng \
$(LOCAL_PATH)/gui/include \
$(LOCAL_PATH)/recovery_ui/include \
$(LOCAL_PATH)/otautil/include \
$(LOCAL_PATH)/install/include \
$(LOCAL_PATH)/fuse_sideload/include \
$(LOCAL_PATH)/install/include \
$(LOCAL_PATH)/twrpinstall/include \
$(LOCAL_PATH)/recovery_utils/include \
$(LOCAL_PATH)/libpixelflinger/include
$(LOCAL_PATH)/libpixelflinger/include \
$(LOCAL_PATH)/minuitwrp/include \
$(LOCAL_PATH)/twinstall/include

LOCAL_STATIC_LIBRARIES += libguitwrp
LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libmtdutils libtwadbbu
Expand Down Expand Up @@ -404,7 +404,9 @@ TWRP_REQUIRED_MODULES += \
twrpbu \
adbd_system_api_recovery \
me.twrp.twrpapp.apk \
privapp-permissions-twrpapp.xml
privapp-permissions-twrpapp.xml \
adbd_system_api_recovery \
libsync.recovery

ifneq ($(TW_EXCLUDE_TZDATA), true)
TWRP_REQUIRED_MODULES += \
Expand Down Expand Up @@ -500,8 +502,6 @@ endif
ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
endif
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"
ifeq ($(TW_INCLUDE_NTFS_3G),true)
TWRP_REQUIRED_MODULES += \
mount.ntfs \
Expand Down
10 changes: 7 additions & 3 deletions gui/Android.bp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,19 @@ cc_library_static {
"system/core/libziparchive/include",
"bootable/recovery/recovery_ui/include",
"bootable/recovery/fuse_sideload/include",
"bootable/recovery/gui/include",
"bootable/recovery/twrpinstall",
"bootable/recovery/twrpinstall/include",
"bootable/recovery/libpixelflinger/include",
"bootable/recovery/minuitwrp/include",
"bionic",
"system/core/base/include",
"system/core/include",
"external/freetype/include"
"external/freetype/include",
"external/libpng"

],
srcs: [
srcs: [
"gui.cpp",
"resources.cpp",
"pages.cpp",
Expand Down Expand Up @@ -78,6 +81,7 @@ cc_library_static {
"libziparchive"
],
static_libs: [
"libotautil"
"libotautil",
"libpng"
]
}
41 changes: 1 addition & 40 deletions gui/action.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ extern "C" {
#include "twinstall/adb_install.h"
};
#include "set_metadata.h"
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down Expand Up @@ -221,9 +221,6 @@ GUIAction::GUIAction(xml_node<>* node)
ADD_ACTION(fixpermissions);
ADD_ACTION(dd);
ADD_ACTION(partitionsd);
ADD_ACTION(installhtcdumlock);
ADD_ACTION(htcdumlockrestoreboot);
ADD_ACTION(htcdumlockreflashrecovery);
ADD_ACTION(cmd);
ADD_ACTION(terminalcommand);
ADD_ACTION(reinjecttwrp);
Expand Down Expand Up @@ -1362,42 +1359,6 @@ int GUIAction::partitionsd(std::string arg __unused)

}

int GUIAction::installhtcdumlock(std::string arg __unused)
{
operation_start("Install HTC Dumlock");
if (simulate) {
simulate_progress_bar();
} else
TWFunc::install_htc_dumlock();

operation_end(0);
return 0;
}

int GUIAction::htcdumlockrestoreboot(std::string arg __unused)
{
operation_start("HTC Dumlock Restore Boot");
if (simulate) {
simulate_progress_bar();
} else
TWFunc::htc_dumlock_restore_original_boot();

operation_end(0);
return 0;
}

int GUIAction::htcdumlockreflashrecovery(std::string arg __unused)
{
operation_start("HTC Dumlock Reflash Recovery");
if (simulate) {
simulate_progress_bar();
} else
TWFunc::htc_dumlock_reflash_recovery_to_boot();

operation_end(0);
return 0;
}

int GUIAction::cmd(std::string arg)
{
int op_status = 0;
Expand Down
2 changes: 1 addition & 1 deletion gui/animation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/blanktimer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"
#include "../twrp-functions.hpp"
#include "../variables.h"

Expand Down
2 changes: 1 addition & 1 deletion gui/button.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/checkbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/fileselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/fill.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/gui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern "C"
#include "../twcommon.h"
#include <pixelflinger/pixelflinger.h>
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/image.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
0 gui/placement.h → gui/include/gui/placement.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions gui/input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "../minuitwrp/truetype.hpp"
#include "minuitwrp/minui.h"
#include "minuitwrp/truetype.hpp"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
4 changes: 2 additions & 2 deletions gui/keyboard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ extern "C" {
#include "../twcommon.h"
#include "gui.h"
}
#include "../minuitwrp/minui.h"
#include "../minuitwrp/truetype.hpp"
#include "minuitwrp/minui.h"
#include "minuitwrp/truetype.hpp"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/listbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/mousecursor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/objects.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace rapidxml;
#include "resources.hpp"
#include "pages.hpp"
#include "../partitions.hpp"
#include "placement.h"
#include "gui/placement.h"

#ifndef TW_X_OFFSET
#define TW_X_OFFSET 0
Expand Down
2 changes: 1 addition & 1 deletion gui/pages.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extern "C" {
#include "../twcommon.h"
#include "gui.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/partitionlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/patternpassword.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"
#include "../twrp-functions.hpp"
#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/progressbar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
11 changes: 6 additions & 5 deletions gui/resources.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ extern "C" {
#include "gui.h"
}

#include "../minuitwrp/truetype.hpp"
#include "../minuitwrp/minui.h"
#include "minuitwrp/truetype.hpp"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down Expand Up @@ -100,7 +100,7 @@ void Resource::LoadImage(ZipArchiveHandle pZip, std::string file, gr_surface* su
void Resource::CheckAndScaleImage(gr_surface source, gr_surface* destination, int retain_aspect)
{
if (!source) {
*destination = NULL;
*destination = nullptr;
return;
}
if (get_scale_w() != 0 && get_scale_h() != 0) {
Expand Down Expand Up @@ -214,7 +214,7 @@ ImageResource::ImageResource(xml_node<>* node, ZipArchiveHandle pZip)
: Resource(node, pZip)
{
std::string file;
gr_surface temp_surface = NULL;
gr_surface temp_surface = nullptr;

mSurface = NULL;
if (!node) {
Expand Down Expand Up @@ -264,7 +264,8 @@ AnimationResource::AnimationResource(xml_node<>* node, ZipArchiveHandle pZip)
std::ostringstream fileName;
fileName << file << std::setfill ('0') << std::setw (3) << fileNum;

gr_surface surface, temp_surface = NULL;
gr_surface surface = nullptr;
gr_surface temp_surface = nullptr;
LoadImage(pZip, fileName.str(), &temp_surface);
CheckAndScaleImage(temp_surface, &surface, retain_aspect);
if (surface) {
Expand Down
4 changes: 2 additions & 2 deletions gui/resources.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
#include <map>
#include "rapidxml.hpp"
#include "ziparchive/zip_archive.h"
#include "../minuitwrp/truetype.hpp"
#include "minuitwrp/truetype.hpp"

extern "C" {
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"
}

// Base Objects
Expand Down
4 changes: 2 additions & 2 deletions gui/scrolllist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "../minuitwrp/truetype.hpp"
#include "minuitwrp/minui.h"
#include "minuitwrp/truetype.hpp"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
2 changes: 1 addition & 1 deletion gui/slider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
#include "minuitwrp/minui.h"

#include "rapidxml.hpp"
#include "objects.hpp"
Expand Down
Loading

0 comments on commit d81833a

Please sign in to comment.