Fix several theming issues for Contact Selection.

fork-5.53.8
Alex Hart 2022-03-18 10:32:03 -03:00
rodzic 7e0cd99f48
commit e603391c35
4 zmienionych plików z 15 dodań i 7 usunięć

Wyświetl plik

@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components
import android.app.Dialog
import android.os.Bundle
import android.view.ContextThemeWrapper
import android.view.LayoutInflater
import android.view.View
import androidx.annotation.StyleRes
import androidx.core.view.ViewCompat

Wyświetl plik

@ -171,7 +171,11 @@ object ContactSearchItems {
}
protected open fun bindSmsTagField(model: T) {
smsTag.visible = false
smsTag.visible = isSmsContact(model)
}
private fun isSmsContact(model: T): Boolean {
return (getRecipient(model).isForceSmsSelection || getRecipient(model).isUnregistered) && !getRecipient(model).isDistributionList
}
abstract fun isSelected(model: T): Boolean

Wyświetl plik

@ -5,6 +5,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.view.ContextThemeWrapper
import androidx.fragment.app.setFragmentResult
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog

Wyświetl plik

@ -11,6 +11,7 @@ import android.widget.EditText
import android.widget.TextView
import android.widget.Toast
import androidx.annotation.PluralsRes
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
@ -47,10 +48,7 @@ import org.thoughtcrime.securesms.util.fragments.findListener
import org.thoughtcrime.securesms.util.views.SimpleProgressDialog
import org.thoughtcrime.securesms.util.visible
class MultiselectForwardFragment :
Fragment(),
SafetyNumberChangeDialog.Callback,
ChooseStoryTypeBottomSheet.Callback {
class MultiselectForwardFragment : Fragment(R.layout.multiselect_forward_fragment), SafetyNumberChangeDialog.Callback, ChooseStoryTypeBottomSheet.Callback {
private val viewModel: MultiselectForwardViewModel by viewModels(factoryProducer = this::createViewModelFactory)
private val disposables = LifecycleDisposable()
@ -69,8 +67,12 @@ class MultiselectForwardFragment :
private fun getMultiShareArgs(): ArrayList<MultiShareArgs> = requireNotNull(requireArguments().getParcelableArrayList(ARG_MULTISHARE_ARGS))
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.multiselect_forward_fragment, container, false)
override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
return if (parentFragment != null) {
requireParentFragment().onGetLayoutInflater(savedInstanceState)
} else {
super.onGetLayoutInflater(savedInstanceState)
}
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {