Skip to content

Commit f24ed79

Browse files
committed
Revert "Added restart button on final page"
This reverts commit 13c3500.
1 parent 475cfa3 commit f24ed79

2 files changed

Lines changed: 7 additions & 38 deletions

File tree

openandroidinstaller/openandroidinstaller.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(self, state: AppState):
7676
self.view = Column(expand=True, width=1200)
7777

7878
# create default starter views
79-
self.welcome_view = WelcomeView(
79+
welcome_view = WelcomeView(
8080
on_confirm=self.to_next_view,
8181
state=self.state,
8282
)
@@ -103,10 +103,7 @@ def __init__(self, state: AppState):
103103
)
104104

105105
# create the final success view
106-
self.success_view = SuccessView(
107-
on_confirm=self.restart,
108-
state=self.state,
109-
)
106+
self.final_view = SuccessView(state=self.state)
110107

111108
# initialize the addon view
112109
self.select_addon_view = AddonsView(
@@ -123,7 +120,7 @@ def __init__(self, state: AppState):
123120
select_files_view,
124121
requirements_view,
125122
start_view,
126-
self.welcome_view,
123+
welcome_view,
127124
]
128125
)
129126
self.state.add_addon_views(
@@ -135,7 +132,7 @@ def __init__(self, state: AppState):
135132
# final default views, ordered to allow to pop
136133
self.state.add_final_default_views(
137134
views=[
138-
self.success_view,
135+
self.final_view,
139136
self.install_view,
140137
]
141138
)
@@ -181,19 +178,10 @@ def to_next_view(self, e):
181178

182179
# else:
183180
# # display the final view
184-
# self.view.controls.append(self.success_view)
181+
# self.view.controls.append(self.final_view)
185182
logger.info("Confirmed and moved to next step.")
186183
self.view.update()
187-
188-
def restart(self, e):
189-
"""Method to display the first view."""
190-
self.welcome_view.init_visuals()
191-
# clear the current view
192-
self.view.controls = []
193-
# retrieve the new view and update
194-
self.view.controls.append(self.welcome_view)
195-
logger.info("Restart.")
196-
self.view.update()
184+
197185

198186
def configure(page: Page):
199187
"""Configure the application."""

openandroidinstaller/views/success_view.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313
# If not, see <https://www.gnu.org/licenses/>."""
1414
# Author: Tobias Sterbak
1515

16-
from typing import Callable
17-
1816
import webbrowser
1917
from loguru import logger
2018
from flet import (
2119
ElevatedButton,
2220
Row,
2321
Text,
2422
Markdown,
25-
icons,
2623
)
2724

2825
from views import BaseView
@@ -31,13 +28,8 @@
3128

3229

3330
class SuccessView(BaseView):
34-
def __init__(
35-
self,
36-
state: AppState,
37-
on_confirm: Callable,
38-
):
31+
def __init__(self, state: AppState):
3932
super().__init__(state=state, image="success.png")
40-
self.on_confirm = on_confirm
4133

4234
def build(
4335
self,
@@ -77,16 +69,5 @@ def close_window(e):
7769
)
7870
]
7971
),
80-
Row(
81-
[
82-
ElevatedButton(
83-
"Flash new device",
84-
on_click=self.on_confirm,
85-
icon=icons.RESTART_ALT,
86-
disabled=False,
87-
expand=True,
88-
)
89-
]
90-
),
9172
]
9273
return self.view

0 commit comments

Comments
 (0)