mirror of
https://github.com/skyline-emu/skyline.git
synced 2024-12-29 13:35:30 +03:00
Partially revert 'Make all Dialog
s use @color/backgroundColor
as the background color'
This partially reverts commit 36a1f2a2ec
.
This commit is contained in:
parent
dec04db647
commit
f63fdf26c9
@ -70,7 +70,6 @@ class AppDialog : BottomSheetDialogFragment() {
|
|||||||
|
|
||||||
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
|
|
||||||
|
|
||||||
val missingIcon = ContextCompat.getDrawable(requireActivity(), R.drawable.default_icon)!!.toBitmap(256, 256)
|
val missingIcon = ContextCompat.getDrawable(requireActivity(), R.drawable.default_icon)!!.toBitmap(256, 256)
|
||||||
|
|
||||||
|
@ -64,7 +64,6 @@ class ButtonDialog @JvmOverloads constructor(private val item : ControllerButton
|
|||||||
|
|
||||||
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
|
|
||||||
|
|
||||||
if (item != null && context is ControllerActivity) {
|
if (item != null && context is ControllerActivity) {
|
||||||
val context = requireContext() as ControllerActivity
|
val context = requireContext() as ControllerActivity
|
||||||
|
@ -47,7 +47,6 @@ class RumbleDialog @JvmOverloads constructor(val item : ControllerGeneralViewIte
|
|||||||
|
|
||||||
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
|
|
||||||
|
|
||||||
if (item != null && context is ControllerActivity) {
|
if (item != null && context is ControllerActivity) {
|
||||||
val context = requireContext() as ControllerActivity
|
val context = requireContext() as ControllerActivity
|
||||||
|
@ -240,7 +240,6 @@ class StickDialog @JvmOverloads constructor(val item : ControllerStickViewItem?
|
|||||||
|
|
||||||
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
|
|
||||||
|
|
||||||
if (item != null && context is ControllerActivity) {
|
if (item != null && context is ControllerActivity) {
|
||||||
val context = requireContext() as ControllerActivity
|
val context = requireContext() as ControllerActivity
|
||||||
|
@ -9,7 +9,6 @@ import android.graphics.Rect
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import emu.skyline.R
|
|
||||||
import emu.skyline.databinding.LicenseDialogBinding
|
import emu.skyline.databinding.LicenseDialogBinding
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -35,7 +34,6 @@ class LicenseDialog : BottomSheetDialogFragment() {
|
|||||||
|
|
||||||
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
|
|
||||||
|
|
||||||
binding.libraryTitle.text = requireArguments().getString(LicensePreference.LIBRARY_TITLE_ARG)
|
binding.libraryTitle.text = requireArguments().getString(LicensePreference.LIBRARY_TITLE_ARG)
|
||||||
binding.libraryUrl.text = requireArguments().getString(LicensePreference.LIBRARY_URL_ARG)
|
binding.libraryUrl.text = requireArguments().getString(LicensePreference.LIBRARY_URL_ARG)
|
||||||
|
Loading…
Reference in New Issue
Block a user