From 3326b6a7f35f39bafffd490f0c25a296a123bfb7 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 12:20:04 +0200
Subject: [PATCH] rename design for CallActivity

move methods

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 78 ++++++++++---------
 ...{controller_call.xml => call_activity.xml} |  0
 2 files changed, 40 insertions(+), 38 deletions(-)
 rename app/src/main/res/layout/{controller_call.xml => call_activity.xml} (100%)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index cd5787547..923260581 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -54,7 +54,7 @@ import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.databinding.ControllerCallBinding;
+import com.nextcloud.talk.databinding.CallActivityBinding;
 import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.events.MediaStreamEvent;
 import com.nextcloud.talk.events.NetworkEvent;
@@ -242,7 +242,7 @@ public class CallActivity extends BaseActivity {
 
     private Boolean isInPipMode = false;
 
-    private ControllerCallBinding binding;
+    private CallActivityBinding binding;
 
     @Parcel
     public enum CallStatus {
@@ -262,7 +262,7 @@ public class CallActivity extends BaseActivity {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        binding = ControllerCallBinding.inflate(getLayoutInflater());
+        binding = CallActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         Bundle extras = getIntent().getExtras();
@@ -312,6 +312,43 @@ public class CallActivity extends BaseActivity {
         initClickListeners();
     }
 
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public void onStart() {
+        super.onStart();
+        // TODO: move some lines to onCreate!?!
+
+        binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
+
+        pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
+            .setDuration(310)
+            .setRepeatCount(PulseAnimation.INFINITE)
+            .setRepeatMode(PulseAnimation.REVERSE);
+
+
+        try {
+            cache.evictAll();
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to evict cache");
+        }
+
+        binding.callControls.setZ(100.0f);
+        basicInitialization();
+        participantDisplayItems = new HashMap<>();
+        initViews();
+        updateSelfVideoViewPosition();
+        if (!isConnectionEstablished()){
+            initiateCall();
+        }
+    }
+
+    public void onStop() {
+        super.onStop();
+        if (isInPipMode) {
+            finish();
+        }
+    }
+
     private void initClickListeners() {
         binding.pictureInPictureButton.setOnClickListener(l -> enterPipMode());
 
@@ -2380,34 +2417,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onStart() {
-        super.onStart();
-        binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
-
-        pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
-            .setDuration(310)
-            .setRepeatCount(PulseAnimation.INFINITE)
-            .setRepeatMode(PulseAnimation.REVERSE);
-
-
-        try {
-            cache.evictAll();
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to evict cache");
-        }
-
-        binding.callControls.setZ(100.0f);
-        basicInitialization();
-        participantDisplayItems = new HashMap<>();
-        initViews();
-        updateSelfVideoViewPosition();
-        if (!isConnectionEstablished()){
-            initiateCall();
-        }
-    }
-
     private class MicrophoneButtonTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
@@ -2505,13 +2514,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    public void onStop() {
-        super.onStop();
-        if (isInPipMode) {
-            finish();
-        }
-    }
-
     private class SelfVideoTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/call_activity.xml
similarity index 100%
rename from app/src/main/res/layout/controller_call.xml
rename to app/src/main/res/layout/call_activity.xml