Lossless Transformations(Rotate feature) #5252

shankarpriyank · 2023-07-03T14:20:23Z

Description (required)

Made simple changes to initiate the editing feature in the app, right now the UI can only facilitate rotating the images, the rotated imaged are written in the download directory, but how to propagate the images back to the uploads is something I am trying to figure rn, and I would appreciate any help with it.

Also cause I have merged #5220 in this branch so please ignore the changes that were made in that pr.

Please let me know what do you think about the changes, I know that a lot of improvements can be made but I am focusing on getting things running first, let me know if you want me to do anything differently

nicolas-raoul

Very nice, great start! :-)

shankarpriyank · 2023-07-09T15:22:04Z

@nicolas-raoul Thank you, I am having a hard time trying to find a way to send the edited back to the upload screen.
Do you have any advice/ idea on how it might be done?

shankarpriyank · 2023-08-13T18:10:48Z

@nicolas-raoul can you do a quick review here, I was not sure where to add the helper functions.
I am unable to upload any image right now, even from the master branch. So could not test the functionality.
I guess that now maybe that the rotated image will get uploaded(not sure though!), trying to figure out how to reflect the change in the preview of the image too.

nicolas-raoul · 2023-09-13T09:24:30Z

Hi @shankarpriyank sorry for the delay!

I just uploaded this picture using this branch, rotating it and tapping "Save". Unfortunately the uploaded image is not rotated, as you can see, it is deeper than a preview issue. For testing you can just take pictures of streets or monuments ad rotate them first to an unnatural angle.

Thanks! :-)

shankarpriyank · 2023-09-13T18:58:25Z

No worries @nicolas-raoul, thanks for testing it, I will try finding to fix this

shankarpriyank · 2023-10-04T20:27:25Z

Hi @nicolas-raoul can you test this branch again?
I tested it with a bunch of images and it was working as intended.

nicolas-raoul · 2023-10-06T13:43:42Z

I just uploaded https://commons.wikimedia.org/wiki/File:2007,_cliff_near_Rabat_in_Malta.jpg with your branch. The picture originally had the wrong orientation, but I corrected it using the Edit image button and now it looks great. :-)

One remark: The result image does not have EXIF anymore. Would you mind making sure that the EXIF is kept? It is vital metadata information of the picture, it can contain coordinates and exact date for instance, which are very important to use the picture in Wikipedia.

Thanks a lot!

shankarpriyank · 2023-10-06T17:03:40Z

How are you checking the exif data? is there a handy tool i can use to test it ?

shankarpriyank · 2023-10-06T17:46:12Z

@nicolas-raoul can you please test again, the exif data should be retained now

nicolas-raoul

Somehow I get Failed to rotate image now... I tried two different pictures, 3 times 90 degrees.

nicolas-raoul · 2023-10-07T14:01:30Z

screen-20231007-225756.mp4

shankarpriyank · 2023-10-07T14:02:07Z

That's happening most probably because the image's encoding is not supported by lljtran(mostly happens huffman encoding), can you please try with some other images.

nicolas-raoul · 2023-10-07T14:06:46Z

The successful rotation I had mentioned at #5252 (comment) was with a picture taken by the same camera the same day, though, os I doubt it used a different encoding...

I just tried with a picture taken by Pixel 7 Pro's stock camera, the error message does not appear but the picture is not rotated either. :'-(

shankarpriyank · 2023-10-16T09:05:34Z

Done @nicolas-raoul

nicolas-raoul

Sorry I just caught these.
Once the Flamingo PR is merged (now waiting for #5339), I will ask you to rebase (or pull), and will review the code once more just in case, thank you for your understanding. :-)

nicolas-raoul · 2023-10-16T09:29:50Z

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

+
+
+
+


Ah, is all of this whitespace needed? :-)

nicolas-raoul · 2023-10-16T09:30:25Z

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

+
+        val animator = ValueAnimator.ofFloat(0f, 1f).setDuration(1000L)
+
+


Single white lines is better within functions.

nicolas-raoul · 2023-10-16T09:31:38Z

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

+        }
+        btn_save.setOnClickListener {
+            getRotatedImage()
+


remove empty line before }

shankarpriyank · 2023-10-16T10:21:40Z

Sorry I just caught these. Once the Flamingo PR is merged (now waiting for #5339), I will ask you to rebase (or pull), and will review the code once more just in case, thank you for your understanding. :-)

Hey! no worries at all.
Sorry for my formatting mistakes, I have fixed them now

nicolas-raoul · 2023-10-16T13:17:03Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+            } catch (Exception e) {
+                Timber.e(e);
+            }
+


Please remove empty lines here too.

remove 1 line

app/src/main/res/drawable/baseline_rotate_right.xml

nicolas-raoul · 2023-10-19T07:32:39Z

Actually, would you mind:

From your same branch, creating a new pull request.
On the pull request creation webpage, select base:v4.2.0-release instead of base:main as the target branch.
Send the pull request.

This will allow us to review all of your changes clearly (not mixed with other Flamingo-related changes). Maybe we can even merge this into the v4.2.0-release branch.

shankarpriyank · 2023-10-19T09:52:29Z

I made the pr, but in the first look it also seems to have unrelated changes.
I am a bit occupied for the next couples of days, will be having a closer look by monday

nicolas-raoul · 2023-10-20T05:12:32Z

The main branch now supports Flamingo :-)

nicolas-raoul · 2023-10-20T05:13:59Z

Would you mind rebasing or pulling from main, then checking the difference and possibly donig a bit of clean-up? Then ask for a review. :-)

# Conflicts: # app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java # app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

shankarpriyank · 2023-10-20T08:17:31Z

I pulled the changes from main, and now the pr looks quite clean to me.
There is some noise from extra formatting fixes, but I don't see any harm in them

nicolas-raoul · 2023-10-20T12:02:32Z

Any idea why a unit test fails?

shankarpriyank · 2023-10-20T12:52:03Z

Any idea why a unit test fails?

Nope, had a look at the logs, I could not really infer much from it apart from

Caused by: java.lang.IllegalStateException: Cannot process instrumented class fr/free/nrw/commons/di/DaggerCommonsApplicationComponent$60. Please supply original non-instrumented classes.

nicolas-raoul · 2023-10-20T13:53:57Z

fr.free.nrw.commons.settings.SettingsActivityUnitTests > testSetTotalUploadCount FAILED
    java.lang.reflect.InvocationTargetException at SettingsActivityUnitTests.kt:77
        Caused by: java.lang.IllegalStateException at SettingsActivityUnitTests.kt:77

shankarpriyank · 2023-10-20T14:50:00Z

@nicolas-raoul its fixed now

app/build.gradle

nicolas-raoul

minor

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

nicolas-raoul · 2023-10-21T13:33:57Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+        Intent intent = new Intent(getContext(), EditActivity.class);
+        intent.putExtra("image", uploadableFile.getFilePath().toString());
+        startActivityForResult(intent, REQUEST_CODE_FOR_EDIT_ACTIVITY);
+


remove 2 empty lines

nicolas-raoul · 2023-10-21T13:34:31Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java

+  @Override
+  public void onEditButtonClicked(int indexInViewFlipper){
+      view.showEditActivity(repository.getUploads().get(indexInViewFlipper));
+


remove 1 empty line

nicolas-raoul · 2023-10-21T13:35:22Z

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

+        }
+
+        init()
+


remove 1 empty line

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

nicolas-raoul · 2023-10-21T13:37:46Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+    @OnClick(R.id.edit_image)
+    public void onEditButtonClicked() {
+        presenter.onEditButtonClicked(callback.getIndexInViewFlipper(this));
+


remove 1 empty line

nicolas-raoul · 2023-10-21T13:37:52Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+        presenter.onEditButtonClicked(callback.getIndexInViewFlipper(this));
+
+    }
+


remove 1 empty line

nicolas-raoul · 2023-10-21T13:38:15Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+            }
+
+        }
+


remove 1 empty line

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailsContract.java

nicolas-raoul · 2023-10-21T13:38:53Z

app/src/main/res/layout/activity_edit.xml

+      android:text="@string/menu_save_categories"
+      android:textColor="@android:color/white" />
+  </LinearLayout>
+


remove 2 empty lines

shankarpriyank · 2023-10-22T17:54:32Z

@nicolas-raoul i guess all of them are fixed now

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

nicolas-raoul · 2023-10-23T01:29:06Z

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+            } catch (Exception e) {
+                Timber.e(e);
+            }
+


remove 1 line

shankarpriyank · 2023-10-23T17:27:23Z

fixed

nicolas-raoul · 2023-10-24T05:56:24Z

Huge congratulations @shankarpriyank for adding this lossless rotation feature to the app, as well as setting the foundation for other lossless transforms.
Thanks to you, many picture uploads will have both keep their original quality and not occupy more disk space, while being in the right orientation to be used in Wikipedia articles and other places.
You truly help Wikipedia/etc run better!

shankarpriyank · 2023-10-24T07:01:52Z

Thank you so much for your kind words!

shankarpriyank and others added 4 commits May 13, 2023 22:21

UI setup for the crop feature almost setup

292f942

basic setup of rotate feature done

7a4f1ab

Merge branch 'temp' into rotate_feature

e1ea40a

Added basic changes for editing feature

c0138d7

shankarpriyank marked this pull request as draft July 3, 2023 14:20

nicolas-raoul reviewed Jul 3, 2023

View reviewed changes

shankarpriyank added 3 commits August 11, 2023 23:52

Getting data back from edit activity

b4f0ad9

Getting data back from edit activity

71fb049

Updated contentUri

6bb3667

shankarpriyank requested a review from nicolas-raoul August 13, 2023 18:08

shankarpriyank added 6 commits September 26, 2023 21:14

Merge branch 'main' into rotate_feature

8db0ed2

Merge branch 'master' into rotate_feature

1b3836d

Merge remote-tracking branch 'origin/rotate_feature' into rotate_feature

bacaf56

Merge branch 'master' into rotate_feature

40c1119

Finally the rotated image is getting uploaded

8849765

Minor Improvements for better testing

aa325a7

Fixed thumbnail preview

90754cb

Fixed loss of exif data

9bbd1b8

nicolas-raoul requested changes Oct 7, 2023

View reviewed changes

nicolas-raoul requested changes Oct 16, 2023

View reviewed changes

Formatting fixes

dae0cf0

nicolas-raoul requested changes Oct 16, 2023

View reviewed changes

shankarpriyank added 2 commits October 20, 2023 13:43

Merge branch 'master' into rotate_feature

9a3f1c9

# Conflicts: # app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java # app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

Minor Formatting Fix

ace4b8f

Fix unit test

e8bcf04

nicolas-raoul requested changes Oct 20, 2023

View reviewed changes

app/build.gradle Show resolved Hide resolved

Add test coverage

ef0d93d

nicolas-raoul requested changes Oct 21, 2023

View reviewed changes

Formatting fixes

aed0f68

nicolas-raoul requested changes Oct 23, 2023

View reviewed changes

shankarpriyank added 2 commits October 23, 2023 20:20

Formatting Fixes

2d72b35

Merge branch 'main' into rotate_feature

48dcf61

nicolas-raoul merged commit 2ddb6b2 into commons-app:main Oct 24, 2023
1 check passed

shankarpriyank changed the title ~~[WIP]Lossless Transformations(Rotate feature)~~ Lossless Transformations(Rotate feature) Dec 30, 2023


		val animator = ValueAnimator.ofFloat(0f, 1f).setDuration(1000L)

		presenter.onEditButtonClicked(callback.getIndexInViewFlipper(this));

		}

Lossless Transformations(Rotate feature) #5252

Lossless Transformations(Rotate feature) #5252

Conversation

shankarpriyank commented Jul 3, 2023

nicolas-raoul left a comment

Choose a reason for hiding this comment

shankarpriyank commented Jul 9, 2023

shankarpriyank commented Aug 13, 2023

nicolas-raoul commented Sep 13, 2023

shankarpriyank commented Sep 13, 2023

shankarpriyank commented Oct 4, 2023

nicolas-raoul commented Oct 6, 2023

shankarpriyank commented Oct 6, 2023

shankarpriyank commented Oct 6, 2023

nicolas-raoul left a comment

Choose a reason for hiding this comment

nicolas-raoul commented Oct 7, 2023

shankarpriyank commented Oct 7, 2023

nicolas-raoul commented Oct 7, 2023

shankarpriyank commented Oct 16, 2023

nicolas-raoul left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shankarpriyank commented Oct 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicolas-raoul commented Oct 19, 2023

shankarpriyank commented Oct 19, 2023

nicolas-raoul commented Oct 20, 2023

nicolas-raoul commented Oct 20, 2023

shankarpriyank commented Oct 20, 2023 • edited Loading

nicolas-raoul commented Oct 20, 2023

shankarpriyank commented Oct 20, 2023

nicolas-raoul commented Oct 20, 2023

shankarpriyank commented Oct 20, 2023

nicolas-raoul left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shankarpriyank commented Oct 22, 2023

Choose a reason for hiding this comment

shankarpriyank commented Oct 23, 2023

nicolas-raoul commented Oct 24, 2023

shankarpriyank commented Oct 24, 2023

shankarpriyank commented Oct 20, 2023 •

edited

Loading