From e3c12e6b04e6b7ef9ea849bd151b87d614b1148d Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 16:48:27 +0100 Subject: [PATCH 1/9] Updated contribute_link --- openandroidinstaller/views/success_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index 04016af8..b55860e7 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -47,7 +47,7 @@ def close_window(e): get_title("Installation completed successfully!"), ] # right view main part - contribute_link = "https://github.com/openandroidinstaller-dev/openandroidinstaller#contributing" + contribute_link = "https://openandroidinstaller.org/#contribute" self.right_view.controls = [ Text( "Now your devices boots into the new OS. Have fun with it!", From 1a99a42a9b513472bd0e501cac74f1b3f29e1bd5 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 18:45:44 +0100 Subject: [PATCH 2/9] Moved feedback to app header Moved feedback to app header instead of opening it automatically. --- openandroidinstaller/openandroidinstaller.py | 11 +++++++++++ openandroidinstaller/views/success_view.py | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index f6b26431..258a7db5 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -247,6 +247,17 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"): padding=15, tooltip="Frequently asked questions and encountered issues.", ), + Container( + content=ElevatedButton( + icon=icons.BUG_REPORT_OUTLINED, + text="Give feedback", + on_click=lambda _: webbrowser.open( + "https://openandroidinstaller.org/feedback.html" + ), + ), + padding=15, + tooltip="Give feedback about your experience with Open Android Installer", + ), Container( content=ElevatedButton( icon=icons.BUG_REPORT_OUTLINED, diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index b55860e7..e7f84bf6 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -36,9 +36,6 @@ def build( ): def close_window(e): logger.success("Success! Close the window.") - # open the feedback page - feedback_url = "https://openandroidinstaller.org/feedback.html" - webbrowser.open(feedback_url) # close the window self.page.window_close() From 3c28998998262640c312a0a5c59c09b96422b76a Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 20:43:48 +0100 Subject: [PATCH 3/9] Added feedback icon and updated tooltip --- openandroidinstaller/openandroidinstaller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 258a7db5..92868949 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -249,14 +249,14 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"): ), Container( content=ElevatedButton( - icon=icons.BUG_REPORT_OUTLINED, + icon=icons.FEEDBACK_OUTLINED, text="Give feedback", on_click=lambda _: webbrowser.open( "https://openandroidinstaller.org/feedback.html" ), ), padding=15, - tooltip="Give feedback about your experience with Open Android Installer", + tooltip="Give feedback about your experience with OpenAndroidInstaller", ), Container( content=ElevatedButton( From 6880808056c2bb4cce6547f56368d2ffd3a835e6 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 22:30:16 +0100 Subject: [PATCH 4/9] Code formatting --- openandroidinstaller/openandroidinstaller.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 92868949..6c1aa578 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -97,7 +97,10 @@ def __init__(self, state: AppState): ) # create the install view - self.install_view = InstallView(on_confirm=self.to_next_view, state=self.state) + self.install_view = InstallView( + on_confirm=self.to_next_view, + state=self.state, + ) # create the final success view self.final_view = SuccessView(state=self.state) From 13c3500fbc8822b823dce382f387f2d626768c08 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 11:08:43 +0100 Subject: [PATCH 5/9] Added restart button on final page --- openandroidinstaller/openandroidinstaller.py | 24 +++++++++++++++----- openandroidinstaller/views/success_view.py | 21 ++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 6c1aa578..bc239841 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -76,7 +76,7 @@ def __init__(self, state: AppState): self.view = Column(expand=True, width=1200) # create default starter views - welcome_view = WelcomeView( + self.welcome_view = WelcomeView( on_confirm=self.to_next_view, state=self.state, ) @@ -103,7 +103,10 @@ def __init__(self, state: AppState): ) # create the final success view - self.final_view = SuccessView(state=self.state) + self.success_view = SuccessView( + on_confirm=self.restart, + state=self.state, + ) # initialize the addon view self.select_addon_view = AddonsView( @@ -120,7 +123,7 @@ def __init__(self, state: AppState): select_files_view, requirements_view, start_view, - welcome_view, + self.welcome_view, ] ) self.state.add_addon_views( @@ -132,7 +135,7 @@ def __init__(self, state: AppState): # final default views, ordered to allow to pop self.state.add_final_default_views( views=[ - self.final_view, + self.success_view, self.install_view, ] ) @@ -178,10 +181,19 @@ def to_next_view(self, e): # else: # # display the final view - # self.view.controls.append(self.final_view) + # self.view.controls.append(self.success_view) logger.info("Confirmed and moved to next step.") self.view.update() - + + def restart(self, e): + """Method to display the first view.""" + self.welcome_view.init_visuals() + # clear the current view + self.view.controls = [] + # retrieve the new view and update + self.view.controls.append(self.welcome_view) + logger.info("Restart.") + self.view.update() def configure(page: Page): """Configure the application.""" diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index e7f84bf6..fbc88464 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -13,6 +13,8 @@ # If not, see .""" # Author: Tobias Sterbak +from typing import Callable + import webbrowser from loguru import logger from flet import ( @@ -20,6 +22,7 @@ Row, Text, Markdown, + icons, ) from views import BaseView @@ -28,8 +31,13 @@ class SuccessView(BaseView): - def __init__(self, state: AppState): + def __init__( + self, + state: AppState, + on_confirm: Callable, + ): super().__init__(state=state, image="success.png") + self.on_confirm = on_confirm def build( self, @@ -69,5 +77,16 @@ def close_window(e): ) ] ), + Row( + [ + ElevatedButton( + "Flash new device", + on_click=self.on_confirm, + icon=icons.RESTART_ALT, + disabled=False, + expand=True, + ) + ] + ), ] return self.view From 4222309a5d0bd8362d415f74883b3151e9041bd0 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 20:19:33 +0100 Subject: [PATCH 6/9] Put restart and finish buttons next to each other --- openandroidinstaller/views/success_view.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index fbc88464..38ade88d 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -68,15 +68,6 @@ def close_window(e): """, on_tap_link=lambda e: self.page.launch_url(e.data), ), - Row( - [ - ElevatedButton( - "Finish and close", - expand=True, - on_click=close_window, - ) - ] - ), Row( [ ElevatedButton( @@ -85,8 +76,14 @@ def close_window(e): icon=icons.RESTART_ALT, disabled=False, expand=True, + ), + ElevatedButton( + "Finish and close", + on_click=close_window, + icon=icons.EXIT_TO_APP_OUTLINED, + expand=True, ) ] - ), + ) ] return self.view From 2d7b0e21533fc025b1e6b4f55745b87bde1cb84c Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 20:22:18 +0100 Subject: [PATCH 7/9] Updated search icon Updated the search icon, due to coming support for other devices than phones. --- openandroidinstaller/views/start_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openandroidinstaller/views/start_view.py b/openandroidinstaller/views/start_view.py index 44c6d6c8..b7e09487 100644 --- a/openandroidinstaller/views/start_view.py +++ b/openandroidinstaller/views/start_view.py @@ -186,7 +186,7 @@ def build(self): FilledButton( "Search for device", on_click=self.search_devices, - icon=icons.PHONE_ANDROID, + icon=icons.DEVICES_OTHER_OUTLINED, expand=True, tooltip="Search for a connected device.", ), From 475cfa357c316f95467f871d3a896ecfad308ac3 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Thu, 23 Mar 2023 19:45:19 +0100 Subject: [PATCH 8/9] Revert "Put restart and finish buttons next to each other" This reverts commit 4222309a5d0bd8362d415f74883b3151e9041bd0. --- openandroidinstaller/views/success_view.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index 38ade88d..fbc88464 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -68,6 +68,15 @@ def close_window(e): """, on_tap_link=lambda e: self.page.launch_url(e.data), ), + Row( + [ + ElevatedButton( + "Finish and close", + expand=True, + on_click=close_window, + ) + ] + ), Row( [ ElevatedButton( @@ -76,14 +85,8 @@ def close_window(e): icon=icons.RESTART_ALT, disabled=False, expand=True, - ), - ElevatedButton( - "Finish and close", - on_click=close_window, - icon=icons.EXIT_TO_APP_OUTLINED, - expand=True, ) ] - ) + ), ] return self.view From f24ed79a36c12d132e5ab007b44fd0ec9b569ef6 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Thu, 23 Mar 2023 19:45:52 +0100 Subject: [PATCH 9/9] Revert "Added restart button on final page" This reverts commit 13c3500fbc8822b823dce382f387f2d626768c08. --- openandroidinstaller/openandroidinstaller.py | 24 +++++--------------- openandroidinstaller/views/success_view.py | 21 +---------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index bc239841..6c1aa578 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -76,7 +76,7 @@ def __init__(self, state: AppState): self.view = Column(expand=True, width=1200) # create default starter views - self.welcome_view = WelcomeView( + welcome_view = WelcomeView( on_confirm=self.to_next_view, state=self.state, ) @@ -103,10 +103,7 @@ def __init__(self, state: AppState): ) # create the final success view - self.success_view = SuccessView( - on_confirm=self.restart, - state=self.state, - ) + self.final_view = SuccessView(state=self.state) # initialize the addon view self.select_addon_view = AddonsView( @@ -123,7 +120,7 @@ def __init__(self, state: AppState): select_files_view, requirements_view, start_view, - self.welcome_view, + welcome_view, ] ) self.state.add_addon_views( @@ -135,7 +132,7 @@ def __init__(self, state: AppState): # final default views, ordered to allow to pop self.state.add_final_default_views( views=[ - self.success_view, + self.final_view, self.install_view, ] ) @@ -181,19 +178,10 @@ def to_next_view(self, e): # else: # # display the final view - # self.view.controls.append(self.success_view) + # self.view.controls.append(self.final_view) logger.info("Confirmed and moved to next step.") self.view.update() - - def restart(self, e): - """Method to display the first view.""" - self.welcome_view.init_visuals() - # clear the current view - self.view.controls = [] - # retrieve the new view and update - self.view.controls.append(self.welcome_view) - logger.info("Restart.") - self.view.update() + def configure(page: Page): """Configure the application.""" diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index fbc88464..e7f84bf6 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -13,8 +13,6 @@ # If not, see .""" # Author: Tobias Sterbak -from typing import Callable - import webbrowser from loguru import logger from flet import ( @@ -22,7 +20,6 @@ Row, Text, Markdown, - icons, ) from views import BaseView @@ -31,13 +28,8 @@ class SuccessView(BaseView): - def __init__( - self, - state: AppState, - on_confirm: Callable, - ): + def __init__(self, state: AppState): super().__init__(state=state, image="success.png") - self.on_confirm = on_confirm def build( self, @@ -77,16 +69,5 @@ def close_window(e): ) ] ), - Row( - [ - ElevatedButton( - "Flash new device", - on_click=self.on_confirm, - icon=icons.RESTART_ALT, - disabled=False, - expand=True, - ) - ] - ), ] return self.view