diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt index 98074ad5..3a40696d 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt @@ -2,51 +2,54 @@ package com.vanced.manager.ui.dialogs import android.os.Bundle import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil -import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.vanced.manager.R import com.vanced.manager.databinding.DialogMusicPreferencesBinding +import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment import com.vanced.manager.utils.Extensions.convertToAppVersions import com.vanced.manager.utils.Extensions.getDefaultPrefs import com.vanced.manager.utils.Extensions.show import com.vanced.manager.utils.InternetTools.musicVersions -class MusicPreferencesDialog : BottomSheetDialogFragment() { +class MusicPreferencesDialog : BindingBottomSheetDialogFragment() { + + companion object { + + fun newInstance(): MusicPreferencesDialog = MusicPreferencesDialog().apply { + arguments = Bundle() + } + } - private lateinit var binding: DialogMusicPreferencesBinding private val prefs by lazy { requireActivity().getDefaultPrefs() } - override fun onCreateView( + override fun binding( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - binding = DataBindingUtil.inflate(inflater, R.layout.dialog_music_preferences, container, false) - return binding.root + ) = DialogMusicPreferencesBinding.inflate(inflater, container, false) + + override fun otherSetups() { + bindData() } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - val musicVersionsConv = musicVersions.get()?.value?.reversed()?.convertToAppVersions() - - binding.musicInstallTitle.text = requireActivity().getString(R.string.app_installation_preferences, requireActivity().getString(R.string.music)) - binding.musicVersion.text = requireActivity().getString(R.string.chosen_version, prefs.getString("music_version", "latest")) - - binding.openVersionSelector.setOnClickListener { - dismiss() - AppVersionSelectorDialog.newInstance( - versions = musicVersionsConv, - app = "music" - ).show(requireActivity()) - } - binding.musicInstall.setOnClickListener { - dismiss() - AppDownloadDialog.newInstance( - app = getString(R.string.music) - ).show(requireActivity()) + private fun bindData() { + with(binding) { + val musicVersionsConv = musicVersions.get()?.value?.reversed()?.convertToAppVersions() + musicInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.music)) + musicVersion.text = getString(R.string.chosen_version, prefs.getString("music_version", "latest")) + openVersionSelector.setOnClickListener { + dismiss() + AppVersionSelectorDialog.newInstance( + versions = musicVersionsConv, + app = "music" + ).show(requireActivity()) + } + musicInstall.setOnClickListener { + dismiss() + AppDownloadDialog.newInstance( + app = getString(R.string.music) + ).show(requireActivity()) + } } } } \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_music_preferences.xml b/app/src/main/res/layout/dialog_music_preferences.xml index c92ba97a..bafa32a9 100644 --- a/app/src/main/res/layout/dialog_music_preferences.xml +++ b/app/src/main/res/layout/dialog_music_preferences.xml @@ -1,50 +1,43 @@ - + - + - + + + android:layout_marginTop="12dp"> + android:id="@+id/music_version" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@id/open_version_selector" + style="@style/BottomDialogCardTextItem"/> - + android:layout_alignParentEnd="true" + android:background="@android:color/transparent" + android:maxWidth="24dp" + android:maxHeight="24dp" + android:src="@drawable/ic_baseline_navigate_next_36"/> + - - - - - - - - - - - - - + + + \ No newline at end of file