Merge remote-tracking branch 'upstream/master'

arvapps-forked-projects · Jan 19, 2025 · dc39cae · dc39cae
2 parents 3d2b5ef + 069622d
commit dc39cae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/MediaServiceCore b/MediaServiceCore
diff --git a/SharedModules b/SharedModules
diff --git a/...com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/menu/VideoMenuPresenter.java b/...com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/menu/VideoMenuPresenter.java
@@ -952,7 +952,7 @@ private void initMenuMapping() {
         mMenuMapping.put(MainUIData.MENU_ITEM_SUBSCRIBE, new MenuAction(this::appendSubscribeButton, false));
         mMenuMapping.put(MainUIData.MENU_ITEM_EXCLUDE_FROM_CONTENT_BLOCK, new MenuAction(this::appendToggleExcludeFromContentBlockButton, false));
         mMenuMapping.put(MainUIData.MENU_ITEM_PIN_TO_SIDEBAR, new MenuAction(this::appendTogglePinVideoToSidebarButton, false));
-        mMenuMapping.put(MainUIData.MENU_ITEM_SAVE_REMOVE_PLAYLIST, new MenuAction(this::appendSaveRemovePlaylistButton, true));
+        mMenuMapping.put(MainUIData.MENU_ITEM_SAVE_REMOVE_PLAYLIST, new MenuAction(this::appendSaveRemovePlaylistButton, false));
         mMenuMapping.put(MainUIData.MENU_ITEM_OPEN_DESCRIPTION, new MenuAction(this::appendOpenDescriptionButton, false));
         mMenuMapping.put(MainUIData.MENU_ITEM_SHARE_LINK, new MenuAction(this::appendShareLinkButton, false));
         mMenuMapping.put(MainUIData.MENU_ITEM_SHARE_QR_LINK, new MenuAction(this::appendShareQRLinkButton, false));

diff --git a/common/src/main/res/values-ko/strings.xml b/common/src/main/res/values-ko/strings.xml
@@ -686,4 +686,9 @@
   <string name="playlists_rows">재생목록 섹션을 행으로 표시</string>
   <string name="not_supported_by_device">해당 장치는 이 기능을 지원하지 않음</string>
   <string name="suggestions">제안</string>
+  <string name="context_menu_sorting">상황에 맞는 메뉴 정렬</string>
+  <string name="hide_shorts_from_search">검색 결과에서 쇼츠 숨기기</string>
+  <string name="import_subscriptions_group">가져오기</string>
+  <string name="lb_playback_controls_closed_captioning_disable">폐쇄 자막 넣기 비활성화</string>
+  <string name="lb_playback_controls_closed_captioning_enable">폐쇄 자막 넣기 활성화</string>
 </resources>
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
@@ -60,8 +60,8 @@ android {
         applicationId "com.liskovsoft.smarttubetv"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 1737
-        versionName "25.47"
+        versionCode 1740
+        versionName "25.50"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
+1 −1		SharedModules
+3 −0		googleapi/src/main/java/com/liskovsoft/googleapi/youtubedata3/YouTubeDataApi.kt
+7 −0		googleapi/src/main/java/com/liskovsoft/googleapi/youtubedata3/YouTubeDataServiceInt.kt
+3 −1		googleapi/src/main/java/com/liskovsoft/googleapi/youtubedata3/data/SnippetResponseHelper.kt
+1 −1		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/browse/v2/BrowseService2.kt
+41 −10		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/browse/v2/BrowseService2Wrapper.kt
+82 −14		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/playlist/PlaylistServiceWrapper.java
+16 −0		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/playlistgroups/PlaylistGroupServiceImpl.kt
+4 −1		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/service/YouTubeContentService.java