Skip to content

Commit

Permalink
fix issues #19 & #20
Browse files Browse the repository at this point in the history
  • Loading branch information
jepiqueau committed Aug 20, 2020
1 parent 1b355fc commit be00968
Show file tree
Hide file tree
Showing 86 changed files with 2,530 additions and 1,607 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.3.0-beta.4 (202-08-20)

### Bug Fixes

- fix issue#20 Exit player when in PIP mode
- fix issue#19 Play video from local storage by giving the **url = "internal"**

## 2.3.0-beta.3 (2020-08-09)

### Bug Fixes
Expand Down
Binary file modified android/.gradle/4.10.1/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified android/.gradle/4.10.1/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/javaCompile/classAnalysis.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/javaCompile/jarAnalysis.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/javaCompile/javaCompile.lock
Binary file not shown.
Binary file modified android/.gradle/4.10.1/javaCompile/taskHistory.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/taskHistory/taskHistory.bin
Binary file not shown.
Binary file modified android/.gradle/4.10.1/taskHistory/taskHistory.lock
Binary file not shown.
Binary file modified android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified android/.idea/caches/build_file_checksums.ser
Binary file not shown.
28 changes: 22 additions & 6 deletions android/android.iml
Original file line number Diff line number Diff line change
Expand Up @@ -104,35 +104,51 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.gridlayout:gridlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-ui:2.11.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-hls:2.11.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-dash:2.11.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-smoothstreaming:2.11.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-core:2.11.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.71828@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.exifinterface:exifinterface:1.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
Expand Down
5 changes: 5 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':capacitor-android')
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
Expand All @@ -50,5 +54,6 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.4'
implementation 'com.google.android.exoplayer:exoplayer-dash:2.11.4'
implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.11.4'
implementation 'com.squareup.picasso:picasso:2.71828'
}

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@
android:minSdkVersion="21"
android:targetSdkVersion="29" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

</manifest>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#Sun Aug 09 11:14:12 CEST 2020
#Thu Aug 20 17:19:25 CEST 2020
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/bridge_layout_main.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/layout/bridge_layout_main.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_image_background.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/drawable/ic_image_background.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/fragment_picker_video.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/layout/fragment_picker_video.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_img_9_16_background.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/drawable/ic_img_9_16_background.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/fragment_fs_exoplayer.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/layout/fragment_fs_exoplayer.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_img_16_9_background.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/drawable/ic_img_16_9_background.xml
/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/row_video.xml=/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/intermediates/packaged_res/debug/layout/row_video.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="black">#000000</color>
<color name="colorAccent">#FF9800</color>
<color name="colorPrimary">#000000</color>
<color name="colorPrimaryDark">#000000</color>
<color name="grey">#353535</color>
<color name="white">#FFFFFF</color>
<string name="my_string">Just a simple string</string>
</resources>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/rs/debug"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res"><file name="fragment_fs_exoplayer" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/fragment_fs_exoplayer.xml" qualifiers="" type="layout"/><file name="bridge_layout_main" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/bridge_layout_main.xml" qualifiers="" type="layout"/><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/colors.xml" qualifiers=""/><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/styles.xml" qualifiers=""/><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/strings.xml" qualifiers=""><string name="my_string">Just a simple string</string></file></source><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/rs/debug"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/debug/res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/rs/debug"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res"><file name="ic_img_9_16_background" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_img_9_16_background.xml" qualifiers="" type="drawable"/><file name="ic_img_16_9_background" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_img_16_9_background.xml" qualifiers="" type="drawable"/><file name="ic_image_background" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/drawable/ic_image_background.xml" qualifiers="" type="drawable"/><file name="fragment_picker_video" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/fragment_picker_video.xml" qualifiers="" type="layout"/><file name="fragment_fs_exoplayer" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/fragment_fs_exoplayer.xml" qualifiers="" type="layout"/><file name="bridge_layout_main" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/bridge_layout_main.xml" qualifiers="" type="layout"/><file name="row_video" path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/layout/row_video.xml" qualifiers="" type="layout"/><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/colors.xml" qualifiers=""><color name="colorPrimary">#000000</color><color name="colorPrimaryDark">#000000</color><color name="colorAccent">#FF9800</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="grey">#353535</color></file><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/styles.xml" qualifiers=""/><file path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/main/res/values/strings.xml" qualifiers=""><string name="my_string">Just a simple string</string></file></source><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/rs/debug"/><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/queaujeanpierre/Documents/StencilWebComponent/publishCapacitorPlugins/dev/capacitor-video-player/android/src/debug/res"/></dataSet><mergedItems/></merger>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@
android:minSdkVersion="21"
android:targetSdkVersion="29" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

</manifest>
Binary file modified android/build/intermediates/packaged-classes/debug/classes.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="black">#000000</color>
<color name="colorAccent">#FF9800</color>
<color name="colorPrimary">#000000</color>
<color name="colorPrimaryDark">#000000</color>
<color name="grey">#353535</color>
<color name="white">#FFFFFF</color>
<string name="my_string">Just a simple string</string>
</resources>
Loading

0 comments on commit be00968

Please sign in to comment.