Pictures can be uploaded directly clicking them from the device's camera #2075

shashvat-kedia · 2017-12-15T11:01:38Z

Issue #2027 Fixed

jesmrec · 2017-12-18T11:41:52Z

thanks for your contribution. As usual, it will pass a QA process and code review before merging. If we detect bugs, improvements or issues related with the code, we will report here.

shashvat-kedia · 2017-12-19T05:48:39Z

@jesmrec How much time does it take for the QA process and code review? As I want to work on Issue #2036 and thus any further changes I make will get updated in this PR itself.

jesmrec · 2017-12-19T10:42:42Z

first step is designing a test plan and execute it (i will take care). Please keep tuned here. In any case, i encourage you not to wait and start developing other stuff if you really wish to do it. Branches finally merges (or rebase) to have all stuff together and perform then appropiate checks.

shashvat-kedia · 2017-12-19T13:00:48Z

@jesmrec There should be a feature that allows the user to reset their Passcode in case they forget it right?

jesmrec · 2017-12-19T14:18:50Z

@SD1998 there shouldn't. Passcode is the way you can protect the data in your app if you lose your device (for example), in case any other protection in the device is set (not probably). The only way to remove the passcode is inputing the passcode. If not, app has to be removed and reinstalled.

jesmrec · 2017-12-20T11:18:10Z

@SD1998 this is available only for pics (not videos), isn't it?

shashvat-kedia · 2017-12-20T11:35:34Z

@jesmrec Yes comment

jesmrec · 2017-12-21T12:43:56Z

In landscape orientation, mobile phones does not show the upload option of the FAB (on the top) because there is not enough room for 4 options with this orientation. Any possibility to fix this? or is a collateral effect (feature)? @SD1998 @davigonz

shashvat-kedia · 2017-12-24T04:25:39Z

@jesmrec Should I implement a horizontally opening FAB for landscape orientation?

davigonz · 2017-12-29T14:24:53Z

AndroidManifest.xml

-            android:theme="@style/Theme.ownCloud.Fullscreen">
-        </activity>
+            android:theme="@style/Theme.ownCloud.Fullscreen" />
+        <activity android:name=".ui.activity.CapturedFileChecker" />


Please include the suffix "Activity" for all the activities you add here, it will be helpful to distinguish them from services and other components. In this case, CapturedFileCheckerActivity would be great.

I have removed the activity tags as there is no such activity present in the project(I created the activity before but then changed my approach and deleted them as they were of no use but the activity tag for them was still present in the Manifest file)

davigonz · 2017-12-29T14:25:39Z

AndroidManifest.xml

-        </activity>
+            android:theme="@style/Theme.ownCloud.Fullscreen" />
+        <activity android:name=".ui.activity.CapturedFileChecker" />
+        <activity android:name=".ui.activity.Camera" />


Same here, CameraActivity

comment the same applies for the Camera Activity.

davigonz · 2017-12-29T14:29:39Z

build.gradle


    // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
-    androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
+    androidTestCompile "com.android.support:support-annotations:" +


Why have you moved all these dependencies and kept the comments above? The different dependencies were ordered with different comments to know why they have been included. Can you reorder them as before?

I have fixed this

davigonz · 2017-12-29T14:35:59Z

Hi @SD1998 , I've tested your feature and the upload from camera is working, congrats!! 👏

Apart from that, I've just started with the code review and requested you some changes to be applied. I will continue with the review in the coming days, meanwhile you can start to apply those changes, go for it! 😉

Should I implement a horizontally opening FAB for landscape orientation?

We will discuss about it also, maybe some UI changes are needed.

shashvat-kedia · 2017-12-30T05:58:09Z

@davigonz Yes I will start working on the changes.

davigonz · 2018-01-05T12:33:39Z

@SD1998 @jesmrec

In landscape orientation, mobile phones does not show the upload option of the FAB (on the top) because there is not enough room for 4 options with this orientation. Any possibility to fix this? or is a collateral effect (feature)?

Should I implement a horizontally opening FAB for landscape orientation?

Well, since the new "Upload from camera" floating button doesn't fit in landscape mode, I've thought in a new design to fix the problem by using bottom sheets:

So, we have two options here:

Delete the floating button to upload from camera only in landscape mode and include bottom sheets as you can see in the design above.
Delete the floating button to upload from camera in both portrait and landscape modes, and include bottom sheets in both cases, which would be clearer and more consistent for the user.

Besides, using bottom sheets would enable us to add more options in the future (even with a scroll if needed), without depending on the space occupied by new floating buttons.

@SD1998 I would go for the second option, here you have some articles explaining how to implement bottom sheets:

Ping me if you have any question and I will help you

CC / @michaelstingl

shashvat-kedia · 2018-01-05T12:51:18Z

@davigonz Yes even I think the second option is the better option. So I will remove the FAB and implement bottom sheets instead.

shashvat-kedia · 2018-01-05T16:42:28Z

@davigonz Can I use fragments instead of bottom sheets?

davigonz · 2018-01-05T16:53:19Z

Can I use fragments instead of bottom sheets?

@SD1998 You can use BottomSheetDialogFragment. In this link you will find an example.

shashvat-kedia · 2018-01-05T17:15:59Z

@davigonz Thanks

jesmrec · 2018-01-09T08:32:12Z

Please, take in account about the label Upload to ownCloud:

ownCloudinstead of OwnCloud
ownCloud word has to be brandeable

In any case, this label is not very important so it is implicit that the user wants to upload.

CC @davigonz

jesmrec · 2018-01-09T09:34:32Z

I have detected the following behaviour, in landscape orientation in Android 8.

shashvat-kedia · 2018-01-09T16:56:28Z

@jesmrec Yes I just noticed the behaviour. Actually the bottom sheet in not opening completely only one option is being shown but you can drag the bottom sheet upwards this will show the second option. I am trying to change it so that both the options are shown when the bottom sheets is displayed.

shashvat-kedia · 2018-01-09T16:59:04Z

@jesmrec Regarding this comment I will change OwnCloud to ownCloud.

shashvat-kedia · 2018-01-20T20:00:11Z

@davigonz Are there any more changes required?

davigonz · 2018-01-22T07:58:55Z

I have added the feature again and based on the number of files changed I think there have been no unnecessary deletions. Sorry for the inconvenience.

@SD1998 Awesome, the PR changes look better now 👏

Are there any more changes required?

Let me have a final look and if everything is OK, we can start with some QA.

davigonz · 2018-01-22T13:51:49Z

Hi again @SD1998 , you've been merging the owncloud master branch into your master branch when it was out-of-date with owncloud master. I'm sorry if I have not commented this to you before but we always use rebase so that all the commits appear not mixed in the history (I will update the CONTRIBUTING.md with this stuff).

Let's see an example:

Clone your repo and checkout to your master branch.
After executing git log and scrolling down a bit, I've noticed this:

Here you can see that a master commit appears between two of your commits. To avoid that we always follow the next steps when one of our feature branches is out-of-date with master:

git checkout master
git fetch
git rebase
git checkout feature
git fetch
git rebase
git rebase master
Solve conflicts, if any
git push -f origin feature

When we execute git rebase master, all the commits of the feature branch are placed after the last commit of the master branch.

If you want to know more info about it, check this

To have your commits history properly, you will need to perform a rebase with ownCloud master branch, by executing git rebase master (of ownCloud). At this point, you will probably have some conflicts to fix, in several steps, have you ever used rebase with several steps?

Once all the conflicts are fixed, execute git push -f origin/master (be sure before executing this command, it will overwrite your commits history in your master branch) , and all your commits of your feature should appear after master ones, not mixed.

Please, if you have any question, ask me, I hope you are learning a lot about git 😉

shashvat-kedia · 2018-01-22T16:43:47Z

@davigonz When I am using rebase all the files that got deleted before Code Review are getting deleted again (i.e After this all the files were added again but when I rebase all the files that were added are getting removed).

davigonz · 2018-01-23T07:49:03Z

When I am using rebase all the files that got deleted before Code Review are getting deleted again (i.e After this all the files were added again but when I rebase all the files that were added are getting removed).

@SD1998 Are you using rebase in several steps? With rebase --continue? This should pass through all the commits, applying them, including the one to add the deleted files.

shashvat-kedia · 2018-01-23T07:52:42Z

@davigonz Yes I am using rebase with several steps.

shashvat-kedia · 2018-01-23T10:35:41Z

@davigonz should I just rebase from the following commit? As this and the commits that follow this particular commit as these are the ones that have all the files.

davigonz · 2018-01-23T11:28:19Z

should I just rebase from the following commit? As this and the commits that follow this particular commit as these are the ones that have all the files.

@SD1998 and what would happen with the rest of commits? I'm not sure if that will fix it, are you sure you are not missing some conflicts in any step? I will try it to do the rebase locally and see what happens.

shashvat-kedia · 2018-01-24T06:34:34Z

@davigonz Will this project be there for GSOC 2018?

michaelstingl · 2018-01-24T07:41:11Z

@SD1998 please discuss GSOC in https://central.owncloud.org/c/gsoc

davigonz · 2018-01-24T08:36:53Z

Will this project be there for GSOC 2018?

@SD1998 We have several proposals in the link @michaelstingl pasted just above, including the one I added yesterday about the integration of a document scanner in the Android app but the accepted organizations will be announced on February 12rd (program timeline). After that, if ownCloud is accepted as project in GSOC 2018, students can begin discussing project ideas.

davigonz · 2018-01-24T09:57:59Z

@SD1998 during the rebase, all your commits are applied one by one, some of them can trigger conflicts while others not. After this there isn't any commit that can delete the files again since the next commits are:

Feature added.
Deleted String added.
Merge branch 'master' of https://github.com/owncloud/android

Are you following these steps during the rebase?

git rebase master (of ownCloud)
Some conflicts appear
Solve conflicts
git add file_with_conflict_solved (for each file with conflicts solved)
git rebase --continue

Repeat till there are no more conflicts.

shashvat-kedia · 2018-01-24T11:27:58Z

@davigonz Yes I am following those steps. So should I just rebase from the commit that you have mentioned or should I start from the first commit?

davigonz · 2018-01-24T11:36:30Z

Yes I am following those steps. So should I just rebase from the commit that you have mentioned or should I start from the first commit?

@SD1998 You mean this?

git checkout 434cd8c481fcc1a88c21920d49472655534c43f9
git rebase master (of ownCloud)

This will apply all the previous commits to that specific commit but not the last three, which include the new feature itself.

shashvat-kedia · 2018-01-24T11:38:31Z

@davigonz Yes

davigonz · 2018-01-24T11:42:22Z

Yes

@SD1998 if you perform the rebase from that commit, you will need to apply after that the last three commits, you can do it by using git cherry-pick commit command, selecting the commits to apply in the same order you had before.

But the last commit is a merge from master of ownCloud when it should be a rebase

shashvat-kedia · 2018-01-24T11:44:02Z

@davigonz Thanks I will try it now.

shashvat-kedia · 2018-01-24T12:51:47Z

@davigonz I used rebase but still the branch is out of date.

But I have the changes made in the recent commits in my local repository.

shashvat-kedia · 2018-01-24T14:02:06Z

@davigonz I have used rebase and created a new branch with the feature should I send a PR from that branch and close this one?

davigonz · 2018-01-24T14:59:05Z

I have used rebase and created a new branch with the feature should I send a PR from that branch and close this one?

@SD1998 Yes please, let's close this and open a new PR.

shashvat-kedia added 3 commits December 14, 2017 11:41

Fix to issue owncloud#2027

19095ad

FAB Added for Upload from Camera

e14cc81

Camera Button from UploadFilesActivity Removed

d10bfec

Conflit Resolved

6778a97

jesmrec added this to the 2.5.1 milestone Dec 20, 2017

jesmrec mentioned this pull request Dec 20, 2017

[PR 2097] Upload from camera owncloud/QA#513

Closed

shashvat-kedia mentioned this pull request Dec 28, 2017

Pictures can be uploaded directly clicking them from the device's camera #2059

Closed

davigonz suggested changes Dec 29, 2017

View reviewed changes

Conflicts Resolved and Requested Changes

b347ba0

Bottom Sheet Added and Conflicts Resolved

aca6833

Merge branch 'master' of https://github.com/owncloud/android

c36e044

davigonz mentioned this pull request Jan 22, 2018

Pattern Lock Added #2083

Merged

3 tasks

shashvat-kedia force-pushed the master branch from 8cfd971 to c36e044 Compare January 24, 2018 12:48

davigonz closed this Jan 24, 2018

jesmrec mentioned this pull request Feb 13, 2018

solve bug of hiding of fab on opening snackbar #2105

Closed

davigonz removed this from the 2.7.0 milestone Mar 2, 2018

theScrabi mentioned this pull request Apr 18, 2018

Fix typo in CONTRIBUTING.md #2166

Closed

davigonz mentioned this pull request May 18, 2018

No such property: name for class: java.lang.String #2225

Closed

davigonz mentioned this pull request Jun 6, 2018

Set notification time on file upload and download #2196

Closed

davigonz mentioned this pull request Dec 3, 2018

Fix/welcome wizard rotation #2369

Merged

Pictures can be uploaded directly clicking them from the device's camera #2075

Pictures can be uploaded directly clicking them from the device's camera #2075

Conversation

shashvat-kedia commented Dec 15, 2017

jesmrec commented Dec 18, 2017

shashvat-kedia commented Dec 19, 2017

jesmrec commented Dec 19, 2017

shashvat-kedia commented Dec 19, 2017

jesmrec commented Dec 19, 2017 • edited Loading

jesmrec commented Dec 20, 2017

shashvat-kedia commented Dec 20, 2017

jesmrec commented Dec 21, 2017

shashvat-kedia commented Dec 24, 2017

davigonz Dec 29, 2017

Choose a reason for hiding this comment

shashvat-kedia Dec 30, 2017

Choose a reason for hiding this comment

davigonz Dec 29, 2017

Choose a reason for hiding this comment

shashvat-kedia Dec 30, 2017

Choose a reason for hiding this comment

davigonz Dec 29, 2017

Choose a reason for hiding this comment

shashvat-kedia Dec 30, 2017

Choose a reason for hiding this comment

davigonz commented Dec 29, 2017 • edited Loading

shashvat-kedia commented Dec 30, 2017

davigonz commented Jan 5, 2018 • edited Loading

shashvat-kedia commented Jan 5, 2018

shashvat-kedia commented Jan 5, 2018

davigonz commented Jan 5, 2018

shashvat-kedia commented Jan 5, 2018

jesmrec commented Jan 9, 2018

jesmrec commented Jan 9, 2018

shashvat-kedia commented Jan 9, 2018

shashvat-kedia commented Jan 9, 2018

shashvat-kedia commented Jan 20, 2018

davigonz commented Jan 22, 2018 • edited Loading

davigonz commented Jan 22, 2018 • edited Loading

shashvat-kedia commented Jan 22, 2018

davigonz commented Jan 23, 2018 • edited Loading

shashvat-kedia commented Jan 23, 2018

shashvat-kedia commented Jan 23, 2018

davigonz commented Jan 23, 2018

shashvat-kedia commented Jan 24, 2018 • edited Loading

michaelstingl commented Jan 24, 2018

davigonz commented Jan 24, 2018 • edited Loading

davigonz commented Jan 24, 2018

shashvat-kedia commented Jan 24, 2018

davigonz commented Jan 24, 2018

shashvat-kedia commented Jan 24, 2018

davigonz commented Jan 24, 2018 • edited Loading

shashvat-kedia commented Jan 24, 2018

shashvat-kedia commented Jan 24, 2018 • edited Loading

shashvat-kedia commented Jan 24, 2018

davigonz commented Jan 24, 2018

jesmrec commented Dec 19, 2017 •

edited

Loading

davigonz commented Dec 29, 2017 •

edited

Loading

davigonz commented Jan 5, 2018 •

edited

Loading

davigonz commented Jan 22, 2018 •

edited

Loading

davigonz commented Jan 22, 2018 •

edited

Loading

davigonz commented Jan 23, 2018 •

edited

Loading

shashvat-kedia commented Jan 24, 2018 •

edited

Loading

davigonz commented Jan 24, 2018 •

edited

Loading

davigonz commented Jan 24, 2018 •

edited

Loading

shashvat-kedia commented Jan 24, 2018 •

edited

Loading