Skip to content

Commit b3e4179

Browse files
mahibimahibi
committed
change top bar
just as temporary solution? Signed-off-by: Marcel Hibbe <[email protected]>
1 parent c49d534 commit b3e4179

File tree

2 files changed

+39
-69
lines changed

2 files changed

+39
-69
lines changed

‎app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,6 @@ class CallActivity : CallBaseActivity() {
914914
@SuppressLint("ClickableViewAccessibility")
915915
private fun initViews() {
916916
Log.d(TAG, "initViews")
917-
binding!!.callInfosLinearLayout.visibility = View.VISIBLE
918917
if (!isPipModePossible) {
919918
binding!!.pictureInPictureButton.visibility = View.GONE
920919
}
@@ -2599,7 +2598,6 @@ class CallActivity : CallBaseActivity() {
25992598
private fun handleCallStateLeaving() {
26002599
if (!isDestroyed) {
26012600
stopCallingSound()
2602-
binding!!.callModeTextView.text = descriptionForCallType
26032601
binding!!.callStates.callStateTextView.setText(R.string.nc_leaving_call)
26042602
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26052603
binding!!.composeParticipantGrid.visibility = View.INVISIBLE
@@ -2628,8 +2626,6 @@ class CallActivity : CallBaseActivity() {
26282626

26292627
private fun handleCallStateInConversation() {
26302628
stopCallingSound()
2631-
binding!!.callModeTextView.text = descriptionForCallType
2632-
26332629
if (binding!!.callStates.callStateRelativeLayout.visibility != View.INVISIBLE) {
26342630
binding!!.callStates.callStateRelativeLayout.visibility = View.INVISIBLE
26352631
}
@@ -2645,7 +2641,6 @@ class CallActivity : CallBaseActivity() {
26452641
}
26462642

26472643
private fun handleCallStateJoined() {
2648-
binding!!.callModeTextView.text = descriptionForCallType
26492644
if (isIncomingCallFromNotification) {
26502645
binding!!.callStates.callStateTextView.setText(R.string.nc_call_incoming)
26512646
} else {
@@ -2668,7 +2663,6 @@ class CallActivity : CallBaseActivity() {
26682663
private fun handleCallStateReconnecting() {
26692664
playCallingSound()
26702665
binding!!.callStates.callStateTextView.setText(R.string.nc_call_reconnecting)
2671-
binding!!.callModeTextView.text = descriptionForCallType
26722666
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
26732667
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26742668
}
@@ -2686,7 +2680,6 @@ class CallActivity : CallBaseActivity() {
26862680
private fun handleCallStatePublisherFailed() {
26872681
// No calling sound when the publisher failed
26882682
binding!!.callStates.callStateTextView.setText(R.string.nc_call_reconnecting)
2689-
binding!!.callModeTextView.text = descriptionForCallType
26902683
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
26912684
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26922685
}
@@ -2704,7 +2697,6 @@ class CallActivity : CallBaseActivity() {
27042697
private fun handleCallStateCallingTimeout() {
27052698
hangup(shutDownView = false, endCallForAll = false)
27062699
binding!!.callStates.callStateTextView.setText(R.string.nc_call_timeout)
2707-
binding!!.callModeTextView.text = descriptionForCallType
27082700
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
27092701
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
27102702
}
@@ -2728,7 +2720,6 @@ class CallActivity : CallBaseActivity() {
27282720
binding!!.callStates.callStateTextView.setText(R.string.nc_call_ringing)
27292721
}
27302722
binding!!.callConversationNameTextView.text = conversationName
2731-
binding!!.callModeTextView.text = descriptionForCallType
27322723
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
27332724
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
27342725
}
@@ -2743,16 +2734,6 @@ class CallActivity : CallBaseActivity() {
27432734
}
27442735
}
27452736

2746-
private val descriptionForCallType: String
2747-
get() {
2748-
val appName = resources.getString(R.string.nc_app_product_name)
2749-
return if (isVoiceOnlyCall) {
2750-
String.format(resources.getString(R.string.nc_call_voice), appName)
2751-
} else {
2752-
String.format(resources.getString(R.string.nc_call_video), appName)
2753-
}
2754-
}
2755-
27562737
private fun playCallingSound() {
27572738
stopCallingSound()
27582739
val ringtoneUri: Uri? = if (isIncomingCallFromNotification) {
@@ -3064,7 +3045,6 @@ class CallActivity : CallBaseActivity() {
30643045
override fun updateUiForPipMode() {
30653046
Log.d(TAG, "updateUiForPipMode")
30663047
binding!!.callControls.visibility = View.GONE
3067-
binding!!.callInfosLinearLayout.visibility = View.GONE
30683048
binding!!.selfVideoViewWrapper.visibility = View.GONE
30693049
binding!!.callStates.callStateRelativeLayout.visibility = View.GONE
30703050
binding!!.pipCallConversationNameTextView.text = conversationName
@@ -3106,7 +3086,6 @@ class CallActivity : CallBaseActivity() {
31063086

31073087
binding!!.callControls.visibility = View.VISIBLE
31083088
initViews()
3109-
binding!!.callInfosLinearLayout.visibility = View.VISIBLE
31103089
binding!!.selfVideoViewWrapper.visibility = View.VISIBLE
31113090
}
31123091

‎app/src/main/res/layout/call_activity.xml‎

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
~
55
~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <[email protected]>
66
~ SPDX-FileCopyrightText: 2022 Tim Krüger <[email protected]>
7-
~ SPDX-FileCopyrightText: 2021 Marcel Hibbe <[email protected]>
7+
~ SPDX-FileCopyrightText: 2021-2025 Marcel Hibbe <[email protected]>
88
~ SPDX-FileCopyrightText: 2017-2018 Mario Danic <[email protected]>
99
~ SPDX-License-Identifier: GPL-3.0-or-later
1010
-->
@@ -76,64 +76,55 @@
7676
android:background="@android:color/transparent"
7777
android:orientation="horizontal"
7878
android:weightSum="1">
79-
80-
<ImageView
81-
android:id="@+id/call_recording_indicator"
82-
android:layout_width="wrap_content"
83-
android:layout_height="wrap_content"
84-
android:contentDescription="@null"
85-
android:src="@drawable/record_stop"
86-
android:translationZ="2dp"
87-
android:visibility="gone"
88-
tools:visibility="visible">
89-
</ImageView>
9079
</LinearLayout>
9180

9281
<LinearLayout
93-
android:id="@+id/callInfosLinearLayout"
9482
android:layout_width="match_parent"
9583
android:layout_height="match_parent"
9684
android:animateLayoutChanges="true"
9785
android:gravity="center"
9886
android:orientation="vertical"
99-
android:paddingTop="20dp">
87+
android:paddingTop="10dp">
10088

101-
<TextView
102-
android:id="@+id/callModeTextView"
103-
android:layout_width="match_parent"
104-
android:layout_height="wrap_content"
105-
android:textAlignment="center"
106-
android:textColor="@color/call_incomingCallTextView"
107-
android:textSize="16sp"
108-
app:layout_constraintEnd_toEndOf="parent"
109-
app:layout_constraintStart_toStartOf="parent"
110-
app:layout_constraintTop_toTopOf="parent"
111-
tools:text="Voice Call" />
112-
113-
<TextView
114-
android:id="@+id/call_duration"
115-
android:layout_width="match_parent"
116-
android:layout_height="wrap_content"
117-
android:textAlignment="center"
118-
android:textColor="@color/white"
119-
android:textSize="16sp"
120-
app:layout_constraintEnd_toEndOf="parent"
121-
app:layout_constraintStart_toStartOf="parent"
122-
app:layout_constraintTop_toTopOf="parent"
123-
tools:text="00:22" />
124-
125-
<TextView
126-
android:id="@+id/callConversationNameTextView"
89+
<RelativeLayout
12790
android:layout_width="match_parent"
12891
android:layout_height="wrap_content"
129-
android:layout_marginTop="10dp"
130-
android:layout_marginBottom="15dp"
131-
android:ellipsize="marquee"
132-
android:textAlignment="center"
133-
android:textColor="@color/white"
134-
android:textSize="22sp"
135-
android:textStyle="bold"
136-
tools:text="Marsellus Wallace" />
92+
android:paddingStart="20dp"
93+
android:paddingEnd="20dp">
94+
95+
<ImageView
96+
android:id="@+id/call_recording_indicator"
97+
android:layout_width="wrap_content"
98+
android:layout_height="wrap_content"
99+
android:contentDescription="@null"
100+
android:src="@drawable/record_stop"
101+
android:translationZ="2dp"
102+
android:visibility="gone"
103+
tools:visibility="visible">
104+
</ImageView>
105+
106+
<TextView
107+
android:id="@+id/callConversationNameTextView"
108+
android:layout_width="wrap_content"
109+
android:layout_height="wrap_content"
110+
android:layout_centerHorizontal="true"
111+
android:ellipsize="end"
112+
android:textColor="@color/white"
113+
android:textSize="16sp"
114+
android:textStyle="bold"
115+
tools:text="Marsellus Wallace" />
116+
117+
<TextView
118+
android:id="@+id/call_duration"
119+
android:layout_width="wrap_content"
120+
android:layout_height="wrap_content"
121+
android:layout_alignBaseline="@id/callConversationNameTextView"
122+
android:layout_alignParentEnd="true"
123+
android:textAlignment="center"
124+
android:textColor="@color/white"
125+
android:textSize="16sp"
126+
tools:text="00:22"/>
127+
</RelativeLayout>
137128

138129
<RelativeLayout
139130
android:layout_width="match_parent"

0 commit comments

Comments
 (0)