From cf147aa161adb4b35367bf2e12189ad262bc5845 Mon Sep 17 00:00:00 2001 From: John Zhen Mo Date: Sat, 4 Nov 2017 11:30:49 -0700 Subject: [PATCH] -Reverted dropdown menu UI for list view info items. --- .../fragments/detail/VideoDetailFragment.java | 3 - .../fragments/list/BaseListFragment.java | 9 -- .../subscription/SubscriptionFragment.java | 6 -- .../newpipe/info_list/InfoItemBuilder.java | 2 - .../holder/ChannelMiniInfoItemHolder.java | 57 ----------- .../holder/PlaylistInfoItemHolder.java | 56 ----------- .../holder/StreamMiniInfoItemHolder.java | 94 ------------------ .../drawable-hdpi/ic_more_vert_black_24dp.png | Bin 132 -> 0 bytes .../drawable-hdpi/ic_more_vert_white_24dp.png | Bin 134 -> 0 bytes .../drawable-mdpi/ic_more_vert_black_24dp.png | Bin 108 -> 0 bytes .../drawable-mdpi/ic_more_vert_white_24dp.png | Bin 112 -> 0 bytes .../ic_more_vert_black_24dp.png | Bin 155 -> 0 bytes .../ic_more_vert_white_24dp.png | Bin 158 -> 0 bytes .../ic_more_vert_black_24dp.png | Bin 205 -> 0 bytes .../ic_more_vert_white_24dp.png | Bin 216 -> 0 bytes .../ic_more_vert_black_24dp.png | Bin 272 -> 0 bytes .../ic_more_vert_white_24dp.png | Bin 305 -> 0 bytes app/src/main/res/layout/list_channel_item.xml | 25 +---- .../res/layout/list_channel_mini_item.xml | 25 +---- .../main/res/layout/list_playlist_item.xml | 25 +---- app/src/main/res/layout/list_stream_item.xml | 25 +---- .../main/res/layout/list_stream_mini_item.xml | 27 +---- app/src/main/res/values/attrs.xml | 1 - app/src/main/res/values/strings.xml | 2 - app/src/main/res/values/styles.xml | 2 - 25 files changed, 9 insertions(+), 350 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png 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 cbb658025..9522446af 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 @@ -460,9 +460,6 @@ public class VideoDetailFragment extends BaseStateFragment implement public void selected(StreamInfoItem selectedItem) { selectAndLoadVideo(selectedItem.service_id, selectedItem.url, selectedItem.name); } - - @Override - public void dropdownClicked(StreamInfoItem selectedItem, PopupMenu menu) {} }); videoTitleRoot.setOnClickListener(this); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index e3a94a5e2..a780c5160 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -140,9 +140,6 @@ public abstract class BaseListFragment extends BaseStateFragment implem useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(), selectedItem.service_id, selectedItem.url, selectedItem.name); } - - @Override - public void dropdownClicked(StreamInfoItem selectedItem, PopupMenu menu) {} }); infoListAdapter.setOnChannelSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() { @@ -153,9 +150,6 @@ public abstract class BaseListFragment extends BaseStateFragment implem useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(), selectedItem.service_id, selectedItem.url, selectedItem.name); } - - @Override - public void dropdownClicked(ChannelInfoItem selectedItem, PopupMenu menu) {} }); infoListAdapter.setOnPlaylistSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() { @@ -166,9 +160,6 @@ public abstract class BaseListFragment extends BaseStateFragment implem useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(), selectedItem.service_id, selectedItem.url, selectedItem.name); } - - @Override - public void dropdownClicked(PlaylistInfoItem selectedItem, PopupMenu menu) {} }); itemsList.clearOnScrollListeners(); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java index c3afa9620..4e60ef0d0 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java @@ -10,7 +10,6 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.PopupMenu; import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.SubscriptionEntity; @@ -20,8 +19,6 @@ import org.schabi.newpipe.fragments.BaseStateFragment; import org.schabi.newpipe.info_list.InfoItemBuilder; import org.schabi.newpipe.info_list.InfoListAdapter; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.util.KioskTranslator; -import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.util.NavigationHelper; import java.util.ArrayList; @@ -135,9 +132,6 @@ public class SubscriptionFragment extends BaseStateFragment { void selected(T selectedItem); - void dropdownClicked(T selectedItem, PopupMenu menu); } private final Context context; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java index 30dc3d8bc..9aef6dbd2 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java @@ -1,11 +1,7 @@ package org.schabi.newpipe.info_list.holder; -import android.content.Context; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; -import android.widget.PopupMenu; import android.widget.TextView; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -14,9 +10,7 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; -import org.schabi.newpipe.playlist.ChannelPlayQueue; import org.schabi.newpipe.util.Localization; -import org.schabi.newpipe.util.NavigationHelper; import de.hdodenhof.circleimageview.CircleImageView; @@ -24,7 +18,6 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder { public final CircleImageView itemThumbnailView; public final TextView itemTitleView; public final TextView itemAdditionalDetailView; - public final ImageButton itemActionDropdown; ChannelMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) { super(infoItemBuilder, layoutId, parent); @@ -32,7 +25,6 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder { itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView); itemTitleView = itemView.findViewById(R.id.itemTitleView); itemAdditionalDetailView = itemView.findViewById(R.id.itemAdditionalDetails); - itemActionDropdown = itemView.findViewById(R.id.itemActionDropdown); } public ChannelMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) { @@ -58,55 +50,6 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder { } } }); - - enableActionDropdown(item); - } - - private void enableActionDropdown(final ChannelInfoItem item) { - itemActionDropdown.setVisibility(View.VISIBLE); - itemActionDropdown.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - final PopupMenu actionMenu = getStreamDropdown(itemBuilder.getContext(), itemActionDropdown, item); - if (itemBuilder.getOnChannelSelectedListener() != null) { - itemBuilder.getOnChannelSelectedListener().dropdownClicked(item, actionMenu); - } - actionMenu.show(); - } - }); - } - - private PopupMenu getStreamDropdown(final Context context, final View anchor, final ChannelInfoItem infoItem) { - PopupMenu actionMenu = new PopupMenu(context, anchor); - - final MenuItem mainPlay = actionMenu.getMenu().add(R.string.play_all); - mainPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnMainPlayer(context, new ChannelPlayQueue(infoItem)); - return true; - } - }); - - final MenuItem popupPlay = actionMenu.getMenu().add(R.string.controls_popup_title); - popupPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnPopupPlayer(context, new ChannelPlayQueue(infoItem)); - return true; - } - }); - - final MenuItem backgroundPlay = actionMenu.getMenu().add(R.string.controls_background_title); - backgroundPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnBackgroundPlayer(context, new ChannelPlayQueue(infoItem)); - return true; - } - }); - - return actionMenu; } protected String getDetailLine(final ChannelInfoItem item) { diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java index 5e0f44939..3c29a4b76 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java @@ -1,12 +1,8 @@ package org.schabi.newpipe.info_list.holder; -import android.content.Context; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; import android.widget.ImageView; -import android.widget.PopupMenu; import android.widget.TextView; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -15,15 +11,12 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; -import org.schabi.newpipe.playlist.PlaylistPlayQueue; -import org.schabi.newpipe.util.NavigationHelper; public class PlaylistInfoItemHolder extends InfoItemHolder { public final ImageView itemThumbnailView; public final TextView itemStreamCountView; public final TextView itemTitleView; public final TextView itemUploaderView; - public final ImageButton itemActionDropdown; public PlaylistInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) { super(infoItemBuilder, R.layout.list_playlist_item, parent); @@ -32,7 +25,6 @@ public class PlaylistInfoItemHolder extends InfoItemHolder { itemTitleView = itemView.findViewById(R.id.itemTitleView); itemStreamCountView = itemView.findViewById(R.id.itemStreamCountView); itemUploaderView = itemView.findViewById(R.id.itemUploaderView); - itemActionDropdown = itemView.findViewById(R.id.itemActionDropdown); } @Override @@ -55,56 +47,8 @@ public class PlaylistInfoItemHolder extends InfoItemHolder { } } }); - - enableActionDropdown(item); } - private void enableActionDropdown(final PlaylistInfoItem item) { - itemActionDropdown.setVisibility(View.VISIBLE); - itemActionDropdown.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - final PopupMenu actionMenu = getStreamDropdown(itemBuilder.getContext(), itemActionDropdown, item); - if (itemBuilder.getOnPlaylistSelectedListener() != null) { - itemBuilder.getOnPlaylistSelectedListener().dropdownClicked(item, actionMenu); - } - actionMenu.show(); - } - }); - } - - private PopupMenu getStreamDropdown(final Context context, final View anchor, final PlaylistInfoItem infoItem) { - PopupMenu actionMenu = new PopupMenu(context, anchor); - - final MenuItem mainPlay = actionMenu.getMenu().add(R.string.play_all); - mainPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnMainPlayer(context, new PlaylistPlayQueue(infoItem)); - return true; - } - }); - - final MenuItem popupPlay = actionMenu.getMenu().add(R.string.controls_popup_title); - popupPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnPopupPlayer(context, new PlaylistPlayQueue(infoItem)); - return true; - } - }); - - final MenuItem backgroundPlay = actionMenu.getMenu().add(R.string.controls_background_title); - backgroundPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnBackgroundPlayer(context, new PlaylistPlayQueue(infoItem)); - return true; - } - }); - - return actionMenu; - } /** * Display options for playlist thumbnails */ diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java index a910041d0..138503d39 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java @@ -1,13 +1,9 @@ package org.schabi.newpipe.info_list.holder; -import android.content.Context; import android.support.v4.content.ContextCompat; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; import android.widget.ImageView; -import android.widget.PopupMenu; import android.widget.TextView; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -17,9 +13,7 @@ import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemBuilder; -import org.schabi.newpipe.playlist.SinglePlayQueue; import org.schabi.newpipe.util.Localization; -import org.schabi.newpipe.util.NavigationHelper; public class StreamMiniInfoItemHolder extends InfoItemHolder { @@ -27,7 +21,6 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder { public final TextView itemVideoTitleView; public final TextView itemUploaderView; public final TextView itemDurationView; - public final ImageButton itemActionDropdown; StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) { super(infoItemBuilder, layoutId, parent); @@ -36,7 +29,6 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder { itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView); itemUploaderView = itemView.findViewById(R.id.itemUploaderView); itemDurationView = itemView.findViewById(R.id.itemDurationView); - itemActionDropdown = itemView.findViewById(R.id.itemActionDropdown); } public StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) { @@ -75,92 +67,6 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder { } } }); - - switch (item.stream_type) { - case AUDIO_STREAM: - case VIDEO_STREAM: - case FILE: - enableActionDropdown(item); - break; - case LIVE_STREAM: - case AUDIO_LIVE_STREAM: - case NONE: - default: - disableActionDropdown(); - break; - } - } - - private void enableActionDropdown(final StreamInfoItem item) { - itemActionDropdown.setClickable(true); - itemActionDropdown.setVisibility(View.VISIBLE); - itemActionDropdown.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - final PopupMenu actionMenu = getStreamDropdown(itemBuilder.getContext(), itemActionDropdown, item); - if (itemBuilder.getOnStreamSelectedListener() != null) { - itemBuilder.getOnStreamSelectedListener().dropdownClicked(item, actionMenu); - } - actionMenu.show(); - } - }); - } - - private void disableActionDropdown() { - itemActionDropdown.setVisibility(View.GONE); - itemActionDropdown.setClickable(false); - itemActionDropdown.setOnClickListener(null); - } - - private PopupMenu getStreamDropdown(final Context context, final View anchor, final StreamInfoItem infoItem) { - PopupMenu actionMenu = new PopupMenu(context, anchor); - - final MenuItem backgroundEnqueue = actionMenu.getMenu().add(R.string.enqueue_on_background); - backgroundEnqueue.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem)); - return true; - } - }); - - final MenuItem popupEnqueue = actionMenu.getMenu().add(R.string.enqueue_on_popup); - popupEnqueue.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.enqueueOnPopupPlayer(context, new SinglePlayQueue(infoItem)); - return true; - } - }); - - final MenuItem mainPlay = actionMenu.getMenu().add(R.string.play_btn_text); - mainPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnMainPlayer(context, new SinglePlayQueue(infoItem)); - return true; - } - }); - - final MenuItem popupPlay = actionMenu.getMenu().add(R.string.controls_popup_title); - popupPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnPopupPlayer(context, new SinglePlayQueue(infoItem)); - return true; - } - }); - - final MenuItem backgroundPlay = actionMenu.getMenu().add(R.string.controls_background_title); - backgroundPlay.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - NavigationHelper.playOnBackgroundPlayer(context, new SinglePlayQueue(infoItem)); - return true; - } - }); - - return actionMenu; } /** diff --git a/app/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png deleted file mode 100644 index 22acc550088d98f9d98ced517de75b5e8ead3c7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B5}8r;B4q1>@UGdwClSM3^70uIQ21 z47_&cJkx~*+Z%R2IKOxGVZM^fH+7^Mmwc{S?NKJ@tD@b{HffqWt7pJW9xm}`3bIR@ eOD6DrGLJi>8B(9~m^Tk-EQ6=3pUXO@geCy;;w$k0 diff --git a/app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png deleted file mode 100644 index 67f07e473442d1f5bd5dc486a42ce4bedf40b425..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;ucwP+h{y4_mv-_VP!M4WR9aA@ zB9L2TV$k7bqBi~Tf{Y7K)@EPe&B(sMnUQ&cV?}1b!p)H;o34MJ iAa}{R%7g#se7OLo1Hz}Zd6xqXX7F_Nb6Mw<&;$T!hAw^p diff --git a/app/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png deleted file mode 100644 index 0e4f2f6ea0564fe9d6ebdb4bea0df48aced9de0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1V^0^ykP60RiERoU4^0niv(+!U z$~^Ty`=RMavMX4xeQ2uS{l}xxJ=eVCD820|N5W*kJjJ67$C*FG*QAUgq7iWp7Wo)^m*JsBN#kg L{an^LB{Ts5on9xv diff --git a/app/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png deleted file mode 100644 index 9f10aa2759a2e53beb129849c9b0e6ee5f7ae97b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DBu^K|kP61PR}A@_6b0BGTJ|c& z&2zArUdgs%qoJD@@9neO|NgtXV7^DW)MQ81qkHN%-79zXF}ZeKv~Tuphvz#4Z3DJ9 zo+<2n{rTU)UWQJm<&*zc>PM$^=S_g|6%VwoI2{_d>%srJ7&|&vk-TbVh<5S;l;%8hhyk$Kc9U$ho zN!;a@as7tMKN^!>mP|UmC!qU^(pC>$p{$8fOT;)oR_iUC=UG0_`?VR+LIzJ)KbLh* G2~7aOZ8w1c diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png deleted file mode 100644 index 94d5ab98c6d3b3548536f04a2d635fb5c4a05b88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrg*wIhEy=Vy=KqV>>$DV@#Ph3 zmm-(IJxlAmHdKggydBZHA?LrN(f;zraK2yFla}<&ocsFTF&FO*>g+$WJLfsbvhR#o zqU5?6`INL2k&sND<*?!p=%CFlpb5%Rrp)D#!8^w7WtAYxjJ8qaZaq8!Lha3*C xpO9i0)g!jJUB|8aV$u`{=V%64OvRJ&URzP%pP$_?yn*gx@O1TaS?83{1OO~yQ~m$| diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png deleted file mode 100644 index d32281307232fefc363e19d9d2728af62b440a8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6kw0hGg7(d(E5ckb#KX!!teA z8+IJIbSd_mp~lgrEob_e9cxnR1kZ18I^5b~uj)DJpG>-%nby>)6J_QWKRvd(S?`Ri~_DWys(>8rgyQv zG%aCaz>Js9>y=L)eUVgRxJx3oN6$@sv5NTO?u&4dNh*K$SbOB%sZae;9uIUXgQu&X J%Q~loCIECSTxI|O diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png deleted file mode 100644 index 4642a3b66e690a25544c7a65b5484607c76e9e4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgu6w#ThEy=Vz2TVE>>%O(aeKF| z&%}AAoaYX07I~@2Qzf){=E~b*b6q_X?JD-aXZn{o>8SH070*d=@0yRCD&F7PI4|Iy zgr>dT{)s<*uuMbP?bJzL!+Uj>du1MOpP(^y_vJlXtsXdjo_CdTHuJx`L9zyy z_bjw};Pttx=xP2JS*8CI?{O?lw)*qOUytSD#5&t0XL`98ez{Y*;jMY`-`}^VtDMwJ z5#Pjpv-OQrnIiiQFtvL^tj8o3AbA2TH#1Zw0j|Uo=)7NS4apHKER!-ifL>(qboFyt I=akR{05Df}#Q*>R diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png deleted file mode 100644 index 2f2cb3d004f6e828917b5f6b1decc7fe5d99b445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcget5b#hE&{od&7{g$w9>R;>#mP zB_2gJIy{WxDHIfl;54zZ?(Dj(@bmNJ>M(=pX9D&J05vf@IA0RFIB;_s@2aW4t^P!s z?~T5q@wxa<`?f89Li_gpTlKB*dwsOb9#+$?m6!M>7BklVVk|aEPh1DJ$>V{EJl=XH?V({#-awY-(QL|0?dORlc*XtSl(} z&d3n4k$a}x{MZxU-fiZ-$+m%8aD#C}>V?${Gwe!OwoRt{8X v))3p#FqiR-(={Oe2E;4(u$C!;+}~cs6m#}#(>L)Q#vrbztDnm{r-UW|mL!4d diff --git a/app/src/main/res/layout/list_channel_item.xml b/app/src/main/res/layout/list_channel_item.xml index 4fa74387e..547054cc0 100644 --- a/app/src/main/res/layout/list_channel_item.xml +++ b/app/src/main/res/layout/list_channel_item.xml @@ -8,8 +8,7 @@ android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" - android:paddingTop="@dimen/video_item_search_padding" - android:paddingBottom="@dimen/video_item_search_padding"> + android:padding="@dimen/video_item_search_padding"> - - + android:padding="@dimen/video_item_search_padding"> - - + android:padding="@dimen/video_item_search_padding"> - - + android:padding="@dimen/video_item_search_padding"> - - + android:padding="@dimen/video_item_search_padding"> - + tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum" + /> + tools:text="Uploader" /> \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7fd512c9e..abf7c7b09 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -20,7 +20,6 @@ - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d93b61f1..7092feaf5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -310,6 +310,4 @@ Details Audio Settings Hold To Enqueue - Enqueue on Background - Enqueue on Popup diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 85549c8c5..8f0bb02cd 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,6 @@ @drawable/ic_history_black_24dp @drawable/ic_drag_handle_black_24dp @drawable/ic_fiber_manual_record_black_24dp - @drawable/ic_more_vert_black_24dp @color/light_separator_color @color/light_contrast_background_color @@ -66,7 +65,6 @@ @drawable/ic_history_white_24dp @drawable/ic_drag_handle_white_24dp @drawable/ic_fiber_manual_record_white_24dp - @drawable/ic_more_vert_white_24dp @color/dark_separator_color @color/dark_contrast_background_color