From e548905873d691295e2c53dbae418434412a42e0 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 27 Jun 2022 19:02:10 +0200 Subject: [PATCH 1/6] title in fullscreen --- .../libretube/fragments/PlayerFragment.kt | 26 ++++++++++++++----- .../layout/exo_styled_player_control_view.xml | 11 ++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index 1f81707c6..0264319c0 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -267,8 +267,13 @@ class PlayerFragment : Fragment() { toggleComments() } - // FullScreen button trigger + val fullScreenButton = view.findViewById(R.id.fullscreen) + val exoTitle = view.findViewById(R.id.exo_title) + val mainContainer = view.findViewById(R.id.main_container) + val linLayout = view.findViewById(R.id.linLayout) + + // FullScreen button trigger fullScreenButton.setOnClickListener { exoPlayerView.hideController() if (!isFullScreen) { @@ -276,24 +281,29 @@ class PlayerFragment : Fragment() { getConstraintSet(R.id.start).constrainHeight(R.id.player, -1) enableTransition(R.id.yt_transition, false) } - view.findViewById(R.id.main_container).isClickable = true - view.findViewById(R.id.linLayout).visibility = View.GONE + + mainContainer.isClickable = true + linLayout.visibility = View.GONE fullScreenButton.setImageResource(R.drawable.ic_fullscreen_exit) + exoTitle.visibility = View.VISIBLE + val mainActivity = activity as MainActivity mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE - isFullScreen = true } else { with(motionLayout) { getConstraintSet(R.id.start).constrainHeight(R.id.player, 0) enableTransition(R.id.yt_transition, true) } - view.findViewById(R.id.main_container).isClickable = false - view.findViewById(R.id.linLayout).visibility = View.VISIBLE + + mainContainer.isClickable = false + linLayout.visibility = View.VISIBLE fullScreenButton.setImageResource(R.drawable.ic_fullscreen) + exoTitle.visibility = View.GONE + val mainActivity = activity as MainActivity mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT - isFullScreen = false } + isFullScreen = !isFullScreen } // switching between original aspect ratio (black bars) and zoomed to fill device screen @@ -564,6 +574,8 @@ class PlayerFragment : Fragment() { view.findViewById(R.id.player_title).text = response.title view.findViewById(R.id.player_description).text = response.description + view.findViewById(R.id.exo_title).text = response.title + // Listener for play and pause icon change exoPlayer.addListener(object : Player.Listener { override fun onIsPlayingChanged(isPlaying: Boolean) { diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml index 6c1566c57..41397298b 100644 --- a/app/src/main/res/layout/exo_styled_player_control_view.xml +++ b/app/src/main/res/layout/exo_styled_player_control_view.xml @@ -63,6 +63,17 @@ android:src="@drawable/ic_unlocked" android:padding="@dimen/exo_icon_padding" android:background="#00FFFFFF" /> + + Date: Mon, 27 Jun 2022 19:13:31 +0200 Subject: [PATCH 2/6] player UI improvements --- .../libretube/fragments/PlayerFragment.kt | 5 +-- .../layout/exo_styled_player_control_view.xml | 40 ++++++++++++------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index 0264319c0..87f7bdf55 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -267,7 +267,6 @@ class PlayerFragment : Fragment() { toggleComments() } - val fullScreenButton = view.findViewById(R.id.fullscreen) val exoTitle = view.findViewById(R.id.exo_title) val mainContainer = view.findViewById(R.id.main_container) @@ -298,7 +297,7 @@ class PlayerFragment : Fragment() { mainContainer.isClickable = false linLayout.visibility = View.VISIBLE fullScreenButton.setImageResource(R.drawable.ic_fullscreen) - exoTitle.visibility = View.GONE + exoTitle.visibility = View.INVISIBLE val mainActivity = activity as MainActivity mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT @@ -770,7 +769,7 @@ class PlayerFragment : Fragment() { val defres = PreferenceHelper.getString(requireContext(), "default_res", "")!! val qualityText = view.findViewById(R.id.quality_text) - val qualitySelect = view.findViewById(R.id.quality_select) + val qualitySelect = view.findViewById(R.id.quality_linLayout) var videosNameArray: Array = arrayOf() var videosUrlArray: Array = arrayOf() diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml index 41397298b..8392a9631 100644 --- a/app/src/main/res/layout/exo_styled_player_control_view.xml +++ b/app/src/main/res/layout/exo_styled_player_control_view.xml @@ -27,7 +27,7 @@ android:layout_height="0dp" android:background="@color/exo_black_opacity_60" /> - - + + + + @@ -113,9 +121,11 @@ android:padding="@dimen/exo_icon_padding" android:background="#00FFFFFF" app:tint="@android:color/white" /> + + - + Date: Mon, 27 Jun 2022 19:16:22 +0200 Subject: [PATCH 3/6] quality select fix --- app/src/main/res/layout/exo_styled_player_control_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml index 8392a9631..a5b9eef0b 100644 --- a/app/src/main/res/layout/exo_styled_player_control_view.xml +++ b/app/src/main/res/layout/exo_styled_player_control_view.xml @@ -113,13 +113,12 @@ android:text="HLS" android:textColor="#FFFFFF" /> - From 0f5f4b459c4afd1489d6a9bf168c5c9d69fcae66 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 27 Jun 2022 19:17:52 +0200 Subject: [PATCH 4/6] code reformat --- app/src/main/AndroidManifest.xml | 118 +++++++-------- app/src/main/res/drawable/ic_add.xml | 4 +- app/src/main/res/drawable/ic_arrow_down.xml | 4 +- .../main/res/drawable/ic_arrow_up_down.xml | 6 +- app/src/main/res/drawable/ic_aspect_ratio.xml | 10 +- app/src/main/res/drawable/ic_bell.xml | 4 +- app/src/main/res/drawable/ic_bell_small.xml | 4 +- app/src/main/res/drawable/ic_block.xml | 4 +- app/src/main/res/drawable/ic_campaign.xml | 4 +- app/src/main/res/drawable/ic_close.xml | 4 +- app/src/main/res/drawable/ic_color.xml | 4 +- app/src/main/res/drawable/ic_delete.xml | 4 +- app/src/main/res/drawable/ic_download.xml | 4 +- .../main/res/drawable/ic_download_filled.xml | 4 +- .../main/res/drawable/ic_empty_playlist.xml | 8 +- app/src/main/res/drawable/ic_filter.xml | 4 +- app/src/main/res/drawable/ic_frame.xml | 4 +- .../main/res/drawable/ic_fullscreen_exit.xml | 10 +- app/src/main/res/drawable/ic_grid.xml | 4 +- app/src/main/res/drawable/ic_hd.xml | 4 +- app/src/main/res/drawable/ic_hearted.xml | 4 +- .../main/res/drawable/ic_history_filled.xml | 4 +- app/src/main/res/drawable/ic_home.xml | 8 +- .../main/res/drawable/ic_home_outlined.xml | 4 +- app/src/main/res/drawable/ic_info.xml | 4 +- app/src/main/res/drawable/ic_library.xml | 8 +- app/src/main/res/drawable/ic_license.xml | 4 +- app/src/main/res/drawable/ic_like.xml | 4 +- app/src/main/res/drawable/ic_list.xml | 4 +- app/src/main/res/drawable/ic_login.xml | 12 +- app/src/main/res/drawable/ic_login_filled.xml | 4 +- app/src/main/res/drawable/ic_no_wifi.xml | 4 +- app/src/main/res/drawable/ic_pause.xml | 4 +- app/src/main/res/drawable/ic_pause_filled.xml | 4 +- app/src/main/res/drawable/ic_pinned.xml | 8 +- app/src/main/res/drawable/ic_play_filled.xml | 4 +- app/src/main/res/drawable/ic_playlist.xml | 10 +- app/src/main/res/drawable/ic_region.xml | 4 +- app/src/main/res/drawable/ic_save.xml | 4 +- app/src/main/res/drawable/ic_search.xml | 10 +- app/src/main/res/drawable/ic_server.xml | 4 +- app/src/main/res/drawable/ic_share.xml | 4 +- app/src/main/res/drawable/ic_skip.xml | 4 +- app/src/main/res/drawable/ic_speed.xml | 4 +- app/src/main/res/drawable/ic_sponsorblock.xml | 4 +- .../main/res/drawable/ic_subscriptions.xml | 8 +- app/src/main/res/drawable/ic_theme.xml | 4 +- app/src/main/res/drawable/ic_thumb_up.xml | 4 +- app/src/main/res/drawable/ic_time.xml | 4 +- app/src/main/res/drawable/ic_translate.xml | 4 +- app/src/main/res/drawable/ic_trash.xml | 4 +- app/src/main/res/drawable/ic_trending.xml | 4 +- app/src/main/res/drawable/ic_update.xml | 4 +- app/src/main/res/drawable/ic_upload.xml | 4 +- app/src/main/res/drawable/ic_verified.xml | 4 +- app/src/main/res/drawable/ic_video.xml | 4 +- app/src/main/res/drawable/ic_videocam.xml | 4 +- app/src/main/res/drawable/ic_vlc.xml | 10 +- app/src/main/res/layout/activity_main.xml | 12 +- app/src/main/res/layout/activity_player.xml | 4 +- app/src/main/res/layout/activity_settings.xml | 14 +- .../main/res/layout/channel_search_row.xml | 6 +- .../res/layout/channel_subscription_row.xml | 6 +- app/src/main/res/layout/chapter_column.xml | 8 +- app/src/main/res/layout/comments_row.xml | 28 ++-- .../main/res/layout/dialog_addtoplaylist.xml | 4 +- .../res/layout/dialog_create_playlist.xml | 20 +-- .../res/layout/dialog_custom_instance.xml | 22 +-- .../main/res/layout/dialog_delete_account.xml | 20 +-- app/src/main/res/layout/dialog_download.xml | 12 +- app/src/main/res/layout/dialog_login.xml | 22 +-- app/src/main/res/layout/dialog_logout.xml | 16 +-- .../layout/exo_styled_player_control_view.xml | 136 +++++++++--------- app/src/main/res/layout/fragment_channel.xml | 30 ++-- app/src/main/res/layout/fragment_home.xml | 4 +- app/src/main/res/layout/fragment_library.xml | 4 +- app/src/main/res/layout/fragment_playlist.xml | 12 +- app/src/main/res/layout/fragment_search.xml | 12 +- .../res/layout/fragment_subscriptions.xml | 4 +- .../main/res/layout/playlist_search_row.xml | 8 +- app/src/main/res/layout/playlists_row.xml | 16 +-- app/src/main/res/layout/replies_row.xml | 28 ++-- app/src/main/res/layout/searchhistory_row.xml | 10 +- .../main/res/layout/searchsuggestion_row.xml | 10 +- app/src/main/res/menu/action_bar.xml | 4 +- app/src/main/res/menu/bottom_menu.xml | 12 +- app/src/main/res/xml/activity_main_scene.xml | 16 +-- app/src/main/res/xml/player_scene.xml | 82 +++++------ app/src/main/res/xml/player_settings.xml | 8 +- .../main/res/xml/sponsorblock_settings.xml | 44 +++--- 90 files changed, 520 insertions(+), 520 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88ea6ba64..8f5d7d3c2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,32 +11,32 @@ + android:theme="@style/Theme.Purple"> + android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> + android:supportsPictureInPicture="true"> @@ -44,16 +44,16 @@ + android:icon="@mipmap/ic_gradient" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_gradient_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -61,16 +61,16 @@ + android:icon="@mipmap/ic_fire" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_fire_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -78,16 +78,16 @@ + android:icon="@mipmap/ic_flame" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_flame_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -95,16 +95,16 @@ + android:icon="@mipmap/ic_shaped" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_shaped_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -112,16 +112,16 @@ + android:icon="@mipmap/ic_torch" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_torch_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -129,16 +129,16 @@ + android:icon="@mipmap/ic_legacy" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_legacy_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> @@ -146,16 +146,16 @@ + android:icon="@mipmap/ic_bird" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_bird_round" + android:supportsPictureInPicture="true" + android:targetActivity=".MainActivity"> diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 0dbf2e57a..9460f4eaa 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml index 10cedc2e3..68fd4058e 100644 --- a/app/src/main/res/drawable/ic_arrow_down.xml +++ b/app/src/main/res/drawable/ic_arrow_down.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrow_up_down.xml index aa33a09e8..4b0da4369 100644 --- a/app/src/main/res/drawable/ic_arrow_up_down.xml +++ b/app/src/main/res/drawable/ic_arrow_up_down.xml @@ -1,9 +1,9 @@ + android:viewportHeight="160"> diff --git a/app/src/main/res/drawable/ic_aspect_ratio.xml b/app/src/main/res/drawable/ic_aspect_ratio.xml index 4f2bff3ea..e7b7cbba1 100644 --- a/app/src/main/res/drawable/ic_aspect_ratio.xml +++ b/app/src/main/res/drawable/ic_aspect_ratio.xml @@ -1,9 +1,9 @@ - + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_bell.xml b/app/src/main/res/drawable/ic_bell.xml index a65a68661..458ed83e0 100644 --- a/app/src/main/res/drawable/ic_bell.xml +++ b/app/src/main/res/drawable/ic_bell.xml @@ -4,7 +4,7 @@ android:viewportWidth="18" android:viewportHeight="20"> + android:fillType="evenOdd" + android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z" /> diff --git a/app/src/main/res/drawable/ic_bell_small.xml b/app/src/main/res/drawable/ic_bell_small.xml index c9f18e09d..2df32bee1 100644 --- a/app/src/main/res/drawable/ic_bell_small.xml +++ b/app/src/main/res/drawable/ic_bell_small.xml @@ -4,7 +4,7 @@ android:viewportWidth="18" android:viewportHeight="20"> + android:fillType="evenOdd" + android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z" /> diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml index bae4d16c2..6dca0e37e 100644 --- a/app/src/main/res/drawable/ic_block.xml +++ b/app/src/main/res/drawable/ic_block.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml index 9a5eb603d..7f22d42a0 100644 --- a/app/src/main/res/drawable/ic_campaign.xml +++ b/app/src/main/res/drawable/ic_campaign.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml index 3b3c877a9..f96401501 100644 --- a/app/src/main/res/drawable/ic_close.xml +++ b/app/src/main/res/drawable/ic_close.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_color.xml b/app/src/main/res/drawable/ic_color.xml index a42e26a0a..ae57a36aa 100644 --- a/app/src/main/res/drawable/ic_color.xml +++ b/app/src/main/res/drawable/ic_color.xml @@ -1,9 +1,9 @@ + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 1726235a5..05fc2abd8 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_download_filled.xml b/app/src/main/res/drawable/ic_download_filled.xml index 4e586a0eb..6d5b1302c 100644 --- a/app/src/main/res/drawable/ic_download_filled.xml +++ b/app/src/main/res/drawable/ic_download_filled.xml @@ -1,9 +1,9 @@ + android:viewportHeight="300"> diff --git a/app/src/main/res/drawable/ic_empty_playlist.xml b/app/src/main/res/drawable/ic_empty_playlist.xml index 3b7371ebc..5e92611a9 100644 --- a/app/src/main/res/drawable/ic_empty_playlist.xml +++ b/app/src/main/res/drawable/ic_empty_playlist.xml @@ -1,11 +1,11 @@ + android:viewportHeight="144"> + android:strokeWidth="1" /> diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml index 0761dca14..52d959093 100644 --- a/app/src/main/res/drawable/ic_filter.xml +++ b/app/src/main/res/drawable/ic_filter.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_frame.xml b/app/src/main/res/drawable/ic_frame.xml index a665fed39..7f0e915ba 100644 --- a/app/src/main/res/drawable/ic_frame.xml +++ b/app/src/main/res/drawable/ic_frame.xml @@ -1,9 +1,9 @@ + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml index 27064c626..12719f5b4 100644 --- a/app/src/main/res/drawable/ic_fullscreen_exit.xml +++ b/app/src/main/res/drawable/ic_fullscreen_exit.xml @@ -1,9 +1,9 @@ - + android:height="24dp" + android:tint="@android:color/white" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_grid.xml b/app/src/main/res/drawable/ic_grid.xml index add61c29f..c37661f36 100644 --- a/app/src/main/res/drawable/ic_grid.xml +++ b/app/src/main/res/drawable/ic_grid.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml index 752aa24d1..7c4595403 100644 --- a/app/src/main/res/drawable/ic_hd.xml +++ b/app/src/main/res/drawable/ic_hd.xml @@ -1,9 +1,9 @@ + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_hearted.xml b/app/src/main/res/drawable/ic_hearted.xml index 026c4821e..604628cc2 100644 --- a/app/src/main/res/drawable/ic_hearted.xml +++ b/app/src/main/res/drawable/ic_hearted.xml @@ -4,6 +4,6 @@ android:viewportWidth="66.911" android:viewportHeight="66.911"> + android:fillColor="#E34326" + android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z" /> diff --git a/app/src/main/res/drawable/ic_history_filled.xml b/app/src/main/res/drawable/ic_history_filled.xml index b191e731a..253ae05ac 100644 --- a/app/src/main/res/drawable/ic_history_filled.xml +++ b/app/src/main/res/drawable/ic_history_filled.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 7eb8f98dd..20c5ae8c5 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -1,9 +1,9 @@ + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="48" + android:viewportHeight="48"> + android:viewportHeight="48"> + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml index f49974c03..e623e5d3c 100644 --- a/app/src/main/res/drawable/ic_library.xml +++ b/app/src/main/res/drawable/ic_library.xml @@ -1,9 +1,9 @@ + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="48" + android:viewportHeight="48"> + android:viewportHeight="96"> + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml index 4ca7cd869..ed656a508 100644 --- a/app/src/main/res/drawable/ic_list.xml +++ b/app/src/main/res/drawable/ic_list.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml index aff40998d..40a327adf 100644 --- a/app/src/main/res/drawable/ic_login.xml +++ b/app/src/main/res/drawable/ic_login.xml @@ -1,14 +1,14 @@ + android:viewportHeight="24"> + android:strokeLineCap="round" + android:strokeLineJoin="round" /> diff --git a/app/src/main/res/drawable/ic_login_filled.xml b/app/src/main/res/drawable/ic_login_filled.xml index 3446db2fd..a4f99155a 100644 --- a/app/src/main/res/drawable/ic_login_filled.xml +++ b/app/src/main/res/drawable/ic_login_filled.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_no_wifi.xml b/app/src/main/res/drawable/ic_no_wifi.xml index b984b8dbc..8d8b7777a 100644 --- a/app/src/main/res/drawable/ic_no_wifi.xml +++ b/app/src/main/res/drawable/ic_no_wifi.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml index 7e8a3e2ad..645e31d2c 100644 --- a/app/src/main/res/drawable/ic_pause.xml +++ b/app/src/main/res/drawable/ic_pause.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pause_filled.xml b/app/src/main/res/drawable/ic_pause_filled.xml index 98cc2172d..39b09cf20 100644 --- a/app/src/main/res/drawable/ic_pause_filled.xml +++ b/app/src/main/res/drawable/ic_pause_filled.xml @@ -1,9 +1,9 @@ + android:viewportHeight="300"> diff --git a/app/src/main/res/drawable/ic_pinned.xml b/app/src/main/res/drawable/ic_pinned.xml index e08649fa0..5519b88fa 100644 --- a/app/src/main/res/drawable/ic_pinned.xml +++ b/app/src/main/res/drawable/ic_pinned.xml @@ -1,11 +1,11 @@ + android:viewportHeight="24"> + android:fillType="evenOdd" + android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" /> diff --git a/app/src/main/res/drawable/ic_play_filled.xml b/app/src/main/res/drawable/ic_play_filled.xml index f3e089124..952f0be6c 100644 --- a/app/src/main/res/drawable/ic_play_filled.xml +++ b/app/src/main/res/drawable/ic_play_filled.xml @@ -1,9 +1,9 @@ + android:viewportHeight="485.74"> diff --git a/app/src/main/res/drawable/ic_playlist.xml b/app/src/main/res/drawable/ic_playlist.xml index 24d17c426..c96251991 100644 --- a/app/src/main/res/drawable/ic_playlist.xml +++ b/app/src/main/res/drawable/ic_playlist.xml @@ -1,9 +1,9 @@ - + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_region.xml b/app/src/main/res/drawable/ic_region.xml index c311f9af4..68c610189 100644 --- a/app/src/main/res/drawable/ic_region.xml +++ b/app/src/main/res/drawable/ic_region.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml index 602bb91b5..6a9620b07 100644 --- a/app/src/main/res/drawable/ic_save.xml +++ b/app/src/main/res/drawable/ic_save.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 451a03301..f13841ac2 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -1,9 +1,9 @@ - + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml index 05c9d5b44..e7cb848fa 100644 --- a/app/src/main/res/drawable/ic_server.xml +++ b/app/src/main/res/drawable/ic_server.xml @@ -1,9 +1,9 @@ + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index 36897c94c..76837ec84 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -1,9 +1,9 @@ + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_skip.xml b/app/src/main/res/drawable/ic_skip.xml index d88b792d4..1594f7d64 100644 --- a/app/src/main/res/drawable/ic_skip.xml +++ b/app/src/main/res/drawable/ic_skip.xml @@ -1,9 +1,9 @@ + android:viewportHeight="32"> + android:viewportHeight="512"> diff --git a/app/src/main/res/drawable/ic_sponsorblock.xml b/app/src/main/res/drawable/ic_sponsorblock.xml index c16db6ea8..afe0e720b 100644 --- a/app/src/main/res/drawable/ic_sponsorblock.xml +++ b/app/src/main/res/drawable/ic_sponsorblock.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_subscriptions.xml b/app/src/main/res/drawable/ic_subscriptions.xml index f877314b4..10574772e 100644 --- a/app/src/main/res/drawable/ic_subscriptions.xml +++ b/app/src/main/res/drawable/ic_subscriptions.xml @@ -1,9 +1,9 @@ + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="48" + android:viewportHeight="48"> + android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml index f55183f28..146f85cee 100644 --- a/app/src/main/res/drawable/ic_thumb_up.xml +++ b/app/src/main/res/drawable/ic_thumb_up.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml index 120a2b142..fe85b1f50 100644 --- a/app/src/main/res/drawable/ic_time.xml +++ b/app/src/main/res/drawable/ic_time.xml @@ -1,9 +1,9 @@ + android:viewportHeight="60"> diff --git a/app/src/main/res/drawable/ic_translate.xml b/app/src/main/res/drawable/ic_translate.xml index 92291014a..6da4f4e5e 100644 --- a/app/src/main/res/drawable/ic_translate.xml +++ b/app/src/main/res/drawable/ic_translate.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_trending.xml b/app/src/main/res/drawable/ic_trending.xml index fbcf2a478..536738d66 100644 --- a/app/src/main/res/drawable/ic_trending.xml +++ b/app/src/main/res/drawable/ic_trending.xml @@ -1,9 +1,9 @@ + android:viewportHeight="52"> diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index f175850f5..ca962aa07 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -1,9 +1,9 @@ + android:viewportHeight="420.83"> + android:viewportHeight="300"> diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml index d7bd40fba..cc83f3eda 100644 --- a/app/src/main/res/drawable/ic_verified.xml +++ b/app/src/main/res/drawable/ic_verified.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml index ca1dce23e..16fefb228 100644 --- a/app/src/main/res/drawable/ic_video.xml +++ b/app/src/main/res/drawable/ic_video.xml @@ -1,9 +1,9 @@ + android:viewportHeight="512"> diff --git a/app/src/main/res/drawable/ic_videocam.xml b/app/src/main/res/drawable/ic_videocam.xml index e91a47788..f3699e8ab 100644 --- a/app/src/main/res/drawable/ic_videocam.xml +++ b/app/src/main/res/drawable/ic_videocam.xml @@ -1,9 +1,9 @@ + android:viewportHeight="28"> diff --git a/app/src/main/res/drawable/ic_vlc.xml b/app/src/main/res/drawable/ic_vlc.xml index db03e26e9..074c57662 100644 --- a/app/src/main/res/drawable/ic_vlc.xml +++ b/app/src/main/res/drawable/ic_vlc.xml @@ -1,9 +1,9 @@ - + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="1000" + android:viewportHeight="1000"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b30527a37..aed494ea4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,21 +2,21 @@ + tools:context=".MainActivity"> @@ -44,9 +44,9 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/transparent" android:elevation="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - android:background="@android:color/transparent" /> + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml index 35f81a257..c9851ab3f 100644 --- a/app/src/main/res/layout/activity_player.xml +++ b/app/src/main/res/layout/activity_player.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".util.Player" - android:background="@android:color/black"> + android:background="@android:color/black" + tools:context=".util.Player"> + android:text="@string/settings" + android:textSize="20sp" /> + android:layout_height="match_parent" + android:orientation="vertical" /> \ No newline at end of file diff --git a/app/src/main/res/layout/channel_search_row.xml b/app/src/main/res/layout/channel_search_row.xml index bd82790a1..c52c4c0cd 100644 --- a/app/src/main/res/layout/channel_search_row.xml +++ b/app/src/main/res/layout/channel_search_row.xml @@ -16,10 +16,10 @@ @@ -29,9 +29,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="10dp" - android:textSize="16sp" + android:ellipsize="end" android:maxLines="1" - android:ellipsize="end" /> + android:textSize="16sp" /> @@ -35,7 +35,7 @@ android:layout_alignParentEnd="true" android:backgroundTint="?attr/colorOnPrimary" android:text="@string/unsubscribe" - android:textSize="11dp" android:textColor="?android:attr/textColorPrimary" + android:textSize="11dp" app:cornerRadius="20dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/chapter_column.xml b/app/src/main/res/layout/chapter_column.xml index 4f5171ea4..bc9a2f45d 100644 --- a/app/src/main/res/layout/chapter_column.xml +++ b/app/src/main/res/layout/chapter_column.xml @@ -1,9 +1,9 @@ + android:layout_height="wrap_content" + android:layout_marginHorizontal="10dp" + android:orientation="vertical"> diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml index d764f3b71..a694c0029 100644 --- a/app/src/main/res/layout/comments_row.xml +++ b/app/src/main/res/layout/comments_row.xml @@ -2,8 +2,8 @@ + android:layout_height="wrap_content" + android:background="?android:attr/selectableItemBackground"> + android:paddingBottom="16dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:layout_marginTop="4dp" + android:visibility="gone" + app:srcCompat="@drawable/ic_verified" /> + android:layout_marginTop="4dp" + android:visibility="gone" + app:srcCompat="@drawable/ic_pinned" /> + android:visibility="gone" + app:srcCompat="@drawable/ic_hearted" /> diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml index f8bbb2632..04e3bc172 100644 --- a/app/src/main/res/layout/dialog_addtoplaylist.xml +++ b/app/src/main/res/layout/dialog_addtoplaylist.xml @@ -22,8 +22,8 @@