diff --git a/app/src/main/java/com/freshollie/monkeyboard/keystoneradio/ui/PlayerActivity.java b/app/src/main/java/com/freshollie/monkeyboard/keystoneradio/ui/PlayerActivity.java index 91ff748..5545d50 100644 --- a/app/src/main/java/com/freshollie/monkeyboard/keystoneradio/ui/PlayerActivity.java +++ b/app/src/main/java/com/freshollie/monkeyboard/keystoneradio/ui/PlayerActivity.java @@ -716,11 +716,11 @@ public void updateVolumeIcon(int volume) { // At full volume if (volume > 8) { - icon = R.drawable.ic_volume_up_white_24dp; + icon = R.drawable.ic_volume_up_white_100dp; } else if (volume > 0) { - icon = R.drawable.ic_volume_down_white_24dp; + icon = R.drawable.ic_volume_down_white_100dp; } else { - icon = R.drawable.ic_volume_mute_white_24dp; + icon = R.drawable.ic_volume_mute_white_100dp; } volumeButton.setImageResource(icon); @@ -1104,10 +1104,10 @@ public void onRadioVolumeChanged(int volume) { if (playerService.isDucked() && playerService.isPlaying()) { // Ducking if (volume == 0) { // Full duck - icon = R.drawable.ic_volume_mute_white_24dp; + icon = R.drawable.ic_volume_mute_white_100dp; } else { // Duck - icon = R.drawable.ic_volume_down_white_24dp; + icon = R.drawable.ic_volume_down_white_100dp; } } } diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_100dp.xml similarity index 81% rename from app/src/main/res/drawable/ic_add_white_24dp.xml rename to app/src/main/res/drawable/ic_add_white_100dp.xml index b9b8eca..0e6627d 100644 --- a/app/src/main/res/drawable/ic_add_white_24dp.xml +++ b/app/src/main/res/drawable/ic_add_white_100dp.xml @@ -1,6 +1,6 @@ + app:layout_constraintStart_toEndOf="@+id/volume_button" + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline"/> + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline" + app:srcCompat="@drawable/ic_volume_mute_white_100dp" /> + app:layout_constraintStart_toStartOf="@+id/player_and_station_list_separator" + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline"/> + app:layout_constraintGuide_percent="0.75" /> + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline" + app:srcCompat="@drawable/ic_add_white_100dp" /> + + diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml index 8e0d59f..ac0dda8 100644 --- a/app/src/main/res/layout/activity_player.xml +++ b/app/src/main/res/layout/activity_player.xml @@ -39,7 +39,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.66" /> + app:layout_constraintGuide_percent="0.70" /> + app:layout_constraintStart_toEndOf="@+id/volume_button" + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline" + app:srcCompat="@drawable/ic_volume_mute_white_100dp" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline"/> + app:layout_constraintGuide_percent="0.55" /> + app:layout_constraintTop_toTopOf="@+id/volume_controls_top_guideline" + app:srcCompat="@drawable/ic_add_white_100dp" /> + + \ No newline at end of file