Tweak volume dialog (#908)

xbmc · Sep 19, 2022 · 65de9a2 · 65de9a2
1 parent 5e27d3f
commit 65de9a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java b/app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java
@@ -129,7 +129,6 @@ private void registerObserver() {
 
     private void setListeners() {
         binding.vcdVolumeMute.setOnClickListener(onMuteToggleOnClickListener);
-        binding.vcdVolumeMutedIndicator.setOnClickListener(onMuteToggleOnClickListener);
 
         binding.vcdVolumeLevelIndicator.setOnVolumeChangeListener(
                 volume -> {
@@ -143,10 +142,6 @@ private void setListeners() {
     @Override
     public void onApplicationVolumeChanged(int volume, boolean muted) {
         binding.vcdVolumeLevelIndicator.setVolume(muted, volume);
-
-        binding.vcdVolumeMutedIndicator.setVisibility(muted ? View.VISIBLE : View.GONE);
-        binding.vcdVolumeMutedIndicator.setHighlight(muted);
-
         binding.vcdVolumeMute.setHighlight(muted);
     }
 

diff --git a/app/src/main/res/layout/volume_controller_dialog.xml b/app/src/main/res/layout/volume_controller_dialog.xml
@@ -4,6 +4,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="@dimen/default_padding"
+    android:paddingBottom="@dimen/default_padding"
+    android:paddingStart="@dimen/small_padding"
+    android:paddingEnd="@dimen/small_padding"
     android:background="?attr/colorSurface"
     android:minWidth="200dp">
 
@@ -15,20 +19,10 @@
         android:contentDescription="@string/volume_mute"
         android:src="@drawable/ic_round_volume_off_24"/>
 
-    <org.xbmc.kore.ui.widgets.HighlightButton
-        android:id="@+id/vcd_volume_muted_indicator"
-        style="@style/Widget.Kore.Button.Borderless"
-        android:layout_width="@dimen/default_icon_size"
-        android:layout_height="@dimen/default_icon_size"
-        android:contentDescription="@string/volume_mute"
-        android:src="@drawable/ic_round_volume_off_24"
-        android:visibility="gone"/>
-
     <org.xbmc.kore.ui.widgets.VolumeLevelIndicator
         android:id="@+id/vcd_volume_level_indicator"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:layout_toEndOf="@id/vcd_volume_mute"
         android:orientation="vertical">
     </org.xbmc.kore.ui.widgets.VolumeLevelIndicator>