NikGapps 3.17__py3-none-any.whl → 3.19__py3-none-any.whl

NikGapps/build/NikGappsManager.py

@@ -117,7 +117,8 @@ class NikGappsManager:
     def create_appset_list(self, package_list, keyword=None, fallback_appset=None):
         appset_dict = {}
         for package in package_list:
-            appset_title = self.find_appset_by_package(package.package_title, keyword=keyword, fallback_appset=fallback_appset)
+            appset_title = self.find_appset_by_package(package.package_title, keyword=keyword,
+                                                       fallback_appset=fallback_appset)
             if appset_title not in appset_dict:
                 appset_dict[appset_title] = AppSet(appset_title, [package])
             else:
@@ -171,114 +172,133 @@ class NikGappsManager:
         package_overlays = {
             "com.google.android.gms": [
                 {
+                    "package_title": "GmsCore",
                     "package_name": "com.nikgapps.overlay.gmscore",
                     "resources": Library.get_gms_core_resources()
                 }
             ],
             "com.google.android.dialer": [
                 {
+                    "package_title": "GoogleDialer",
                     "package_name": "com.nikgapps.overlay.dialer",
                     "resources": Library.get_google_dialer_resources()
                 }
             ],
             "com.google.android.contacts": [
                 {
+                    "package_title": "GoogleContacts",
                     "package_name": "com.nikgapps.overlay.contacts",
                     "resources": Library.get_google_contacts_resources()
                 }
             ],
             "com.google.android.tts": [
                 {
+                    "package_title": "GoogleTTS",
                     "package_name": "com.nikgapps.overlay.googletts",
                     "resources": Library.get_google_tts_resources()
                 }
             ],
             "com.google.android.apps.wellbeing": [
                 {
+                    "package_title": "DigitalWellbeing",
                     "package_name": "com.nikgapps.overlay.wellbeing",
                     "resources": Library.get_digital_wellbeing_resources()
                 }
             ],
             "com.google.android.marvin.talkback": [
                 {
+                    "package_title": "GoogleTalkback",
                     "package_name": "com.nikgapps.overlay.talkback",
                     "resources": Library.get_google_talkback_resources()
                 }
             ],
             "com.google.android.flipendo": [
                 {
+                    "package_title": "Flipendo",
                     "package_name": "com.nikgapps.overlay.flipendo",
                     "resources": Library.get_flipendo_resources()
                 }
             ],
             "com.google.android.apps.messaging": [
                 {
+                    "package_title": "GoogleMessages",
                     "package_name": "com.nikgapps.overlay.messages",
                     "resources": Library.get_google_messages_resources()
                 }
             ],
             "com.google.android.gms.location.history": [
                 {
+                    "package_title": "GoogleLocationHistory",
                     "package_name": "com.nikgapps.overlay.googlelocationhistory",
                     "resources": Library.get_google_location_history_resources()
                 }
             ],
             "com.google.android.apps.photos": [
                 {
+                    "package_title": "GooglePhotos",
                     "package_name": "com.nikgapps.overlay.googlephotos",
                     "resources": Library.get_google_photos_resources()
                 }
             ],
             "com.google.android.settings.intelligence": [
                 {
+                    "package_title": "SettingsServices",
                     "package_name": "com.nikgapps.overlay.settingsintelligence",
                     "resources": Library.get_settings_services_resources(self.android_version)
                 }
             ],
             "com.google.android.projection.gearhead": [
                 {
+                    "package_title": "AndroidAuto",
                     "package_name": "com.nikgapps.overlay.androidauto",
                     "resources": Library.get_android_auto_resources()
                 }
             ],
             "com.google.android.apps.nexuslauncher": [
                 {
+                    "package_title": "PixelLauncher",
                     "package_name": "com.nikgapps.overlay.pixellauncher",
                     "resources": Library.get_pixel_launcher_resources()
                 }
             ],
             "com.google.android.googlequicksearchbox": [
                 {
+                    "package_title": "Velvet",
                     "package_name": "com.nikgapps.overlay.googlequicksearchbox",
                     "resources": Library.get_velvet_resources()
                 }
             ],
             "com.google.android.deskclock": [
                 {
+                    "package_title": "GoogleClock",
                     "package_name": "com.nikgapps.overlay.googleclock",
                     "resources": Library.get_google_clock_resources()
                 }
             ],
             "com.google.android.as": [
                 {
+                    "package_title": "DevicePersonalizationServices",
                     "package_name": "com.nikgapps.overlay.ais",
                     "resources": Library.get_devices_personalization_services_resources()
                 }
             ],
             "com.google.android.wallpaper.effects": [
                 {
+                    "package_title": "CinematicEffect",
                     "package_name": "com.nikgapps.overlay.cinematiceffect",
                     "resources": Library.get_cinematic_effect_resources()
                 }
             ],
             "com.google.android.apps.youtube.music": [
                 {
+                    "package_title": "YouTubeMusic",
                     "package_name": "com.nikgapps.overlay.youtubemusic",
                     "resources": Library.get_youtube_music_resources()
                 }
             ]
         }
-        return [Overlay(package_name, overlay["package_name"], self.android_version, overlay["resources"]) for overlay
+        return [Overlay(overlay["package_title"], overlay["package_name"], self.android_version, overlay["resources"])
+                for overlay
                 in package_overlays.get(package_name, [])]
 
     def get_go_package(self):

NikGapps/build/NikGappsOverlays.py

@@ -1,4 +1,4 @@
-from NikGapps.build.NikGappsPackages import NikGappsPackages
+from NikGapps.config.NikGappsConfig import NikGappsConfig
 from NikGapps.helper.overlay.Overlay import Overlay
 
 
@@ -7,7 +7,8 @@ class NikGappsOverlays:
     @staticmethod
     def get_overlay(android_version):
         overlay_list = []
-        for packages in NikGappsPackages.get_packages("all", android_version=android_version):
+        config_obj = NikGappsConfig(android_version=android_version)
+        for packages in config_obj.package_manager.get_packages("all"):
             for pkg in packages.package_list:
                 for overlay in pkg.overlay_list:
                     overlay: Overlay

NikGapps/helper/Assets.py

@@ -23,7 +23,7 @@ class Assets:
     cwd = assets_folder + os.path.sep
     system_name = platform.system()
     apksigner_path = cwd + "apksigner.jar"
-    apktool_path = cwd + "apktool_2.9.3.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"

NikGapps/helper/Statics.py

@@ -106,19 +106,19 @@ class Statics:
 
     @staticmethod
     def get_overlay_source_directory(android_version):
-        return Statics.pwd + os.path.sep + f"overlays_{Statics.get_android_code(android_version)}_source"
+        return Statics.pwd + os.path.sep + f"overlays_{android_version}_source"
 
     @staticmethod
     def get_overlay_source_repo(android_version):
-        return f"git@github.com:nikgapps/overlays_{Statics.get_android_code(android_version)}_source.git"
+        return f"git@gitlab.com:nikgapps/overlays_{android_version}_source.git"
 
     @staticmethod
     def get_overlay_directory(android_version):
-        return Statics.pwd + os.path.sep + f"overlays_{Statics.get_android_code(android_version)}"
+        return Statics.pwd + os.path.sep + f"overlays_{android_version}"
 
     @staticmethod
     def get_overlay_repo(android_version):
-        return f"git@github.com:nikgapps/overlays_{Statics.get_android_code(android_version)}.git"
+        return f"git@gitlab.com:nikgapps/overlays_{android_version}.git"
 
     @staticmethod
     def get_temp_overlay_directory(android_version):

NikGapps/helper/assets/config_versions.json

@@ -4,5 +4,6 @@
   "12": "35",
   "12.1": "35",
   "13": "35",
-  "14": "35"
+  "14": "35",
+  "15": "35"
 }

NikGapps/helper/overlay/Library.py

@@ -183,6 +183,10 @@ class Library:
         r.add(String('config_defaultMusic', 'com.google.android.apps.youtube.music'))
         return r
 
+    @staticmethod
+    def get_template():
+        return Resources()
+
     @staticmethod
     def get_devices_personalization_services_resources():
         r = Resources()

NikGapps/overlay_control.py

@@ -4,6 +4,7 @@ from NikGapps.build.NikGappsOverlays import NikGappsOverlays
 from NikGapps.helper.Args import Args
 from NikGapps.helper.Cmd import Cmd
 from NikGapps.helper.FileOp import FileOp
+from NikGapps.helper.P import P
 from NikGapps.helper.Statics import Statics
 from NikGapps.helper.git.Git import Git
 from NikGapps.helper.overlay.Overlay import Overlay
@@ -16,7 +17,7 @@ def overlay_control():
     for android_version in android_versions:
         repo_name = Statics.get_overlay_source_repo(android_version)
         repo_dir = Statics.get_overlay_source_directory(android_version)
-        branch = "master"
+        branch = "main"
         overlay_source_repo = Git(repo_dir)
         overlay_source_repo.clone_repo(repo_name, branch=branch)
 
@@ -31,11 +32,14 @@ def overlay_control():
             overlays_repo_name = Statics.get_overlay_repo(android_version)
             overlays_repo_dir = Statics.get_overlay_directory(android_version)
             overlay_repo = Git(overlays_repo_dir)
-            overlay_repo.clone_repo(overlays_repo_name, branch="master")
+            overlay_repo.clone_repo(overlays_repo_name, branch="main")
             for folder in Path(repo_dir).iterdir():
-                if str(folder).endswith(".git"):
+                if str(folder).__contains__(".git") or str(folder).__contains__("README.md"):
                     continue
                 cmd = Cmd()
+                if not FileOp.file_exists(os.path.join(str(folder), "apktool.yml")):
+                    P.red(f"apktool.yml doesn't exist in {folder}")
+                    continue
                 overlay_path = cmd.build_overlay(folder_name=str(folder))
                 if not overlay_path.__eq__(""):
                     print(f"{overlay_path} successfully built..")

{NikGapps-3.17.dist-info → NikGapps-3.19.dist-info}/METADATA

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

{NikGapps-3.17.dist-info → NikGapps-3.19.dist-info}/RECORD

@@ -4,11 +4,11 @@ NikGapps/cache.py,sha256=VBp5T4_DKGxdBtWrLfaBVXFTi4LeI24L-31CszLhVYs,4124
 NikGapps/config_upload.py,sha256=0HE7txm73XXxat_cR0JDXWtQUmg1IYK_SktwJS6N34s,652
 NikGapps/copy_repos.py,sha256=5YygTyuFW-DRnLPLGVcndQO6JqBW4JsN7O6cVWDQ4pE,1379
 NikGapps/main.py,sha256=o10A9vjGN-C6kFf0BynssIybpuC8bRPon_49DWBUPYg,2652
-NikGapps/overlay_control.py,sha256=57m6DvzOczttXyfo8QAFeXGZo1TynB4w6Gjf1i0scfY,2873
+NikGapps/overlay_control.py,sha256=0Yzkf2AIuIXpUsr-wqjB3rHkWICRRQVnBNRz8FnaSD0,3128
 NikGapps/test.py,sha256=eXEeyM5xOpSKyUjb7OTP8BL37bqTE0eTKwnD1zT33rY,687
 NikGapps/build/Build.py,sha256=5ru8mOUpZTJNqjfeVkppUPEvbj8XqMcdaGZlR74IOw4,7547
-NikGapps/build/NikGappsManager.py,sha256=U9eCJj8Gzj9wvondtaKyz77AiK0mkSzpKAjOZY50HhA,18643
-NikGapps/build/NikGappsOverlays.py,sha256=ApyO2bnPpsG80uEvuB_XoeVn7TRDGCCWtl5myJcVrFI,526
+NikGapps/build/NikGappsManager.py,sha256=LIF808IJ-mr2WhhrWnahjGlD95XmKUR0zVE_7gRHM4U,19704
+NikGapps/build/NikGappsOverlays.py,sha256=bbAIuIeE7HICdXRNeZJrvuW58_tUuDH9Du_1k6QPkxg,569
 NikGapps/build/NikGappsPackages.py,sha256=samBrWZxNWVi5U28vgvfRNENLSdbK37oYo1oe2EI-HA,56928
 NikGapps/build/PackageConstants.py,sha256=-vmkiAWXoD5Ba1lmqd71ueEkivY7ne0zXSU3dzCfYLc,15847
 NikGapps/build/Release.py,sha256=FChsFVmrFndEuvNk5nc288KCkFONUJ7SwsphgejVER4,4846
@@ -17,7 +17,7 @@ NikGapps/config/NikGappsConfig.py,sha256=TSfwPWqxR4SE80lz-Jrn41yuTfSQcwi-jFh7iGm
 NikGapps/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/helper/AppSet.py,sha256=vEIwk7NX1LQt71UJ3naEdsekmB_Ea0v8j0CQJkrSTEU,352
 NikGapps/helper/Args.py,sha256=r1KIKs1x9DbIPwqBPmfIb3BBD5PvclvUDIv3D-fvy2A,4338
-NikGapps/helper/Assets.py,sha256=RqTOGPIUiJu6jaVSyhOOT_T6OOoU-8mLo5S9hCoPSb4,2900
+NikGapps/helper/Assets.py,sha256=39GmIAqQKaeDSYj42kzCDkodPDItj6cyE9M_m_KCbY4,2901
 NikGapps/helper/B64.py,sha256=WFtnOa1lNWvCQH_tjslRONZY8uAR6CwDm2-JZVn3vkM,939
 NikGapps/helper/C.py,sha256=MvRvtXLu-gjsJIXcMH73CSdbf_R-_LrmqS-ZKOtLrCU,354
 NikGapps/helper/Cmd.py,sha256=Fc4mywiDrJk9MI_Pw1Ow26gdpFL23D8EF2XbB1WmyBo,13540
@@ -27,7 +27,7 @@ NikGapps/helper/FileOp.py,sha256=vPgXFBUdzDCo36OyHLCn8Jt62Fhf29_OPPwvh6kv7Sc,784
 NikGapps/helper/Json.py,sha256=pgkXXHMBGs0Pl6YjTXjDSqPdIXryWzl5c0YyR-2YPYQ,973
 NikGapps/helper/P.py,sha256=S3dTkLQcOhS1SEE9WZVIVQUAVtSIGhO8TDH72SxWLb8,516
 NikGapps/helper/Package.py,sha256=yYOm5kUf_a6HOo1UA78_qkm2b0pqn5RCPqLt4yR3B10,9236
-NikGapps/helper/Statics.py,sha256=dU19il9CmBO2QTksQH-Zo5qh6JFzJG1Z9gY4_Qgl8TM,6893
+NikGapps/helper/Statics.py,sha256=f3dKMazDrooV53FBApK-fUEPZe9Ehqwn3c4qdUKkazA,6789
 NikGapps/helper/SystemStat.py,sha256=f5H5L8FOZVLe-7SKYdCtjnjVXsgaJ2Eo9c3akiYjJLM,4074
 NikGapps/helper/T.py,sha256=tp2VAVfy_lbIJKIbYsGFtDck65BUo8JiHqOokpkpaKE,2898
 NikGapps/helper/XmlOp.py,sha256=ZcaO6JSriNDiOvom6gs6XwucnFInjIXaigUiehgVpQY,1632
@@ -41,7 +41,7 @@ NikGapps/helper/assets/busybox,sha256=HXYuiWQcmRrsxgu-83wul1Qroff2k_LJC0Bd4dF-p8
 NikGapps/helper/assets/cert.pk8,sha256=GtjvVWhw7bcPaanTwRJUTAfeUWK6RA2E0z-LsMWWKHU,1216
 NikGapps/helper/assets/cert.x509.pem,sha256=mDfeAo9GDDXMjT-kXxTuzOMPb7_kuT05mu8ay4DCDRQ,1675
 NikGapps/helper/assets/changelogs.yaml,sha256=J6TKXUre04OTOLdX3ks7AUkDUPz8wBcpQEweGGIX8HM,47787
-NikGapps/helper/assets/config_versions.json,sha256=-lm4OvZcQ-LgoJwwfYM07gMKoOkrhQx0mGB4Hm9hQ7U,88
+NikGapps/helper/assets/config_versions.json,sha256=T7fJFW5uYUbiZphw7VP89T4F1WKK6EzG7q_33M8zrJA,102
 NikGapps/helper/assets/customize.sh,sha256=bfYUgf1vd7GGUix4CPIhzn2eFN-DJh67IVIY6eMIrGo,10242
 NikGapps/helper/assets/debloater.config,sha256=7Wx-WH93JSJHTYJCT5-y8TtPFFIzQgMKJcKJaf583bU,878
 NikGapps/helper/assets/functions.sh,sha256=9jOHEM0cmkP0cMIj7KaNwXDOAG0WxOuIZganxu1YoFU,3859
@@ -85,7 +85,7 @@ NikGapps/helper/git/TestGit.py,sha256=_XCN2cRy_yWNtk0AZDTmsw_fSebR2Twy8uOYMG06q-
 NikGapps/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/helper/overlay/ApkMetaInfo.py,sha256=WyEMGl_7fM2KdudB4pIGUuYbjSstieKMpjflfUosi5U,1565
 NikGapps/helper/overlay/Bool.py,sha256=1VfI30ytFvT5eTWHwRCePE2hVRb_X-lFYPhAxS6xVCM,372
-NikGapps/helper/overlay/Library.py,sha256=JAMEIArde2Mr7puxw4smqoVgL2tTWIu-PN74Z4uzuvw,41037
+NikGapps/helper/overlay/Library.py,sha256=00qiKvgCxuZGkF21sTIdVhqRqp7xDd2UbPALexDMIJE,41107
 NikGapps/helper/overlay/Manifest.py,sha256=VE2JpiU2tnaLfdLVy_zJEJ0kQKlkFfbLCZwGDXsm-Lw,2448
 NikGapps/helper/overlay/Overlay.py,sha256=kcLjHGqNd_qTA6_KfsFY9PJwC9TmxDlL-JHsCrojnYU,908
 NikGapps/helper/overlay/Resources.py,sha256=bKWJEF2avl3j2ud390HQq9fRMMA8GKh9-KABdvim-Wg,1458
@@ -99,9 +99,9 @@ NikGapps/helper/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 NikGapps/helper/web/Requests.py,sha256=HaZUHe_xi_7LjPLOYBUwK3uwOYOcVaW2E1zazjw2wow,5502
 NikGapps/helper/web/TelegramApi.py,sha256=XREdngh0vPvPMUOJsCJ3wSqXMFqS8q3qJUhmFMY6SH8,4743
 NikGapps/helper/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-NikGapps-3.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-NikGapps-3.17.dist-info/METADATA,sha256=IAnNO0LVL_Qba72FGvs4CirqxCOy6OnErGTcjcXCMsc,4070
-NikGapps-3.17.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-NikGapps-3.17.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
-NikGapps-3.17.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
-NikGapps-3.17.dist-info/RECORD,,
+NikGapps-3.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+NikGapps-3.19.dist-info/METADATA,sha256=CBsDmbO6rYCJa-uueujYxQ-a8HwWVxhQFoFCI7lKMcQ,4070
+NikGapps-3.19.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+NikGapps-3.19.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
+NikGapps-3.19.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
+NikGapps-3.19.dist-info/RECORD,,