mirror of
https://github.com/YTVanced/VancedManager
synced 2024-11-29 22:43:01 +00:00
clickable boundary adjustments
This commit is contained in:
parent
4efaaed304
commit
238943af62
4 changed files with 20 additions and 8 deletions
|
@ -36,7 +36,7 @@ class MusicPreferencesDialog : BindingBottomSheetDialogFragment<DialogMusicPrefe
|
||||||
val musicVersionsConv = musicVersions.value?.value?.convertToAppVersions()
|
val musicVersionsConv = musicVersions.value?.value?.convertToAppVersions()
|
||||||
musicInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.music))
|
musicInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.music))
|
||||||
musicVersion.text = getString(R.string.chosen_version, prefs.musicVersion?.formatVersion(requireActivity()))
|
musicVersion.text = getString(R.string.chosen_version, prefs.musicVersion?.formatVersion(requireActivity()))
|
||||||
openVersionSelector.setOnClickListener {
|
openVersionSelectorLayout.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
showDialog(
|
showDialog(
|
||||||
AppVersionSelectorDialog.newInstance(
|
AppVersionSelectorDialog.newInstance(
|
||||||
|
|
|
@ -47,11 +47,11 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment<DialogVancedPre
|
||||||
vancedTheme.text = getString(R.string.chosen_theme, installPrefs.theme?.convertToAppTheme(requireActivity()))
|
vancedTheme.text = getString(R.string.chosen_theme, installPrefs.theme?.convertToAppTheme(requireActivity()))
|
||||||
vancedVersion.text = getString(R.string.chosen_version, defPrefs.vancedVersion?.formatVersion(requireActivity()))
|
vancedVersion.text = getString(R.string.chosen_version, defPrefs.vancedVersion?.formatVersion(requireActivity()))
|
||||||
vancedLang.text = getString(R.string.chosen_lang, showLang)
|
vancedLang.text = getString(R.string.chosen_lang, showLang)
|
||||||
openThemeSelector.setOnClickListener {
|
openThemeSelectorLayout.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
showDialog(VancedThemeSelectorDialog())
|
showDialog(VancedThemeSelectorDialog())
|
||||||
}
|
}
|
||||||
openVersionSelector.setOnClickListener {
|
openVersionSelectorLayout.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
showDialog(
|
showDialog(
|
||||||
AppVersionSelectorDialog.newInstance(
|
AppVersionSelectorDialog.newInstance(
|
||||||
|
@ -60,7 +60,7 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment<DialogVancedPre
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
openLanguageSelector.setOnClickListener {
|
openLanguageSelectorLayout.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
showDialog(VancedLanguageSelectionDialog())
|
showDialog(VancedLanguageSelectionDialog())
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
style="@style/BottomDialogCardTitle" />
|
style="@style/BottomDialogCardTitle" />
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
android:id="@+id/open_version_selector_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp">
|
android:layout_marginTop="12dp">
|
||||||
|
@ -23,7 +24,7 @@
|
||||||
android:layout_toStartOf="@id/open_version_selector"
|
android:layout_toStartOf="@id/open_version_selector"
|
||||||
style="@style/BottomDialogCardTextItem" />
|
style="@style/BottomDialogCardTextItem" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageView
|
||||||
android:id="@+id/open_version_selector"
|
android:id="@+id/open_version_selector"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -32,11 +33,14 @@
|
||||||
android:maxWidth="24dp"
|
android:maxWidth="24dp"
|
||||||
android:maxHeight="24dp"
|
android:maxHeight="24dp"
|
||||||
android:src="@drawable/ic_baseline_navigate_next_36" />
|
android:src="@drawable/ic_baseline_navigate_next_36" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<com.vanced.manager.ui.core.ThemedMaterialButton
|
<com.vanced.manager.ui.core.ThemedMaterialButton
|
||||||
android:id="@+id/music_install"
|
android:id="@+id/music_install"
|
||||||
android:text="@string/install"
|
android:text="@string/install"
|
||||||
style="@style/BottomDialogButtonStyle" />
|
style="@style/BottomDialogButtonStyle" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
</com.google.android.material.card.MaterialCardView>
|
|
@ -14,6 +14,7 @@
|
||||||
style="@style/BottomDialogCardTitle" />
|
style="@style/BottomDialogCardTitle" />
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
android:id="@+id/open_theme_selector_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp">
|
android:layout_marginTop="12dp">
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
android:layout_toStartOf="@id/open_theme_selector"
|
android:layout_toStartOf="@id/open_theme_selector"
|
||||||
style="@style/BottomDialogCardTextItem" />
|
style="@style/BottomDialogCardTextItem" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageView
|
||||||
android:id="@+id/open_theme_selector"
|
android:id="@+id/open_theme_selector"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -34,9 +35,11 @@
|
||||||
android:maxWidth="24dp"
|
android:maxWidth="24dp"
|
||||||
android:maxHeight="24dp"
|
android:maxHeight="24dp"
|
||||||
android:src="@drawable/ic_baseline_navigate_next_36" />
|
android:src="@drawable/ic_baseline_navigate_next_36" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
android:id="@+id/open_version_selector_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp">
|
android:layout_marginTop="12dp">
|
||||||
|
@ -48,7 +51,7 @@
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:layout_toStartOf="@id/open_version_selector" />
|
android:layout_toStartOf="@id/open_version_selector" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageView
|
||||||
android:id="@+id/open_version_selector"
|
android:id="@+id/open_version_selector"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -57,9 +60,11 @@
|
||||||
android:maxWidth="24dp"
|
android:maxWidth="24dp"
|
||||||
android:maxHeight="24dp"
|
android:maxHeight="24dp"
|
||||||
android:src="@drawable/ic_baseline_navigate_next_36" />
|
android:src="@drawable/ic_baseline_navigate_next_36" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
android:id="@+id/open_language_selector_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp">
|
android:layout_marginTop="8dp">
|
||||||
|
@ -71,7 +76,7 @@
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:layout_toStartOf="@+id/open_language_selector" />
|
android:layout_toStartOf="@+id/open_language_selector" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageView
|
||||||
android:id="@+id/open_language_selector"
|
android:id="@+id/open_language_selector"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -80,11 +85,14 @@
|
||||||
android:maxWidth="24dp"
|
android:maxWidth="24dp"
|
||||||
android:maxHeight="24dp"
|
android:maxHeight="24dp"
|
||||||
android:src="@drawable/ic_baseline_navigate_next_36" />
|
android:src="@drawable/ic_baseline_navigate_next_36" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<com.vanced.manager.ui.core.ThemedMaterialButton
|
<com.vanced.manager.ui.core.ThemedMaterialButton
|
||||||
android:id="@+id/vanced_install"
|
android:id="@+id/vanced_install"
|
||||||
android:text="@string/install"
|
android:text="@string/install"
|
||||||
style="@style/BottomDialogButtonStyle" />
|
style="@style/BottomDialogButtonStyle" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
</com.google.android.material.card.MaterialCardView>
|
Loading…
Reference in a new issue