NikGapps 3.20__tar.gz → 3.22__tar.gz

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/build/Build.py

@@ -119,6 +119,8 @@ class Build:
                                                                                    android_version=android_version,
                                                                                    pkg_path=source_directory)
             pkg.delete_files_list = delete_files_list
+            for delete_app in pkg_obj.delete_files_list:
+                pkg.delete(delete_app)
             pkg.delete_overlay_list = delete_overlay_list
             pkg.validation_script = pkg_obj.validation_script
             pkg.overlay_list = pkg_obj.overlay_list

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/build/NikGappsManager.py

@@ -295,7 +295,14 @@ class NikGappsManager:
                     "package_name": "com.nikgapps.overlay.youtubemusic",
                     "resources": Library.get_youtube_music_resources()
                 }
-            ]
+            ],
+            "com.google.android.apps.turbo": [
+                {
+                    "package_title": "DeviceHealthServices",
+                    "package_name": "com.nikgapps.overlay.turbo",
+                    "resources": Library.get_device_health_services_resources()
+                }
+            ],
         }
         return [Overlay(overlay["package_title"], overlay["package_name"], self.android_version, overlay["resources"])
                 for overlay

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/build_config.py

@@ -48,8 +48,10 @@ def build_config():
             path = config_name
             FileOp.write_string_in_lf_file(str_data=config_string, file_path=path)
     for android_version in android_versions:
-        GitOperations.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
-        GitOperations.clone_overlay_repo(android_version)
+        apk_repo = GitOperations.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
+        Config.APK_SOURCE = apk_repo.working_tree_dir
+        overlay_repo = GitOperations.clone_overlay_repo(android_version)
+        Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         config_obj = NikGappsConfig(android_version=android_version, config_path=path)
         print(f"Setting up package list from {config_name}...")
         config_obj.config_package_list = Build.build_from_directory(app_set_build_list=config_obj.config_package_list,

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/helper/Assets.py

@@ -1,5 +1,8 @@
 from pathlib import Path
 from importlib import resources
+
+from nikassets.helper.Assets import Assets as A
+
 from NikGapps.helper.Statics import Statics
 from .FileOp import FileOp
 import os.path
@@ -22,19 +25,19 @@ class Assets:
                     break
     cwd = assets_folder + os.path.sep
     system_name = platform.system()
-    apksigner_path = cwd + "apksigner.jar"
-    apktool_path = cwd + "apktool_2.10.0.jar"
-    key_path = cwd + "cert.pk8"
-    cert_path = cwd + "cert.x509.pem"
-    private_key_pem = cwd + "private_key.pem"
+    apksigner_path = A.get("apksigner.jar")
+    apktool_path = A.get("apktool_2.10.0.jar")
+    key_path = A.get("cert.pk8")
+    cert_path = A.get("cert.x509.pem")
+    private_key_pem = A.get("private_key.pem")
     if system_name == "Windows":
-        aapt_path = os.path.join(assets_folder, 'bin', system_name, 'aapt2.exe')
-        adb_path = os.path.join(assets_folder, 'bin', system_name, 'adb.exe')
+        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2.exe')
+        adb_path = os.path.join(A.assets_folder, 'bin', system_name, 'adb.exe')
     elif system_name == "Linux":
-        aapt_path = os.path.join(assets_folder, 'bin', system_name, 'aapt2')
+        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2')
         adb_path = "adb"
     elif system_name == "Darwin":
-        aapt_path = os.path.join(assets_folder, 'bin', system_name, 'aapt2')
+        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2')
         if not FileOp.file_exists(aapt_path):
             aapt_path = Statics.find_latest_aapt()
         adb_path = "adb"
@@ -45,7 +48,7 @@ class Assets:
     header_path = cwd + "header.sh"
     functions_path = cwd + "functions.sh"
     gofile_path = cwd + "gofile.sh"
-    busybox = cwd + "busybox"
+    busybox = A.get("busybox")
     file_sizes_path = cwd + "file_size.txt"
     mount_path = cwd + "mount.sh"
     mtg_mount_path = cwd + "mtg_mount.sh"
@@ -57,7 +60,7 @@ class Assets:
     installer_path = cwd + "installer.sh"
     uninstaller_path = cwd + "uninstaller.sh"
     changelog = cwd + "changelogs.yaml"
-    sign_jar = os.path.join(assets_folder, "NikGappsZipSigner.jar")
+    sign_jar = os.path.join(A.assets_folder, "NikGappsZipSigner.jar")
     customize_path = cwd + "customize.sh"
     module_path = cwd + "module.prop"
     magisk_update_binary = cwd + "magisk-update-binary.sh"

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/helper/git/GitOperations.py

@@ -20,13 +20,12 @@ class GitOperations:
         return repo if result else None
 
     @staticmethod
-    def clone_overlay_repo(android_version, fresh_clone=False, branch="master", source=False, enable_push=False):
+    def clone_overlay_repo(android_version, fresh_clone=False, branch="main", source=False, enable_push=False):
         if float(android_version) > 12:
-            android_code = Statics.get_android_code(android_version)
-            overlay_source_dir = (Statics.pwd + Statics.dir_sep + f"overlays_{android_code}"
+            overlay_source_dir = (Statics.pwd + Statics.dir_sep + f"overlays_{android_version}"
                                   + ("_source" if source else ""))
-            overlay_source_repo = (("git@github.com:nikgapps/" if enable_push else "https://github.com/nikgapps/")
-                                   + f"overlays_{android_code}"
+            overlay_source_repo = (("git@gitlab.com:nikgapps/" if enable_push else "https://gitlab.com/nikgapps/")
+                                   + f"overlays_{android_version}"
                                    + ("_source" if source else "") + ".git")
             return GitOperations.setup_repo(overlay_source_dir, overlay_source_repo, branch, fresh_clone)
         else:

{nikgapps-3.20 → nikgapps-3.22}/NikGapps/helper/overlay/Library.py

@@ -187,6 +187,16 @@ class Library:
     def get_template():
         return Resources()
 
+    @staticmethod
+    def get_device_health_services_resources():
+        r = Resources()
+        r.add(String('battery_suggestion_summary', 'Turn on Adaptive Battery'))
+        r.add(String('smart_battery_manager_title', 'Adaptive Battery'))
+        r.add(String('smart_battery_footer', 'When Battery Manager detects that apps are draining battery, you\u2019ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.'))
+        r.add(String('smart_battery_title', 'Use Adaptive Battery'))
+        r.add(String('battery_tip_smart_battery_summary', 'Turn on Adaptive Battery'))
+        return r
+
     @staticmethod
     def get_devices_personalization_services_resources():
         r = Resources()

{nikgapps-3.20 → nikgapps-3.22/NikGapps.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.20
+Version: 3.22
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.20 → nikgapps-3.22}/NikGapps.egg-info/SOURCES.txt

@@ -42,15 +42,8 @@ NikGapps/helper/SystemStat.py
 NikGapps/helper/T.py
 NikGapps/helper/XmlOp.py
 NikGapps/helper/__init__.py
-NikGapps/helper/assets/NikGappsZipSigner.jar
 NikGapps/helper/assets/addon.sh
-NikGapps/helper/assets/apksigner.jar
-NikGapps/helper/assets/apktool_2.10.0.jar
-NikGapps/helper/assets/apktool_2.9.3.jar
 NikGapps/helper/assets/appsets.json
-NikGapps/helper/assets/busybox
-NikGapps/helper/assets/cert.pk8
-NikGapps/helper/assets/cert.x509.pem
 NikGapps/helper/assets/changelogs.yaml
 NikGapps/helper/assets/config_versions.json
 NikGapps/helper/assets/customize.sh
@@ -66,20 +59,8 @@ NikGapps/helper/assets/mtg_mount.sh
 NikGapps/helper/assets/nikgapps.config
 NikGapps/helper/assets/nikgapps_functions.sh
 NikGapps/helper/assets/packages.json
-NikGapps/helper/assets/private_key.pem
 NikGapps/helper/assets/uninstaller.sh
 NikGapps/helper/assets/unmount.sh
-NikGapps/helper/assets/update-binary-busybox
-NikGapps/helper/assets/bin/Darwin/aapt2
-NikGapps/helper/assets/bin/Linux/aapt2
-NikGapps/helper/assets/bin/Linux/dex-tools-2.2-SNAPSHOT-2021-10-31.zip
-NikGapps/helper/assets/bin/Linux/jd-gui-1.6.6-min.jar
-NikGapps/helper/assets/bin/Windows/AdbWinApi.dll
-NikGapps/helper/assets/bin/Windows/AdbWinUsbApi.dll
-NikGapps/helper/assets/bin/Windows/aapt.exe
-NikGapps/helper/assets/bin/Windows/aapt2.exe
-NikGapps/helper/assets/bin/Windows/aapt_64.exe
-NikGapps/helper/assets/bin/Windows/adb.exe
 NikGapps/helper/compression/CompOps.py
 NikGapps/helper/compression/Export.py
 NikGapps/helper/compression/Modes.py

{nikgapps-3.20/NikGapps.egg-info → nikgapps-3.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.20
+Version: 3.22
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.20 → nikgapps-3.22}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="NikGapps",
-version="3.20",
+version="3.22",
     packages=find_packages(),
     include_package_data=True,
     package_data={

nikgapps-3.20/NikGapps/helper/assets/cert.x509.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIJALOZgIbQVs/6MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-Fw0wODA0MTUyMjQwNTBaFw0zNTA5MDEyMjQwNTBaMIGUMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-hvcNAQEBBQADggENADCCAQgCggEBAJx4BZKsDV04HN6qZezIpgBuNkgMbXIHsSAR
-vlCGOqvitV0Amt9xRtbyICKAx81Ne9smJDuKgGwms0sTdSOkkmgiSQTcAUk+fArP
-GgXIdPabA3tgMJ2QdNJCgOFrrSqHNDYZUer3KkgtCbIEsYdeEqyYwap3PWgAuer9
-5W1Yvtjo2hb5o2AJnDeoNKbf7be2tEoEngeiafzPLFSW8s821k35CjuNjzSjuqtM
-9TNxqydxmzulh1StDFP8FOHbRdUeI0+76TybpO35zlQmE1DsU1YHv2mi/0qgfbX3
-6iANCabBtJ4hQC+J7RGQiTqrWpGA8VLoL4WkV1PPX8GQccXuyCcCAQOjgfwwgfkw
-HQYDVR0OBBYEFE/koLPdnLop9x1yh8Tnw48ghsKZMIHJBgNVHSMEgcEwgb6AFE/k
-oLPdnLop9x1yh8Tnw48ghsKZoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJALOZgIbQVs/6MAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAFclUbjZOh9z3g9tRp+G2tZwFAAp
-PIigzXzXeLc9r8wZf6t25iEuVsHHYc/EL9cz3lLFCuCIFM78CjtaGkNGBU2Cnx2C
-tCsgSL+ItdFJKe+F9g7dEtctVWV+IuPoXQTIMdYT0Zk4u4mCJH+jISVroS0dao+S
-6h2xw3Mxe6DAN/DRr/ZFrvIkl5+6bnoUvAJccbmBOM7z3fwFlhfPJIRc97QNY4L3
-J17XOElatuWTG5QhdlxJG3L7aOCA29tYwgKdNHyLMozkPvaosVUz7fvpib1qSN1L
-IC7alMarjdW4OZID2q4u1EYjLk/pvZYTlMYwDlE448/Shebk5INTjLixs1c=
------END CERTIFICATE-----

nikgapps-3.20/NikGapps/helper/assets/private_key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA5GnQnSHjt+Wa3peW5QIF/88tCM6qXHfj9VvjU7JL7E2M9gmE
-4WitZx7jPupjQx1FfcGqMc3x5t3ElP+jS1HlsWBenjP+SBObasVFOrnHY4Wzs9iB
-I7Pi86RaC82288ZwCowe41m+slcA/PUV9OH3gEzjLyv0Q3NwPVTR1ZIRTsNXrDN3
-VeX/gYm3q/EOpwMsjfshvq9FbwgNpkvnP6DdpVtAZB2PMJDnuu5sz417RW6JycOh
-XCidaW1u+w5Lu5spRpkbl2Ze6+eRdSQe1LQfiQTzUu+H4fIqIcwwMiMFAHoeRBB4
-QAlEde9xpkT16ZBM7nrhWzTegk/YaxuzAgl4bwIDAQABAoIBAFP83KqKpZMfKD0k
-/GUkw1P2uBZ+94GczAOSUBqcevJe6bAme+fud6RtZR3jTbCF+OFu7sf1dDdx4DDx
-dvfhG1aHmwMNFzkljIZMF1KqsThVF2jP+VxJbvArxLiGYfltRBF8yHbMryQgfcqF
-zBcJZ9qTaw4TWXPb5K+ImsevOBH/bBg+gyHV/Ax6fk0djl7j0XzzdMh+H3h7p5bZ
-vdzG4fjG7/npqKevul/yVUP3K2f+Zc8EZY3pVGig+yjRTWzpW6FIF6a8c+QqWYjx
-H2nxLtKSghmT1GvdTPxmx9TFu9CqcwPQFux/kSTdvZDPqwlcbVRLy01xC4fay0IE
-YZgK56ECgYEA/eJSrh3aBOdm2JWIy6W6Q6sverjt3JvoZ7Aoo60q0EgPf7XQfrHx
-I682ln845zVZLBPa9wx7BVoHSSI4aLmzU9dcAEVr4uqXm4KG2UBQWMpK+RnS5IDP
-rM+6bHDHc/4AngM2yUeHKjofVUQ1Gt0Eipq19Tc3sigDBjIl6W3Kg6cCgYEA5lEm
-CQTJxptXbVvXtJsQxbGDwcBP46/tZjzVDDgiT74LDIA4mRMXUdPf5TRYEcmnNGRn
-oPWgLxo9wqYdcVCSxyZoi8pyCD9JOo94iF4ZMVd5qCr7z+/O9dAmKK5pDUFiBuPd
-EzoiOHERlpZmgDV+aK4j5h1bOLVsVtsz6qJenfkCgYEAz4xdmwm8WZXydcyI8DKj
-ev5O6jyT921dKKbSEjxWa779LKItt+UwBMQQFCgdFKaAJ5BzyNLjHxTiL99RzgtB
-lqDQDUizUeYF2pNyOdhh1rRJZiq+RR8op1WKSWxJIYHcb1ChURqwXMz3IHWKFFPq
-ioS/i5+AYJxlHIOSiqm+jLECgYBH2ZbxB1JfKATtM9KmIB3qXoeJARKrKC36UA3y
-ouxpThMqUjHV5zPGLj/RxDOZUPxdhtkhSJ8xMpGD0MismgNAJ4ZD3eMXGY8hurJS
-cHCRiQWF5erqophA7S+KT2asYPJQzfMg1WjpjLR88uyFIKsPwwul9RCJL2fd7MJU
-d1TnGQKBgQD7jRIjJ36FMZ14uESP8pxT42G/16t/zPCfdeXzEVUUt6RwxeOHAP/W
-tO1h8DDMDmmS0dlsYZ+FiCW/1JEwsHqXiBiI6SCkRg+n/d7z4pkvMPyZRn+fGVeq
-H3cit8nqVSw5UbxTo3YNXi5v48k7ouF9IbAcTg4QfNK2G2+9ro/LWQ==
------END RSA PRIVATE KEY-----