Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Add Video Thumbnail preview and set default theme to light #53

Merged
merged 6 commits into from
Sep 29, 2015
Merged

Add Video Thumbnail preview and set default theme to light #53

merged 6 commits into from
Sep 29, 2015

Conversation

alishari
Copy link
Contributor

I'm adding Video Thumbnail preview in multimedia preview and set default theme to light and upgrade glide library version

@spacecowboy
Copy link
Owner

Thanks for the PR! There are some conflicts with the current master. If you could rebase/merge against latest master that would be great, or I can take care of it myself if you prefer.

@@ -64,7 +64,7 @@
</activity>

<activity
android:name="com.nononsenseapps.filepicker.sample.ImagePickerActivity"
android:name=".MultimediaPickerActivity"
Copy link
Owner

Choose a reason for hiding this comment

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

Yup this naming makes sense now

- Add preview of videos
Conflicts:
	sample/build.gradle
	sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerFragment.java
	sample/src/main/res/layout/activity_no_nonsense_file_picker.xml
spacecowboy added a commit that referenced this pull request Sep 29, 2015
Add Video Thumbnail preview and set default theme to light
@spacecowboy spacecowboy merged commit bcf59d4 into spacecowboy:master Sep 29, 2015
@spacecowboy
Copy link
Owner

Your merging of master appears to have killed all your changes. I added them back in

30d1fa7 and dfef9b0

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants