Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added back disable chat feature in corePreferences

Browse source
This commit is contained in:
Sylvain Berfini 2020-11-03 11:22:07 +01:00
parent a4e3abd4c4
commit 3b24fcd097
17 changed files with 184 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
View file

@ -85,6 +85,8 @@ class ControlsViewModel : ViewModel() {
val somethingClickedEvent = MutableLiveData<Event<Boolean>>()
val chatAllowed = !LinphoneApplication.corePreferences.disableChat
private val vibrator = coreContext.context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
val onKeyClick: NumpadDigitListener = object : NumpadDigitListener {

10
app/src/main/java/org/linphone/activities/main/MainActivity.kt
View file

@ -220,6 +220,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
}
intent.hasExtra("Chat") -> {
if (corePreferences.disableChat) return
val deepLink = if (intent.hasExtra("RemoteSipUri") && intent.hasExtra("LocalSipUri")) {
val peerAddress = intent.getStringExtra("RemoteSipUri")
val localAddress = intent.getStringExtra("LocalSipUri")
@ -262,6 +264,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
}
private fun handleSendText(intent: Intent) {
if (corePreferences.disableChat) return
intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
sharedViewModel.textToShare.value = it
}
@ -270,6 +274,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
}
private suspend fun handleSendFile(intent: Intent) {
if (corePreferences.disableChat) return
(intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
val list = arrayListOf<String>()
coroutineScope {
@ -289,6 +295,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
}
private suspend fun handleSendMultipleFiles(intent: Intent) {
if (corePreferences.disableChat) return
intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM)?.let {
val list = arrayListOf<String>()
coroutineScope {
@ -310,6 +318,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
}
private fun handleSendChatRoom(intent: Intent) {
if (corePreferences.disableChat) return
val uri = intent.data
if (uri != null) {
Log.i("[Main Activity] Found uri: $uri to send a message to")

3
app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactNumberOrAddressViewModel.kt
View file

@ -20,6 +20,7 @@
package org.linphone.activities.main.contact.viewmodels
import androidx.lifecycle.ViewModel
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.core.Address
class ContactNumberOrAddressViewModel(
@ -32,6 +33,8 @@ class ContactNumberOrAddressViewModel(
) : ViewModel() {
val showInvite = !hasPresence && !isSip
val chatAllowed = !corePreferences.disableChat
fun startCall() {
address ?: return
listener.onCall(address)

3
app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
View file

@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModelProvider
import java.text.SimpleDateFormat
import java.util.*
import kotlin.collections.ArrayList
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.contact.GenericContactViewModel
import org.linphone.core.*
@ -105,6 +106,8 @@ class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.r
val waitForChatRoomCreation = MutableLiveData<Boolean>()
val chatAllowed = !corePreferences.disableChat
val secureChatAllowed = contact.value?.friend?.getPresenceModelForUriOrTel(peerSipUri)?.hasCapability(FriendCapability.LimeX3Dh) ?: false
val relatedCallLogs = MutableLiveData<ArrayList<CallLog>>()

17
app/src/main/java/org/linphone/activities/main/viewmodels/TabsViewModel.kt
View file

@ -22,12 +22,17 @@ package org.linphone.activities.main.viewmodels
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.core.*
class TabsViewModel : ViewModel() {
val unreadMessagesCount = MutableLiveData<Int>()
val missedCallsCount = MutableLiveData<Int>()
val leftAnchor = MutableLiveData<Float>()
val middleAnchor = MutableLiveData<Float>()
val rightAnchor = MutableLiveData<Float>()
private val listener: CoreListenerStub = object : CoreListenerStub() {
override fun onCallStateChanged(
core: Core,
@ -58,6 +63,16 @@ class TabsViewModel : ViewModel() {
init {
coreContext.core.addListener(listener)
if (corePreferences.disableChat) {
leftAnchor.value = 1 / 3F
middleAnchor.value = 2 / 3F
rightAnchor.value = 1F
} else {
leftAnchor.value = 0.25F
middleAnchor.value = 0.5F
rightAnchor.value = 0.75F
}
updateUnreadChatCount()
updateMissedCallCount()
}
@ -72,6 +87,6 @@ class TabsViewModel : ViewModel() {
}
fun updateUnreadChatCount() {
unreadMessagesCount.value = coreContext.core.unreadChatMessageCountFromActiveLocals
unreadMessagesCount.value = if (corePreferences.disableChat) 0 else coreContext.core.unreadChatMessageCountFromActiveLocals
}
}

4
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -311,6 +311,10 @@ class CorePreferences constructor(private val context: Context) {
val dtmfKeypadVibration: Boolean
get() = config.getBool("app", "dtmf_keypad_vibraton", false)
// Will disable chat feature completely
val disableChat: Boolean
get() = config.getBool("app", "disable_chat_feature", false)
/* Assistant */
val showCreateAccount: Boolean

2
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -132,7 +132,7 @@ class NotificationsManager(private val context: Context) {
}
override fun onMessageReceived(core: Core, room: ChatRoom, message: ChatMessage) {
if (message.isOutgoing) return
if (message.isOutgoing || corePreferences.disableChat) return
if (currentlyDisplayedChatRoomAddress == room.peerAddress.asStringUriOnly()) {
Log.i("[Notifications Manager] Chat room is currently displayed, do not notify received message")

84
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -32,6 +32,8 @@ import android.view.ViewGroup
import android.view.inputmethod.EditorInfo
import android.widget.*
import android.widget.SeekBar.OnSeekBarChangeListener
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.Guideline
import androidx.databinding.*
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
@ -135,6 +137,13 @@ fun setLayoutToLeftOf(view: View, oldTargetId: Int, newTargetId: Int) {
view.layoutParams = layoutParams
}
@BindingAdapter("layout_constraintGuide_percent")
fun setLayoutConstraintGuidePercent(guideline: Guideline, percent: Float) {
val params = guideline.layoutParams as ConstraintLayout.LayoutParams
params.guidePercent = percent
guideline.layoutParams = params
}
@BindingAdapter("onClickToggleSwitch")
fun switchSetting(view: View, switchId: Int) {
val switch: SwitchMaterial = view.findViewById(switchId)
@ -162,9 +171,9 @@ fun editTextSetting(view: EditText, lambda: () -> Unit) {
}
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
})
}
@ -195,9 +204,9 @@ fun setListener(view: SeekBar, lambda: (Any) -> Unit) {
if (fromUser) lambda(progress)
}
override fun onStartTrackingTouch(seekBar: SeekBar?) { }
override fun onStartTrackingTouch(seekBar: SeekBar?) {}
override fun onStopTrackingTouch(seekBar: SeekBar?) { }
override fun onStopTrackingTouch(seekBar: SeekBar?) {}
})
}
@ -226,7 +235,12 @@ private fun <T> setEntries(
val inflater = viewGroup.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
for (i in entries.indices) {
val entry = entries[i]
val binding = DataBindingUtil.inflate<ViewDataBinding>(inflater, layoutId, viewGroup, false)
val binding = DataBindingUtil.inflate<ViewDataBinding>(
inflater,
layoutId,
viewGroup,
false
)
binding.setVariable(BR.data, entry)
binding.setVariable(BR.longClickListener, onLongClick)
binding.setVariable(BR.parent, parent)
@ -271,7 +285,9 @@ fun <T> setEntries(
@BindingAdapter("glideAvatarFallback")
fun loadAvatarWithGlideFallback(imageView: ImageView, path: String?) {
if (path != null && path.isNotEmpty() && FileUtils.isExtensionImage(path)) {
GlideApp.with(imageView).load(path).apply(RequestOptions.circleCropTransform()).into(imageView)
GlideApp.with(imageView).load(path).apply(RequestOptions.circleCropTransform()).into(
imageView
)
} else {
Log.w("[Data Binding] [Glide] Can't load $path")
imageView.setImageResource(R.drawable.avatar)
@ -295,7 +311,8 @@ fun loadAvatarWithGlide(imageView: ImageView, path: Uri?) {
@BindingAdapter("glideAvatar")
fun loadAvatarWithGlide(imageView: ImageView, path: String?) {
if (path != null) {
GlideApp.with(imageView).load(path).apply(RequestOptions.circleCropTransform()).listener(object :
GlideApp.with(imageView).load(path).apply(RequestOptions.circleCropTransform()).listener(
object :
RequestListener<Drawable?> {
override fun onLoadFailed(
e: GlideException?,
@ -341,13 +358,14 @@ fun addPhoneNumberEditTextValidation(editText: EditText, enabled: Boolean) {
override fun afterTextChanged(s: Editable?) {
when {
s?.matches(Regex("\\d+")) == false ->
editText.error = editText.context.getString(R.string.assistant_error_phone_number_invalid_characters)
editText.error =
editText.context.getString(R.string.assistant_error_phone_number_invalid_characters)
}
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
})
}
@ -355,9 +373,9 @@ fun addPhoneNumberEditTextValidation(editText: EditText, enabled: Boolean) {
fun addPrefixEditTextValidation(editText: EditText, enabled: Boolean) {
if (!enabled) return
editText.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) { }
override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
if (s == null || s.isEmpty() || !s.startsWith("+")) {
@ -370,22 +388,28 @@ fun addPrefixEditTextValidation(editText: EditText, enabled: Boolean) {
@BindingAdapter("assistantUsernameValidation")
fun addUsernameEditTextValidation(editText: EditText, enabled: Boolean) {
if (!enabled) return
val usernameRegexp = corePreferences.config.getString("assistant", "username_regex", "^[a-z0-9+_.\\-]*\$")!!
val usernameRegexp = corePreferences.config.getString(
"assistant",
"username_regex",
"^[a-z0-9+_.\\-]*\$"
)!!
val usernameMaxLength = corePreferences.config.getInt("assistant", "username_max_length", 64)
editText.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
when {
s?.matches(Regex(usernameRegexp)) == false ->
editText.error = editText.context.getString(R.string.assistant_error_username_invalid_characters)
editText.error =
editText.context.getString(R.string.assistant_error_username_invalid_characters)
s?.length ?: 0 > usernameMaxLength -> {
editText.error = editText.context.getString(R.string.assistant_error_username_too_long)
editText.error =
editText.context.getString(R.string.assistant_error_username_too_long)
}
}
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
})
}
@ -393,13 +417,14 @@ fun addUsernameEditTextValidation(editText: EditText, enabled: Boolean) {
fun addEmailEditTextValidation(editText: EditText, enabled: Boolean) {
if (!enabled) return
editText.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) { }
override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
if (!Patterns.EMAIL_ADDRESS.matcher(s).matches()) {
editText.error = editText.context.getString(R.string.assistant_error_invalid_email_address)
editText.error =
editText.context.getString(R.string.assistant_error_invalid_email_address)
}
}
})
@ -409,13 +434,14 @@ fun addEmailEditTextValidation(editText: EditText, enabled: Boolean) {
fun addUrlEditTextValidation(editText: EditText, enabled: Boolean) {
if (!enabled) return
editText.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) { }
override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
if (!Patterns.WEB_URL.matcher(s).matches()) {
editText.error = editText.context.getString(R.string.assistant_remote_provisioning_wrong_format)
editText.error =
editText.context.getString(R.string.assistant_remote_provisioning_wrong_format)
}
}
})
@ -426,11 +452,12 @@ fun addPasswordConfirmationEditTextValidation(password: EditText, passwordConfir
password.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
if (passwordConfirmation.text == null || s == null || passwordConfirmation.text.toString() != s.toString()) {
passwordConfirmation.error = passwordConfirmation.context.getString(R.string.assistant_error_passwords_dont_match)
passwordConfirmation.error =
passwordConfirmation.context.getString(R.string.assistant_error_passwords_dont_match)
} else {
passwordConfirmation.error = null // To clear other edit text field error
}
@ -440,11 +467,12 @@ fun addPasswordConfirmationEditTextValidation(password: EditText, passwordConfir
passwordConfirmation.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
if (password.text == null || s == null || password.text.toString() != s.toString()) {
passwordConfirmation.error = passwordConfirmation.context.getString(R.string.assistant_error_passwords_dont_match)
passwordConfirmation.error =
passwordConfirmation.context.getString(R.string.assistant_error_passwords_dont_match)
}
}
})
@ -474,7 +502,7 @@ fun setEditTextErrorListener(editText: EditText, attrChange: InverseBindingListe
attrChange.onChange()
}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
})
}

3
app/src/main/res/layout-land/history_detail_fragment.xml
View file

@ -124,6 +124,7 @@
<ImageView
android:onClick="@{() -> viewModel.startChat(false)}"
android:visibility="@{viewModel.chatAllowed ? View.VISIBLE : View.GONE}"
android:contentDescription="@string/content_description_start_chat"
android:layout_width="60dp"
android:layout_height="60dp"
@ -133,7 +134,7 @@
<RelativeLayout
android:onClick="@{() -> viewModel.startChat(true)}"
android:visibility="@{viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.chatAllowed &amp;&amp; viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:layout_width="65dp"
android:layout_height="60dp"
android:layout_margin="10dp">

11
app/src/main/res/layout-land/tabs_fragment.xml
View file

@ -33,21 +33,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.25" />
layout_constraintGuide_percent="@{viewModel.leftAnchor, default=0.25}" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineMiddle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5" />
layout_constraintGuide_percent="@{viewModel.middleAnchor, default=0.5}" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineBottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.75" />
layout_constraintGuide_percent="@{viewModel.rightAnchor, default=0.75}" />
<ImageView
android:id="@+id/history"
@ -143,10 +143,7 @@
android:id="@+id/selector"
android:layout_width="@dimen/tabs_fragment_selector_size"
android:layout_height="0dp"
android:background="?attr/accentColor"
app:layout_constraintHeight_percent=".25"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@id/guidelineBottom" />
android:background="?attr/accentColor" />
</androidx.constraintlayout.motion.widget.MotionLayout>

3
app/src/main/res/layout-sw533dp-land/history_detail_fragment.xml
View file

@ -118,6 +118,7 @@
<ImageView
android:onClick="@{() -> viewModel.startChat(false)}"
android:visibility="@{viewModel.chatAllowed ? View.VISIBLE : View.GONE}"
android:contentDescription="@string/content_description_start_chat"
android:layout_width="60dp"
android:layout_height="60dp"
@ -127,7 +128,7 @@
<RelativeLayout
android:onClick="@{() -> viewModel.startChat(true)}"
android:visibility="@{viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.chatAllowed &amp;&amp; viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:layout_width="65dp"
android:layout_height="60dp"
android:layout_margin="10dp">

63
app/src/main/res/layout/call_primary_buttons.xml
View file

@ -8,65 +8,38 @@
type="org.linphone.activities.call.viewmodels.ControlsViewModel" />
</data>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp">
<View
android:id="@+id/vertical_divider"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true" />
<ImageView
android:onClick="@{() -> viewModel.terminateCall()}"
android:contentDescription="@string/content_description_terminate_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/call_hangup_background"
android:padding="12dp"
android:src="@drawable/call_hangup" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/vertical_divider">
<View
android:id="@+id/left_vertical_divider"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"/>
android:layout_height="60dp"
android:orientation="horizontal">
<ImageView
android:onClick="@{() -> viewModel.toggleNumpadVisibility()}"
android:selected="@{viewModel.numpadVisibility}"
android:contentDescription="@string/content_description_show_numpad"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/left_vertical_divider"
android:layout_weight="0.25"
android:background="@drawable/button_background_dark"
android:padding="15dp"
android:src="@drawable/call_numpad" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toRightOf="@id/vertical_divider">
<View
android:id="@+id/right_vertical_divider"
<ImageView
android:onClick="@{() -> viewModel.terminateCall()}"
android:contentDescription="@string/content_description_terminate_call"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"/>
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:background="@drawable/call_hangup_background"
android:padding="12dp"
android:src="@drawable/call_hangup" />
<RelativeLayout
android:onClick="@{() -> viewModel.onChatClicked()}"
android:layout_width="match_parent"
android:visibility="@{viewModel.chatAllowed ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/right_vertical_divider"
android:layout_weight="0.25"
android:background="@drawable/footer_button">
<ImageView
@ -94,8 +67,6 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</layout>

5
app/src/main/res/layout/contact_detail_cell.xml
View file

@ -91,6 +91,7 @@
<ImageView
android:onClick="@{() -> data.startChat(false)}"
android:enabled="@{data.address != null}"
android:visibility="@{data.chatAllowed ? View.VISIBLE : View.GONE}"
android:contentDescription="@string/content_description_start_chat"
android:layout_width="60dp"
android:layout_height="60dp"
@ -99,9 +100,9 @@
android:src="@drawable/chat_start_default" />
<RelativeLayout
android:visibility="@{data.showSecureChat ? View.VISIBLE : View.GONE}"
android:enabled="@{data.address != null}"
android:onClick="@{() -> data.startChat(true)}"
android:enabled="@{data.address != null}"
android:visibility="@{data.chatAllowed &amp;&amp; data.showSecureChat ? View.VISIBLE : View.GONE}"
android:layout_width="65dp"
android:layout_height="60dp"
android:layout_margin="10dp">

3
app/src/main/res/layout/history_detail_fragment.xml
View file

@ -118,6 +118,7 @@
<ImageView
android:onClick="@{() -> viewModel.startChat(false)}"
android:visibility="@{viewModel.chatAllowed ? View.VISIBLE : View.GONE}"
android:contentDescription="@string/content_description_start_chat"
android:layout_width="60dp"
android:layout_height="60dp"
@ -127,7 +128,7 @@
<RelativeLayout
android:onClick="@{() -> viewModel.startChat(true)}"
android:visibility="@{viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.chatAllowed &amp;&amp; viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
android:layout_width="65dp"
android:layout_height="60dp"
android:layout_margin="10dp">

11
app/src/main/res/layout/tabs_fragment.xml
View file

@ -33,21 +33,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.25" />
layout_constraintGuide_percent="@{viewModel.leftAnchor, default=0.25}" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineMiddle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
layout_constraintGuide_percent="@{viewModel.middleAnchor, default=0.5}" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.75" />
layout_constraintGuide_percent="@{viewModel.rightAnchor, default=0.75}" />
<ImageView
android:id="@+id/history"
@ -143,10 +143,7 @@
android:id="@+id/selector"
android:layout_width="0dp"
android:layout_height="@dimen/tabs_fragment_selector_size"
android:background="?attr/accentColor"
app:layout_constraintWidth_percent=".25"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/guidelineMiddle" />
android:background="?attr/accentColor" />
</androidx.constraintlayout.motion.widget.MotionLayout>

14
app/src/main/res/xml/motion_main_activity_tabs_selector.xml
View file

@ -31,9 +31,9 @@
<Constraint
android:id="@id/selector"
android:layout_height="@dimen/tabs_fragment_selector_size"
motion:layout_constraintWidth_percent=".25"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent" />
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toLeftOf="@id/guidelineLeft" />
</ConstraintSet>
@ -42,9 +42,9 @@
<Constraint
android:id="@id/selector"
android:layout_height="@dimen/tabs_fragment_selector_size"
motion:layout_constraintWidth_percent=".25"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="@id/guidelineLeft" />
motion:layout_constraintLeft_toLeftOf="@id/guidelineLeft"
motion:layout_constraintRight_toLeftOf="@id/guidelineMiddle" />
</ConstraintSet>
@ -53,9 +53,9 @@
<Constraint
android:id="@id/selector"
android:layout_height="@dimen/tabs_fragment_selector_size"
motion:layout_constraintWidth_percent=".25"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="@id/guidelineMiddle" />
motion:layout_constraintLeft_toLeftOf="@id/guidelineMiddle"
motion:layout_constraintRight_toLeftOf="@id/guidelineRight" />
</ConstraintSet>
@ -64,8 +64,8 @@
<Constraint
android:id="@id/selector"
android:layout_height="@dimen/tabs_fragment_selector_size"
motion:layout_constraintWidth_percent=".25"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="@id/guidelineRight"
motion:layout_constraintRight_toRightOf="parent" />
</ConstraintSet>

14
app/src/main/res/xml/motion_main_activity_tabs_selector_land.xml
View file

@ -31,9 +31,9 @@
<Constraint
android:id="@id/selector"
android:layout_width="@dimen/tabs_fragment_selector_size"
motion:layout_constraintHeight_percent=".25"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="@id/guidelineTop" />
</ConstraintSet>
@ -42,9 +42,9 @@
<Constraint
android:id="@id/selector"
android:layout_width="@dimen/tabs_fragment_selector_size"
motion:layout_constraintHeight_percent=".25"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="@id/guidelineTop" />
motion:layout_constraintTop_toTopOf="@id/guidelineTop"
motion:layout_constraintBottom_toBottomOf="@id/guidelineMiddle" />
</ConstraintSet>
@ -53,9 +53,9 @@
<Constraint
android:id="@id/selector"
android:layout_width="@dimen/tabs_fragment_selector_size"
motion:layout_constraintHeight_percent=".25"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="@id/guidelineMiddle" />
motion:layout_constraintTop_toTopOf="@id/guidelineMiddle"
motion:layout_constraintBottom_toBottomOf="@id/guidelineBottom" />
</ConstraintSet>
@ -64,8 +64,8 @@
<Constraint
android:id="@id/selector"
android:layout_width="@dimen/tabs_fragment_selector_size"
motion:layout_constraintHeight_percent=".25"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="@id/guidelineBottom"
motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>