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

Reworked PickImage() composable #877

Merged
merged 10 commits into from
Jun 25, 2023

Conversation

sockenklaus
Copy link
Contributor

I reworked this composable and made it (in my opinion) more elegant and show a more consistent behaviour:

  • I lifted the image preview out of PickImage and put it in the surrounding composables where needed.
  • Image preview doesn't show the local file anymore but displays the image post url links to if possible. This not only previews uploaded images but also shows a preview of linked images.
  • added a CircularProgressIndicator for uploading.
  • removed unnecessary redunancies in PickImage

@sockenklaus sockenklaus marked this pull request as draft June 25, 2023 04:41
sockenklaus added a commit to sockenklaus/jerboa that referenced this pull request Jun 25, 2023
@sockenklaus sockenklaus marked this pull request as ready for review June 25, 2023 05:26
twizmwazin pushed a commit that referenced this pull request Jun 25, 2023
* Did some refactoring on PostEdit and CreatePost activities, consolidating composables to reduce unnecessary redundancies.

* removed unnecessary annotations, working on changed PickImage behaviour. WIP!!!

* working on changed PickImage behaviour. WIP!!!

* Fixed behaviour of PickImage(), it now displays the old image when editing a post.

* PickImage now always loads the preview image from web, added uploadIndicator

* Rerolled all changes regarding PickImage and put them in their own PR #877

* Removed some composables in PostComposables that appear only once and add unnecessary clutter. Added comments instead to structure the post body composable.

* Reverted a change to isImage() that belongs to #877
# Conflicts:
#	app/src/main/java/com/jerboa/ui/components/post/create/CreatePost.kt
#	app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt
#	app/src/main/java/com/jerboa/ui/components/post/edit/PostEdit.kt
#	app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt
@twizmwazin twizmwazin merged commit 59d50b9 into LemmyNet:main Jun 25, 2023
@sockenklaus sockenklaus deleted the reworked_PickImage branch June 26, 2023 02:04
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.

2 participants