From 4d0d3c7eadb83479c47f69ad966a077e22ff4c81 Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Mon, 8 May 2017 22:23:27 -0300 Subject: [PATCH 1/8] Update menu items after change in settings --- .../schabi/newpipe/fragments/detail/ActionBarHandler.java | 5 +++++ .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java index 3805c30e7..41a927d16 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java @@ -40,6 +40,7 @@ import java.util.List; */ +@SuppressWarnings("WeakerAccess") class ActionBarHandler { private static final String TAG = "ActionBarHandler"; @@ -103,6 +104,10 @@ class ActionBarHandler { defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity); inflater.inflate(R.menu.video_detail_menu, menu); + updateItemsVisibility(); + } + + public void updateItemsVisibility(){ showPlayWithKodiAction(defaultPreferences.getBoolean(activity.getString(R.string.show_play_with_kodi_key), false)); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index 65ddc36ed..030028d64 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -98,6 +98,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor private static final int RELATED_STREAMS_UPDATE_FLAG = 0x1; private static final int RESOLUTIONS_MENU_UPDATE_FLAG = 0x2; + private static final int TOOLBAR_ITEMS_UPDATE_FLAG = 0x4; private int updateFlags = 0; private boolean autoPlayEnabled; @@ -219,6 +220,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor if ((updateFlags & RELATED_STREAMS_UPDATE_FLAG) != 0) initRelatedVideos(currentStreamInfo); if ((updateFlags & RESOLUTIONS_MENU_UPDATE_FLAG) != 0) setupActionBarHandler(currentStreamInfo); } + + if ((updateFlags & TOOLBAR_ITEMS_UPDATE_FLAG) != 0 && actionBarHandler != null) actionBarHandler.updateItemsVisibility(); updateFlags = 0; } @@ -329,6 +332,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor || key.equals(getString(R.string.default_resolution_key)) || key.equals(getString(R.string.show_higher_resolutions_key))) { updateFlags |= RESOLUTIONS_MENU_UPDATE_FLAG; + } else if (key.equals(getString(R.string.show_play_with_kodi_key))) { + updateFlags |= TOOLBAR_ITEMS_UPDATE_FLAG; } } From aeb0cac3ee28be8ec8812f8452cc6907bf432545 Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Tue, 9 May 2017 17:11:19 +0200 Subject: [PATCH 2/8] change order of buttons. closes #471 --- app/src/main/res/menu/video_detail_menu.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/menu/video_detail_menu.xml b/app/src/main/res/menu/video_detail_menu.xml index 9ac1ce65c..92887e788 100644 --- a/app/src/main/res/menu/video_detail_menu.xml +++ b/app/src/main/res/menu/video_detail_menu.xml @@ -2,17 +2,11 @@ - - + app:showAsAction="always"/> + + - \ No newline at end of file + From 94cc2ad3658f6d9e4a5814021f8ed3f267229950 Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Tue, 9 May 2017 20:57:42 +0200 Subject: [PATCH 3/8] change order of buttons, see https://github.com/TeamNewPipe/NewPipe/issues/471#issuecomment-300267118 --- app/src/main/res/menu/video_detail_menu.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/menu/video_detail_menu.xml b/app/src/main/res/menu/video_detail_menu.xml index 92887e788..10580a098 100644 --- a/app/src/main/res/menu/video_detail_menu.xml +++ b/app/src/main/res/menu/video_detail_menu.xml @@ -3,9 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> Date: Sat, 13 May 2017 22:13:28 +0200 Subject: [PATCH 4/8] move on to version 0.9.6 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c5106adbf..0f3ab2455 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.schabi.newpipe" minSdkVersion 15 targetSdkVersion 25 - versionCode 32 - versionName "0.9.5" + versionCode 33 + versionName "0.9.6" } buildTypes { release { From e47761750a0020a771a8381c0b1dda627e538f2a Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Sun, 14 May 2017 00:32:28 -0300 Subject: [PATCH 5/8] Fix 'keep screen on' --- .../java/org/schabi/newpipe/player/MainVideoPlayer.java | 8 +++++++- app/src/main/res/layout/activity_main_player.xml | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java index 45221325b..7af2c20a1 100644 --- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java @@ -184,6 +184,7 @@ public class MainVideoPlayer extends Activity { repeatButton.setAlpha(77); } + getRootView().setKeepScreenOn(true); } @Override @@ -308,12 +309,14 @@ public class MainVideoPlayer extends Activity { super.onLoading(); playPauseButton.setImageResource(R.drawable.ic_pause_white); animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100); + getRootView().setKeepScreenOn(true); } @Override public void onBuffering() { super.onBuffering(); animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100); + getRootView().setKeepScreenOn(true); } @Override @@ -326,8 +329,8 @@ public class MainVideoPlayer extends Activity { animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200); } }); - showSystemUi(); + getRootView().setKeepScreenOn(true); } @Override @@ -342,12 +345,14 @@ public class MainVideoPlayer extends Activity { }); showSystemUi(); + getRootView().setKeepScreenOn(false); } @Override public void onPausedSeek() { super.onPausedSeek(); animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100); + getRootView().setKeepScreenOn(true); } @@ -365,6 +370,7 @@ public class MainVideoPlayer extends Activity { } }); } + getRootView().setKeepScreenOn(false); super.onCompleted(); } diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml index cd76d2f07..07363f7e0 100644 --- a/app/src/main/res/layout/activity_main_player.xml +++ b/app/src/main/res/layout/activity_main_player.xml @@ -5,8 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" - android:gravity="center" - android:keepScreenOn="true"> + android:gravity="center"> Date: Sun, 14 May 2017 10:46:28 -0300 Subject: [PATCH 6/8] Improve behavior on audio focus gain --- app/src/main/java/org/schabi/newpipe/player/BasePlayer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java index fb010481d..9a4d49fda 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java @@ -320,7 +320,6 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage if (DEBUG) Log.d(TAG, "onAudioFocusGain() called"); if (simpleExoPlayer != null) simpleExoPlayer.setVolume(DUCK_AUDIO_TO); animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION); - simpleExoPlayer.setPlayWhenReady(true); } protected void onAudioFocusLoss() { From 641ab254703cee451eb136f05513e6a8c4c82610 Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Sun, 14 May 2017 11:10:00 -0300 Subject: [PATCH 7/8] Fix Settings on screen rotation --- .../org/schabi/newpipe/settings/SettingsActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java index a1e8fb49b..f076c5645 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java @@ -53,15 +53,17 @@ public class SettingsActivity extends AppCompatActivity { actionBar.setDisplayShowTitleEnabled(true); } - getFragmentManager().beginTransaction() - .replace(R.id.fragment_holder, new SettingsFragment()) - .commit(); + if (savedInstanceBundle == null) { + getFragmentManager().beginTransaction() + .replace(R.id.fragment_holder, new SettingsFragment()) + .commit(); + } } @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); - if(id == android.R.id.home) { + if (id == android.R.id.home) { finish(); } return true; From 25988f61a6e7f3fad599817d8ff404fb21fa50af Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Sun, 14 May 2017 13:57:08 -0300 Subject: [PATCH 8/8] Change popup default resolution --- app/src/main/res/values/settings_keys.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 34898377b..ac5647aee 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -31,7 +31,7 @@ popup_remember_size_pos_key default_popup_resolution_key - 480p + 360p show_higher_resolutions_key