diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index cd26682fd..580b42ab8 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -120,7 +120,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { var darkMode: Int get() { if (!darkModeAllowed) return 0 - return config.getInt("app", "dark_mode", 0) // TODO FIXME: set back to -1 when dark mode will be available + return config.getInt("app", "dark_mode", -1) } set(value) { config.setInt("app", "dark_mode", value) @@ -133,12 +133,12 @@ class CorePreferences @UiThread constructor(private val context: Context) { // Will disable chat feature completely @get:WorkerThread val disableChat: Boolean - get() = config.getBool("app", "disable_chat_feature", true) // TODO FIXME: set it to true for first "release" without chat + get() = config.getBool("app", "disable_chat_feature", false) // Will disable meetings feature completely @get:WorkerThread val disableMeetings: Boolean - get() = config.getBool("app", "disable_meetings_feature", true) // TODO FIXME: set it to true for first "release" without meetings + get() = config.getBool("app", "disable_meetings_feature", false) @get:WorkerThread val defaultDomain: String diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt index 794cb09bb..f651242a9 100644 --- a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt +++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt @@ -122,11 +122,9 @@ class LoginFragment : Fragment() { viewModel.accountLoggedInEvent.observe(viewLifecycleOwner) { it.consume { - // TODO FIXME: uncomment when mode secure/interop will work - /*Log.i("$TAG Account successfully logged-in, go to profile mode fragment") + Log.i("$TAG Account successfully logged-in, go to profile mode fragment") val action = LoginFragmentDirections.actionLoginFragmentToProfileModeFragment() - findNavController().navigate(action)*/ - requireActivity().finish() + findNavController().navigate(action) } } diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml index 099bfb4de..ab980b867 100644 --- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml @@ -128,7 +128,6 @@ android:background="@drawable/in_call_button_background_red" android:padding="@dimen/call_button_icon_padding" android:src="@drawable/chat_teardrop_text" - android:visibility="gone" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="@id/chat_label" app:layout_constraintStart_toStartOf="@id/chat_label" @@ -146,7 +145,6 @@ android:background="@drawable/in_call_button_background_green" android:padding="@dimen/call_button_icon_padding" android:src="@{viewModel.isPaused ? @drawable/play : @drawable/pause, default=@drawable/pause}" - android:visibility="gone" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="@id/pause_call_label" app:layout_constraintStart_toStartOf="@id/pause_call_label" @@ -164,7 +162,6 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/record_fill" android:selected="@{viewModel.isRecording()}" - android:visibility="gone" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="@id/record_call_label" app:layout_constraintStart_toStartOf="@id/record_call_label" @@ -227,7 +224,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@string/call_action_show_messages" - android:visibility="gone" app:layout_constraintEnd_toStartOf="@id/pause_call_label" app:layout_constraintStart_toEndOf="@id/numpad_label" app:layout_constraintTop_toBottomOf="@id/chat" /> @@ -241,7 +237,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" - android:visibility="gone" app:layout_constraintEnd_toStartOf="@id/record_call_label" app:layout_constraintStart_toEndOf="@id/chat_label" app:layout_constraintTop_toBottomOf="@id/pause_call" /> @@ -255,7 +250,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@string/call_action_record_call" - android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/pause_call_label" app:layout_constraintTop_toBottomOf="@id/record_call" /> diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 327df427a..671b52cba 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -401,7 +401,6 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" - android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/connection_background" @@ -415,7 +414,6 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.isCurrentlySelectedModeSecure ? @string/manage_account_secure_mode_default_title : @string/manage_account_secure_mode_interoperable_title, default=@string/manage_account_secure_mode_default_title}" - android:visibility="gone" app:layout_constraintTop_toTopOf="@id/mode_background" app:layout_constraintStart_toStartOf="@id/mode_background" app:layout_constraintBottom_toBottomOf="@id/mode_background"/> @@ -436,7 +434,6 @@ android:text="@string/manage_account_change_mode" android:maxLines="1" android:ellipsize="end" - android:visibility="gone" app:layout_constraintEnd_toEndOf="@id/mode_background" app:layout_constraintTop_toTopOf="@id/mode_background" app:layout_constraintBottom_toBottomOf="@id/mode_background"/> @@ -518,7 +515,6 @@ android:background="@drawable/action_background" android:text="@string/manage_account_settings" android:drawableStart="@drawable/gear" - android:visibility="gone" app:layout_constraintTop_toTopOf="@id/actions_background" app:layout_constraintStart_toStartOf="@id/actions_background" app:layout_constraintEnd_toEndOf="@id/actions_background"/> diff --git a/app/src/main/res/layout/call_actions_bottom_sheet.xml b/app/src/main/res/layout/call_actions_bottom_sheet.xml index 42827534d..f5280b6b2 100644 --- a/app/src/main/res/layout/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml @@ -124,7 +124,6 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/chat_teardrop_text" android:background="@drawable/shape_round_in_call_disabled_button_background" - android:visibility="gone" app:tint="?attr/color_grey_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/transfer_label" @@ -142,7 +141,6 @@ android:padding="@dimen/call_button_icon_padding" android:background="@drawable/in_call_button_background_green" android:src="@{viewModel.isPaused ? @drawable/play : @drawable/pause, default=@drawable/pause}" - android:visibility="gone" app:tint="@color/in_call_button_tint_color" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/new_call_label" @@ -160,7 +158,6 @@ android:background="@drawable/in_call_button_background_red" android:src="@drawable/record_fill" android:selected="@{viewModel.isRecording()}" - android:visibility="gone" app:tint="@color/in_call_button_tint_color" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/calls_list_label" @@ -219,7 +216,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@string/call_action_show_messages" - android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/chat" app:layout_constraintStart_toStartOf="@id/transfer_label" app:layout_constraintEnd_toEndOf="@id/transfer_label" /> @@ -233,7 +229,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" - android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintStart_toStartOf="@id/new_call_label" app:layout_constraintEnd_toEndOf="@id/new_call_label" /> @@ -247,7 +242,6 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@string/call_action_record_call" - android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/record_call" app:layout_constraintStart_toStartOf="@id/calls_list_label" app:layout_constraintEnd_toEndOf="@id/calls_list_label" /> diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index ac13eb8aa..2a0ae00ef 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -146,7 +146,6 @@ android:drawableStart="@drawable/gear" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - android:visibility="gone" app:drawableTint="?attr/color_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -165,7 +164,6 @@ android:drawableStart="@drawable/microphone_stage" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - android:visibility="gone" app:drawableTint="?attr/color_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 85ad58c4c..51f617a94 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -43,8 +43,7 @@ 28dp 48dp 110dp - - 235dp + 345dp 120dp 20dp 55dp