mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert hiding some features

Browse source
This commit is contained in:
Sylvain Berfini 2024-01-16 16:04:17 +01:00
parent c447b2699c
commit b308e2a8a0
7 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

6
app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
View file

@ -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)
}
}

6
app/src/main/res/layout-land/call_actions_bottom_sheet.xml
View file

@ -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" />

4
app/src/main/res/layout/account_profile_fragment.xml
View file

@ -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"/>

6
app/src/main/res/layout/call_actions_bottom_sheet.xml
View file

@ -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" />

2
app/src/main/res/layout/drawer_menu.xml
View file

@ -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"

3
app/src/main/res/values/dimen.xml
View file

@ -43,8 +43,7 @@
<dimen name="call_top_bar_text_height">28dp</dimen>
<dimen name="call_top_bar_info_height">48dp</dimen> <!-- Size of top text + top & bottom margins -->
<dimen name="call_main_actions_menu_height">110dp</dimen>
<!--<dimen name="call_all_actions_menu_height">345dp</dimen>--> <!-- sum of above two -->
<dimen name="call_all_actions_menu_height">235dp</dimen>
<dimen name="call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
<dimen name="call_main_actions_menu_margin">120dp</dimen>
<dimen name="call_round_corners_texture_view_radius">20dp</dimen>
<dimen name="call_button_size">55dp</dimen>