diff --git a/application/resources/src/main/res/drawable/ic_export.xml b/application/resources/src/main/res/drawable/ic_export.xml new file mode 100644 index 000000000..6127c138d --- /dev/null +++ b/application/resources/src/main/res/drawable/ic_export.xml @@ -0,0 +1,9 @@ + + + diff --git a/application/resources/src/main/res/drawable/ic_invisible.xml b/application/resources/src/main/res/drawable/ic_invisible.xml new file mode 100644 index 000000000..94255f40e --- /dev/null +++ b/application/resources/src/main/res/drawable/ic_invisible.xml @@ -0,0 +1,9 @@ + + + diff --git a/application/resources/src/main/res/drawable/ic_visible.xml b/application/resources/src/main/res/drawable/ic_visible.xml new file mode 100644 index 000000000..4516a4521 --- /dev/null +++ b/application/resources/src/main/res/drawable/ic_visible.xml @@ -0,0 +1,9 @@ + + + diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml index 71a719864..c8e08a6af 100644 --- a/application/resources/src/main/res/values/strings.xml +++ b/application/resources/src/main/res/values/strings.xml @@ -67,6 +67,7 @@ Set \'%1$s\' as ringtone? Information Delete the file \'%1$s\'? + The equalizer has been deleted Are you sure you want to delete this preset? Are you sure you want to hide this preset?\nYou can restore it in the equalizer settings. Are you sure you want to replace the playlist \'%1$s\'? @@ -1148,6 +1149,9 @@ Play %s Edit equalizer preset This name is not allowed + Export equalizer + Hide equalizer + Show equalizer Add duplicated item(s)? diff --git a/application/vlc-android/AndroidManifest.xml b/application/vlc-android/AndroidManifest.xml index 3ed4bae52..a2ebbd080 100644 --- a/application/vlc-android/AndroidManifest.xml +++ b/application/vlc-android/AndroidManifest.xml @@ -990,6 +990,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/vlc-android/res/layout/equalizer_settings_activity.xml b/application/vlc-android/res/layout/equalizer_settings_activity.xml new file mode 100644 index 000000000..72afd49bd --- /dev/null +++ b/application/vlc-android/res/layout/equalizer_settings_activity.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/vlc-android/res/xml/preferences.xml b/application/vlc-android/res/xml/preferences.xml index 77c365577..455e82685 100644 --- a/application/vlc-android/res/xml/preferences.xml +++ b/application/vlc-android/res/xml/preferences.xml @@ -100,6 +100,10 @@ android:title="@string/audio_prefs_category" android:key="audio_category" android:fragment="org.videolan.television.ui.preferences.PreferencesAudio"/> + + diff --git a/application/vlc-android/src/org/videolan/vlc/gui/EqualizerSettingsActivity.kt b/application/vlc-android/src/org/videolan/vlc/gui/EqualizerSettingsActivity.kt new file mode 100644 index 000000000..f5527d4d1 --- /dev/null +++ b/application/vlc-android/src/org/videolan/vlc/gui/EqualizerSettingsActivity.kt @@ -0,0 +1,229 @@ +package org.videolan.vlc.gui + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import android.graphics.Rect +import android.graphics.RectF +import android.os.Bundle +import android.util.Log +import android.util.TypedValue +import android.view.LayoutInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.activity.viewModels +import androidx.annotation.ColorInt +import androidx.core.content.ContextCompat +import androidx.core.graphics.createBitmap +import androidx.databinding.BindingAdapter +import androidx.databinding.DataBindingUtil +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.asLiveData +import androidx.lifecycle.viewModelScope +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.appbar.MaterialToolbar +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import org.videolan.resources.AndroidDevices +import org.videolan.resources.util.applyOverscanMargin +import org.videolan.tools.dp +import org.videolan.vlc.BuildConfig +import org.videolan.vlc.R +import org.videolan.vlc.databinding.EqualizerSettingItemBinding +import org.videolan.vlc.databinding.EqualizerSettingsActivityBinding +import org.videolan.vlc.gui.helpers.SelectorViewHolder +import org.videolan.vlc.gui.helpers.UiTools +import org.videolan.vlc.mediadb.models.EqualizerWithBands +import org.videolan.vlc.repository.EqualizerRepository + + +/** + * Equalizer settings activity allowing to enable/disable/delete/export/import the presets + * + * @constructor Create empty Equalizer settings activity + */ +class EqualizerSettingsActivity : BaseActivity() { + + private lateinit var adapter: EqualizerSettingsAdapter + private val model: EqualizerSettingsModel by viewModels { + EqualizerSettingsModelFactory(this, EqualizerRepository.getInstance(application)) + } + + internal lateinit var binding: EqualizerSettingsActivityBinding + override fun getSnackAnchorView(overAudioPlayer: Boolean) = binding.root + override val displayTitle = true + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = DataBindingUtil.setContentView(this, R.layout.equalizer_settings_activity) + val toolbar = findViewById(R.id.main_toolbar) + setSupportActionBar(toolbar) + supportActionBar!!.setDisplayHomeAsUpEnabled(true) + supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_up) + title = getString(R.string.equalizer) + + binding.equalizers.layoutManager = LinearLayoutManager(this) + adapter = EqualizerSettingsAdapter { equalizer, type -> + when (type) { + ClickType.EQUALIZER_ENABLE -> model.enable(this, equalizer) + ClickType.EQUALIZER_DISABLE -> model.disable(this, equalizer) + ClickType.EQUALIZER_DELETE -> { + model.delete(this, equalizer) + UiTools.snackerConfirm(this, getString(R.string.equalizer_deleted), confirmMessage = R.string.undo) { + model.restore(this) + } + } + + ClickType.EQUALIZER_EXPORT -> model.export(this, equalizer) + } + } + binding.equalizers.adapter = adapter + + model.equalizerEntries.observe(this, Observer { + adapter.update(it) + }) + if (AndroidDevices.isTv) applyOverscanMargin(this) + + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + android.R.id.home -> finish() + } + return super.onOptionsItemSelected(item) + } + +} + +class EqualizerSettingsModel(private val equalizerRepository: EqualizerRepository) : ViewModel() { + private var oldEqualizer: EqualizerWithBands? = null + + fun enable(context: Context, equalizer: EqualizerWithBands) = viewModelScope.launch(Dispatchers.IO) { + equalizerRepository.addOrUpdateEqualizerWithBands(context, equalizer.copy(equalizerEntry = equalizer.equalizerEntry.copy(isDisabled = false).apply { id = equalizer.equalizerEntry.id })) + } + + fun disable(context: Context, equalizer: EqualizerWithBands) = viewModelScope.launch(Dispatchers.IO) { + equalizerRepository.addOrUpdateEqualizerWithBands(context, equalizer.copy(equalizerEntry = equalizer.equalizerEntry.copy(isDisabled = true).apply { id = equalizer.equalizerEntry.id })) + } + + fun delete(context: Context, equalizer: EqualizerWithBands) = viewModelScope.launch(Dispatchers.IO) { + oldEqualizer = equalizer + equalizerRepository.delete(equalizer.equalizerEntry) + } + + fun restore(context: Context) = viewModelScope.launch(Dispatchers.IO) { + equalizerRepository.addOrUpdateEqualizerWithBands(context, oldEqualizer!!) + } + + fun export(context: Context, equalizer: EqualizerWithBands) = viewModelScope.launch(Dispatchers.IO) { +//todo add export + } + + val equalizerEntries = equalizerRepository.equalizerEntriesUnfiltered.asLiveData() +} + +class EqualizerSettingsModelFactory(private val context: Context, private val repository: EqualizerRepository) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(EqualizerSettingsModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return EqualizerSettingsModel(repository) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} + +class EqualizerSettingsAdapter(private val itemClickHandler: (equalizer: EqualizerWithBands, ClickType) -> Unit) : DiffUtilAdapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + return ViewHolder(EqualizerSettingItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.binding.equalizer = dataset[position] + } + + override fun getItemCount() = dataset.size + + inner class ViewHolder(vdb: EqualizerSettingItemBinding) : SelectorViewHolder(vdb) { + init { + binding.holder = this + } + + fun onClickEnable(@Suppress("UNUSED_PARAMETER") v: View) { + itemClickHandler.invoke(dataset[layoutPosition], ClickType.EQUALIZER_ENABLE) + } + + fun onClickDisable(@Suppress("UNUSED_PARAMETER") v: View) { + itemClickHandler.invoke(dataset[layoutPosition], ClickType.EQUALIZER_DISABLE) + } + + fun onClickDelete(@Suppress("UNUSED_PARAMETER") v: View) { + itemClickHandler.invoke(dataset[layoutPosition], ClickType.EQUALIZER_DELETE) + } + + fun onClickExport(@Suppress("UNUSED_PARAMETER") v: View) { + itemClickHandler.invoke(dataset[layoutPosition], ClickType.EQUALIZER_EXPORT) + } + } +} + +enum class ClickType { + EQUALIZER_DISABLE, EQUALIZER_ENABLE, EQUALIZER_DELETE, EQUALIZER_EXPORT +} + +fun EqualizerWithBands.getBitmap(context: Context): Bitmap { + val imageSize = 72.dp + val step = 8.dp + + val typedValue = TypedValue() + val theme = context.theme + theme.resolveAttribute(R.attr.default_divider, typedValue, true) + @ColorInt val color: Int = typedValue.data + + + val bitmap = createBitmap(imageSize, imageSize) + val canvas = Canvas(bitmap) + val paint = Paint() + + val path = Path() + path.addRoundRect(RectF(0F, 0F, imageSize.toFloat(), imageSize.toFloat()), step.toFloat(), step.toFloat(), Path.Direction.CCW) + + canvas.clipPath(path) + + + paint.color = if (equalizerEntry.presetIndex == -1) ContextCompat.getColor(context, R.color.orange500focus) else color + var x = 0 + bands.sortedBy { it.index }.forEach { + val heightPc = (it.bandValue + 20) / 40 + if (BuildConfig.DEBUG) Log.d("BandBitmap", "band value is ${it.bandValue} and height is ${heightPc * 38}") + canvas.drawRect(Rect(x, imageSize, x + step, imageSize - (66 * heightPc).toInt().dp), paint) + x += step + } + paint.color = color + + canvas.drawPath(path, paint) + return bitmap +} + +@BindingAdapter("equalizerImage") +fun equalizerImage(view: ImageView, item: EqualizerWithBands) { + view.setImageBitmap(item.getBitmap(view.context)) +} + +@BindingAdapter("equalizerNameColor") +fun equalizerNameColor(view: TextView, item: EqualizerWithBands) { + val typedValue = TypedValue() + val theme = view.context.theme + theme.resolveAttribute(if (item.equalizerEntry.isDisabled)R.attr.font_disabled else R.attr.font_default, typedValue, true) + @ColorInt val color: Int = typedValue.data + view.setTextColor(color) +} + + diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt index 2a454b1ea..908dd27ff 100644 --- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt +++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt @@ -53,6 +53,7 @@ import org.videolan.tools.Settings import org.videolan.tools.Settings.isPinCodeSet import org.videolan.tools.VIDEO_RESUME_PLAYBACK import org.videolan.vlc.R +import org.videolan.vlc.gui.EqualizerSettingsActivity import org.videolan.vlc.gui.PinCodeActivity import org.videolan.vlc.gui.PinCodeReason import org.videolan.vlc.gui.SecondaryActivity @@ -160,6 +161,7 @@ class PreferencesFragment : BasePreferenceFragment(), SharedPreferences.OnShared "video_category" -> loadFragment(PreferencesVideo()) "subtitles_category" -> loadFragment(PreferencesSubtitles()) "audio_category" -> loadFragment(PreferencesAudio()) + "equalizer" -> startActivity(Intent(requireActivity().applicationContext, EqualizerSettingsActivity::class.java)) "adv_category" -> loadFragment(PreferencesAdvanced()) "casting_category" -> loadFragment(PreferencesCasting()) "parental_control" -> { diff --git a/application/vlc-android/src/org/videolan/vlc/repository/EqualizerRepository.kt b/application/vlc-android/src/org/videolan/vlc/repository/EqualizerRepository.kt index e26842f37..c379d48f1 100644 --- a/application/vlc-android/src/org/videolan/vlc/repository/EqualizerRepository.kt +++ b/application/vlc-android/src/org/videolan/vlc/repository/EqualizerRepository.kt @@ -41,6 +41,10 @@ class EqualizerRepository(private val equalizerDao: EqualizerDao, private val co equalizerDao.getEnabledEqualizerEntries() } + val equalizerEntriesUnfiltered by lazy { + equalizerDao.getAllEqualizerEntries() + } + fun getCurrentEqualizer(context: Context) = equalizerDao.getCurrentEqualizer(Settings.getInstance(context).getLong(KEY_CURRENT_EQUALIZER_ID, 1L)) /**