Download binary dependencies automatically#201
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix Tool Detection, Download Dialog, and macOS Build Issues
Summary
This PR fixes critical issues with tool version detection on Windows, improves the download dialog UX, corrects Apktool build flags, replaces external styling with Qt 6 native themes, and resolves macOS bundle configuration issues.
Changes
🔧 Fixed JADX Version Detection on Windows
Problem: JADX version detection failed because
.batfiles cannot be executed directly viaQProcess.Solution:
ProcessUtils::runCommand()to detect.bat/.cmdfiles and wrap them withcmd.exe /cJAVA_HOMEandPATHenvironment variables for batch files requiring JavaFiles Changed:
sources/processutils.cpp🐛 Fixed Download Dialog Showing "Cancelled" After Success
Problem: Clicking "Close" after successful downloads incorrectly showed "Download cancelled" message.
Solution:
handleCancel()andcloseEvent()to detect successful completionFiles Changed:
sources/tooldownloaddialog.cpp🔨 Fixed Apktool Build Flag
Problem: Apktool 2.12.1+ uses aapt2 by default and doesn't support
--use-aapt2flag.Solution:
--use-aapt2flag (aapt2 is default)--use-aapt1flag when aapt1 is explicitly requestedFiles Changed:
sources/apkrecompileworker.cpp🎨 Replaced External Styling with Qt 6 Native Themes
Problem: Using external QDarkStyleSheet library added unnecessary dependency.
Solution:
app.setStyle("Fusion")setColorScheme()API for dark/light themes (with fallback for older versions)Files Changed:
sources/main.cppCMakeLists.txtsources/darkstyle.*,sources/lightstyle.*,sources/stylecommon.*🍎 Fixed macOS Build Issues
Problem: App showed as "ApkStudio" instead of "APK Studio", missing icon in dock/DMG, and launch issues.
Solution:
CFBundleDisplayNameset to "APK Studio" in Info.plistCFBundleIconNameand proper icon resource handlingNSPrincipalClassandLSApplicationCategoryTypefor proper app initializationFiles Changed:
CMakeLists.txt(Info.plist generation and icon handling).github/workflows/build.yml(DMG creation with proper bundle naming)🛠️ Enhanced Debug Logging
qDebug()calls in#ifdef QT_DEBUGblocksFiles Changed:
sources/versionresolveworker.cppsources/processutils.cppsources/tooldownloadworker.cppsources/apkdecompileworker.cppsources/adbinstallworker.cppsources/apksignworker.cppsources/apkrecompileworker.cppTechnical Details
Batch File Execution on Windows
The implementation correctly handles Windows batch files by:
.batand.cmdfile extensionscmd.exe /cin correct orderJAVA_HOME,PATH) for tools requiring JavaQt 6 Native Theming
QStyleHints::setColorScheme()API when availablemacOS Bundle Configuration
CFBundleDisplayNamefor user-facing nameTesting
Manual Testing Performed
Impact
Related Issues
Fixes issues with:
--use-aapt2flag