Skip to content

Commit

Permalink
Merge branch 'ogrepo_dev' into peertube
Browse files Browse the repository at this point in the history
merge dev
  • Loading branch information
B0pol committed Jan 23, 2020
2 parents 8bdece8 + 8c3be2c commit 334eab3
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 67 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId "org.schabi.newpipe"
minSdkVersion 19
targetSdkVersion 28
versionCode 800
versionName "0.18.0"
versionCode 810
versionName "0.18.1"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/org/schabi/newpipe/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,16 @@ protected void onResume() {
sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
NavigationHelper.openMainActivity(this);
}

if (sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
if (DEBUG) Log.d(TAG, "do not show History-menu as its disabled in settings");
drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(true);
}

if (!sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
if (DEBUG) Log.d(TAG, "show History-menu as its enabled in settings");
drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(false);
}
}

@Override
Expand Down Expand Up @@ -550,8 +560,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
if (!(fragment instanceof SearchFragment)) {
findViewById(R.id.toolbar).findViewById(R.id.toolbar_search_container).setVisibility(View.GONE);

MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main_menu, menu);
}

ActionBar actionBar = getSupportActionBar();
Expand All @@ -573,14 +581,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
case android.R.id.home:
onHomeButtonPressed();
return true;
case R.id.action_show_downloads:
return NavigationHelper.openDownloads(this);
case R.id.action_history:
NavigationHelper.openStatisticFragment(getSupportFragmentManager());
return true;
case R.id.action_settings:
NavigationHelper.openSettings(this);
return true;
default:
return super.onOptionsItemSelected(item);
}
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
case android.R.id.home:
finish();
return true;
case R.id.action_settings:
NavigationHelper.openSettings(this);
return true;
case R.id.action_show_downloads:
return NavigationHelper.openDownloads(this);
}

return super.onOptionsItemSelected(item);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
onBackPressed();
return true;
}
case R.id.action_settings: {
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
return true;
}

default:
return super.onOptionsItemSelected(item);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_append_playlist:
appendAllToPlaylist();
return true;
case R.id.action_settings:
NavigationHelper.openSettings(this);
redraw = true;
return true;
case R.id.action_system_audio:
startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
return true;
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/schabi/newpipe/util/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ public class Constants {
public static final String KEY_THEME_CHANGE = "key_theme_change";
public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change";

public static final String KEY_ENABLE_WATCH_HISTORY = "enable_watch_history";

public static final int NO_SERVICE_ID = -1;
}
4 changes: 0 additions & 4 deletions app/src/main/res/menu/download_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@
android:title="@string/clear_download_history"
app:showAsAction="ifRoom" />

<item android:id="@+id/action_settings"
android:title="@string/settings"
app:showAsAction="never" />

</menu>
22 changes: 0 additions & 22 deletions app/src/main/res/menu/main_menu.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/menu/menu_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,4 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.schabi.newpipe.about.AboutActivity">

<item android:id="@+id/action_show_downloads"
android:orderInCategory="980"
android:title="@string/downloads"
app:showAsAction="never"/>

<item android:id="@+id/action_settings"
android:orderInCategory="990"
android:title="@string/settings"
app:showAsAction="never"/>

</menu>
5 changes: 0 additions & 5 deletions app/src/main/res/menu/menu_play_queue.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
android:visible="true"
app:showAsAction="ifRoom"/>

<item android:id="@+id/action_settings"
android:orderInCategory="990"
android:title="@string/settings"
app:showAsAction="never"/>

<item android:id="@+id/action_system_audio"
android:orderInCategory="996"
android:title="@string/play_queue_audio_settings"
Expand Down
19 changes: 19 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/810.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
New
• Show video thumbnail on the lock screen when playing in the background

Improved
• Add local playlist to queue when long pressing on background / popup button
• Make main page tabs scrollable and hide when there is only a single tab
• Limit amount of notification thumbnail updates in background player
• Add dummy thumbnail for empty local playlists
• Use *.opus file extension instead of *.webm and show "opus" in format label instead of "WebM Opus" in the download dropdown
• Add button to delete downloaded files or download history in "Downloads"
• [YouTube] Add support to /c/shortened_url channel links

Fixed
• Fixed multiple issues when sharing a video to NewPipe and downloading its streams directly
• Fixed player access out of its creation thread
• Fixed search result paging
• [YouTube] Fixed switching on null causing NPE
• [YouTube] Fixed viewing comments when opening an invidio.us url
• [SoundCloud] Updated client_id

0 comments on commit 334eab3

Please sign in to comment.