mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Added profile mode fragment for account params
This commit is contained in:
Sylvain Berfini
parent
78e40807b1
commit
27063c9e45
15 changed files with 525 additions and 24 deletions
|
|
@ -27,6 +27,7 @@ import androidx.annotation.UiThread
|
|||
import androidx.fragment.app.Fragment
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import org.linphone.databinding.AssistantSecureModeFragmentBinding
|
||||
import org.linphone.utils.DialogUtils
|
||||
|
||||
@UiThread
|
||||
class ProfileModeFragment : Fragment() {
|
||||
|
|
@ -59,11 +60,13 @@ class ProfileModeFragment : Fragment() {
|
|||
}
|
||||
|
||||
binding.setDefaultModeTooltipClickListener {
|
||||
// TODO
|
||||
val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), true)
|
||||
dialog.show()
|
||||
}
|
||||
|
||||
binding.setInteropModeTooltipClickListener {
|
||||
// TODO
|
||||
val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), false)
|
||||
dialog.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,8 +133,10 @@ class AccountModel @WorkerThread constructor(
|
|||
initials.postValue(LinphoneUtils.getInitials(name))
|
||||
|
||||
val pictureUri = account.params.pictureUri.orEmpty()
|
||||
avatar.postValue(pictureUri)
|
||||
Log.d("$TAG Account picture URI is [$pictureUri]")
|
||||
if (pictureUri != avatar.value) {
|
||||
avatar.postValue(pictureUri)
|
||||
Log.d("$TAG Account picture URI is [$pictureUri]")
|
||||
}
|
||||
|
||||
isDefault.postValue(coreContext.core.defaultAccount == account)
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class AccountProfileFragment : GenericFragment() {
|
|||
}
|
||||
|
||||
binding.setChangeModeClickListener {
|
||||
val action = AccountProfileFragmentDirections.actionAccountProfileFragmentToProfileModeFragment()
|
||||
val action = AccountProfileFragmentDirections.actionAccountProfileFragmentToAccountProfileModeFragment()
|
||||
findNavController().navigate(action)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2023 Belledonne Communications SARL.
|
||||
*
|
||||
* This file is part of linphone-android
|
||||
* (see https://www.linphone.org).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.linphone.ui.main.settings.fragment
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.annotation.UiThread
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import org.linphone.databinding.AccountProfileSecureModeFragmentBinding
|
||||
import org.linphone.utils.DialogUtils
|
||||
|
||||
@UiThread
|
||||
class AccountProfileModeFragment : Fragment() {
|
||||
companion object {
|
||||
private const val TAG = "[Account Profile Mode Fragment]"
|
||||
}
|
||||
|
||||
private lateinit var binding: AccountProfileSecureModeFragmentBinding
|
||||
|
||||
override fun onCreateView(
|
||||
inflater: LayoutInflater,
|
||||
container: ViewGroup?,
|
||||
savedInstanceState: Bundle?
|
||||
): View {
|
||||
binding = AccountProfileSecureModeFragmentBinding.inflate(layoutInflater)
|
||||
return binding.root
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
binding.lifecycleOwner = viewLifecycleOwner
|
||||
|
||||
binding.setBackClickListener {
|
||||
findNavController().popBackStack()
|
||||
}
|
||||
|
||||
binding.setContinueClickListener {
|
||||
findNavController().popBackStack()
|
||||
}
|
||||
|
||||
binding.setDefaultModeTooltipClickListener {
|
||||
val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), true)
|
||||
dialog.show()
|
||||
}
|
||||
|
||||
binding.setInteropModeTooltipClickListener {
|
||||
val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), false)
|
||||
dialog.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -58,7 +58,7 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
|
|||
account = found
|
||||
accountModel.postValue(AccountModel(account))
|
||||
currentMode.postValue(
|
||||
"Mode ${AppUtils.getString(R.string.assistant_secure_mode_default_title)}"
|
||||
AppUtils.getString(R.string.manage_account_secure_mode_default_title)
|
||||
) // TODO FIXME
|
||||
registerEnabled.postValue(account.params.isRegisterEnabled)
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import androidx.core.content.ContextCompat
|
|||
import androidx.databinding.DataBindingUtil
|
||||
import androidx.databinding.ViewDataBinding
|
||||
import org.linphone.R
|
||||
import org.linphone.databinding.DialogAccountModesExplanationBinding
|
||||
import org.linphone.databinding.DialogAssistantAcceptConditionsAndPolicyBinding
|
||||
import org.linphone.databinding.DialogAssistantCreateAccountConfirmPhoneNumberBinding
|
||||
import org.linphone.databinding.DialogCancelContactChangesBinding
|
||||
|
|
@ -82,6 +83,28 @@ class DialogUtils {
|
|||
return getDialog(context, binding)
|
||||
}
|
||||
|
||||
@UiThread
|
||||
fun getAccountModeExplanationDialog(
|
||||
context: Context,
|
||||
defaultMode: Boolean
|
||||
): Dialog {
|
||||
lateinit var dialog: Dialog
|
||||
|
||||
val binding: DialogAccountModesExplanationBinding = DataBindingUtil.inflate(
|
||||
LayoutInflater.from(context),
|
||||
R.layout.dialog_account_modes_explanation,
|
||||
null,
|
||||
false
|
||||
)
|
||||
binding.defaultMode = defaultMode
|
||||
binding.setDismissClickListener {
|
||||
dialog.dismiss()
|
||||
}
|
||||
|
||||
dialog = getDialog(context, binding)
|
||||
return dialog
|
||||
}
|
||||
|
||||
@UiThread
|
||||
fun getNumberOrAddressPickerDialog(
|
||||
context: Context,
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -237,14 +238,14 @@
|
|||
app:layout_constraintTop_toBottomOf="@id/details_background"
|
||||
app:layout_constraintBottom_toBottomOf="@id/connection_bottom_anchor"/>
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:onClick="@{() -> viewModel.toggleRegister()}"
|
||||
android:id="@+id/connected_switch"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="17dp"
|
||||
android:layout_marginTop="21dp"
|
||||
android:checked="@{viewModel.registerEnabled}"
|
||||
android:checked="@{viewModel.registerEnabled, default=true}"
|
||||
app:layout_constraintStart_toStartOf="@id/connection_background"
|
||||
app:layout_constraintTop_toTopOf="@id/connection_background" />
|
||||
|
||||
|
|
@ -302,7 +303,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:text="@{viewModel.currentMode, default=@string/assistant_secure_mode_default_title}"
|
||||
android:text="@{viewModel.currentMode, default=@string/manage_account_secure_mode_default_title}"
|
||||
android:textSize="13sp"
|
||||
android:textColor="@color/gray_9"
|
||||
app:layout_constraintTop_toTopOf="@id/mode_background"
|
||||
|
|
|
|||
273
app/src/main/res/layout/account_profile_secure_mode_fragment.xml
Normal file
273
app/src/main/res/layout/account_profile_secure_mode_fragment.xml
Normal file
|
|
@ -0,0 +1,273 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="backClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="defaultModeTooltipClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="interopModeTooltipClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="continueClickListener"
|
||||
type="View.OnClickListener" />
|
||||
</data>
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:onClick="@{backClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="35dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:adjustViewBounds="true"
|
||||
android:padding="5dp"
|
||||
android:src="@drawable/caret_left"
|
||||
android:drawableTint="@color/primary_color"
|
||||
app:layout_constraintBottom_toBottomOf="@id/title"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style_800"
|
||||
android:id="@+id/title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/top_bar_height"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/manage_account_choose_mode_title"
|
||||
android:textColor="@color/primary_color"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/default_mode"
|
||||
style="@style/default_text_style_800"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="30dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:text="@string/assistant_secure_mode_default_title"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/black"
|
||||
android:checked="true"
|
||||
app:useMaterialThemeColors="false"
|
||||
app:buttonTint="@color/primary_color"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/default_mode_tooltip"
|
||||
style="@style/default_text_style_800"
|
||||
android:onClick="@{defaultModeTooltipClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:src="@drawable/info"
|
||||
app:tint="@color/black"
|
||||
app:layout_constraintTop_toTopOf="@id/default_mode"
|
||||
app:layout_constraintBottom_toBottomOf="@id/default_mode"
|
||||
app:layout_constraintStart_toEndOf="@id/default_mode" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/default_mode_summary"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@drawable/shape_squircle_gray_2_background"
|
||||
android:paddingTop="21dp"
|
||||
android:paddingBottom="21dp"
|
||||
android:paddingStart="17dp"
|
||||
android:paddingEnd="17dp"
|
||||
android:text="@string/manage_account_secure_mode_default_summary"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintTop_toBottomOf="@id/default_mode"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<io.getstream.avatarview.AvatarView
|
||||
android:id="@+id/image1"
|
||||
android:layout_width="@dimen/avatar_list_cell_size"
|
||||
android:layout_height="@dimen/avatar_list_cell_size"
|
||||
android:adjustViewBounds="true"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="21dp"
|
||||
android:background="@drawable/shape_circle_light_blue_background"
|
||||
android:src="@drawable/contact_avatar"
|
||||
app:avatarViewPlaceholder="@drawable/contact_avatar"
|
||||
app:avatarViewInitialsBackgroundColor="@color/blue_light"
|
||||
app:avatarViewInitialsTextColor="@color/gray_9"
|
||||
app:avatarViewInitialsTextSize="16sp"
|
||||
app:avatarViewInitialsTextStyle="bold"
|
||||
app:avatarViewShape="circle"
|
||||
app:avatarViewInitials="JD"
|
||||
app:avatarViewBorderWidth="0dp"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/arrow"
|
||||
app:layout_constraintTop_toBottomOf="@id/default_mode_summary"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image1_presence_badge"
|
||||
android:layout_width="@dimen/avatar_presence_badge_size"
|
||||
android:layout_height="@dimen/avatar_presence_badge_size"
|
||||
android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
|
||||
android:background="@drawable/led_background"
|
||||
android:padding="@dimen/avatar_presence_badge_padding"
|
||||
android:src="@drawable/led_online"
|
||||
app:layout_constraintEnd_toEndOf="@id/image1"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image1"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/arrow"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/arrow_right_fill"
|
||||
app:tint="@color/black"
|
||||
app:layout_constraintStart_toEndOf="@id/image1"
|
||||
app:layout_constraintEnd_toStartOf="@id/image2"
|
||||
app:layout_constraintTop_toTopOf="@id/image1"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image1"/>
|
||||
|
||||
<io.getstream.avatarview.AvatarView
|
||||
android:id="@+id/image2"
|
||||
android:layout_width="@dimen/avatar_list_cell_size"
|
||||
android:layout_height="@dimen/avatar_list_cell_size"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@drawable/shape_circle_light_blue_background"
|
||||
android:src="@drawable/contact_avatar"
|
||||
app:avatarViewPlaceholder="@drawable/contact_avatar"
|
||||
app:avatarViewInitialsBackgroundColor="@color/blue_light"
|
||||
app:avatarViewInitialsTextColor="@color/gray_9"
|
||||
app:avatarViewInitialsTextSize="16sp"
|
||||
app:avatarViewInitialsTextStyle="bold"
|
||||
app:avatarViewShape="circle"
|
||||
app:avatarViewInitials="JD"
|
||||
app:avatarViewBorderWidth="2dp"
|
||||
app:avatarViewBorderColor="@color/blue_trusted"
|
||||
app:layout_constraintStart_toEndOf="@id/arrow"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/image1"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image1"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image2_trust_badge"
|
||||
android:layout_width="@dimen/avatar_presence_badge_size"
|
||||
android:layout_height="@dimen/avatar_presence_badge_size"
|
||||
android:src="@drawable/trusted"
|
||||
app:layout_constraintStart_toStartOf="@id/image2"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image2"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image2_presence_badge"
|
||||
android:layout_width="@dimen/avatar_presence_badge_size"
|
||||
android:layout_height="@dimen/avatar_presence_badge_size"
|
||||
android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
|
||||
android:background="@drawable/led_background"
|
||||
android:padding="@dimen/avatar_presence_badge_padding"
|
||||
android:src="@drawable/led_online"
|
||||
app:layout_constraintEnd_toEndOf="@id/image2"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image2"/>
|
||||
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/interop_mode"
|
||||
style="@style/default_text_style_800"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="30dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:text="@string/assistant_secure_mode_interoperable_title"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/black"
|
||||
app:useMaterialThemeColors="false"
|
||||
app:buttonTint="@color/primary_color"
|
||||
app:layout_constraintTop_toBottomOf="@id/image1"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/interop_mode_tooltip"
|
||||
style="@style/default_text_style_800"
|
||||
android:onClick="@{interopModeTooltipClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:src="@drawable/info"
|
||||
app:tint="@color/black"
|
||||
app:layout_constraintTop_toTopOf="@id/interop_mode"
|
||||
app:layout_constraintBottom_toBottomOf="@id/interop_mode"
|
||||
app:layout_constraintStart_toEndOf="@id/interop_mode" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/interop_mode_summary"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@drawable/shape_squircle_gray_2_background"
|
||||
android:paddingTop="21dp"
|
||||
android:paddingBottom="21dp"
|
||||
android:paddingStart="17dp"
|
||||
android:paddingEnd="17dp"
|
||||
android:text="@string/dialog_account_secure_mode_interoperable_summary"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintTop_toBottomOf="@id/interop_mode"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style_600"
|
||||
android:onClick="@{continueClickListener}"
|
||||
android:id="@+id/login"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_marginBottom="32dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:text="@string/manage_account_choose_mode_save_changes"
|
||||
android:textSize="18sp"
|
||||
android:textColor="@color/primary_button_label_color"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/primary_button_background"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</layout>
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -80,7 +81,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<RadioButton
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/default_mode"
|
||||
style="@style/default_text_style_800"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -90,8 +91,9 @@
|
|||
android:text="@string/assistant_secure_mode_default_title"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/black"
|
||||
android:buttonTint="@color/primary_color"
|
||||
android:checked="true"
|
||||
app:useMaterialThemeColors="false"
|
||||
app:buttonTint="@color/primary_color"
|
||||
app:layout_constraintTop_toBottomOf="@id/sub_title"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
|
@ -121,7 +123,7 @@
|
|||
android:paddingBottom="21dp"
|
||||
android:paddingStart="17dp"
|
||||
android:paddingEnd="17dp"
|
||||
android:text="Explication :\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam velit sapien, egestas sit amet dictum eget, condimentum a ligula. "
|
||||
android:text="@string/manage_account_secure_mode_default_summary"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintTop_toBottomOf="@id/default_mode"
|
||||
|
|
@ -213,7 +215,7 @@
|
|||
app:layout_constraintEnd_toEndOf="@id/image2"
|
||||
app:layout_constraintBottom_toBottomOf="@id/image2"/>
|
||||
|
||||
<RadioButton
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/interop_mode"
|
||||
style="@style/default_text_style_800"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -223,7 +225,8 @@
|
|||
android:text="@string/assistant_secure_mode_interoperable_title"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/black"
|
||||
android:buttonTint="@color/primary_color"
|
||||
app:useMaterialThemeColors="false"
|
||||
app:buttonTint="@color/primary_color"
|
||||
app:layout_constraintTop_toBottomOf="@id/image1"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
|
@ -253,7 +256,7 @@
|
|||
android:paddingBottom="21dp"
|
||||
android:paddingStart="17dp"
|
||||
android:paddingEnd="17dp"
|
||||
android:text="Explication :\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam velit sapien, egestas sit amet dictum eget, condimentum a ligula. "
|
||||
android:text="@string/dialog_account_secure_mode_interoperable_summary"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintTop_toBottomOf="@id/interop_mode"
|
||||
|
|
@ -266,19 +269,21 @@
|
|||
android:id="@+id/login"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="138dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_marginBottom="32dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:text="@string/dialog_continue"
|
||||
android:text="@string/assistant_secure_mode_finish_account_login"
|
||||
android:textSize="18sp"
|
||||
android:textColor="@color/primary_button_label_color"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/primary_button_background"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -255,6 +256,7 @@
|
|||
android:background="@drawable/primary_button_background"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintTop_toBottomOf="@id/transport"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@color/white">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -124,7 +125,7 @@
|
|||
android:id="@+id/create_linphone_account"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="130dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
|
|
@ -138,6 +139,7 @@
|
|||
android:gravity="center"
|
||||
android:background="@drawable/secondary_button_background"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/contact"
|
||||
|
|
|
|||
107
app/src/main/res/layout/dialog_account_modes_explanation.xml
Normal file
107
app/src/main/res/layout/dialog_account_modes_explanation.xml
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="dismissClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="defaultMode"
|
||||
type="Boolean" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:onClick="@{dismissClickListener}"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dialog_background_shadow"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:src="@drawable/shape_squircle_primary_background"
|
||||
app:layout_constraintBottom_toBottomOf="@id/anchor"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialog_background"
|
||||
app:layout_constraintStart_toStartOf="@id/dialog_background"
|
||||
app:layout_constraintTop_toTopOf="@id/dialog_background" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dialog_background"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:src="@drawable/shape_squircle_white_background"
|
||||
app:layout_constraintWidth_max="@dimen/dialog_max_width"
|
||||
app:layout_constraintBottom_toBottomOf="@id/anchor"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style_800"
|
||||
android:id="@+id/title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:paddingTop="@dimen/dialog_top_bottom_margin"
|
||||
android:text="@{defaultMode ? @string/manage_account_secure_mode_default_title : @string/manage_account_secure_mode_interoperable_title, default=@string/manage_account_secure_mode_default_title}"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:layout_constraintBottom_toTopOf="@id/message"
|
||||
app:layout_constraintStart_toStartOf="@id/dialog_background"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialog_background"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/message"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:text="@{defaultMode ? @string/dialog_account_secure_mode_default_message : @string/dialog_account_secure_mode_interoperable_message, default=@string/dialog_account_secure_mode_default_message}"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintBottom_toTopOf="@id/confirm"
|
||||
app:layout_constraintStart_toStartOf="@id/dialog_background"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialog_background"
|
||||
app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:onClick="@{dismissClickListener}"
|
||||
style="@style/default_text_style_600"
|
||||
android:id="@+id/confirm"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/primary_button_background"
|
||||
android:text="@string/dialog_close"
|
||||
android:textSize="18sp"
|
||||
android:textColor="@color/primary_button_label_color"
|
||||
app:layout_constraintStart_toStartOf="@id/dialog_background"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialog_background"
|
||||
app:layout_constraintTop_toBottomOf="@id/message"
|
||||
app:layout_constraintBottom_toTopOf="@id/anchor"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/anchor"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/dialog_top_bottom_margin"
|
||||
app:layout_constraintTop_toBottomOf="@id/confirm"
|
||||
app:layout_constraintStart_toStartOf="@id/dialog_background"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialog_background"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
android:name="accountIdentity"
|
||||
app:argType="string" />
|
||||
<action
|
||||
android:id="@+id/action_accountProfileFragment_to_profileModeFragment"
|
||||
app:destination="@id/profileModeFragment"
|
||||
android:id="@+id/action_accountProfileFragment_to_accountProfileModeFragment"
|
||||
app:destination="@id/accountProfileModeFragment"
|
||||
app:enterAnim="@anim/slide_in_right"
|
||||
app:exitAnim="@anim/slide_out_left"
|
||||
app:popEnterAnim="@anim/slide_in_left"
|
||||
|
|
@ -115,9 +115,9 @@
|
|||
app:launchSingleTop="true" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/profileModeFragment"
|
||||
android:name="org.linphone.ui.assistant.fragment.ProfileModeFragment"
|
||||
android:label="ProfileModeFragment"
|
||||
tools:layout="@layout/assistant_secure_mode_fragment"/>
|
||||
android:id="@+id/accountProfileModeFragment"
|
||||
android:name="org.linphone.ui.main.settings.fragment.AccountProfileModeFragment"
|
||||
android:label="AccountProfileModeFragment"
|
||||
tools:layout="@layout/account_profile_secure_mode_fragment"/>
|
||||
|
||||
</navigation>
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
<string name="dialog_ok">OK</string>
|
||||
<string name="dialog_call">Call</string>
|
||||
<string name="dialog_delete">Delete</string>
|
||||
<string name="dialog_close">Close</string>
|
||||
<string name="dialog_do_not_show_anymore">Do not show this dialog anymore</string>
|
||||
<string name="dialog_general_terms_and_privacy_policy_title">General terms & privacy policy</string>
|
||||
<string name="dialog_general_terms_and_privacy_policy_message">blah blah blah</string> <!-- TODO FIXME -->
|
||||
|
|
@ -58,6 +59,8 @@
|
|||
<string name="dialog_pick_phone_number_or_sip_address_title">Which canal do you choose?</string>
|
||||
<string name="dialog_delete_all_call_logs_title">Do you really want to delete all calls history?</string>
|
||||
<string name="dialog_delete_all_call_logs_message">All calls will be deleted of the history</string>
|
||||
<string name="dialog_account_secure_mode_default_message">Blah</string> <!-- TODO -->
|
||||
<string name="dialog_account_secure_mode_interoperable_message">Blah</string> <!-- TODO -->
|
||||
|
||||
<string name="toast_assistant_qr_code_valid">QR code validated!</string>
|
||||
<string name="toast_assistant_qr_code_invalid">Invalid QR code!</string>
|
||||
|
|
@ -89,6 +92,7 @@
|
|||
<string name="assistant_account_secure_mode_subtitle">You may change that mode later</string>
|
||||
<string name="assistant_secure_mode_default_title">Default</string>
|
||||
<string name="assistant_secure_mode_interoperable_title">Interoperable</string>
|
||||
<string name="assistant_secure_mode_finish_account_login">Continue</string>
|
||||
|
||||
<string name="drawer_menu_default_account_label">Default</string>
|
||||
<string name="drawer_menu_manage_account">Manage the profile</string>
|
||||
|
|
@ -116,6 +120,12 @@
|
|||
<string name="manage_account_international_prefix">International Prefix</string>
|
||||
<string name="manage_account_settings">Account settings</string>
|
||||
<string name="manage_account_delete">Delete account</string>
|
||||
<string name="manage_account_choose_mode_title">Choose account mode</string>
|
||||
<string name="manage_account_choose_mode_save_changes">Apply</string>
|
||||
<string name="manage_account_secure_mode_default_title">Default mode</string>
|
||||
<string name="manage_account_secure_mode_interoperable_title">Interoperable mode</string>
|
||||
<string name="manage_account_secure_mode_default_summary">Blah</string> <!-- TODO -->
|
||||
<string name="dialog_account_secure_mode_interoperable_summary">Blah</string> <!-- TODO -->
|
||||
|
||||
<string name="friend_presence_status_online">Online</string>
|
||||
<string name="friend_presence_status_was_online_on">Online on %s</string>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue