diff options
Diffstat (limited to '')
6 files changed, 92 insertions, 62 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java index 26a2522c..c474a710 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java @@ -1848,7 +1848,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView @BindView(R.id.player_view_item_post_video_type_autoplay) PlayerView videoPlayer; @BindView(R.id.mute_exo_playback_control_view) - ImageButton muteButton; + ImageView muteButton; @BindView(R.id.bottom_constraint_layout_item_post_video_type_autoplay) ConstraintLayout bottomConstraintLayout; @BindView(R.id.plus_button_item_post_video_type_autoplay) @@ -1900,11 +1900,11 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView muteButton.setOnClickListener(view -> { if (helper != null) { if (helper.getVolume() != 0) { - muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_mute_24dp)); + muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_mute_white_rounded_18dp)); helper.setVolume(0f); volume = 0f; } else { - muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_unmute_24dp)); + muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_unmute_white_rounded_18dp)); helper.setVolume(1f); volume = 1f; } @@ -1942,9 +1942,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView helper.setVolume(volume); muteButton.setVisibility(View.VISIBLE); if (volume != 0f) { - muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_unmute_24dp)); + muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_unmute_white_rounded_18dp)); } else { - muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_mute_24dp)); + muteButton.setImageDrawable(mActivity.getDrawable(R.drawable.ic_mute_white_rounded_18dp)); } break; } diff --git a/app/src/main/res/drawable/ic_mute_white_rounded_18dp.xml b/app/src/main/res/drawable/ic_mute_white_rounded_18dp.xml new file mode 100644 index 00000000..b4f8f660 --- /dev/null +++ b/app/src/main/res/drawable/ic_mute_white_rounded_18dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="18dp" + android:height="18dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M3.63,3.63c-0.39,0.39 -0.39,1.02 0,1.41L7.29,8.7 7,9L4,9c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71v-4.17l4.18,4.18c-0.49,0.37 -1.02,0.68 -1.6,0.91 -0.36,0.15 -0.58,0.53 -0.58,0.92 0,0.72 0.73,1.18 1.39,0.91 0.8,-0.33 1.55,-0.77 2.22,-1.31l1.34,1.34c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L5.05,3.63c-0.39,-0.39 -1.02,-0.39 -1.42,0zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-3.83 -2.4,-7.11 -5.78,-8.4 -0.59,-0.23 -1.22,0.23 -1.22,0.86v0.19c0,0.38 0.25,0.71 0.61,0.85C17.18,6.54 19,9.06 19,12zM10.29,5.71l-0.17,0.17L12,7.76L12,6.41c0,-0.89 -1.08,-1.33 -1.71,-0.7zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z" + android:fillColor="#ffffff"/> +</vector> diff --git a/app/src/main/res/drawable/ic_pause_white_rounded_18dp.xml b/app/src/main/res/drawable/ic_pause_white_rounded_18dp.xml new file mode 100644 index 00000000..479c57b0 --- /dev/null +++ b/app/src/main/res/drawable/ic_pause_white_rounded_18dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="18dp" + android:height="18dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M8,19c1.1,0 2,-0.9 2,-2L10,7c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2v10c0,1.1 0.9,2 2,2zM14,7v10c0,1.1 0.9,2 2,2s2,-0.9 2,-2L18,7c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2z" + android:fillColor="#ffffff"/> +</vector> diff --git a/app/src/main/res/drawable/ic_play_arrow_white_rounded_18dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_rounded_18dp.xml new file mode 100644 index 00000000..3400b3ac --- /dev/null +++ b/app/src/main/res/drawable/ic_play_arrow_white_rounded_18dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="18dp" + android:height="18dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M8,6.82v10.36c0,0.79 0.87,1.27 1.54,0.84l8.14,-5.18c0.62,-0.39 0.62,-1.29 0,-1.69L9.54,5.98C8.87,5.55 8,6.03 8,6.82z" + android:fillColor="#ffffff"/> +</vector> diff --git a/app/src/main/res/drawable/ic_unmute_white_rounded_18dp.xml b/app/src/main/res/drawable/ic_unmute_white_rounded_18dp.xml new file mode 100644 index 00000000..90b8f85d --- /dev/null +++ b/app/src/main/res/drawable/ic_unmute_white_rounded_18dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="18dp" + android:height="18dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z" + android:fillColor="#ffffff"/> +</vector> diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml index b12deafe..826f6870 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml @@ -1,70 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear_layout_exo_playback_control_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:gravity="bottom" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:orientation="vertical"> + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:layout_gravity="bottom"> - <RelativeLayout - android:layout_width="match_parent" + <TextView android:id="@id/exo_position" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="4dp" - android:orientation="horizontal"> + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:includeFontPadding="false" + android:textColor="#FFFFFF" + android:textSize="12sp" + android:textStyle="bold" /> - <ImageButton android:id="@id/exo_play" - style="@style/ExoMediaButton.Play" - android:layout_centerInParent="true" /> - - <ImageButton android:id="@id/exo_pause" - style="@style/ExoMediaButton.Pause" - android:layout_centerInParent="true" /> - - <ImageButton - android:id="@+id/mute_exo_playback_control_view" - style="@style/ExoMediaButton" - android:src="@drawable/ic_mute_24dp" - android:layout_alignParentEnd="true" - android:visibility="gone" /> - - </RelativeLayout> - - <LinearLayout - android:layout_width="match_parent" + <TextView + android:id="@+id/slash" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:gravity="center_vertical" - android:orientation="horizontal"> + android:layout_toEndOf="@id/exo_position" + android:layout_centerVertical="true" + android:text="/" + android:textColor="#FFFFFF" + android:textSize="12sp" + android:textStyle="bold" /> - <TextView android:id="@id/exo_position" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - android:textStyle="bold" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:includeFontPadding="false" - android:textColor="#FFBEBEBE"/> + <TextView android:id="@id/exo_duration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toEndOf="@id/slash" + android:layout_centerVertical="true" + android:includeFontPadding="false" + android:textColor="#FFFFFF" + android:textSize="12sp" + android:textStyle="bold" /> - <com.google.android.exoplayer2.ui.DefaultTimeBar - android:id="@id/exo_progress" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="26dp"/> + <ImageView android:id="@id/exo_play" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_centerInParent="true" + android:src="@drawable/ic_play_arrow_white_rounded_18dp" /> - <TextView android:id="@id/exo_duration" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - android:textStyle="bold" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:includeFontPadding="false" - android:textColor="#FFBEBEBE"/> + <ImageView android:id="@id/exo_pause" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_centerInParent="true" + android:src="@drawable/ic_pause_white_rounded_18dp" /> - </LinearLayout> + <ImageView + android:id="@+id/mute_exo_playback_control_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_alignParentEnd="true" + android:src="@drawable/ic_mute_white_rounded_18dp" + android:visibility="gone" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file |