Browse Source

New equalizer: enable/disable all controls depending on equalizer state

merge-requests/2298/head
Nicolas Pomepuy 1 year ago
parent
commit
f7278c3746
  1. 2
      application/resources/src/main/res/drawable/ic_delete.xml
  2. 2
      application/resources/src/main/res/drawable/ic_edit.xml
  3. 2
      application/vlc-android/res/layout/dialog_equalizer.xml
  4. 4
      application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt

2
application/resources/src/main/res/drawable/ic_delete.xml

@ -7,7 +7,7 @@
<path
tools:fillColor="@color/white"
android:fillColor="?attr/colorControlNormal"
android:fillColor="@color/standard_selection_control_normal_primary"
android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
</vector>

2
application/resources/src/main/res/drawable/ic_edit.xml

@ -6,7 +6,7 @@
android:viewportHeight="24">
<path
android:fillColor="@color/standard_selection_control_normal"
android:fillColor="@color/standard_selection_control_normal_primary"
tools:fillColor="@color/white"
android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z" />

2
application/vlc-android/res/layout/dialog_equalizer.xml

@ -111,6 +111,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:clickable="false"
android:visibility="gone"
app:cardBackgroundColor="@color/red500transparent_10"
app:cardCornerRadius="4dp"
@ -189,6 +190,7 @@
android:layout_marginBottom="8dp"
app:cardCornerRadius="4dp"
app:cardElevation="0dp"
android:clickable="false"
app:cardUseCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt

@ -288,6 +288,10 @@ class EqualizerFragmentDialog : VLCBottomSheetDialogFragment(), Slider.OnChangeL
binding.equalizerBands.children.forEach {
it.isEnabled = eqCardEnabled
}
binding.delete.isEnabled = eqCardEnabled
binding.edit.isEnabled = isChecked
binding.undo.isEnabled = eqCardEnabled && viewModel.history.isNotEmpty()
binding.presetTitleEdit.isEnabled = eqCardEnabled
binding.snapBands.isEnabled = eqCardEnabled
}

Loading…
Cancel
Save