-
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR for Release v.0.2.1-alpha adds: - Simplify config files - Popup enabled again - Make enabeling developer options clearer, better design hierarchy - Use twrp scripting - Use specific functions to run commands with tools - Write logs to file - Only support twrp recoveries in tool now - major refactoring and decoupling of frontend and logic - Enable terminal output in tool - Improve logging - Adapt config for TWRP recovery for FairPhones - Support new devices: - [x] samsung galaxy s9 - [x] samsung galaxy s10 - [x] Samsung Galaxy A7 (2016) - [x] Samsung Galaxy A72 - [x] Samsung Galaxy J7 (2015) - [x] pixel 4 - [x] pixel 4a - [x] pixel 5 - [x] pixel 5a - [x] Sony Xperia Z3
- Loading branch information
Showing
29 changed files
with
1,539 additions
and
993 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| """This file contains a class and function to manage the app state over various steps.""" | ||
|
|
||
| # This file is part of OpenAndroidInstaller. | ||
| # OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of | ||
| # the GNU General Public License as published by the Free Software Foundation, | ||
| # either version 3 of the License, or (at your option) any later version. | ||
|
|
||
| # OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| # WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
|
|
||
| # You should have received a copy of the GNU General Public License along with OpenAndroidInstaller. | ||
| # If not, see <https://www.gnu.org/licenses/>.""" | ||
| # Author: Tobias Sterbak | ||
|
|
||
| from pathlib import Path | ||
|
|
||
| from flet import ProgressBar | ||
| from installer_config import _load_config | ||
| from loguru import logger | ||
|
|
||
|
|
||
| class AppState: | ||
| """Container class to store the state of the application.""" | ||
|
|
||
| def __init__( | ||
| self, | ||
| platform: str, | ||
| config_path: Path, | ||
| bin_path: Path, | ||
| progressbar: ProgressBar, | ||
| num_steps: int, | ||
| test: bool = False, | ||
| test_config: str = None, | ||
| ): | ||
| self.platform = platform | ||
| self.config_path = config_path | ||
| self.bin_path = bin_path | ||
| self.progressbar = progressbar | ||
| self.num_steps = num_steps # keep track of the steps already taken | ||
| self.test = test | ||
| self.test_config = test_config | ||
|
|
||
| # initialize the progress bar at 0 | ||
| self.progressbar.value = 0 | ||
|
|
||
| # placeholders | ||
| self.advanced = False | ||
| self.config = None | ||
| self.image_path = None | ||
| self.recovery_path = None | ||
|
|
||
| # is this still needed? | ||
| self.steps = None | ||
|
|
||
| def load_config(self, device_code: str): | ||
| """Load the config from file to state by device code.""" | ||
| self.config = _load_config(device_code, self.config_path) | ||
| if self.config: | ||
| self.steps = ( | ||
| self.config.unlock_bootloader | ||
| + self.config.flash_recovery | ||
| + self.config.install_os | ||
| ) | ||
| self.num_total_steps = len(self.steps) | ||
|
|
||
| def increment_progressbar(self): | ||
| """Increment the progressbar and step counter.""" | ||
| self.progressbar.value = (self.num_steps - 1) / ( | ||
| self.num_total_steps + 2 | ||
| ) # don't show on the first step | ||
| self.num_steps += 1 # increase the step counter |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.