Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Account Settings: Use Alorma Compose Settings Components#731

Merged
dessalines merged 9 commits into
LemmyNet:mainfrom
sabieber:account-compose-settings
Jun 19, 2023
Merged

Account Settings: Use Alorma Compose Settings Components#731
dessalines merged 9 commits into
LemmyNet:mainfrom
sabieber:account-compose-settings

Conversation

@sabieber

@sabieber sabieber commented Jun 17, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

As promised in #612 I tried to replace all custom component for which Alorma Compose Settings provide a counter part.

The following components don't seem to be present in the lib:

  • text field
  • text area
  • image selector

Because of this I left the custom components for these intact.

Preview

sabieber added 5 commits June 17, 2023 22:04
@sabieber
Replaces custom account checkboxes with existing components
bb5422c 
This uses the checkboxes of the alorma compose settings lib instead of creating our own.
@sabieber
Replaces custom account dropdowns with existing components
d1da357 
This uses the dropdowns of the alorma compose settings lib instead of creating our own.
@sabieber
Removes unnecessary checkbox click handlers
57a4896 
Updating the state is handled by the checkbox component itself.
@sabieber
Improves code style
efefd50
@sabieber
Removes unused imports
ca4d3d7
dessalines
dessalines approved these changes Jun 19, 2023
View reviewed changes

@dessalines dessalines left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you... this is sooo much better. Fix that one conflict then I can merge.

@sabieber
Merge branch 'main' into account-compose-settings
6d6e9f1 
# Conflicts:
#	app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt
@sabieber

sabieber commented Jun 19, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@dessalines I am trying to merge main into the branch but I seem to be unable to login to the new main development state of the app as a NPE is thrown (perhaps because of commit 7d9c5a6)

It seems we want to read the ordinal of a setting that is not yet set for a freshly logged in account.

java.lang.NullPointerException: Attempt to invoke virtual method 'int com.jerboa.datatypes.types.ListingType.ordinal()' on a null object reference
                                                                                                    	at com.jerboa.ui.components.login.LoginViewModel$login$1.invokeSuspend(LoginViewModel.kt:103)
                                                                                                    	at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
                                                                                                    	at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:106)
                                                                                                    	at android.os.Handler.handleCallback(Handler.java:942)
                                                                                                    	at android.os.Handler.dispatchMessage(Handler.java:99)
                                                                                                    	at android.os.Looper.loopOnce(Looper.java:201)
                                                                                                    	at android.os.Looper.loop(Looper.java:288)
                                                                                                    	at android.app.ActivityThread.main(ActivityThread.java:7872)
                                                                                                    	at java.lang.reflect.Method.invoke(Native Method)
                                                                                                    	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
                                                                                                    	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
                                                                                                  ```

@sabieber
Properly resolves a merge conflict
bface22 
The settings for default sort and listing type were changed from ints to enums so we need to handle those with the new compose fields.
@sabieber

sabieber commented Jun 19, 2023

Copy link
Copy Markdown
Contributor Author

I think I properly merged the two changes but I would like to test it locally before the PR is merged :)

@dessalines

dessalines commented Jun 19, 2023

Copy link
Copy Markdown
Member

mmmk no problem, ping me whenever you're ready to go.

@sabieber

sabieber commented Jun 19, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

mmmk no problem, ping me whenever you're ready to go.

@dessalines is the reported NPE issue reproducable by you on the main branch?
What I did:

  1. Clean install of the debug build
  2. Login with my user account
  3. Crash

If not I will try to fix it in my branch. But also the failing test in the build does not seem to correlate with something I changed.

@dessalines

dessalines commented Jun 19, 2023

Copy link
Copy Markdown
Member

Use https://voyager.lemmy.ml , the current main branch has breaking API changes.

@sabieber

sabieber commented Jun 19, 2023

Copy link
Copy Markdown
Contributor Author

@dessalines Thanks for the hint. With an account on that instance my changes to the account settings view seem to work with the new enums. Did set them to "Subscribed" and "TopToday", reopening the settings it stayed the same and restarting the app launched the screen to "Subscribed" and "TopToday"
So my local tests are succesfull.

@dessalines

dessalines commented Jun 19, 2023

Copy link
Copy Markdown
Member

Perfect, thanks!

@dessalines dessalines merged commit 4872a18 into LemmyNet:main Jun 19, 2023
@sabieber

sabieber commented Jun 20, 2023

Copy link
Copy Markdown
Contributor Author

Thanks for merging 👍🏻

@sabieber sabieber deleted the account-compose-settings branch June 20, 2023 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dessalines dessalines dessalines approved these changes
@twizmwazin twizmwazin Awaiting requested review from twizmwazin

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sabieber @dessalines