From 8c7ca490c88e1a5ad5dc6fb1b51591ec9dcb2a04 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 15 Jan 2024 17:29:06 +0100 Subject: [PATCH] Hidden & disabled some features for now --- .../java/org/linphone/core/CorePreferences.kt | 6 +++--- .../layout-land/call_actions_bottom_sheet.xml | 20 ++++++++++++------- .../res/layout/account_profile_fragment.xml | 4 +++- .../res/layout/call_actions_bottom_sheet.xml | 6 ++++++ app/src/main/res/layout/contact_fragment.xml | 3 ++- app/src/main/res/layout/drawer_menu.xml | 2 ++ app/src/main/res/values/dimen.xml | 3 ++- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index f70557495..cd26682fd 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", -1) + return config.getInt("app", "dark_mode", 0) // TODO FIXME: set back to -1 when dark mode will be available } 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", false) // TODO FIXME: set it to true for first "release" without chat + get() = config.getBool("app", "disable_chat_feature", true) // TODO FIXME: set it to true for first "release" without chat // Will disable meetings feature completely @get:WorkerThread val disableMeetings: Boolean - get() = config.getBool("app", "disable_meetings_feature", false) // TODO FIXME: set it to true for first "release" without meetings + get() = config.getBool("app", "disable_meetings_feature", true) // TODO FIXME: set it to true for first "release" without meetings @get:WorkerThread val defaultDomain: String 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 79bfd6145..099bfb4de 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 @@ -104,7 +104,7 @@ app:layout_constraintEnd_toEndOf="@id/calls_list"/> @@ -128,6 +128,7 @@ 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" @@ -145,6 +146,7 @@ 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" @@ -162,6 +164,7 @@ 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" @@ -200,13 +203,13 @@ android:layout_height="wrap_content" android:paddingBottom="15dp" android:text="@string/call_action_go_to_calls_list" - app:layout_constraintEnd_toStartOf="@id/layout_label" + app:layout_constraintEnd_toStartOf="@id/numpad_label" app:layout_constraintStart_toEndOf="@id/new_call_label" app:layout_constraintTop_toBottomOf="@id/calls_list"/> + app:layout_constraintTop_toBottomOf="@id/numpad" /> @@ -250,6 +255,7 @@ 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 25273d150..5293b8287 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -437,6 +437,7 @@ android:text="@string/manage_account_devices_title" android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="@color/gray_main2_600" + android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/mode_background"/> @@ -455,7 +456,7 @@ android:paddingEnd="16dp" android:paddingBottom="20dp" android:background="@drawable/shape_squircle_white_background" - android:visibility="@{viewModel.expandDevices ? View.VISIBLE : View.GONE}" + android:visibility="@{viewModel.expandDevices ? View.VISIBLE : View.GONE, default=gone}" app:entries="@{viewModel.devices}" app:layout="@{@layout/account_profile_device_list_cell}" app:layout_constraintStart_toStartOf="parent" @@ -500,6 +501,7 @@ 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 f5280b6b2..42827534d 100644 --- a/app/src/main/res/layout/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml @@ -124,6 +124,7 @@ 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" @@ -141,6 +142,7 @@ 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" @@ -158,6 +160,7 @@ 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" @@ -216,6 +219,7 @@ 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" /> @@ -229,6 +233,7 @@ 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" /> @@ -242,6 +247,7 @@ 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/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 92fe5b919..c993c9f9b 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="trusted_devices_count, trust_background, trusted_devices_progress, devices, trusted_devices_progress_label" - android:visibility="@{viewModel.expandDevicesTrust ? View.VISIBLE : View.GONE}" /> + android:visibility="@{viewModel.expandDevicesTrust ? View.VISIBLE : View.GONE, default=gone}" /> diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index 2a0ae00ef..ac13eb8aa 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -146,6 +146,7 @@ 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" @@ -164,6 +165,7 @@ 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 51f617a94..85ad58c4c 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -43,7 +43,8 @@ 28dp 48dp 110dp - 345dp + + 235dp 120dp 20dp 55dp