Browse Source

reformat code and use app-defined color-white

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 years ago
parent
commit
d1d81b947f
2 changed files with 31 additions and 32 deletions
  1. 9 9
      app/src/main/res/layout/call_item.xml
  2. 22 23
      app/src/main/res/layout/controller_call.xml

+ 9 - 9
app/src/main/res/layout/call_item.xml

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

+ 22 - 23
app/src/main/res/layout/controller_call.xml

@@ -21,14 +21,14 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/controllerCallLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:fitsSystemWindows="true"
-        tools:context=".activities.MagicCallActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/controllerCallLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:context=".activities.MagicCallActivity">
 
     <LinearLayout
         android:id="@+id/linearWrapperLayout"
@@ -40,9 +40,9 @@
             android:id="@+id/conversationRelativeLayoutView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:layout_weight="1"
             android:background="@color/grey950"
             android:visibility="visible"
-            android:layout_weight="1"
             tools:visibility="visible">
 
             <GridView
@@ -50,10 +50,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:stretchMode="columnWidth"
                 android:numColumns="2"
                 android:scrollbars="vertical"
-                />
+                android:stretchMode="columnWidth" />
 
             <FrameLayout
                 android:id="@+id/selfVideoView"
@@ -66,8 +65,8 @@
                     android:layout_height="150dp"
                     android:layout_gravity="center"
                     android:layout_margin="16dp"
-                    android:visibility="invisible"
                     android:clickable="false"
+                    android:visibility="invisible"
                     tools:visibility="visible" />
 
                 <com.facebook.drawee.view.SimpleDraweeView
@@ -85,8 +84,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
-                android:orientation="vertical"
                 android:gravity="center"
+                android:orientation="vertical"
                 android:paddingTop="20dp">
 
                 <TextView
@@ -99,7 +98,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="Voice Call"/>
+                    tools:text="Voice Call" />
 
                 <TextView
                     android:id="@+id/callConversationNameTextView"
@@ -115,18 +114,19 @@
                     tools:text="Marsellus Wallace" />
             </LinearLayout>
 
-            <View android:id="@+id/verticalCenter"
+            <View
+                android:id="@+id/verticalCenter"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"/>
+                android:layout_centerVertical="true" />
 
             <include
                 layout="@layout/call_states"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@id/verticalCenter"
-                android:layout_marginTop="-50dp"/>
+                android:layout_marginTop="-50dp" />
         </RelativeLayout>
 
     </LinearLayout>
@@ -135,11 +135,11 @@
         android:id="@+id/callControlsLinearLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_controls_height"
+        android:layout_alignBottom="@id/linearWrapperLayout"
         android:animateLayoutChanges="true"
-        android:orientation="horizontal"
         android:background="@android:color/transparent"
         android:gravity="center"
-        android:layout_alignBottom="@id/linearWrapperLayout">
+        android:orientation="horizontal">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/callControlToggleChat"
@@ -147,11 +147,10 @@
             android:layout_height="match_parent"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="10dp"
+            android:elevation="10dp"
             app:backgroundImage="@color/call_buttons_background"
             app:placeholderImage="@drawable/ic_comment_white"
-            app:roundAsCircle="true"
-            android:elevation="10dp"
-            />
+            app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/callControlEnableSpeaker"
@@ -196,4 +195,4 @@
             app:roundAsCircle="true" />
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>