gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 22:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue caused by merge

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-08 20:17:13 +01:00
parent 8f864063fb
commit 043f1ff6f5
1 changed files with 55 additions and 43 deletions

42
app/src/main/res/layout/controller_call.xml
View File

@ -100,13 +100,33 @@
</FrameLayout> </FrameLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/callControlsRelativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:animateLayoutChanges="true">
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/callControlHangupView"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_above="@id/callControlsLinearLayoutView"
android:layout_centerHorizontal="true"
app:checked="false"
app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px" />
<LinearLayout <LinearLayout
android:id="@+id/callControlsLinearLayoutView" android:id="@+id/callControlsLinearLayoutView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="16dp" android:layout_marginBottom="24dp"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:gravity="center"> android:gravity="center">
@ -115,28 +135,19 @@
android:id="@+id/call_control_microphone" android:id="@+id/call_control_microphone"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="24dp" android:layout_marginStart="24dp"
android:alpha="0.7" android:alpha="0.7"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_mic_off_white_24px" /> app:frontImage="@drawable/ic_mic_off_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/callControlHangupView"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="24dp"
app:checked="false"
app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto" <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/call_control_camera" android:id="@+id/call_control_camera"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:alpha="0.7" android:alpha="0.7"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
@ -147,7 +158,8 @@
android:id="@+id/callControlEnableSpeaker" android:id="@+id/callControlEnableSpeaker"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:visibility="gone" android:visibility="gone"
app:animateRearImage="false" app:animateRearImage="false"
app:checked="false" app:checked="false"
@ -158,5 +170,5 @@
app:rearImage="@drawable/ic_volume_up_white_24dp" /> app:rearImage="@drawable/ic_volume_up_white_24dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>