Merge branch 'kefir500:1.8.0' into main

MadGuyyy · Sep 28, 2023 · 1ea76e8 · 1ea76e8
2 parents 003cb02 + 59eb47d
commit 1ea76e8
Show file tree

Hide file tree

Showing 113 changed files with 14,018 additions and 1,987 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
           tools: tools_openssl_x86
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download Tools
         run: python scripts\download.py
       - name: Build MSI Package
@@ -51,7 +51,7 @@ jobs:
           tools: tools_openssl_x86
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download Tools
         run: python scripts\download.py
       - name: Build ZIP Package
@@ -84,7 +84,7 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install qt515base qt515imageformats qt515svg qt515tools libgl1-mesa-dev libsecret-1-dev adb zipalign
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download Tools
         run: python3 scripts/download.py
       - name: Build AppImage Package
@@ -106,15 +106,15 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   build-macos:
     name: macOS Build (APP, DMG)
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: 5.15.2
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download Tools
         run: python3 scripts/download.py
       - name: Build APP/DMG Package

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -20,11 +20,17 @@
 
 ### Translators:
 
+#### Arabic
+- [SWxEng](https://github.com/SWxEng)
+- [Ammar Salem](https://www.transifex.com/user/profile/amar0876/)
+- [Salih Ail](https://www.transifex.com/user/profile/rrrfff444/)
+
 #### Azerbaijani
 - [Emin Huseynzade](https://www.transifex.com/user/profile/ehsynze/)
 
 #### Chinese (Simplified)
 - [Wang Chenxu](http://www.dayanzai.me)
+- [Chen Xiang Fang](https://www.transifex.com/user/profile/chenxiangfang/)
 
 #### Czech
 - [Michal Mrnka](https://www.transifex.com/user/profile/Mimrixerix/)
@@ -38,9 +44,11 @@
 
 #### Greek
 - [Spiros Kaparos](https://www.transifex.com/user/profile/spkprs/)
+- [Theodoros Asimakopoulos](https://www.transifex.com/user/profile/theoasima/)
 
 #### Hebrew
 - [Tomer Shami](https://www.transifex.com/user/profile/PointApps/)
+- [yoeliko](https://www.transifex.com/user/profile/July./)
 
 #### Hungarian
 - [Egyed Ferenc](https://www.transifex.com/user/profile/efi99/)
@@ -58,6 +66,7 @@
 
 #### Korean
 - [Gyuha Shin](https://www.transifex.com/user/profile/gyuha/)
+- [VenusGirl](https://www.transifex.com/user/profile/VenusGirl/)
 
 #### Kurdish
 - [Erfan Sci](https://www.transifex.com/user/profile/erfan13/)
@@ -67,7 +76,7 @@
 - [Milad19s](https://www.transifex.com/user/profile/Milad19s/)
 
 #### Polish
-- [Jerzy Puczek](https://www.transifex.com/user/profile/Jurek04/)
+- [Jerzy Puczek](https://www.transifex.com/user/profile/puczek.jerzy/)
 
 #### Portuguese
 - [Giancarlo Molinari](https://www.transifex.com/user/profile/pombimsjb/)
@@ -82,8 +91,15 @@
 - [Francisco Zamorano](https://www.transifex.com/user/profile/Paco_Zamo/)
 - [Jose Osuna](https://www.transifex.com/user/profile/itp.osuna/)
 
+#### Spanish (Mexican)
+- [Robert Huerta](https://www.transifex.com/user/profile/lazarito/)
+
+#### Swedish
+- [Åke Engelbrektson](https://www.transifex.com/user/profile/eson/)
+
 #### Turkish
 - [emre1393](https://www.transifex.com/user/profile/emre1393/)
+- [Adam L. Wilson](https://twitter.com/ataharekat)
 
 ### Supporters:
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,13 +41,15 @@ if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Release")
 endif()
 
 set(TS_FILES
+    src/translations/apk-editor-studio.ar.ts
     src/translations/apk-editor-studio.az.ts
     src/translations/apk-editor-studio.ckb.ts
     src/translations/apk-editor-studio.cs.ts
     src/translations/apk-editor-studio.de.ts
     src/translations/apk-editor-studio.el.ts
     src/translations/apk-editor-studio.en_GB.ts
     src/translations/apk-editor-studio.es.ts
+    src/translations/apk-editor-studio.es_MX.ts
     src/translations/apk-editor-studio.fa.ts
     src/translations/apk-editor-studio.fr.ts
     src/translations/apk-editor-studio.he.ts
@@ -60,6 +62,7 @@ set(TS_FILES
     src/translations/apk-editor-studio.pt.ts
     src/translations/apk-editor-studio.ro.ts
     src/translations/apk-editor-studio.ru.ts
+    src/translations/apk-editor-studio.sv.ts
     src/translations/apk-editor-studio.tr.ts
     src/translations/apk-editor-studio.zh_CN.ts
 )

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # APK Editor Studio
 
-[![Build Status (GitHub Actions)](https://img.shields.io/github/workflow/status/kefir500/apk-editor-studio/Build)](https://github.com/kefir500/apk-editor-studio/actions/workflows/build.yml)
+[![Build Status (GitHub Actions)](https://img.shields.io/github/actions/workflow/status/kefir500/apk-editor-studio/build.yml?branch=1.8.0)](https://github.com/kefir500/apk-editor-studio/actions/workflows/build.yml)
 [![Latest Release](https://img.shields.io/github/release/kefir500/apk-editor-studio.svg?maxAge=86400)](https://github.com/kefir500/apk-editor-studio/releases/latest)
 [![Download Count](https://img.shields.io/github/downloads/kefir500/apk-editor-studio/total?color=blue)](https://github.com/kefir500/apk-editor-studio/releases)
 [![License](https://img.shields.io/github/license/kefir500/apk-editor-studio?color=blue)](https://raw.githubusercontent.com/kefir500/apk-editor-studio/master/LICENSE)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1
diff --git a/dist/all/docs/authors.txt b/dist/all/docs/authors.txt
@@ -18,11 +18,17 @@
 
 # Translators:
 
+## Arabic
+- [SWxEng](https://github.com/SWxEng)
+- [Ammar Salem](https://www.transifex.com/user/profile/amar0876/)
+- [Salih Ail](https://www.transifex.com/user/profile/rrrfff444/)
+
 ## Azerbaijani
 - [Emin Huseynzade](https://www.transifex.com/user/profile/ehsynze/)
 
 ## Chinese (Simplified)
 - [Wang Chenxu](http://www.dayanzai.me)
+- [Chen Xiang Fang](https://www.transifex.com/user/profile/chenxiangfang/)
 
 ## Czech
 - [Michal Mrnka](https://www.transifex.com/user/profile/Mimrixerix/)
@@ -36,9 +42,11 @@
 
 ## Greek
 - [Spiros Kaparos](https://www.transifex.com/user/profile/spkprs/)
+- [Theodoros Asimakopoulos](https://www.transifex.com/user/profile/theoasima/)
 
 ## Hebrew
 - [Tomer Shami](https://www.transifex.com/user/profile/PointApps/)
+- [yoeliko](https://www.transifex.com/user/profile/July./)
 
 ## Hungarian
 - [Egyed Ferenc](https://www.transifex.com/user/profile/efi99/)
@@ -56,6 +64,7 @@
 
 ## Korean
 - [Gyuha Shin](https://www.transifex.com/user/profile/gyuha/)
+- [VenusGirl](https://www.transifex.com/user/profile/VenusGirl/)
 
 ## Kurdish
 - [Erfan Sci](https://www.transifex.com/user/profile/erfan13/)
@@ -65,7 +74,7 @@
 - [Milad19s](https://www.transifex.com/user/profile/Milad19s/)
 
 ## Polish
-- [Jerzy Puczek](https://www.transifex.com/user/profile/Jurek04/)
+- [Jerzy Puczek](https://www.transifex.com/user/profile/puczek.jerzy/)
 
 ## Portuguese
 - [Giancarlo Molinari](https://www.transifex.com/user/profile/pombimsjb/)
@@ -80,8 +89,15 @@
 - [Francisco Zamorano](https://www.transifex.com/user/profile/Paco_Zamo/)
 - [Jose Osuna](https://www.transifex.com/user/profile/itp.osuna/)
 
+## Spanish (Mexican)
+- [Robert Huerta](https://www.transifex.com/user/profile/lazarito/)
+
+## Swedish
+- [Åke Engelbrektson](https://www.transifex.com/user/profile/eson/)
+
 ## Turkish
 - [emre1393](https://www.transifex.com/user/profile/emre1393/)
+- [Adam L. Wilson](https://twitter.com/ataharekat)
 
 # Testers:
 

diff --git a/dist/all/docs/versions.txt b/dist/all/docs/versions.txt
@@ -1,9 +1,31 @@
 # Version History
 
+## 1.8.0
+- Added word wrap support to code editor.
+- Updated default Apktool to 2.8.1.
+
+## 1.7.1
+- Added support for optimizing shared libraries.
+- Added Arabic translation.
+- Added Spanish (Mexican) translation.
+- Fixed Apktool update loop when Java is not found.
+- Windows: Improved Java path detection.
+
 ## 1.7.0
+- Added automatic Apktool updater.
 - Added framework manager.
-- Added search case sensitivity option.
-- Added search by regular expression option.
+- Added global Find and Replace.
+- Added code search case sensitivity option.
+- Added code search by regular expression option.
+- Added syntax definition downloader.
+- Added ability to open resources in an external app.
+- Added ability to disassemble only main DEX classes.
+- Added ability to disassemble without debug info.
+- Added progress indication for APK cloning.
+- Added Android 13 support.
+- Added Swedish translation.
+- Updated default Apktool to 2.7.0.
+- Updated Android SDK Build Tools to 33.0.1.
 - Fixed error while saving the currently open resource.
 
 ## 1.6.0

diff --git a/dist/macos/Info.plist.in b/dist/macos/Info.plist.in
@@ -19,7 +19,7 @@
 	<key>CFBundleIconFile</key>
 	<string>apk-editor-studio.icns</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright (C) Alexander Gorishnyak 2019-2021</string>
+	<string>Copyright (C) Alexander Gorishnyak 2019-2023</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>

diff --git a/lib/DarkStyle/darkstyle/darkstyle.qss b/lib/DarkStyle/darkstyle/darkstyle.qss
@@ -36,7 +36,6 @@ QMenu::item{
   border:1px solid transparent;
 }
 QMenu::item:disabled{
-  background-color:rgba(35,35,35,127);
   color:palette(disabled);
 }
 QMenu::item:selected{
@@ -51,8 +50,7 @@ QMenu::icon:checked{
 QMenu::separator{
   height:1px;
   background:palette(alternate-base);
-  margin-left:5px;
-  margin-right:5px;
+  margin:3px 5px;
 }
 QMenu::indicator{
   width:18px;

diff --git a/lib/KSyntaxHighlighting/CMakeLists.txt b/lib/KSyntaxHighlighting/CMakeLists.txt
@@ -13,6 +13,7 @@ target_sources(KSyntaxHighlighting PRIVATE
     src/context.cpp
     src/contextswitch.cpp
     src/definition.cpp
+    src/definitiondownloader.cpp
     src/foldingregion.cpp
     src/format.cpp
     src/htmlhighlighter.cpp
@@ -39,6 +40,7 @@ target_include_directories(KSyntaxHighlighting
 target_link_libraries(KSyntaxHighlighting
     Qt5::Core
     Qt5::Widgets
+    Qt5::Network
 )
 
 include(GenerateExportHeader)

diff --git a/lib/KSyntaxHighlighting/data/syntax/alert.xml b/lib/KSyntaxHighlighting/data/syntax/alert.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="6" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann ([email protected])" license="MIT" hidden="true">
+<language version="7" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann ([email protected])" license="MIT" hidden="true">
   <highlighting>
     <list name="alerts_hi">
       <item>ALERT</item>
@@ -48,7 +48,8 @@
     </itemDatas>
   </highlighting>
   <general>
-    <keywords casesensitive="1"/>
+    <!-- NO-BREAK SPACE (nbsp) as deliminator -->
+    <keywords casesensitive="1" additionalDeliminator="&#160;"/>
   </general>
 </language>
 <!-- kate: indent-width 2; -->
diff --git a/lib/KSyntaxHighlighting/data/syntax/html.xml b/lib/KSyntaxHighlighting/data/syntax/html.xml
@@ -5,7 +5,7 @@
 	<!ENTITY attributeName "[A-Za-z_:*#\(\[][\)\]\w.:_-]*">
 	<!ENTITY entref        "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="HTML" version="14" kateversion="5.53" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen ([email protected])" license="LGPL" priority="10">
+<language name="HTML" version="15" kateversion="5.53" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm;*.aspx" mimetype="text/html"  author="Wilbert Berendsen ([email protected])" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>