Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved back to call button to the left for basic chat rooms

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-24 15:55:56 +02:00
parent fc69a0e2c9
commit f4bad99765
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
res/layout/chat.xml
View file

@ -53,16 +53,6 @@
</LinearLayout> </LinearLayout>
<ImageView
android:id="@+id/start_call"
android:src="@drawable/call_alt_start"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_call"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/back_to_call" android:id="@+id/back_to_call"
android:src="@drawable/call_back" android:src="@drawable/call_back"
@ -74,6 +64,16 @@
android:visibility="gone" android:visibility="gone"
android:padding="15dp"/> android:padding="15dp"/>
<ImageView
android:id="@+id/start_call"
android:src="@drawable/call_alt_start"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_call"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/group_infos" android:id="@+id/group_infos"
android:src="@drawable/chat_room_group_infos" android:src="@drawable/chat_room_group_infos"

3
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -594,7 +594,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (core == null || mChatRoom == null) return; if (core == null || mChatRoom == null) return;
mBackToCallButton.setVisibility(View.GONE);
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
mCallButton.setVisibility(View.VISIBLE); mCallButton.setVisibility(View.VISIBLE);
mGroupInfosButton.setVisibility(View.GONE); mGroupInfosButton.setVisibility(View.GONE);
@ -614,9 +613,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mParticipantsLabel.setVisibility(View.VISIBLE); mParticipantsLabel.setVisibility(View.VISIBLE);
} }
mBackToCallButton.setVisibility(View.GONE);
if (core.getCallsNb() > 0) { if (core.getCallsNb() > 0) {
mBackToCallButton.setVisibility(View.VISIBLE); mBackToCallButton.setVisibility(View.VISIBLE);
mCallButton.setVisibility(View.GONE);
} }
if (mChatRoom.hasBeenLeft()) { if (mChatRoom.hasBeenLeft()) {