From 9e57195e14cf84567e46fee7445332c36b450972 Mon Sep 17 00:00:00 2001 From: Stypox Date: Mon, 6 Apr 2020 21:07:16 +0200 Subject: [PATCH] Fix checkstyle issues Also replace all tabs with 4 spaces --- .../newpipe/download/DownloadDialog.java | 4 +- .../fragments/detail/VideoDetailFragment.java | 3 +- .../newpipe/player/PopupVideoPlayer.java | 1 - .../settings/SelectChannelFragment.java | 2 +- .../newpipe/settings/SelectKioskFragment.java | 2 +- .../schabi/newpipe/util/KioskTranslator.java | 2 +- .../progress_soundcloud_horizontal_dark.xml | 22 +-- .../progress_soundcloud_horizontal_light.xml | 24 +-- .../progress_youtube_horizontal_dark.xml | 24 +-- .../progress_youtube_horizontal_light.xml | 24 +-- .../res/layout/list_playlist_grid_item.xml | 128 ++++++------- .../main/res/layout/list_stream_grid_item.xml | 168 ++++++++--------- .../layout/list_stream_playlist_grid_item.xml | 172 +++++++++--------- app/src/main/res/layout/mission_item.xml | 162 ++++++++--------- .../main/res/layout/mission_item_linear.xml | 136 +++++++------- app/src/main/res/layout/missions.xml | 22 +-- app/src/main/res/menu/dialog_url.xml | 16 +- 17 files changed, 455 insertions(+), 457 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java index e145888a2..cad0258da 100644 --- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java +++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java @@ -396,13 +396,11 @@ public class DownloadDialog extends DialogFragment Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]"); } - boolean isLight = ThemeHelper.isLightThemeSelected(getActivity()); - toolbar.setTitle(R.string.download_dialog_title); toolbar.setNavigationIcon( ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_arrow_back)); toolbar.inflateMenu(R.menu.dialog_url); - toolbar.setNavigationOnClickListener(v -> getDialog().dismiss()); + toolbar.setNavigationOnClickListener(v -> requireDialog().dismiss()); toolbar.setNavigationContentDescription(R.string.cancel); okButton = toolbar.findViewById(R.id.okay); 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 317f30a48..665d5a635 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 @@ -1078,7 +1078,8 @@ public class VideoDetailFragment extends BaseStateFragment return; } - thumbnailImageView.setImageDrawable(AppCompatResources.getDrawable(requireContext(), imageResource)); + thumbnailImageView.setImageDrawable( + AppCompatResources.getDrawable(requireContext(), imageResource)); animateView(thumbnailImageView, false, 0, 0, () -> animateView(thumbnailImageView, true, 500)); } diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java index c2d7c389e..7a5faf31d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java @@ -53,7 +53,6 @@ import android.widget.SeekBar; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.appcompat.content.res.AppCompatResources; import androidx.core.app.NotificationCompat; import com.google.android.exoplayer2.C; diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java index 9c4b5229a..5b452430b 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java @@ -86,7 +86,7 @@ public class SelectChannelFragment extends DialogFragment { //////////////////////////////////////////////////////////////////////////*/ @Override - public void onCreate(@Nullable Bundle savedInstanceState) { + public void onCreate(@Nullable final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext())); } diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java index 98f133a7c..4df70ccec 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java @@ -68,7 +68,7 @@ public class SelectKioskFragment extends DialogFragment { //////////////////////////////////////////////////////////////////////////*/ @Override - public void onCreate(@Nullable Bundle savedInstanceState) { + public void onCreate(@Nullable final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext())); } diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java index ecc6e6b59..b676a1a88 100644 --- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java +++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java @@ -49,7 +49,7 @@ public final class KioskTranslator { } } - public static int getKioskIcons(final String kioskId, final Context c) { + public static int getKioskIcon(final String kioskId, final Context c) { switch (kioskId) { case "Trending": case "Top 50": diff --git a/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml b/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml index 1ec9f67b6..bf6a3ae23 100644 --- a/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml +++ b/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml b/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml index c326c5c04..0b3000de0 100644 --- a/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml +++ b/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml b/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml index 404410f98..7f4520eb8 100644 --- a/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml +++ b/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_youtube_horizontal_light.xml b/app/src/main/res/drawable/progress_youtube_horizontal_light.xml index 120a6e5fb..d1556de91 100644 --- a/app/src/main/res/drawable/progress_youtube_horizontal_light.xml +++ b/app/src/main/res/drawable/progress_youtube_horizontal_light.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_playlist_grid_item.xml b/app/src/main/res/layout/list_playlist_grid_item.xml index 82dc0be11..4100ba39f 100644 --- a/app/src/main/res/layout/list_playlist_grid_item.xml +++ b/app/src/main/res/layout/list_playlist_grid_item.xml @@ -1,72 +1,72 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/itemRoot" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:padding="@dimen/video_item_search_padding"> - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml index 2850c6125..27c69aee8 100644 --- a/app/src/main/res/layout/list_stream_grid_item.xml +++ b/app/src/main/res/layout/list_stream_grid_item.xml @@ -1,94 +1,94 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/itemRoot" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:padding="@dimen/video_item_search_padding"> - + - + - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml index f96b0eaf7..2b578e2f2 100644 --- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml +++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml @@ -1,96 +1,96 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/itemRoot" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:padding="@dimen/video_item_search_padding"> - + - + - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/mission_item.xml b/app/src/main/res/layout/mission_item.xml index 5bc903576..781fd036b 100644 --- a/app/src/main/res/layout/mission_item.xml +++ b/app/src/main/res/layout/mission_item.xml @@ -1,86 +1,86 @@ - - - - - - - - + + + + + + + + - - - - + + - - - - - - + + + + + + diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml index bcfcea8e2..0916fc5e1 100644 --- a/app/src/main/res/layout/mission_item_linear.xml +++ b/app/src/main/res/layout/mission_item_linear.xml @@ -1,79 +1,79 @@ - - + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_height="wrap_content" + android:layout_width="match_parent"> - + + - + - + - + - - + diff --git a/app/src/main/res/layout/missions.xml b/app/src/main/res/layout/missions.xml index b99824a22..81eaeb9b3 100644 --- a/app/src/main/res/layout/missions.xml +++ b/app/src/main/res/layout/missions.xml @@ -1,17 +1,17 @@ + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> - + - + diff --git a/app/src/main/res/menu/dialog_url.xml b/app/src/main/res/menu/dialog_url.xml index 919ddf368..2fb210b56 100644 --- a/app/src/main/res/menu/dialog_url.xml +++ b/app/src/main/res/menu/dialog_url.xml @@ -1,10 +1,10 @@ - - - + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + +