From 4c6ee9693ad1acdd48004b143dd4758527cc0845 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 7 Apr 2020 16:17:29 +0200
Subject: [PATCH] use appbarlayout in RtpSessionActivity

---
 .../conversations/ui/RtpSessionActivity.java  | 12 ++---
 src/main/res/layout/activity_rtp_session.xml  | 44 +++++++++----------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 4fcab1157..32a0d03ef 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -29,12 +29,8 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
 
     private ActivityRtpSessionBinding binding;
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
-        getWindow().addFlags(
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                        | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                        | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                        | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
         super.onCreate(savedInstanceState);
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_rtp_session);
         this.binding.rejectCall.setOnClickListener(this::rejectCall);
@@ -42,6 +38,12 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         this.binding.acceptCall.setOnClickListener(this::acceptCall);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        Log.d(Config.LOGTAG,"RtpSessionActivity.onStart()");
+    }
+
     private void endCall(View view) {
         requireRtpConnection().endCall();
     }
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 28d954313..c21cec4ff 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -7,33 +7,33 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:background="?colorPrimary"
+        <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="16dp"
-            android:paddingRight="16dp"
             android:paddingTop="32dp"
-            android:paddingBottom="32dp"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
+            android:paddingRight="16dp"
+            android:paddingBottom="32dp">
+
             <TextView
                 android:id="@+id/status"
-                tools:text="Incoming call"
-                android:textColor="@color/white"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Conversations.Title"/>
+                android:textAppearance="@style/TextAppearance.Conversations.Title"
+                android:textColor="@color/white"
+                tools:text="Incoming call" />
+
             <TextView
                 android:id="@+id/with"
-                android:textColor="@color/white"
-                android:layout_below="@id/status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_below="@id/status"
                 android:textAppearance="@style/TextAppearance.Conversations.Display2"
-                tools:text="Juliet Capulet"/>
+                android:textColor="@color/white"
+                tools:text="Juliet Capulet" />
+
+        </android.support.design.widget.AppBarLayout>
 
-        </LinearLayout>
 
         <RelativeLayout
             android:layout_width="288dp"
@@ -45,47 +45,47 @@
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/reject_call"
                 android:layout_width="wrap_content"
-                android:layout_margin="16dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
+                android:layout_margin="16dp"
                 android:src="@drawable/ic_call_end_white_48dp"
+                android:visibility="gone"
                 app:backgroundTint="@color/red700"
                 app:elevation="4dp"
                 app:fabCustomSize="72dp"
                 app:maxImageSize="36dp"
-                android:visibility="gone"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/end_call"
                 android:layout_width="wrap_content"
-                android:layout_margin="16dp"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
+                android:layout_margin="16dp"
                 android:src="@drawable/ic_call_end_white_48dp"
+                android:visibility="gone"
                 app:backgroundTint="@color/red700"
                 app:elevation="4dp"
                 app:fabCustomSize="72dp"
-                app:maxImageSize="36dp"
-                android:visibility="gone"/>
+                app:maxImageSize="36dp" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/accept_call"
                 android:layout_width="wrap_content"
-                android:layout_margin="16dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:layout_margin="16dp"
                 android:src="@drawable/ic_call_white_48dp"
+                android:visibility="gone"
                 app:backgroundTint="@color/green700"
                 app:elevation="4dp"
                 app:fabCustomSize="72dp"
                 app:maxImageSize="36dp"
-                android:visibility="gone"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
         </RelativeLayout>
 
     </RelativeLayout>