Skip to content

Commit 540b336

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

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
@@ -912,7 +912,6 @@ class CallActivity : CallBaseActivity() {
912912
@SuppressLint("ClickableViewAccessibility")
913913
private fun initViews() {
914914
Log.d(TAG, "initViews")
915-
binding!!.callInfosLinearLayout.visibility = View.VISIBLE
916915
if (!isPipModePossible) {
917916
binding!!.pictureInPictureButton.visibility = View.GONE
918917
}
@@ -2598,7 +2597,6 @@ class CallActivity : CallBaseActivity() {
25982597
private fun handleCallStateLeaving() {
25992598
if (!isDestroyed) {
26002599
stopCallingSound()
2601-
binding!!.callModeTextView.text = descriptionForCallType
26022600
binding!!.callStates.callStateTextView.setText(R.string.nc_leaving_call)
26032601
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26042602
binding!!.composeParticipantGrid.visibility = View.INVISIBLE
@@ -2627,8 +2625,6 @@ class CallActivity : CallBaseActivity() {
26272625

26282626
private fun handleCallStateInConversation() {
26292627
stopCallingSound()
2630-
binding!!.callModeTextView.text = descriptionForCallType
2631-
26322628
if (binding!!.callStates.callStateRelativeLayout.visibility != View.INVISIBLE) {
26332629
binding!!.callStates.callStateRelativeLayout.visibility = View.INVISIBLE
26342630
}
@@ -2644,7 +2640,6 @@ class CallActivity : CallBaseActivity() {
26442640
}
26452641

26462642
private fun handleCallStateJoined() {
2647-
binding!!.callModeTextView.text = descriptionForCallType
26482643
if (isIncomingCallFromNotification) {
26492644
binding!!.callStates.callStateTextView.setText(R.string.nc_call_incoming)
26502645
} else {
@@ -2667,7 +2662,6 @@ class CallActivity : CallBaseActivity() {
26672662
private fun handleCallStateReconnecting() {
26682663
playCallingSound()
26692664
binding!!.callStates.callStateTextView.setText(R.string.nc_call_reconnecting)
2670-
binding!!.callModeTextView.text = descriptionForCallType
26712665
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
26722666
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26732667
}
@@ -2685,7 +2679,6 @@ class CallActivity : CallBaseActivity() {
26852679
private fun handleCallStatePublisherFailed() {
26862680
// No calling sound when the publisher failed
26872681
binding!!.callStates.callStateTextView.setText(R.string.nc_call_reconnecting)
2688-
binding!!.callModeTextView.text = descriptionForCallType
26892682
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
26902683
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
26912684
}
@@ -2703,7 +2696,6 @@ class CallActivity : CallBaseActivity() {
27032696
private fun handleCallStateCallingTimeout() {
27042697
hangup(shutDownView = false, endCallForAll = false)
27052698
binding!!.callStates.callStateTextView.setText(R.string.nc_call_timeout)
2706-
binding!!.callModeTextView.text = descriptionForCallType
27072699
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
27082700
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
27092701
}
@@ -2727,7 +2719,6 @@ class CallActivity : CallBaseActivity() {
27272719
binding!!.callStates.callStateTextView.setText(R.string.nc_call_ringing)
27282720
}
27292721
binding!!.callConversationNameTextView.text = conversationName
2730-
binding!!.callModeTextView.text = descriptionForCallType
27312722
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
27322723
binding!!.callStates.callStateRelativeLayout.visibility = View.VISIBLE
27332724
}
@@ -2742,16 +2733,6 @@ class CallActivity : CallBaseActivity() {
27422733
}
27432734
}
27442735

2745-
private val descriptionForCallType: String
2746-
get() {
2747-
val appName = resources.getString(R.string.nc_app_product_name)
2748-
return if (isVoiceOnlyCall) {
2749-
String.format(resources.getString(R.string.nc_call_voice), appName)
2750-
} else {
2751-
String.format(resources.getString(R.string.nc_call_video), appName)
2752-
}
2753-
}
2754-
27552736
private fun playCallingSound() {
27562737
stopCallingSound()
27572738
val ringtoneUri: Uri? = if (isIncomingCallFromNotification) {
@@ -3063,7 +3044,6 @@ class CallActivity : CallBaseActivity() {
30633044
override fun updateUiForPipMode() {
30643045
Log.d(TAG, "updateUiForPipMode")
30653046
binding!!.callControls.visibility = View.GONE
3066-
binding!!.callInfosLinearLayout.visibility = View.GONE
30673047
binding!!.selfVideoViewWrapper.visibility = View.GONE
30683048
binding!!.callStates.callStateRelativeLayout.visibility = View.GONE
30693049
binding!!.pipCallConversationNameTextView.text = conversationName
@@ -3105,7 +3085,6 @@ class CallActivity : CallBaseActivity() {
31053085

31063086
binding!!.callControls.visibility = View.VISIBLE
31073087
initViews()
3108-
binding!!.callInfosLinearLayout.visibility = View.VISIBLE
31093088
binding!!.selfVideoViewWrapper.visibility = View.VISIBLE
31103089
}
31113090

‎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)