NikGapps 3.16__tar.gz → 3.18__tar.gz

{nikgapps-3.16 → nikgapps-3.18}/NikGapps/build/NikGappsManager.py

@@ -171,114 +171,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"],
+                        overlay["package_title"]) for overlay
                 in package_overlays.get(package_name, [])]
 
     def get_go_package(self):

{nikgapps-3.16 → nikgapps-3.18}/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-3.16 → nikgapps-3.18}/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-3.16 → nikgapps-3.18}/NikGapps/helper/assets/config_versions.json

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

{nikgapps-3.16 → nikgapps-3.18}/NikGapps/helper/git/GitlabManager.py

@@ -6,6 +6,7 @@ from pathlib import Path
 import gitlab
 
 from NikGapps.helper.FileOp import FileOp
+from NikGapps.helper.P import P
 from NikGapps.helper.Statics import Statics
 from NikGapps.helper.git.GitOperations import GitOperations
 
@@ -41,7 +42,7 @@ class GitLabManager:
             gitattributes = ""
             for extn in extn_list:
                 gitattributes += f"*.{extn} filter=lfs diff=lfs merge=lfs -text\n"
-                self.create_and_commit_file(project_id=project.id, file_path=".gitattributes", content=gitattributes)
+            self.create_and_commit_file(project_id=project.id, file_path=".gitattributes", content=gitattributes)
         return project
 
     def provide_owner_access(self, project_id, user_id):
@@ -51,7 +52,7 @@ class GitLabManager:
             'user_id': user_id,
             'access_level': 50
         })
-        print(f"Owner access provided to user with ID {user_id}.")
+        P.green(f"Owner access provided to user with ID {user_id}.")
         return member
 
     def get_project(self, project_name):
@@ -79,8 +80,8 @@ class GitLabManager:
             ]
         }
         commit = project.commits.create(commit_data)
-        print(f"README.md created and committed to the repository {project.name}.")
-        print(commit)
+        P.green(f"README.md created and committed to the repository {project.name}.")
+        # print(commit)
         return commit
 
     def create_and_commit_file(self, project_id, branch_name="main", file_path="file.txt", content=""):
@@ -98,8 +99,8 @@ class GitLabManager:
             ]
         }
         commit = project.commits.create(commit_data)
-        print(f"{file_path} created and committed to the repository {project.name}.")
-        print(commit)
+        P.green(f"{file_path} created and committed to the repository {project.name}.")
+        # print(commit)
         return commit
 
     def create_gitlab_repository(self, project_name, visibility='public'):
@@ -162,13 +163,13 @@ class GitLabManager:
             new_repo_name = f"{repo_name}_{time.strftime('%Y%m%d')}"
         new_project = self.get_project(new_repo_name)
         if new_project is not None:
-            print(f"Project {new_repo_name} already exists. Deleting...")
+            P.red(f"Project {new_repo_name} already exists. Deleting...")
             self.delete_project(new_project.id)
         project.name = new_repo_name
         project.path = new_repo_name
-        print(f"Repository {repo_name} renaming to {new_repo_name}.")
+        P.yellow(f"Repository {repo_name} renaming to {new_repo_name}.")
         project.save()
-        print(f"Repository {repo_name} renamed to {new_repo_name}.")
+        P.green(f"Repository {repo_name} renamed to {new_repo_name}.")
         return project
 
     def reset_repository(self, repo_name, gitattributes=None, user_id=8064473, sleep_for=10, delete_only=False):
@@ -177,13 +178,13 @@ class GitLabManager:
             project = self.get_project(repo_name)
             self.delete_project(project.id)
             if not delete_only:
-                print(f"Waiting for {sleep_for} seconds for the project to be completely deleted...")
+                P.red(f"Waiting for {sleep_for} seconds for the project to be completely deleted...")
                 time.sleep(sleep_for)
                 project = self.create_repository(repo_name, provide_owner_access=True, user_id=user_id)
                 if gitattributes is not None:
                     commit = self.create_and_commit_file(project_id=project.id, file_path=".gitattributes",
                                                          content=gitattributes)
-                    print(commit)
+                    # print(commit)
             return project
         except Exception as e:
             print(f"Failed to reset repository: {e}")
@@ -241,7 +242,7 @@ class GitLabManager:
         if override_target:
             target_project = self.get_project(target_repo_name)
             if target_project is not None:
-                print(f"Project {target_repo_name} already exists. Deleting...")
+                P.red(f"Project {target_repo_name} already exists. Deleting...")
                 self.delete_project(target_project.id)
         if self.get_project(target_repo_name) is not None:
             print(f"Project {target_repo_name} already exists. Exiting...")

{nikgapps-3.16 → nikgapps-3.18}/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-3.16 → nikgapps-3.18}/NikGapps/overlay_control.py

@@ -16,7 +16,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,7 +31,7 @@ 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"):
                     continue

{nikgapps-3.16 → nikgapps-3.18/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.16/NikGapps.egg-info → nikgapps-3.18}/PKG-INFO

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

{nikgapps-3.16 → nikgapps-3.18}/setup.py

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