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

reformat code and use app-defined color-white

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-07-02 14:36:05 +02:00
parent 61fd18a0ca
commit d1d81b947f
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/call_item.xml
View File

@ -28,8 +28,8 @@
android:id="@+id/relative_layout" android:id="@+id/relative_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:gravity="center"
android:gravity="center"> android:orientation="vertical">
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/avatarImageView" android:id="@+id/avatarImageView"
@ -49,24 +49,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="6dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginBottom="6dp"
android:ellipsize="end" android:ellipsize="end"
android:maxEms="8" android:maxEms="8"
android:maxLines="1" android:maxLines="1"
android:textColor="@android:color/white" android:textColor="@color/white"
tools:text="Bill Murray 12345678901234567890" /> tools:text="Bill Murray 12345678901234567890" />
<ImageView <ImageView
android:id="@+id/remote_audio_off" android:id="@+id/remote_audio_off"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginBottom="6dp"
android:layout_marginStart="10dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginStart="10dp"
android:layout_marginBottom="6dp"
android:layout_toEndOf="@id/peer_nick_text_view" android:layout_toEndOf="@id/peer_nick_text_view"
android:src="@drawable/ic_mic_off_white_24px"
android:contentDescription="@string/nc_remote_audio_off" android:contentDescription="@string/nc_remote_audio_off"
android:src="@drawable/ic_mic_off_white_24px"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible" /> tools:visibility="visible" />

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

@ -26,8 +26,8 @@
android:id="@+id/controllerCallLayout" android:id="@+id/controllerCallLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:orientation="vertical"
tools:context=".activities.MagicCallActivity"> tools:context=".activities.MagicCallActivity">
<LinearLayout <LinearLayout
@ -40,9 +40,9 @@
android:id="@+id/conversationRelativeLayoutView" android:id="@+id/conversationRelativeLayoutView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/grey950" android:background="@color/grey950"
android:visibility="visible" android:visibility="visible"
android:layout_weight="1"
tools:visibility="visible"> tools:visibility="visible">
<GridView <GridView
@ -50,10 +50,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:stretchMode="columnWidth"
android:numColumns="2" android:numColumns="2"
android:scrollbars="vertical" android:scrollbars="vertical"
/> android:stretchMode="columnWidth" />
<FrameLayout <FrameLayout
android:id="@+id/selfVideoView" android:id="@+id/selfVideoView"
@ -66,8 +65,8 @@
android:layout_height="150dp" android:layout_height="150dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="16dp" android:layout_margin="16dp"
android:visibility="invisible"
android:clickable="false" android:clickable="false"
android:visibility="invisible"
tools:visibility="visible" /> tools:visibility="visible" />
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
@ -85,8 +84,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:orientation="vertical"
android:paddingTop="20dp"> android:paddingTop="20dp">
<TextView <TextView
@ -115,7 +114,8 @@
tools:text="Marsellus Wallace" /> tools:text="Marsellus Wallace" />
</LinearLayout> </LinearLayout>
<View android:id="@+id/verticalCenter" <View
android:id="@+id/verticalCenter"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -135,11 +135,11 @@
android:id="@+id/callControlsLinearLayout" android:id="@+id/callControlsLinearLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/call_controls_height" android:layout_height="@dimen/call_controls_height"
android:layout_alignBottom="@id/linearWrapperLayout"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:orientation="horizontal"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:gravity="center" android:gravity="center"
android:layout_alignBottom="@id/linearWrapperLayout"> android:orientation="horizontal">
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/callControlToggleChat" android:id="@+id/callControlToggleChat"
@ -147,11 +147,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="40dp" android:layout_marginStart="40dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:elevation="10dp"
app:backgroundImage="@color/call_buttons_background" app:backgroundImage="@color/call_buttons_background"
app:placeholderImage="@drawable/ic_comment_white" app:placeholderImage="@drawable/ic_comment_white"
app:roundAsCircle="true" app:roundAsCircle="true" />
android:elevation="10dp"
/>
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/callControlEnableSpeaker" android:id="@+id/callControlEnableSpeaker"