Skip to content

Commit

Permalink
Replaced app:drawable*Compat with android:drawable*
Browse files Browse the repository at this point in the history 
* Use ``NewPipeTextView`` instead of ``TextView``
* Removed duplicate drawable-usages (left=start, right=end)
  • Loading branch information
@litetex
litetex committed Feb 28, 2022
1 parent 3088071 commit 47fea6e
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 69 deletions.
47 changes: 17 additions & 30 deletions app/src/main/res/layout-large-land/fragment_video_detail.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,19 +325,6 @@
tools:ignore="RtlHardcoded"
tools:text="Uploader" />
</LinearLayout>

<!--<Button
android:id="@+id/detail_uploader_subscribe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginRight="12dp"
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
app:drawableLeftCompat="@drawable/ic_rss_feed"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
</LinearLayout>

<!-- VIEW & THUMBS -->
Expand Down Expand Up @@ -447,12 +434,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/add_to_playlist"
android:drawableTop="@drawable/ic_playlist_add"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_add_to_playlist_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_playlist_add" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_background"
Expand All @@ -463,12 +450,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/play_audio"
android:drawableTop="@drawable/ic_headset"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_background_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_headset" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_popup"
Expand All @@ -479,12 +466,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/open_in_popup_mode"
android:drawableTop="@drawable/ic_picture_in_picture"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_popup_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_picture_in_picture" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_download"
Expand All @@ -495,12 +482,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/controls_download_desc"
android:drawableTop="@drawable/ic_file_download"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/download"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_file_download" />
android:textSize="@dimen/detail_control_text_size" />

</LinearLayout>

Expand All @@ -526,12 +513,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/share"
android:drawableTop="@drawable/ic_share"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/share"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_share" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_open_in_browser"
Expand All @@ -542,12 +529,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/open_in_browser"
android:drawableTop="@drawable/ic_language"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/open_in_browser"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_language" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_play_with_kodi"
Expand All @@ -558,14 +545,14 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/play_with_kodi_title"
android:drawableTop="@drawable/ic_cast"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/play_with_kodi_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_cast" />
android:textSize="@dimen/detail_control_text_size" />

<TextView
<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_crash_the_player"
android:layout_width="@dimen/detail_control_width"
android:layout_height="@dimen/detail_control_height"
Expand All @@ -574,12 +561,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/crash_the_player"
android:drawableTop="@drawable/ic_bug_report"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/crash_the_player"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_bug_report" />
android:textSize="@dimen/detail_control_text_size" />

</LinearLayout>

Expand Down
47 changes: 17 additions & 30 deletions app/src/main/res/layout/fragment_video_detail.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,6 @@
tools:text="Uploader" />

</LinearLayout>

<!--<Button
android:id="@+id/detail_uploader_subscribe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginRight="12dp"
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
app:drawableLeftCompat="@drawable/ic_rss_feed"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
</LinearLayout>

<!-- VIEW & THUMBS -->
Expand Down Expand Up @@ -433,12 +420,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/add_to_playlist"
android:drawableTop="@drawable/ic_playlist_add"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_add_to_playlist_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_playlist_add" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_background"
Expand All @@ -449,12 +436,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/play_audio"
android:drawableTop="@drawable/ic_headset"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_background_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_headset" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_popup"
Expand All @@ -465,12 +452,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/open_in_popup_mode"
android:drawableTop="@drawable/ic_picture_in_picture"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/controls_popup_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_picture_in_picture" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_download"
Expand All @@ -481,12 +468,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/controls_download_desc"
android:drawableTop="@drawable/ic_file_download"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/download"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_file_download" />
android:textSize="@dimen/detail_control_text_size" />

</LinearLayout>

Expand All @@ -510,12 +497,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/share"
android:drawableTop="@drawable/ic_share"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/share"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_share" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_open_in_browser"
Expand All @@ -526,12 +513,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/open_in_browser"
android:drawableTop="@drawable/ic_language"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/open_in_browser"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_language" />
android:textSize="@dimen/detail_control_text_size" />

<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_play_with_kodi"
Expand All @@ -542,14 +529,14 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/play_with_kodi_title"
android:drawableTop="@drawable/ic_cast"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/play_with_kodi_title"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_cast" />
android:textSize="@dimen/detail_control_text_size" />

<TextView
<org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/detail_controls_crash_the_player"
android:layout_width="@dimen/detail_control_width"
android:layout_height="@dimen/detail_control_height"
Expand All @@ -558,12 +545,12 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/crash_the_player"
android:drawableTop="@drawable/ic_bug_report"
android:focusable="true"
android:gravity="center"
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/crash_the_player"
android:textSize="@dimen/detail_control_text_size"
app:drawableTopCompat="@drawable/ic_bug_report" />
android:textSize="@dimen/detail_control_text_size" />

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/list_playlist_grid_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
android:layout_alignRight="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:background="@color/playlist_stream_count_background_color"
android:drawableTop="@drawable/ic_playlist_play"
android:gravity="center"
android:paddingTop="16dp"
android:paddingBottom="14dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/duration_text_color"
android:textSize="@dimen/video_item_search_duration_text_size"
android:textStyle="bold"
app:drawableTopCompat="@drawable/ic_playlist_play"
tools:ignore="RtlHardcoded"
tools:text="314159" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/list_playlist_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
android:layout_alignRight="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:background="@color/playlist_stream_count_background_color"
android:drawableTop="@drawable/ic_playlist_play"
android:gravity="center"
android:paddingTop="16dp"
android:paddingBottom="14dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/duration_text_color"
android:textSize="@dimen/video_item_search_duration_text_size"
android:textStyle="bold"
app:drawableTopCompat="@drawable/ic_playlist_play"
tools:ignore="RtlHardcoded"
tools:text="314159" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/list_playlist_mini_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
android:layout_alignRight="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:background="@color/playlist_stream_count_background_color"
android:drawableTop="@drawable/ic_playlist_play"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="6dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/duration_text_color"
android:textSize="@dimen/video_item_search_duration_text_size"
android:textStyle="bold"
app:drawableTopCompat="@drawable/ic_playlist_play"
tools:ignore="RtlHardcoded"
tools:text="3141" />

Expand Down
Loading

0 comments on commit 47fea6e

Please sign in to comment.