From f24ed79a36c12d132e5ab007b44fd0ec9b569ef6 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Thu, 23 Mar 2023 19:45:52 +0100 Subject: [PATCH] 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