From 863d8b04afc1b16df3fee48cf981a8a2d6fd0556 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 9 Mar 2024 13:03:59 +0100 Subject: [PATCH] (Android) Removed support for the Lite release --- CMakeLists.txt | 21 +++------------------ es-app/src/guis/GuiMenu.cpp | 16 ---------------- es-app/src/main.cpp | 4 ---- es-core/CMakeLists.txt | 9 ++------- es-core/src/Window.cpp | 4 ---- 5 files changed, 5 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed9dbefbc..3e894c078 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,12 +284,7 @@ endif() if(ANDROID) set(BUNDLED_CERTS ON) add_compile_definitions(ANDROID_VERSION_CODE=${ANDROID_VERSION_CODE}) - if(ANDROID_LITE_RELEASE) - add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend.lite") - add_compile_definitions(ANDROID_LITE_RELEASE) - else() - add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend") - endif() + add_compile_definitions(ANDROID_APPLICATION_ID="org.es_de.frontend") endif() if(WIN32) @@ -404,11 +399,6 @@ if(ANDROID) message(FATAL_ERROR "-- Unsupported Android ABI: " ${ANDROID_ABI}) endif() message("-- Building with Android version code " ${ANDROID_VERSION_CODE}) - if(ANDROID_LITE_RELEASE) - message("-- Building Lite release") - else() - message("-- Building full release") - endif() endif() # Affects the application updater and is used for displaying version info in the main menu. @@ -617,13 +607,8 @@ endif() if(NOT WIN32) # SVG rendering library LunaSVG and Lottie animation library rlottie. if(ANDROID) - if(ANDROID_LITE_RELEASE) - set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_lite_${ANDROID_ABI}/liblunasvg.a) - set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_lite_${ANDROID_ABI}/librlottie.a) - else() - set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/liblunasvg.a) - set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/librlottie.a) - endif() + set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/liblunasvg.a) + set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/librlottie.a) else() set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/liblunasvg.a) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/librlottie.a) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index b43fc2dbd..0d84bb77b 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -1898,24 +1898,12 @@ void GuiMenu::openUtilities() HelpStyle style {getHelpStyle()}; ComponentListRow row; - -#if defined(ANDROID_LITE_RELEASE) - auto orphanedDataCleanup = - std::make_shared("ORPHANED DATA CLEANUP (FULL VERSION ONLY)", - Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - orphanedDataCleanup->setOpacity(DISABLED_OPACITY); - row.addElement(orphanedDataCleanup, true); - auto orphanedDataCleanupArrow = mMenu.makeArrow(); - orphanedDataCleanupArrow->setOpacity(DISABLED_OPACITY); - row.addElement(orphanedDataCleanupArrow, false); -#else row.addElement(std::make_shared("ORPHANED DATA CLEANUP", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary), true); row.addElement(mMenu.makeArrow(), false); row.makeAcceptInputHandler(std::bind( [this] { mWindow->pushGui(new GuiOrphanedDataCleanup([&]() { close(true); })); })); -#endif s->addRow(row); row.elements.clear(); @@ -2093,11 +2081,7 @@ void GuiMenu::addVersionInfo() mVersion.setFont(Font::get(FONT_SIZE_SMALL)); mVersion.setColor(mMenuColorTertiary); -#if defined(ANDROID_LITE_RELEASE) - const std::string applicationName {"ES-DE LITE"}; -#else const std::string applicationName {"ES-DE"}; -#endif #if defined(IS_PRERELEASE) mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index ba45cc885..1aee7dcc1 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -691,11 +691,7 @@ int main(int argc, char* argv[]) Log::init(); Log::open(); { -#if defined(ANDROID_LITE_RELEASE) - const std::string applicationName {"ES-DE Lite"}; -#else const std::string applicationName {"ES-DE"}; -#endif #if defined(__ANDROID__) LOG(LogInfo) << applicationName << " " << PROGRAM_VERSION_STRING << "-" << ANDROID_VERSION_CODE << " (r" << PROGRAM_RELEASE_NUMBER << "), built " diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt index 592222d51..e4c387850 100644 --- a/es-core/CMakeLists.txt +++ b/es-core/CMakeLists.txt @@ -184,11 +184,6 @@ add_library(es-core STATIC ${CORE_SOURCES} ${CORE_HEADERS}) target_link_libraries(es-core ${COMMON_LIBRARIES}) if(ANDROID) - if(ANDROID_LITE_RELEASE) - set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY - ${PROJECT_SOURCE_DIR}/../android_lite_${ANDROID_ABI}) - else() - set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY - ${PROJECT_SOURCE_DIR}/../android_${ANDROID_ABI}) - endif() + set_target_properties(es-core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY + ${PROJECT_SOURCE_DIR}/../android_${ANDROID_ABI}) endif() diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp index a74b2d591..bb7f519fe 100644 --- a/es-core/src/Window.cpp +++ b/es-core/src/Window.cpp @@ -887,10 +887,6 @@ void Window::stopMediaViewer() void Window::startPDFViewer(FileData* game) { if (mPDFViewer) { -#if defined(ANDROID_LITE_RELEASE) - queueInfoPopup("PDF VIEWER ONLY AVAILABLE IN FULL VERSION", 6000); - return; -#endif if (mPDFViewer->startPDFViewer(game)) { setAllowTextScrolling(false); setAllowFileAnimation(false);