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

Fixes #196: Create option for whitelisting folders in the settings #285

Merged
merged 7 commits into from Apr 7, 2017

Conversation

5 participants
@rohanagarwal94
Copy link
Contributor

commented Apr 1, 2017

Fixes issue #196

Currently, the app iterates through the images of the app with the help of the MediaStore class to get the images. Hence the user does not have the option to choose the folder in that case. Therefore, the cursor implementation needs to be changed wherever the image grid is being shown. I will be creating separate issue for that since that is altogether a time consuming task itself. The rest of the implementation is included in the PR.

Screenshots for the change:

screenshot_2017-04-02-04-28-06-286_vn mbm phimp me
screenshot_2017-04-02-04-10-03-370_vn mbm phimp me
screenshot_2017-04-02-04-09-54-671_vn mbm phimp me

@phimpme-danger

This comment has been minimized.

Copy link

commented Apr 1, 2017

1 Message
📖 🎉 Thanks for the PR @rohanagarwal94 we hope you have changed the variables in the upload_apk_forks.sh its for easy moderation.

🔗 Maintainers: the apk to test can be found at https://github.com/rohanagarwal94/phimpme-android/blob/apk/app-debug.apk

Generated by 🚫 Danger

@rohanagarwal94

This comment has been minimized.

Copy link
Contributor Author

commented Apr 2, 2017

@pa1pal @Abhi2424shek any reason that the travis build failed?

@abishekvashok

This comment has been minimized.

Copy link
Member

commented Apr 2, 2017

Espresso tests are failing that's why the build is failing. @rohanagarwal. Also there are conflicts please try to resolve them as well.

@codecov-io

This comment has been minimized.

Copy link

commented Apr 2, 2017

Codecov Report

Merging #285 into development will increase coverage by 0.16%.
The diff coverage is 22.42%.

Impacted file tree graph

@@               Coverage Diff                @@
##             development    #285      +/-   ##
================================================
+ Coverage           2.63%   2.79%   +0.16%     
- Complexity            93     116      +23     
================================================
  Files                302     314      +12     
  Lines              39294   39615     +321     
  Branches            4902    4931      +29     
================================================
+ Hits                1036    1108      +72     
- Misses             38164   38409     +245     
- Partials              94      98       +4
Impacted Files Coverage Δ Complexity Δ
...src/main/java/vn/mbm/phimp/me/utils/Constants.java 0% <ø> (ø) 0 <0> (ø) ⬇️
.../phimp/me/folderchooser/FolderChooserActivity.java 0% <0%> (ø) 0 <0> (?)
.../vn/mbm/phimp/me/folderchooser/MediaExtension.java 0% <0%> (ø) 0 <0> (?)
...me/folderchooser/WhitelistedFolderListAdapter.java 0% <0%> (ø) 0 <0> (?)
...a/vn/mbm/phimp/me/folderchooser/FolderChooser.java 0% <0%> (ø) 0 <0> (?)
...a/vn/mbm/phimp/me/folderchooser/FolderAdapter.java 0% <0%> (ø) 0 <0> (?)
app/src/main/java/vn/mbm/phimp/me/utils/Utils.java 6.74% <0%> (-0.16%) 2 <0> (ø)
...n/mbm/phimp/me/folderchooser/FolderViewHolder.java 0% <0%> (ø) 0 <0> (?)
...p/src/main/java/vn/mbm/phimp/me/MyApplication.java 82.35% <100%> (+2.35%) 3 <0> (ø) ⬇️
app/src/main/java/vn/mbm/phimp/me/PhimpMe.java 40.67% <100%> (+0.13%) 15 <0> (ø) ⬇️
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 509f8b5...5e7ccc4. Read the comment docs.

@rohanagarwal94

This comment has been minimized.

Copy link
Contributor Author

commented Apr 2, 2017

@pa1pal @Abhi2424shek please review. Resolved all conflicts.

@abishekvashok
Copy link
Member

left a comment

I haven't commented everywhere where a newline at EOF is needed, there are other instances so please check them as well.

// }
// newGallery.update_number++;
//
// }

This comment has been minimized.

Copy link
@abishekvashok

abishekvashok Apr 4, 2017

Member

Please remove unused code.


private static AppState ourInstance = new AppState();

private AppState() {

This comment has been minimized.

Copy link
@abishekvashok

abishekvashok Apr 4, 2017

Member

Unused constructor?

parent.hasMedia();
}
}
}

This comment has been minimized.

Copy link
@abishekvashok

abishekvashok Apr 4, 2017

Member

Add a newline at eof

<!-- edit Image Dialog -->
<string name="go_back">Go Back</string>
<string name="dialog_message">Do you want to exit and discard changes?</string>
<string name="dialog_title">Confirm</string>

This comment has been minimized.

Copy link
@abishekvashok

abishekvashok Apr 4, 2017

Member

Trailing whitespace

@rohanagarwal94 rohanagarwal94 force-pushed the rohanagarwal94:file_system branch from f9c98e2 to 5e7ccc4 Apr 4, 2017

@rohanagarwal94

This comment has been minimized.

Copy link
Contributor Author

commented Apr 4, 2017

@Abhi2424shek @pa1pal made the changes, please review.

@mariobehling

This comment has been minimized.

Copy link
Member

commented Apr 7, 2017

Thanks a lot! Keep it up. Looking forward to more contributions from you.

@mariobehling mariobehling merged commit 9088e0d into fossasia:development Apr 7, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rohanagarwal94 rohanagarwal94 deleted the rohanagarwal94:file_system branch Apr 7, 2017

pull bot pushed a commit to sahilsaha7773/phimpme-android that referenced this pull request Jul 18, 2019

Merge pull request fossasia#285 from rohanagarwal94/file_system
Fixes fossasia#196: Create option for whitelisting folders in the settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.