From 9e57195e14cf84567e46fee7445332c36b450972 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
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<StreamInfo>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
- <shape>
- <solid android:color="@color/dark_ripple_color" />
- </shape>
- </item>
- <item android:id="@android:id/progress">
- <clip>
- <shape>
- <solid android:color="@color/dark_soundcloud_primary_color" />
- </shape>
- </clip>
- </item>
+ <shape>
+ <solid android:color="@color/dark_ripple_color" />
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/dark_soundcloud_primary_color" />
+ </shape>
+ </clip>
+ </item>
</layer-list>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@android:id/background">
- <shape>
- <solid android:color="@color/light_ripple_color" />
- </shape>
- </item>
- <item android:id="@android:id/progress">
- <clip>
- <shape>
- <solid android:color="@color/light_soundcloud_primary_color" />
- </shape>
- </clip>
- </item>
+ <item android:id="@android:id/background">
+ <shape>
+ <solid android:color="@color/light_ripple_color" />
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/light_soundcloud_primary_color" />
+ </shape>
+ </clip>
+ </item>
</layer-list>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@android:id/background">
- <shape>
- <solid android:color="@color/dark_ripple_color" />
- </shape>
- </item>
- <item android:id="@android:id/progress">
- <clip>
- <shape>
- <solid android:color="@color/dark_youtube_primary_color" />
- </shape>
- </clip>
- </item>
+ <item android:id="@android:id/background">
+ <shape>
+ <solid android:color="@color/dark_ripple_color" />
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/dark_youtube_primary_color" />
+ </shape>
+ </clip>
+ </item>
</layer-list>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@android:id/background">
- <shape>
- <solid android:color="@color/light_ripple_color" />
- </shape>
- </item>
- <item android:id="@android:id/progress">
- <clip>
- <shape>
- <solid android:color="@color/light_youtube_primary_color" />
- </shape>
- </clip>
- </item>
+ <item android:id="@android:id/background">
+ <shape>
+ <solid android:color="@color/light_ripple_color" />
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/light_youtube_primary_color" />
+ </shape>
+ </clip>
+ </item>
</layer-list>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- 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">
+ 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">
- <ImageView
- android:id="@+id/itemThumbnailView"
- android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
- android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
- android:layout_centerHorizontal="true"
- android:layout_alignParentTop="true"
- android:layout_marginRight="@dimen/video_item_search_image_right_margin"
- android:contentDescription="@string/list_thumbnail_view_description"
- android:scaleType="centerCrop"
- android:src="@drawable/dummy_thumbnail_playlist"
- tools:ignore="RtlHardcoded"/>
+ <ImageView
+ android:id="@+id/itemThumbnailView"
+ android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+ android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+ android:contentDescription="@string/list_thumbnail_view_description"
+ android:scaleType="centerCrop"
+ android:src="@drawable/dummy_thumbnail_playlist"
+ tools:ignore="RtlHardcoded"/>
- <TextView
- android:id="@+id/itemStreamCountView"
- android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
- android:layout_height="match_parent"
- android:layout_alignBottom="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_alignTop="@id/itemThumbnailView"
- android:background="@color/playlist_stream_count_background_color"
- app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
- android:gravity="center"
- android:paddingBottom="14dp"
- android:paddingTop="16dp"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/duration_text_color"
- android:textSize="@dimen/video_item_search_duration_text_size"
- android:textStyle="bold"
- tools:ignore="RtlHardcoded"
- tools:text="314159"/>
+ <TextView
+ android:id="@+id/itemStreamCountView"
+ android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
+ android:layout_height="match_parent"
+ android:layout_alignBottom="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_alignTop="@id/itemThumbnailView"
+ android:background="@color/playlist_stream_count_background_color"
+ app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
+ android:gravity="center"
+ android:paddingBottom="14dp"
+ android:paddingTop="16dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/duration_text_color"
+ android:textSize="@dimen/video_item_search_duration_text_size"
+ android:textStyle="bold"
+ tools:ignore="RtlHardcoded"
+ tools:text="314159"/>
- <TextView
- android:id="@+id/itemTitleView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/itemThumbnailView"
- android:layout_alignLeft="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_marginTop="2dp"
- android:ellipsize="end"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_search_title_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
+ <TextView
+ android:id="@+id/itemTitleView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/itemThumbnailView"
+ android:layout_alignLeft="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_marginTop="2dp"
+ android:ellipsize="end"
+ android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_search_title_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
- <TextView
- android:id="@+id/itemUploaderView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/itemTitleView"
- android:layout_alignLeft="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="@dimen/video_item_search_uploader_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="Uploader"/>
+ <TextView
+ android:id="@+id/itemUploaderView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/itemTitleView"
+ android:layout_alignLeft="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="@dimen/video_item_search_uploader_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="Uploader"/>
</RelativeLayout>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
- 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">
+ 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">
- <ImageView
- android:id="@+id/itemThumbnailView"
- android:layout_centerHorizontal="true"
- android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
- android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
- android:layout_alignParentTop="true"
- android:contentDescription="@string/list_thumbnail_view_description"
- android:scaleType="centerCrop"
- android:src="@drawable/dummy_thumbnail"
- tools:ignore="RtlHardcoded"/>
+ <ImageView
+ android:id="@+id/itemThumbnailView"
+ android:layout_centerHorizontal="true"
+ android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+ android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@string/list_thumbnail_view_description"
+ android:scaleType="centerCrop"
+ android:src="@drawable/dummy_thumbnail"
+ tools:ignore="RtlHardcoded"/>
- <TextView
- android:id="@+id/itemDurationView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_marginBottom="@dimen/video_item_search_duration_margin"
- android:layout_marginRight="@dimen/video_item_search_duration_margin"
- android:background="@color/duration_background_color"
- android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
- android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
- android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
- android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
- android:textAllCaps="true"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/duration_text_color"
- android:textSize="@dimen/video_item_search_duration_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="1:09:10"/>
+ <TextView
+ android:id="@+id/itemDurationView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+ android:layout_marginRight="@dimen/video_item_search_duration_margin"
+ android:background="@color/duration_background_color"
+ android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+ android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+ android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+ android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+ android:textAllCaps="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/duration_text_color"
+ android:textSize="@dimen/video_item_search_duration_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="1:09:10"/>
- <TextView
- android:id="@+id/itemVideoTitleView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/itemThumbnailView"
- android:layout_alignLeft="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:ellipsize="end"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_search_title_text_size"
- tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"
- android:layout_alignEnd="@id/itemThumbnailView" />
+ <TextView
+ android:id="@+id/itemVideoTitleView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/itemThumbnailView"
+ android:layout_alignLeft="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:ellipsize="end"
+ android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_search_title_text_size"
+ tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"
+ android:layout_alignEnd="@id/itemThumbnailView" />
- <TextView
- android:id="@+id/itemUploaderView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/itemVideoTitleView"
- android:layout_alignLeft="@id/itemVideoTitleView"
- android:layout_alignRight="@id/itemVideoTitleView"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="@dimen/video_item_search_uploader_text_size"
- tools:text="Uploader"/>
+ <TextView
+ android:id="@+id/itemUploaderView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/itemVideoTitleView"
+ android:layout_alignLeft="@id/itemVideoTitleView"
+ android:layout_alignRight="@id/itemVideoTitleView"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="@dimen/video_item_search_uploader_text_size"
+ tools:text="Uploader"/>
- <TextView
- android:id="@+id/itemAdditionalDetails"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/itemUploaderView"
- android:layout_alignStart="@id/itemUploaderView"
- android:layout_alignEnd="@id/itemUploaderView"
- android:ellipsize="end"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="@dimen/video_item_search_upload_date_text_size"
- tools:text="2 years ago • 10M views"/>
+ <TextView
+ android:id="@+id/itemAdditionalDetails"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/itemUploaderView"
+ android:layout_alignStart="@id/itemUploaderView"
+ android:layout_alignEnd="@id/itemUploaderView"
+ android:ellipsize="end"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="@dimen/video_item_search_upload_date_text_size"
+ tools:text="2 years ago • 10M views"/>
- <org.schabi.newpipe.views.AnimatedProgressBar
- android:id="@+id/itemProgressView"
- style="@style/Widget.AppCompat.ProgressBar.Horizontal"
- android:progressDrawable="?progress_horizontal_drawable"
- android:layout_width="wrap_content"
- android:layout_height="4dp"
- android:layout_marginTop="-2dp"
- android:layout_alignStart="@id/itemThumbnailView"
- android:layout_alignEnd="@id/itemThumbnailView"
- android:layout_below="@id/itemThumbnailView"/>
+ <org.schabi.newpipe.views.AnimatedProgressBar
+ android:id="@+id/itemProgressView"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:progressDrawable="?progress_horizontal_drawable"
+ android:layout_width="wrap_content"
+ android:layout_height="4dp"
+ android:layout_marginTop="-2dp"
+ android:layout_alignStart="@id/itemThumbnailView"
+ android:layout_alignEnd="@id/itemThumbnailView"
+ android:layout_below="@id/itemThumbnailView"/>
</RelativeLayout>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- 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">
+ 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">
- <ImageView
- android:id="@+id/itemThumbnailView"
- android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
- android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginRight="@dimen/video_item_search_image_right_margin"
- android:contentDescription="@string/list_thumbnail_view_description"
- android:scaleType="centerCrop"
- android:src="@drawable/dummy_thumbnail"
- tools:ignore="RtlHardcoded" />
+ <ImageView
+ android:id="@+id/itemThumbnailView"
+ android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+ android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+ android:contentDescription="@string/list_thumbnail_view_description"
+ android:scaleType="centerCrop"
+ android:src="@drawable/dummy_thumbnail"
+ tools:ignore="RtlHardcoded" />
- <TextView
- android:id="@+id/itemDurationView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_marginBottom="@dimen/video_item_search_duration_margin"
- android:layout_marginRight="@dimen/video_item_search_duration_margin"
- android:background="@color/duration_background_color"
- android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
- android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
- android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
- android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/duration_text_color"
- android:textSize="@dimen/video_item_search_duration_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="1:09:10" />
+ <TextView
+ android:id="@+id/itemDurationView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+ android:layout_marginRight="@dimen/video_item_search_duration_margin"
+ android:background="@color/duration_background_color"
+ android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+ android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+ android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+ android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/duration_text_color"
+ android:textSize="@dimen/video_item_search_duration_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="1:09:10" />
- <ImageView
- android:id="@+id/itemHandle"
- android:layout_width="wrap_content"
- android:layout_height="55dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentBottom="true"
- android:contentDescription="@string/detail_drag_description"
- android:paddingLeft="@dimen/video_item_search_image_right_margin"
- android:scaleType="center"
- app:srcCompat="?attr/ic_drag_handle"
- tools:ignore="RtlHardcoded,RtlSymmetry" />
+ <ImageView
+ android:id="@+id/itemHandle"
+ android:layout_width="wrap_content"
+ android:layout_height="55dp"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:contentDescription="@string/detail_drag_description"
+ android:paddingLeft="@dimen/video_item_search_image_right_margin"
+ android:scaleType="center"
+ app:srcCompat="?attr/ic_drag_handle"
+ tools:ignore="RtlHardcoded,RtlSymmetry" />
- <TextView
- android:id="@+id/itemVideoTitleView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignEnd="@id/itemThumbnailView"
- android:layout_alignLeft="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_alignStart="@id/itemThumbnailView"
- android:layout_below="@id/itemThumbnailView"
- android:ellipsize="end"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_search_title_text_size"
- tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique..." />
+ <TextView
+ android:id="@+id/itemVideoTitleView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignEnd="@id/itemThumbnailView"
+ android:layout_alignLeft="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_alignStart="@id/itemThumbnailView"
+ android:layout_below="@id/itemThumbnailView"
+ android:ellipsize="end"
+ android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_search_title_text_size"
+ tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique..." />
- <TextView
- android:id="@+id/itemAdditionalDetails"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignEnd="@id/itemThumbnailView"
- android:layout_alignLeft="@id/itemThumbnailView"
- android:layout_alignRight="@id/itemThumbnailView"
- android:layout_alignStart="@id/itemThumbnailView"
- android:layout_below="@+id/itemVideoTitleView"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="@dimen/video_item_search_uploader_text_size"
- tools:text="Uploader" />
+ <TextView
+ android:id="@+id/itemAdditionalDetails"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignEnd="@id/itemThumbnailView"
+ android:layout_alignLeft="@id/itemThumbnailView"
+ android:layout_alignRight="@id/itemThumbnailView"
+ android:layout_alignStart="@id/itemThumbnailView"
+ android:layout_below="@+id/itemVideoTitleView"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="@dimen/video_item_search_uploader_text_size"
+ tools:text="Uploader" />
- <org.schabi.newpipe.views.AnimatedProgressBar
- android:id="@+id/itemProgressView"
- style="@style/Widget.AppCompat.ProgressBar.Horizontal"
- android:progressDrawable="?progress_horizontal_drawable"
- android:layout_width="wrap_content"
- android:layout_height="4dp"
- android:layout_marginTop="-2dp"
- android:layout_alignStart="@id/itemThumbnailView"
- android:layout_alignEnd="@id/itemThumbnailView"
- android:layout_below="@id/itemThumbnailView"/>
+ <org.schabi.newpipe.views.AnimatedProgressBar
+ android:id="@+id/itemProgressView"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:progressDrawable="?progress_horizontal_drawable"
+ android:layout_width="wrap_content"
+ android:layout_height="4dp"
+ android:layout_marginTop="-2dp"
+ android:layout_alignStart="@id/itemThumbnailView"
+ android:layout_alignEnd="@id/itemThumbnailView"
+ android:layout_below="@id/itemThumbnailView"/>
</RelativeLayout>
\ 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 @@
<RelativeLayout
- 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">
-
- <RelativeLayout
- android:id="@+id/item_bkg"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_margin="2dp"
- android:background="@color/bluegray">
-
- <RelativeLayout
- android:id="@+id/item_title_line"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginTop="2dp">
-
- <TextView
- android:id="@+id/item_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="6dp"
- android:singleLine="true"
- android:text="0%"
- android:textSize="20sp"
- android:textColor="@color/white"/>
-
- <ImageView
- style="?attr/buttonBarButtonStyle"
- android:id="@+id/item_more"
- android:layout_width="49dp"
- android:layout_height="49dp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_marginRight="1dp"
- app:srcCompat="@drawable/ic_more_vert_white_24dp"
- android:scaleType="center"
+ 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">
+
+ <RelativeLayout
+ android:id="@+id/item_bkg"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_margin="2dp"
+ android:background="@color/bluegray">
+
+ <RelativeLayout
+ android:id="@+id/item_title_line"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="2dp">
+
+ <TextView
+ android:id="@+id/item_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="6dp"
+ android:singleLine="true"
+ android:text="0%"
+ android:textSize="20sp"
+ android:textColor="@color/white"/>
+
+ <ImageView
+ style="?attr/buttonBarButtonStyle"
+ android:id="@+id/item_more"
+ android:layout_width="49dp"
+ android:layout_height="49dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="1dp"
+ app:srcCompat="@drawable/ic_more_vert_white_24dp"
+ android:scaleType="center"
android:contentDescription="TODO" />
-
- </RelativeLayout>
-
- <ImageView
- android:id="@+id/item_icon"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_below="@id/item_title_line"
- android:layout_centerHorizontal="true"
- android:scaleType="fitXY"
- android:gravity="center"
- android:padding="10dp"
+
+ </RelativeLayout>
+
+ <ImageView
+ android:id="@+id/item_icon"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_below="@id/item_title_line"
+ android:layout_centerHorizontal="true"
+ android:scaleType="fitXY"
+ android:gravity="center"
+ android:padding="10dp"
android:contentDescription="TODO" />
-
- <TextView
- android:id="@+id/item_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/item_icon"
- android:padding="6dp"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:marqueeRepeatLimit="marquee_forever"
- android:scrollHorizontally="true"
- android:text="XXX.xx"
- android:textSize="16sp"
- android:textStyle="bold"
- android:textColor="@color/white"/>
-
- <TextView
- android:id="@+id/item_size"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/item_name"
- android:padding="6dp"
- android:singleLine="true"
- android:text="100.00MB"
- android:textSize="12sp"
- android:textColor="@color/white"/>
-
- </RelativeLayout>
+
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/item_icon"
+ android:padding="6dp"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:text="XXX.xx"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:textColor="@color/white"/>
+
+ <TextView
+ android:id="@+id/item_size"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/item_name"
+ android:padding="6dp"
+ android:singleLine="true"
+ android:text="100.00MB"
+ android:textSize="12sp"
+ android:textColor="@color/white"/>
+
+ </RelativeLayout>
</RelativeLayout>
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 @@
<RelativeLayout
- 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">
-
- <RelativeLayout
- android:id="@+id/item_bkg"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_margin="2dp"
- android:background="@color/bluegray">
+ 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">
- <ImageView
- android:id="@+id/item_icon"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_centerVertical="true"
- android:scaleType="fitXY"
- android:gravity="center"
- android:padding="15dp"
+ <RelativeLayout
+ android:id="@+id/item_bkg"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_margin="2dp"
+ android:background="@color/bluegray">
+
+ <ImageView
+ android:id="@+id/item_icon"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_centerVertical="true"
+ android:scaleType="fitXY"
+ android:gravity="center"
+ android:padding="15dp"
android:contentDescription="TODO" />
- <TextView
- android:id="@+id/item_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_toLeftOf="@+id/item_more"
- android:layout_toRightOf="@id/item_icon"
- android:ellipsize="end"
- android:padding="6dp"
- android:text="XXX.xx"
- android:textColor="@color/white"
- android:textSize="16sp"
- android:textStyle="bold" />
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@+id/item_more"
+ android:layout_toRightOf="@id/item_icon"
+ android:ellipsize="end"
+ android:padding="6dp"
+ android:text="XXX.xx"
+ android:textColor="@color/white"
+ android:textSize="16sp"
+ android:textStyle="bold" />
- <TextView
- android:id="@+id/item_size"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/item_icon"
- android:layout_below="@+id/item_name"
- android:padding="6dp"
- android:singleLine="true"
- android:text="100.00MB"
- android:textSize="12sp"
- android:textColor="@color/white"/>
+ <TextView
+ android:id="@+id/item_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/item_icon"
+ android:layout_below="@+id/item_name"
+ android:padding="6dp"
+ android:singleLine="true"
+ android:text="100.00MB"
+ android:textSize="12sp"
+ android:textColor="@color/white"/>
- <TextView
- android:id="@+id/item_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/item_name"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="5dp"
- android:layout_toLeftOf="@+id/item_more"
- android:layout_toRightOf="@id/item_size"
- android:padding="6dp"
- android:singleLine="true"
- android:textStyle="bold"
- android:text="0%"
- android:textColor="@color/white"
- android:textSize="12sp" />
+ <TextView
+ android:id="@+id/item_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/item_name"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="5dp"
+ android:layout_toLeftOf="@+id/item_more"
+ android:layout_toRightOf="@id/item_size"
+ android:padding="6dp"
+ android:singleLine="true"
+ android:textStyle="bold"
+ android:text="0%"
+ android:textColor="@color/white"
+ android:textSize="12sp" />
- <ImageView
- style="?attr/buttonBarButtonStyle"
- android:id="@+id/item_more"
- android:layout_width="49dp"
- android:layout_height="49dp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_marginRight="4dp"
- app:srcCompat="@drawable/ic_more_vert_white_24dp"
- android:scaleType="centerInside"
+ <ImageView
+ style="?attr/buttonBarButtonStyle"
+ android:id="@+id/item_more"
+ android:layout_width="49dp"
+ android:layout_height="49dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="4dp"
+ app:srcCompat="@drawable/ic_more_vert_white_24dp"
+ android:scaleType="centerInside"
android:contentDescription="TODO" />
- </RelativeLayout>
+ </RelativeLayout>
</RelativeLayout>
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 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical">
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
- <include
- layout="@layout/list_empty_view"
- android:id="@+id/list_empty_view"
- android:visibility="gone" />
+ <include
+ layout="@layout/list_empty_view"
+ android:id="@+id/list_empty_view"
+ android:visibility="gone" />
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/mission_recycler"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/mission_recycler"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
</LinearLayout>
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 @@
<menu
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <item
- android:id="@+id/okay"
- android:title="@string/finish"
- app:showAsAction="always"/>
-
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/okay"
+ android:title="@string/finish"
+ app:showAsAction="always"/>
+
</menu>