|
|
|
@ -15,21 +15,11 @@ import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.widget.CompoundButton
|
|
|
|
import android.widget.CompoundButton
|
|
|
|
import android.widget.LinearLayout
|
|
|
|
import android.widget.LinearLayout
|
|
|
|
|
|
|
|
import android.widget.RadioButton
|
|
|
|
import androidx.constraintlayout.widget.ConstraintLayout
|
|
|
|
import androidx.constraintlayout.widget.ConstraintLayout
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import androidx.navigation.fragment.findNavController
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.custom_search_engine_form
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.custom_search_engine_name_field
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.custom_search_engine_search_string_field
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.custom_search_engines_learn_more
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.edit_engine_name
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.custom_search_engine.edit_search_string
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.fragment_add_search_engine.search_engine_group
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.search_engine_radio_button.view.engine_icon
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.search_engine_radio_button.view.engine_text
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.search_engine_radio_button.view.overflow_menu
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.search_engine_radio_button.view.radio_button
|
|
|
|
|
|
|
|
import kotlinx.coroutines.Dispatchers.IO
|
|
|
|
import kotlinx.coroutines.Dispatchers.IO
|
|
|
|
import kotlinx.coroutines.Dispatchers.Main
|
|
|
|
import kotlinx.coroutines.Dispatchers.Main
|
|
|
|
import kotlinx.coroutines.launch
|
|
|
|
import kotlinx.coroutines.launch
|
|
|
|
@ -43,6 +33,10 @@ import org.mozilla.fenix.HomeActivity
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.components.FenixSnackbar
|
|
|
|
import org.mozilla.fenix.components.FenixSnackbar
|
|
|
|
import org.mozilla.fenix.components.metrics.Event
|
|
|
|
import org.mozilla.fenix.components.metrics.Event
|
|
|
|
|
|
|
|
import org.mozilla.fenix.databinding.CustomSearchEngineBinding
|
|
|
|
|
|
|
|
import org.mozilla.fenix.databinding.CustomSearchEngineRadioButtonBinding
|
|
|
|
|
|
|
|
import org.mozilla.fenix.databinding.FragmentAddSearchEngineBinding
|
|
|
|
|
|
|
|
import org.mozilla.fenix.databinding.SearchEngineRadioButtonBinding
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
import org.mozilla.fenix.ext.showToolbar
|
|
|
|
import org.mozilla.fenix.ext.showToolbar
|
|
|
|
@ -55,6 +49,10 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
private var selectedIndex: Int = -1
|
|
|
|
private var selectedIndex: Int = -1
|
|
|
|
private val engineViews = mutableListOf<View>()
|
|
|
|
private val engineViews = mutableListOf<View>()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private var _binding: FragmentAddSearchEngineBinding? = null
|
|
|
|
|
|
|
|
private val binding get() = _binding!!
|
|
|
|
|
|
|
|
private lateinit var customSearchEngine: CustomSearchEngineBinding
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
|
super.onCreate(savedInstanceState)
|
|
|
|
super.onCreate(savedInstanceState)
|
|
|
|
setHasOptionsMenu(true)
|
|
|
|
setHasOptionsMenu(true)
|
|
|
|
@ -77,6 +75,8 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
|
|
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
|
|
|
ViewGroup.LayoutParams.WRAP_CONTENT
|
|
|
|
ViewGroup.LayoutParams.WRAP_CONTENT
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
_binding = FragmentAddSearchEngineBinding.bind(view)
|
|
|
|
|
|
|
|
customSearchEngine = binding.customSearchEngine
|
|
|
|
|
|
|
|
|
|
|
|
val setupSearchEngineItem: (Int, SearchEngine) -> Unit = { index, engine ->
|
|
|
|
val setupSearchEngineItem: (Int, SearchEngine) -> Unit = { index, engine ->
|
|
|
|
val engineId = engine.id
|
|
|
|
val engineId = engine.id
|
|
|
|
@ -85,24 +85,24 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
layoutInflater = layoutInflater,
|
|
|
|
layoutInflater = layoutInflater,
|
|
|
|
res = requireContext().resources
|
|
|
|
res = requireContext().resources
|
|
|
|
)
|
|
|
|
)
|
|
|
|
engineItem.id = index
|
|
|
|
engineItem.root.id = index
|
|
|
|
engineItem.tag = engineId
|
|
|
|
engineItem.root.tag = engineId
|
|
|
|
engineItem.radio_button.isChecked = selectedIndex == index
|
|
|
|
engineItem.radioButton.isChecked = selectedIndex == index
|
|
|
|
engineViews.add(engineItem)
|
|
|
|
engineViews.add(engineItem.root)
|
|
|
|
search_engine_group.addView(engineItem, layoutParams)
|
|
|
|
binding.searchEngineGroup.addView(engineItem.root, layoutParams)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
availableEngines.forEachIndexed(setupSearchEngineItem)
|
|
|
|
availableEngines.forEachIndexed(setupSearchEngineItem)
|
|
|
|
|
|
|
|
|
|
|
|
val engineItem = makeCustomButton(layoutInflater)
|
|
|
|
val engineItem = makeCustomButton(layoutInflater)
|
|
|
|
engineItem.id = CUSTOM_INDEX
|
|
|
|
engineItem.root.id = CUSTOM_INDEX
|
|
|
|
engineItem.radio_button.isChecked = selectedIndex == CUSTOM_INDEX
|
|
|
|
engineItem.radioButton.isChecked = selectedIndex == CUSTOM_INDEX
|
|
|
|
engineViews.add(engineItem)
|
|
|
|
engineViews.add(engineItem.root)
|
|
|
|
search_engine_group.addView(engineItem, layoutParams)
|
|
|
|
binding.searchEngineGroup.addView(engineItem.root, layoutParams)
|
|
|
|
|
|
|
|
|
|
|
|
toggleCustomForm(selectedIndex == CUSTOM_INDEX)
|
|
|
|
toggleCustomForm(selectedIndex == CUSTOM_INDEX)
|
|
|
|
|
|
|
|
|
|
|
|
custom_search_engines_learn_more.setOnClickListener {
|
|
|
|
customSearchEngine.customSearchEnginesLearnMore.setOnClickListener {
|
|
|
|
(activity as HomeActivity).openToBrowserAndLoad(
|
|
|
|
(activity as HomeActivity).openToBrowserAndLoad(
|
|
|
|
searchTermOrURL = SupportUtils.getSumoURLForTopic(
|
|
|
|
searchTermOrURL = SupportUtils.getSumoURLForTopic(
|
|
|
|
requireContext(),
|
|
|
|
requireContext(),
|
|
|
|
@ -119,6 +119,11 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
showToolbar(getString(R.string.search_engine_add_custom_search_engine_title))
|
|
|
|
showToolbar(getString(R.string.search_engine_add_custom_search_engine_title))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun onDestroyView() {
|
|
|
|
|
|
|
|
super.onDestroyView()
|
|
|
|
|
|
|
|
_binding = null
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
|
|
|
|
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
|
|
|
|
inflater.inflate(R.menu.add_custom_searchengine_menu, menu)
|
|
|
|
inflater.inflate(R.menu.add_custom_searchengine_menu, menu)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -143,11 +148,11 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
|
|
|
|
|
|
|
|
@Suppress("ComplexMethod")
|
|
|
|
@Suppress("ComplexMethod")
|
|
|
|
private fun createCustomEngine() {
|
|
|
|
private fun createCustomEngine() {
|
|
|
|
custom_search_engine_name_field.error = ""
|
|
|
|
customSearchEngine.customSearchEngineNameField.error = ""
|
|
|
|
custom_search_engine_search_string_field.error = ""
|
|
|
|
customSearchEngine.customSearchEngineSearchStringField.error = ""
|
|
|
|
|
|
|
|
|
|
|
|
val name = edit_engine_name.text?.toString()?.trim() ?: ""
|
|
|
|
val name = customSearchEngine.editEngineName.text?.toString()?.trim() ?: ""
|
|
|
|
val searchString = edit_search_string.text?.toString() ?: ""
|
|
|
|
val searchString = customSearchEngine.editSearchString.text?.toString() ?: ""
|
|
|
|
|
|
|
|
|
|
|
|
if (checkForErrors(name, searchString)) {
|
|
|
|
if (checkForErrors(name, searchString)) {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
@ -163,7 +168,7 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
|
|
|
|
|
|
|
|
when (result) {
|
|
|
|
when (result) {
|
|
|
|
SearchStringValidator.Result.CannotReach -> {
|
|
|
|
SearchStringValidator.Result.CannotReach -> {
|
|
|
|
custom_search_engine_search_string_field.error = resources
|
|
|
|
customSearchEngine.customSearchEngineSearchStringField.error = resources
|
|
|
|
.getString(R.string.search_add_custom_engine_error_cannot_reach, name)
|
|
|
|
.getString(R.string.search_add_custom_engine_error_cannot_reach, name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SearchStringValidator.Result.Success -> {
|
|
|
|
SearchStringValidator.Result.Success -> {
|
|
|
|
@ -198,17 +203,17 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
fun checkForErrors(name: String, searchString: String): Boolean {
|
|
|
|
fun checkForErrors(name: String, searchString: String): Boolean {
|
|
|
|
return when {
|
|
|
|
return when {
|
|
|
|
name.isEmpty() -> {
|
|
|
|
name.isEmpty() -> {
|
|
|
|
custom_search_engine_name_field.error = resources
|
|
|
|
customSearchEngine.customSearchEngineNameField.error = resources
|
|
|
|
.getString(R.string.search_add_custom_engine_error_empty_name)
|
|
|
|
.getString(R.string.search_add_custom_engine_error_empty_name)
|
|
|
|
true
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
searchString.isEmpty() -> {
|
|
|
|
searchString.isEmpty() -> {
|
|
|
|
custom_search_engine_search_string_field.error =
|
|
|
|
customSearchEngine.customSearchEngineSearchStringField.error =
|
|
|
|
resources.getString(R.string.search_add_custom_engine_error_empty_search_string)
|
|
|
|
resources.getString(R.string.search_add_custom_engine_error_empty_search_string)
|
|
|
|
true
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
!searchString.contains("%s") -> {
|
|
|
|
!searchString.contains("%s") -> {
|
|
|
|
custom_search_engine_search_string_field.error =
|
|
|
|
customSearchEngine.customSearchEngineSearchStringField.error =
|
|
|
|
resources.getString(R.string.search_add_custom_engine_error_missing_template)
|
|
|
|
resources.getString(R.string.search_add_custom_engine_error_missing_template)
|
|
|
|
true
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -218,14 +223,16 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
|
|
|
|
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
|
|
|
|
engineViews.forEach {
|
|
|
|
engineViews.forEach {
|
|
|
|
when (it.radio_button == buttonView) {
|
|
|
|
when (it.findViewById<RadioButton>(R.id.radio_button) == buttonView) {
|
|
|
|
true -> {
|
|
|
|
true -> {
|
|
|
|
selectedIndex = it.id
|
|
|
|
selectedIndex = it.id
|
|
|
|
}
|
|
|
|
}
|
|
|
|
false -> {
|
|
|
|
false -> {
|
|
|
|
it.radio_button.setOnCheckedChangeListener(null)
|
|
|
|
it.findViewById<RadioButton>(R.id.radio_button).also { radioButton ->
|
|
|
|
it.radio_button.isChecked = false
|
|
|
|
radioButton.setOnCheckedChangeListener(null)
|
|
|
|
it.radio_button.setOnCheckedChangeListener(this)
|
|
|
|
radioButton.isChecked = false
|
|
|
|
|
|
|
|
radioButton.setOnCheckedChangeListener(this)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -233,37 +240,40 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine),
|
|
|
|
toggleCustomForm(selectedIndex == -1)
|
|
|
|
toggleCustomForm(selectedIndex == -1)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun makeCustomButton(layoutInflater: LayoutInflater): View {
|
|
|
|
private fun makeCustomButton(layoutInflater: LayoutInflater): CustomSearchEngineRadioButtonBinding {
|
|
|
|
val wrapper = layoutInflater
|
|
|
|
val wrapper = layoutInflater
|
|
|
|
.inflate(R.layout.custom_search_engine_radio_button, null) as ConstraintLayout
|
|
|
|
.inflate(R.layout.custom_search_engine_radio_button, null) as ConstraintLayout
|
|
|
|
wrapper.setOnClickListener { wrapper.radio_button.isChecked = true }
|
|
|
|
val customSearchEngineRadioButtonBinding = CustomSearchEngineRadioButtonBinding.bind(wrapper)
|
|
|
|
wrapper.radio_button.setOnCheckedChangeListener(this)
|
|
|
|
wrapper.setOnClickListener { customSearchEngineRadioButtonBinding.radioButton.isChecked = true }
|
|
|
|
return wrapper
|
|
|
|
customSearchEngineRadioButtonBinding.radioButton.setOnCheckedChangeListener(this)
|
|
|
|
|
|
|
|
return customSearchEngineRadioButtonBinding
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun toggleCustomForm(isEnabled: Boolean) {
|
|
|
|
private fun toggleCustomForm(isEnabled: Boolean) {
|
|
|
|
custom_search_engine_form.alpha = if (isEnabled) ENABLED_ALPHA else DISABLED_ALPHA
|
|
|
|
customSearchEngine.customSearchEngineForm.alpha = if (isEnabled) ENABLED_ALPHA else DISABLED_ALPHA
|
|
|
|
edit_search_string.isEnabled = isEnabled
|
|
|
|
customSearchEngine.editSearchString.isEnabled = isEnabled
|
|
|
|
edit_engine_name.isEnabled = isEnabled
|
|
|
|
customSearchEngine.editEngineName.isEnabled = isEnabled
|
|
|
|
custom_search_engines_learn_more.isEnabled = isEnabled
|
|
|
|
customSearchEngine.customSearchEnginesLearnMore.isEnabled = isEnabled
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun makeButtonFromSearchEngine(
|
|
|
|
private fun makeButtonFromSearchEngine(
|
|
|
|
engine: SearchEngine,
|
|
|
|
engine: SearchEngine,
|
|
|
|
layoutInflater: LayoutInflater,
|
|
|
|
layoutInflater: LayoutInflater,
|
|
|
|
res: Resources
|
|
|
|
res: Resources
|
|
|
|
): View {
|
|
|
|
): SearchEngineRadioButtonBinding {
|
|
|
|
val wrapper = layoutInflater
|
|
|
|
val wrapper = layoutInflater
|
|
|
|
.inflate(R.layout.search_engine_radio_button, null) as LinearLayout
|
|
|
|
.inflate(R.layout.search_engine_radio_button, null) as LinearLayout
|
|
|
|
wrapper.setOnClickListener { wrapper.radio_button.isChecked = true }
|
|
|
|
val searchEngineRadioButtonBinding = SearchEngineRadioButtonBinding.bind(wrapper)
|
|
|
|
wrapper.radio_button.setOnCheckedChangeListener(this)
|
|
|
|
|
|
|
|
wrapper.engine_text.text = engine.name
|
|
|
|
wrapper.setOnClickListener { searchEngineRadioButtonBinding.radioButton.isChecked = true }
|
|
|
|
|
|
|
|
searchEngineRadioButtonBinding.radioButton.setOnCheckedChangeListener(this)
|
|
|
|
|
|
|
|
searchEngineRadioButtonBinding.engineText.text = engine.name
|
|
|
|
val iconSize = res.getDimension(R.dimen.preference_icon_drawable_size).toInt()
|
|
|
|
val iconSize = res.getDimension(R.dimen.preference_icon_drawable_size).toInt()
|
|
|
|
val engineIcon = BitmapDrawable(res, engine.icon)
|
|
|
|
val engineIcon = BitmapDrawable(res, engine.icon)
|
|
|
|
engineIcon.setBounds(0, 0, iconSize, iconSize)
|
|
|
|
engineIcon.setBounds(0, 0, iconSize, iconSize)
|
|
|
|
wrapper.engine_icon.setImageDrawable(engineIcon)
|
|
|
|
searchEngineRadioButtonBinding.engineIcon.setImageDrawable(engineIcon)
|
|
|
|
wrapper.overflow_menu.visibility = View.GONE
|
|
|
|
searchEngineRadioButtonBinding.overflowMenu.visibility = View.GONE
|
|
|
|
return wrapper
|
|
|
|
return searchEngineRadioButtonBinding
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
companion object {
|
|
|
|
companion object {
|
|
|
|
|
mcarare
3 years ago
committed by
mergify[bot]