Skip to content

Commit

Permalink
Merge pull request #193 from sschueller/develop
Browse files Browse the repository at this point in the history
Release 1.0.41
  • Loading branch information
sschueller authored Jun 28, 2020
2 parents e1e1007 + 20e98db commit b6ed6b6
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 24 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### Version 1.0.41 Tag: v1.0.41 (2020-06-28)
* Floating window player controls fix (@dhk2)
* Updated app icons

### Version 1.0.40 Tag: v1.0.40 (2020-06-27)
* exoplayer update (@lishoujun)
* Floating window support (@dhk2)
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "net.schueller.peertube"
minSdkVersion 21
targetSdkVersion 29
versionCode 1040
versionName "1.0.40"
versionCode 1041
versionName "1.0.41"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ext {
libVersions = [
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,16 @@ public void enterPipMode() {
}
@Override
public void onPictureInPictureModeChanged (boolean isInPictureInPictureMode, Configuration newConfig) {
FragmentManager fragmentManager = getSupportFragmentManager();
VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);

if (isInPictureInPictureMode) {
Log.v(TAG,"switched to pip ");
videoPlayerFragment.useController(false);
} else {
Log.v(TAG,"switched to normal");
videoPlayerFragment.useController(true);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,11 @@ public void onFailure(@NonNull Call<Video> call, @NonNull Throwable t) {
}
});
}

public void useController(boolean value){
if (mBound){
simpleExoPlayerView.setUseController(value);
}
}
private void playVideo(Video video) {

Context context = getContext();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,12 @@ public void onDestroy() {
playerNotificationManager.setPlayer(null);
}
//Was seeing an error when exiting the program about about not unregistering the receiver.
if (null!=myNoisyAudioStreamReceiver) {
this.unregisterReceiver(myNoisyAudioStreamReceiver);
try {
if (null!=myNoisyAudioStreamReceiver) {
this.unregisterReceiver(myNoisyAudioStreamReceiver);
}
} catch (Exception e) {
Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
}
if (player != null) {
player.release();
Expand Down
18 changes: 7 additions & 11 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="292.8169"
android:viewportHeight="278.87323">
<group android:translateX="54.96479"
android:translateY="45.161972">
<path
android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
android:strokeAlpha="1"
android:strokeWidth="3"
android:fillColor="#1E88E5"
android:fillAlpha="1"
android:strokeColor="#211f20"/>
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.4294737"
android:scaleY="0.4294737"
android:translateX="13.048421"
android:translateY="15.615789">

<path
android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
android:strokeAlpha="1"
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/drawable/ic_logo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
android:height="297dp"
android:viewportWidth="210"
android:viewportHeight="297">
<path
android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
android:strokeAlpha="1"
android:strokeWidth="3"
android:fillColor="#1E88E5"
android:fillAlpha="1"
android:strokeColor="#211f20"/>
<path
android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
android:strokeAlpha="1"
Expand Down
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
<color name="ic_launcher_background">#1E88E5</color>
</resources>

0 comments on commit b6ed6b6

Please sign in to comment.