Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new pr rebased #314

Merged
merged 40 commits into from
Jul 6, 2024
Merged

new pr rebased #314

merged 40 commits into from
Jul 6, 2024

Conversation

binaryb3ast
Copy link
Contributor

No description provided.

binaryb3ast and others added 30 commits June 9, 2024 14:52
Implemented BaseActivity for generic data binding setup in AppCompatActivity subclasses
…andling

- Replaced busy-waiting loop with ScheduledExecutorService for retry mechanism
- Added HandlerThread for background operations and thread safety
- Enhanced logging for better debugging and traceability
- Improved error handling and timeout checks
- Ensured more efficient scheduling of retries
- Enabled data binding in the project
- Updated activity_splash_screen.xml to use data binding
- Modified SplashScreenActivity to bind the layout using data binding
- Refactored ClickHandler to work with data binding
…ture

- Created a new folder named 'ui'
- Moved all activities into the 'ui' folder
- Updated package declarations and imports as necessary
…class in ui package

-add ui binding
- Refactored MainActivity class in the ui package to improve readability and maintainability
- Introduced method extraction to reduce code duplication and improve modularity
- Reorganized imports for better code organization
- Added documentation for methods and important code blocks
- Improved handling of internet connectivity checks and VPN service toggling
- Enhanced error handling and logging for better debugging
# Conflicts:
#	app/src/main/java/org/bepass/oblivion/ui/LogActivity.java
#	app/src/main/res/drawable/button.xml
#	app/src/main/res/values/strings.xml
- Converted ThemeHelper class to a singleton to ensure a single point of management for the theme throughout the application.
- Updated methods to instance methods instead of static methods.
- Added getInstance method to provide the singleton instance.
- Ensured compatibility with AppCompatDelegate night mode constants.
- Improved code organization and readability.
add ColorUtils for handling colors func
@binaryb3ast
Copy link
Contributor Author

is it ok ? @markpash

@markpash
Copy link
Member

markpash commented Jul 3, 2024

@binaryb3ast There's no need to make new PRs, just rebase the branch you have on the main branch from bepass-org/oblivion.
Because this PR is also not mergeable:
image

@binaryb3ast
Copy link
Contributor Author

binaryb3ast commented Jul 3, 2024

i rebased pr/benny & feat-darkmode to main @markpash

@DanielcoderX
Copy link
Collaborator

@binaryb3ast This PR is quite large, but that's understandable given the number of valuable features and bug fixes it introduces.

However, there's one small change that would be beneficial: ensuring the theme adapts seamlessly to the OS theme(dark / light mode).

I'm waiting for this change and then merge it :) Thanks

@binaryb3ast
Copy link
Contributor Author

As far as I can tell, everything appears to be in order
I would appreciate it if you could check PR and merge
Once my PR has been merged, I would like to design a decent user interface for the application @DanielcoderX

@DanielcoderX
Copy link
Collaborator

As far as I can tell, everything appears to be in order
I would appreciate it if you could check PR and merge
Once my PR has been merged, I would like to design a decent user interface for the application @DanielcoderX

Well, the PR is alright. Just give me an hour to merge it.
Feel free to contact me over Telegram and talk about it.

@binaryb3ast
Copy link
Contributor Author

binaryb3ast commented Jul 6, 2024

Cool, I'll get in touch via Twitter. I have your @ , here is mine @binarybeastt

@DanielcoderX DanielcoderX merged commit 68078c7 into bepass-org:main Jul 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants