Commitc70ed72

committed

Simplify is_launcher

1 parent3828a5f commitc70ed72Copy full SHA for c70ed72

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def start_app(fullname):`
`122`	`122`	`start_script_fullpath=f"{app.installed_path}/{app.main_launcher_activity.get('entrypoint')}"`
`123`	`123`	`execute_script(start_script_fullpath,True,app.installed_path+"/assets/",app.main_launcher_activity.get("classname"))`
`124`	`124`	`# Launchers have the bar, other apps don't have it`
`125`		`-ifPackageManager.is_launcher(fullname):`
	`125`	`+ifPackageManager.is_valid_launcher(app):`
`126`	`126`	`mpos.ui.topmenu.open_bar()`
`127`	`127`	`else:`
`128`	`128`	`mpos.ui.topmenu.close_bar()`
`@@ -135,12 +135,10 @@ def restart_launcher():`
`135`	`135`	`mpos.ui.empty_screen_stack()`
`136`	`136`	`# No need to stop the other launcher first, because it exits after building the screen`
`137`	`137`	`forappinmpos.package_manager.PackageManager.get_app_list():`
`138`		`-#print(f"checking {app}")`
`139`		`-ifapp.category=="launcher"andapp.main_launcher_activity:# if it's a launcher and it has a main_launcher_activity`
	`138`	`+ifPackageManager.is_valid_launcher(app):`
`140`	`139`	`print(f"Found launcher, starting{app.fullname}")`
`141`	`140`	`start_app(app.fullname)`
`142`	`141`
`143`		`-`
`144`	`142`	`classApp:`
`145`	`143`	`def__init__(self,name,publisher,short_description,long_description,icon_url,download_url,fullname,version,category,activities,installed_path=None):`
`146`	`144`	`self.name=name`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,6 @@ def is_installed_by_name(app_fullname):`
`221`	`221`	`returnPackageManager.is_installed_by_path(f"apps/{app_fullname}")orPackageManager.is_installed_by_path(f"builtin/apps/{app_fullname}")`
`222`	`222`
`223`	`223`	`@staticmethod`
`224`		`-defis_launcher(app_name):`
`225`		`-print(f"checking is_launcher for{app_name}")`
`226`		`-# Simple check, could be more elaborate by checking the MANIFEST.JSON for the app...`
`227`		`-return"launcher"inapp_nameorlen(mpos.ui.screen_stack)<2# assumes the first one on the stack is the launcher`
	`224`	`+defis_valid_launcher(app_obj):`
	`225`	`+#print(f"checking is_valid_launcher for {app_obj}")`
	`226`	`+returnapp_obj.category=="launcher"andapp_obj.main_launcher_activity`

Comments

(0)