Commitcaab563

committed

Simplify and fix settings app

1 parent51368a3 commitcaab563Copy full SHA for caab563

File tree

-4

lines changed

internal_filesystem
- builtin/apps/com.micropythonos.settings/assets
  - settings.py
- lib/mpos
  - apps.py

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-frommpos.appsimportActivity,ActivityNavigator,Intent`
	`1`	`+frommpos.appsimportActivity,Intent`
	`2`	`+frommpos.navigatorimportActivityNavigator`
`2`	`3`
`3`	`4`	`importmpos.config`
`4`	`5`	`importmpos.ui`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ def good_stack_size():`
`21`	`21`	`returnstacksize`
`22`	`22`
`23`	`23`	`# Run the script in the current thread:`
`24`		`-defexecute_script(script_source,is_file,cwd=None,classname=None,app=None):`
	`24`	`+defexecute_script(script_source,is_file,cwd=None,classname=None):`
`25`	`25`	`importutime# for timing read and compile`
`26`	`26`	`thread_id=_thread.get_ident()`
`27`	`27`	`compile_name='script'ifnotis_fileelsescript_source`
`@@ -123,7 +123,7 @@ def start_app(fullname):`
`123`	`123`	`print(f"WARNING: start_app can't start{fullname} because it doesn't have a main_launcher_activity")`
`124`	`124`	`return`
`125`	`125`	`start_script_fullpath=f"{app.installed_path}/{app.main_launcher_activity.get('entrypoint')}"`
`126`		`-execute_script(start_script_fullpath,True,app.installed_path+"/assets/",app.main_launcher_activity.get("classname"),app)`
	`126`	`+execute_script(start_script_fullpath,True,app.installed_path+"/assets/",app.main_launcher_activity.get("classname"))`
`127`	`127`	`# Launchers have the bar, other apps don't have it`
`128`	`128`	`ifapp.is_valid_launcher():`
`129`	`129`	`mpos.ui.topmenu.open_bar()`
`@@ -143,4 +143,3 @@ def restart_launcher():`
`143`	`143`	`start_app(app.fullname)`
`144`	`144`	`break`
`145`	`145`
`146`		`-`

Comments

(0)