diff --git a/.gradle/9.2.1/checksums/checksums.lock b/.gradle/9.2.1/checksums/checksums.lock
index 1082eac..75b5200 100644
Binary files a/.gradle/9.2.1/checksums/checksums.lock and b/.gradle/9.2.1/checksums/checksums.lock differ
diff --git a/.gradle/9.2.1/checksums/md5-checksums.bin b/.gradle/9.2.1/checksums/md5-checksums.bin
index e55d0e0..b242159 100644
Binary files a/.gradle/9.2.1/checksums/md5-checksums.bin and b/.gradle/9.2.1/checksums/md5-checksums.bin differ
diff --git a/.gradle/9.2.1/checksums/sha1-checksums.bin b/.gradle/9.2.1/checksums/sha1-checksums.bin
index 28ed320..7dcbc84 100644
Binary files a/.gradle/9.2.1/checksums/sha1-checksums.bin and b/.gradle/9.2.1/checksums/sha1-checksums.bin differ
diff --git a/.gradle/9.2.1/executionHistory/executionHistory.bin b/.gradle/9.2.1/executionHistory/executionHistory.bin
index 3433770..e966796 100644
Binary files a/.gradle/9.2.1/executionHistory/executionHistory.bin and b/.gradle/9.2.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/9.2.1/executionHistory/executionHistory.lock b/.gradle/9.2.1/executionHistory/executionHistory.lock
index d133b39..b137f0e 100644
Binary files a/.gradle/9.2.1/executionHistory/executionHistory.lock and b/.gradle/9.2.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/9.2.1/fileHashes/fileHashes.bin b/.gradle/9.2.1/fileHashes/fileHashes.bin
index a9e6030..9d76742 100644
Binary files a/.gradle/9.2.1/fileHashes/fileHashes.bin and b/.gradle/9.2.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/9.2.1/fileHashes/fileHashes.lock b/.gradle/9.2.1/fileHashes/fileHashes.lock
index 869feea..20f97a8 100644
Binary files a/.gradle/9.2.1/fileHashes/fileHashes.lock and b/.gradle/9.2.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/9.2.1/fileHashes/resourceHashesCache.bin b/.gradle/9.2.1/fileHashes/resourceHashesCache.bin
index 18b88b9..db6cdbf 100644
Binary files a/.gradle/9.2.1/fileHashes/resourceHashesCache.bin and b/.gradle/9.2.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index cdc790c..802a452 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index c6f3645..b903673 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 9a7a90f..83a2136 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-02-24T12:15:28.299035Z">
+        <DropdownSelection timestamp="2026-03-30T17:46:20.542699Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=RZCW916BETE" />
diff --git a/app/build.gradle b/app/build.gradle
index d5ce5f2..0ca41f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,6 +14,9 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a"
+        }
     }
 
     buildTypes {
@@ -109,5 +112,6 @@ dependencies {
 
     //rtc
     implementation 'io.agora.rtc:full-sdk:4.2.3'
+    //implementation 'io.agora.rtc:full-sdk:4.2.6'
 
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f096f5..263238d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <uses-feature android:name= "android.hardware.camera.any"/>
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion ="28"/>
     <uses-permission android:name="android.permission.INTERNET" />
@@ -64,9 +65,9 @@
 
         <activity android:name=".ui.Chat.UsersActivity" />
         <activity android:name=".ui.Chat.ChatActivity"/>
-        <activity android:name=".ui.Chat.IncomingCallActivity"/>
         <activity android:name=".ui.Chat.VideoCallActivity" />
-        <activity android:name=".ui.Chat.OutgoingCallActivity" />
+
+        <activity android:name=".ui.Chat.CallsActivity" />
 
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/CallListener.java b/app/src/main/java/com/example/phasmatic/ui/Chat/CallListener.java
deleted file mode 100644
index 3138c53..0000000
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/CallListener.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.example.phasmatic.ui.Chat;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.NonNull;
-
-import com.google.firebase.database.*;
-
-public class CallListener {
-
-    private final DatabaseReference callsRef;
-    private final String currentUid;
-    private final Context context;
-
-    public CallListener(Context context, String currentUid) {
-        this.context = context;
-        this.currentUid = currentUid;
-
-        callsRef = FirebaseDatabase.getInstance(
-                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
-        ).getReference("calls");
-    }
-
-    public void start() {
-        callsRef.addValueEventListener(listener);
-    }
-
-    public void stop() {
-        callsRef.removeEventListener(listener);
-    }
-
-    private final ValueEventListener listener = new ValueEventListener() {
-        @Override
-        public void onDataChange(@NonNull DataSnapshot snapshot) {
-
-            for (DataSnapshot ds : snapshot.getChildren()) {
-
-                String receiverId = ds.child("receiver_id").getValue(String.class);
-                String status = ds.child("status").getValue(String.class);
-
-                if (currentUid.equals(receiverId) && "ringing".equals(status)) {
-
-                    String channelName = ds.child("channelName").getValue(String.class);
-                    String callId = ds.child("id").getValue(String.class);
-
-                    Intent intent = new Intent(context, IncomingCallActivity.class);
-                    intent.putExtra("channelName", channelName);
-                    intent.putExtra("callId", callId);
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                    context.startActivity(intent);
-                    break;
-                }
-            }
-        }
-
-        @Override
-        public void onCancelled(@NonNull DatabaseError error) {}
-    };
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/CallManager.java b/app/src/main/java/com/example/phasmatic/ui/Chat/CallManager.java
deleted file mode 100644
index 7d33a96..0000000
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/CallManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.example.phasmatic.ui.Chat;
-
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-
-public class CallManager {
-
-    private final DatabaseReference callsRef;
-
-    public CallManager() {
-        callsRef = FirebaseDatabase.getInstance(
-                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
-        ).getReference("calls");
-    }
-
-    public String startCall(String callerId, String receiverId, String channelName) {
-
-        String callId = callsRef.push().getKey();
-
-        if (callId == null) return null;
-
-        HashMap<String, Object> call = new HashMap<>();
-        call.put("id", callId);
-        call.put("caller_id", callerId);
-        call.put("receiver_id", receiverId);
-        call.put("channelName", channelName);
-        call.put("status", "ringing");
-        call.put("created_at", now());
-
-        callsRef.child(callId).setValue(call);
-
-        return callId;
-    }
-
-    public void acceptCall(String callId) {
-        callsRef.child(callId).child("status").setValue("accepted");
-    }
-
-    public void rejectCall(String callId) {
-        callsRef.child(callId).child("status").setValue("rejected");
-    }
-
-    public void endCall(String callId) {
-        callsRef.child(callId).child("status").setValue("ended");
-    }
-
-    private String now() {
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-                .format(new Date());
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/CallsActivity.java b/app/src/main/java/com/example/phasmatic/ui/Chat/CallsActivity.java
new file mode 100644
index 0000000..d2b079c
--- /dev/null
+++ b/app/src/main/java/com/example/phasmatic/ui/Chat/CallsActivity.java
@@ -0,0 +1,127 @@
+package com.example.phasmatic.ui.Chat;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.phasmatic.R;
+import com.example.phasmatic.data.model.User;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CallsActivity extends AppCompatActivity {
+
+    private static final String TAG = "CALLS";
+
+    private Spinner spnUsers;
+    private EditText edtMeetingCode;
+    private Button btnJoinCall;
+
+    private String currentUserId;
+    private String currentUserFullName;
+    private String currentUserEmail;
+    private String currentUserPhone;
+
+    private DatabaseReference usersRef;
+
+    private final List<User> userList = new ArrayList<>();
+    private final List<String> userNames = new ArrayList<>();
+    private ArrayAdapter<String> usersAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_calls);
+
+        currentUserId = getIntent().getStringExtra("userId");
+        currentUserFullName = getIntent().getStringExtra("userFullName");
+        currentUserEmail = getIntent().getStringExtra("userEmail");
+        currentUserPhone = getIntent().getStringExtra("userPhone");
+
+        spnUsers       = findViewById(R.id.spnUsers);
+        edtMeetingCode = findViewById(R.id.edtMeetingCode);
+        btnJoinCall    = findViewById(R.id.btnJoinCall);
+
+        FirebaseDatabase db = FirebaseDatabase.getInstance(
+                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
+        );
+        usersRef = db.getReference("users");
+
+        usersAdapter = new ArrayAdapter<>(
+                this,
+                android.R.layout.simple_spinner_item,
+                userNames
+        );
+        usersAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spnUsers.setAdapter(usersAdapter);
+
+        loadUsers();
+
+        btnJoinCall.setOnClickListener(v -> joinCall());
+    }
+
+    private void loadUsers() {
+        usersRef.addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(@NonNull DataSnapshot snapshot) {
+                userList.clear();
+                userNames.clear();
+
+                for (DataSnapshot child : snapshot.getChildren()) {
+                    User u = child.getValue(User.class);
+                    if (u == null) continue;
+
+                    if (child.getKey() != null && child.getKey().equals(currentUserId)) {
+                        continue;
+                    }
+
+                    u.setId(child.getKey());
+                    userList.add(u);
+                    userNames.add(u.getFullName() != null ? u.getFullName() : child.getKey());
+                }
+
+                usersAdapter.notifyDataSetChanged();
+            }
+
+            @Override
+            public void onCancelled(@NonNull DatabaseError error) { }
+        });
+    }
+
+    private void joinCall() {
+        String code = edtMeetingCode.getText().toString().trim();
+        if (code.isEmpty()) {
+            edtMeetingCode.setError("Meeting code required");
+            return;
+        }
+
+        int pos = spnUsers.getSelectedItemPosition();
+        String otherUid = null;
+        String otherName = null;
+        if (pos >= 0 && pos < userList.size()) {
+            User other = userList.get(pos);
+            otherUid = other.getId();
+            otherName = other.getFullName();
+        }
+
+        Log.d(TAG, "joinCall: channel=" + code +
+                " otherUid=" + otherUid + " otherName=" + otherName);
+
+        Intent i = new Intent(this, VideoCallActivity.class);
+        i.putExtra("channelName", code);
+        startActivity(i);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/ChatActivity.java b/app/src/main/java/com/example/phasmatic/ui/Chat/ChatActivity.java
index 08ea936..3d78e47 100644
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/ChatActivity.java
+++ b/app/src/main/java/com/example/phasmatic/ui/Chat/ChatActivity.java
@@ -40,7 +40,7 @@
 
 public class ChatActivity extends AppCompatActivity {
 
-    private ImageButton btnBack, btnSend, btnVoice, btnVideoCall;
+    private ImageButton btnBack, btnSend, btnVoice;
     private TextView txtChatWith;
     private EditText etMessage;
     private RecyclerView rvMessages;
@@ -54,7 +54,6 @@ public class ChatActivity extends AppCompatActivity {
     private String currentUid;
     private String otherUid;
     private String otherName;
-    CallListener callListener;
 
 
     private ProfileMenuHelper profileMenuHelper;
@@ -78,7 +77,6 @@ protected void onCreate(Bundle savedInstanceState) {
         etMessage   = findViewById(R.id.etMessage);
         rvMessages  = findViewById(R.id.rvMessages);
         imgProfile  = findViewById(R.id.imgProfile);
-        btnVideoCall = findViewById(R.id.btnvideoCall);
 
         currentUid = getIntent().getStringExtra("userId");
         otherUid   = getIntent().getStringExtra("otherUid");
@@ -120,7 +118,6 @@ protected void onCreate(Bundle savedInstanceState) {
         btnSend.setOnClickListener(v -> sendMessage());
 
         findOrCreateConversation();
-        setupVideoCall();
 
 
         btnVoice.setOnClickListener(v -> startSpeechRecognizer());
@@ -130,45 +127,15 @@ protected void onStart() {
         super.onStart();
         //String currentUid = "βαλε_εδω_το_uid_του_user"; // πχ απο intent ή auth
 
-        callListener = new CallListener(this, currentUid);
-        callListener.start();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
 
-        if (callListener != null) {
-            callListener.stop();
-        }
     }
 
 
-    private void setupVideoCall() {
-
-        btnVideoCall.setOnClickListener(v -> {
-
-            if (conversationKey == null) return;
-
-            CallManager callManager = new CallManager();
-
-            String callId = callManager.startCall(
-                    currentUid,
-                    otherUid,
-                    conversationKey
-            );
-
-            if (callId == null) return;
-
-            Intent i = new Intent(ChatActivity.this, OutgoingCallActivity.class);
-            i.putExtra("callId", callId);
-            i.putExtra("channelName", conversationKey);
-            i.putExtra("otherUid", otherUid);
-            i.putExtra("otherName", otherName);
-            startActivity(i);
-        });
-    }
-
     private void listenCallStatus(String callId) {
 
         DatabaseReference callRef = db.getReference("calls").child(callId);
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/IncomingCallActivity.java b/app/src/main/java/com/example/phasmatic/ui/Chat/IncomingCallActivity.java
deleted file mode 100644
index 5a95157..0000000
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/IncomingCallActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.example.phasmatic.ui.Chat;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.example.phasmatic.R;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-
-public class IncomingCallActivity extends AppCompatActivity {
-
-    private String callId;
-    private String channelName;
-    private DatabaseReference callsRef;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_incoming_call);
-
-        callId = getIntent().getStringExtra("callId");
-        channelName = getIntent().getStringExtra("channelName");
-
-        callsRef = FirebaseDatabase.getInstance(
-                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
-        ).getReference("calls");
-
-        findViewById(R.id.btnAccept).setOnClickListener(v -> acceptCall());
-        findViewById(R.id.btnReject).setOnClickListener(v -> rejectCall());
-    }
-
-    private void acceptCall() {
-
-        CallManager callManager = new CallManager();
-        callManager.acceptCall(callId);
-
-        Intent intent = new Intent(this, VideoCallActivity.class);
-        intent.putExtra("channelName", channelName);
-        intent.putExtra("callId", callId);
-        startActivity(intent);
-        finish();
-    }
-
-    private void rejectCall() {
-        new CallManager().rejectCall(callId);
-        finish();
-    }
-}
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/OutgoingCallActivity.java b/app/src/main/java/com/example/phasmatic/ui/Chat/OutgoingCallActivity.java
deleted file mode 100644
index a375bab..0000000
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/OutgoingCallActivity.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.example.phasmatic.ui.Chat;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.bumptech.glide.Glide;
-import com.example.phasmatic.R;
-import com.example.phasmatic.extras.ProfileImageManager;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
-
-import android.graphics.Bitmap;
-
-public class OutgoingCallActivity extends AppCompatActivity {
-
-    private String callId;
-    private String channelName;
-    private String otherUid;
-    private String otherName;
-
-    private TextView txtStatus, txtName;
-    private ImageButton btnCancel;
-    private ImageView imgCallee;
-
-    private DatabaseReference callRef;
-    private ValueEventListener callListener;
-
-    private DatabaseReference usersRef;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_outgoing_call);
-
-        txtStatus = findViewById(R.id.txtStatus);
-        txtName   = findViewById(R.id.txtName);
-        btnCancel = findViewById(R.id.btnCancel);
-        imgCallee = findViewById(R.id.imgCallee);
-
-        callId      = getIntent().getStringExtra("callId");
-        channelName = getIntent().getStringExtra("channelName");
-        otherUid    = getIntent().getStringExtra("otherUid");
-        otherName   = getIntent().getStringExtra("otherName");
-
-        txtStatus.setText("Calling…");
-        txtName.setText(otherName != null ? otherName : "User");
-
-        FirebaseDatabase db = FirebaseDatabase.getInstance(
-                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
-        );
-        callRef  = db.getReference("calls").child(callId);
-        usersRef = db.getReference("users");
-
-        loadCalleePhoto();
-
-        btnCancel.setOnClickListener(v -> {
-            new CallManager().endCall(callId);
-            finish();
-        });
-
-        listenCallStatus();
-    }
-
-    private void loadCalleePhoto() {
-        if (otherUid == null || otherUid.isEmpty()) {
-            imgCallee.setImageResource(R.drawable.baseline_face_24);
-            return;
-        }
-
-        usersRef.child(otherUid).get().addOnSuccessListener(snapshot -> {
-            String url = snapshot.child("profileImageUrl").getValue(String.class);
-
-            if (url != null && !url.isEmpty()) {
-                String displayUrl = url + "?t=" + System.currentTimeMillis();
-                Glide.with(this)
-                        .load(displayUrl)
-                        .placeholder(R.drawable.baseline_face_24)
-                        .error(R.drawable.baseline_face_24)
-                        .into(imgCallee);
-            } else {
-                Bitmap bmp = ProfileImageManager.loadBitmap(this, otherUid);
-                if (bmp != null) imgCallee.setImageBitmap(bmp);
-                else imgCallee.setImageResource(R.drawable.baseline_face_24);
-            }
-        });
-    }
-
-    private void listenCallStatus() {
-        callListener = new ValueEventListener() {
-            @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
-                String status = snapshot.child("status").getValue(String.class);
-                if (status == null) return;
-
-                if ("accepted".equals(status)) {
-                    txtStatus.setText("Connected");
-
-                    Intent i = new Intent(OutgoingCallActivity.this, VideoCallActivity.class);
-                    i.putExtra("channelName", channelName);
-                    i.putExtra("callId", callId);
-                    startActivity(i);
-                    finish();
-                } else if ("rejected".equals(status) || "ended".equals(status)) {
-                    txtStatus.setText("Call ended");
-                    finish();
-                }
-            }
-
-            @Override
-            public void onCancelled(@NonNull DatabaseError error) { }
-        };
-
-        callRef.addValueEventListener(callListener);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (callListener != null && callRef != null) {
-            callRef.removeEventListener(callListener);
-        }
-    }
-}
diff --git a/app/src/main/java/com/example/phasmatic/ui/Chat/VideoCallActivity.java b/app/src/main/java/com/example/phasmatic/ui/Chat/VideoCallActivity.java
index e010c6b..04d7a3a 100644
--- a/app/src/main/java/com/example/phasmatic/ui/Chat/VideoCallActivity.java
+++ b/app/src/main/java/com/example/phasmatic/ui/Chat/VideoCallActivity.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.SurfaceView;
 import android.widget.FrameLayout;
 
@@ -11,11 +12,6 @@
 import androidx.core.app.ActivityCompat;
 
 import com.example.phasmatic.R;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
 
 import io.agora.rtc2.ChannelMediaOptions;
 import io.agora.rtc2.Constants;
@@ -25,14 +21,14 @@
 
 public class VideoCallActivity extends AppCompatActivity {
 
+    private static final String TAG = "VIDEO";
+
     private RtcEngine agoraEngine;
 
-    private final String APP_ID = "0f9cc9d655b347fb852d60aef0fcf693";
-    private final String TOKEN = null;
+    private static final String APP_ID = "4b5af779eaed490d907b1a00c7d9eac0";
+    private static final String TOKEN  = null;  //without certificate
 
     private String channelName;
-    private String callId;
-
 
     private FrameLayout localContainer;
     private FrameLayout remoteContainer;
@@ -43,86 +39,110 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_video_call);
 
         channelName = getIntent().getStringExtra("channelName");
+        Log.d(TAG, "onCreate, channelName=" + channelName);
 
-        localContainer = findViewById(R.id.localVideoContainer);
+        localContainer  = findViewById(R.id.localVideoContainer);
         remoteContainer = findViewById(R.id.remoteVideoContainer);
 
         findViewById(R.id.btnEndCall).setOnClickListener(v -> {
-            new CallManager().endCall(callId);
+            Log.d(TAG, "EndCall clicked");
+            if (agoraEngine != null) {
+                agoraEngine.leaveChannel();
+            }
             finish();
         });
 
         findViewById(R.id.btnMute).setOnClickListener(v -> {
-            agoraEngine.muteLocalAudioStream(true);
+            Log.d(TAG, "Mute clicked");
+            if (agoraEngine != null) {
+                agoraEngine.muteLocalAudioStream(true);
+            }
         });
 
         findViewById(R.id.btnSwitchCamera).setOnClickListener(v -> {
-            agoraEngine.switchCamera();
+            Log.d(TAG, "SwitchCamera clicked");
+            if (agoraEngine != null) {
+                agoraEngine.switchCamera();
+            }
         });
 
         requestPermissions();
-        callId = getIntent().getStringExtra("callId");
-        listenCallStatus();
-
     }
+
     private void requestPermissions() {
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED ||
-                ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-
-            ActivityCompat.requestPermissions(this,
-                    new String[]{
-                            Manifest.permission.CAMERA,
-                            Manifest.permission.RECORD_AUDIO
-                    }, 1);
+        Log.d(TAG, "requestPermissions");
+
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED ||
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)
+                        != PackageManager.PERMISSION_GRANTED) {
+
+            Log.d(TAG, "requestPermissions: requesting");
+            ActivityCompat.requestPermissions(
+                    this,
+                    new String[]{ Manifest.permission.CAMERA,
+                            Manifest.permission.RECORD_AUDIO },
+                    1
+            );
         } else {
+            Log.d(TAG, "requestPermissions: already granted → initAgora");
             initAgora();
         }
     }
-    private void listenCallStatus() {
-
-        DatabaseReference callRef = FirebaseDatabase.getInstance(
-                "https://mega-5a5b4-default-rtdb.europe-west1.firebasedatabase.app"
-        ).getReference("calls").child(callId);
-
-        callRef.child("status").addValueEventListener(new ValueEventListener() {
-            @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
-
-                String status = snapshot.getValue(String.class);
 
-                if ("ended".equals(status) || "rejected".equals(status)) {
-                    finish();
-                }
-            }
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
-            @Override
-            public void onCancelled(@NonNull DatabaseError error) {
+        Log.d(TAG, "onRequestPermissionsResult, requestCode=" + requestCode +
+                " len=" + grantResults.length +
+                " cam=" + (grantResults.length > 0 ? grantResults[0] : -1) +
+                " mic=" + (grantResults.length > 1 ? grantResults[1] : -1));
 
-            }
+        if (requestCode == 1 &&
+                grantResults.length >= 2 &&
+                grantResults[0] == PackageManager.PERMISSION_GRANTED &&
+                grantResults[1] == PackageManager.PERMISSION_GRANTED) {
 
-        });
+            Log.d(TAG, "permissions GRANTED → initAgora");
+            initAgora();
+        } else {
+            Log.d(TAG, "permissions NOT fully granted, staying here");
+        }
     }
 
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        initAgora();
-    }
     private void initAgora() {
+        Log.d(TAG, "initAgora START");
+
         try {
             agoraEngine = RtcEngine.create(getBaseContext(), APP_ID, rtcHandler);
+            Log.d(TAG, "RtcEngine.create returned, engine = " + agoraEngine);
         } catch (Exception e) {
-            throw new RuntimeException("Agora init error");
+            Log.e(TAG, "RtcEngine.create FAILED: " + e.getMessage(), e);
+            return;
         }
 
-        agoraEngine.enableVideo();
+        if (agoraEngine == null) {
+            Log.e(TAG, "agoraEngine is NULL");
+            return;
+        }
 
+        Log.d(TAG, "RtcEngine created OK");
+
+        agoraEngine.enableVideo();
         setupLocalVideo();
         joinChannel();
     }
+
     private void setupLocalVideo() {
-        SurfaceView localView = new SurfaceView(getBaseContext());
+        Log.d(TAG, "setupLocalVideo");
+        localContainer.removeAllViews();
+
+        // ΣΗΜΑΝΤΙΚΟ: χρησιμοποιούμε CreateRendererView
+        SurfaceView localView = RtcEngine.CreateRendererView(getBaseContext());
+        localView.setZOrderMediaOverlay(true);
         localContainer.addView(localView);
 
         agoraEngine.setupLocalVideo(
@@ -131,6 +151,7 @@ private void setupLocalVideo() {
     }
 
     private void joinChannel() {
+        Log.d(TAG, "joinChannel, channel=" + channelName);
 
         ChannelMediaOptions options = new ChannelMediaOptions();
         options.channelProfile = Constants.CHANNEL_PROFILE_COMMUNICATION;
@@ -138,31 +159,45 @@ private void joinChannel() {
 
         agoraEngine.startPreview();
 
-        agoraEngine.joinChannel(
+        int res = agoraEngine.joinChannel(
                 TOKEN,
                 channelName,
                 0,
                 options
         );
+        Log.d(TAG, "joinChannel result=" + res);
     }
 
-    // 📡 EVENTS
     private final IRtcEngineEventHandler rtcHandler = new IRtcEngineEventHandler() {
 
+        @Override
+        public void onJoinChannelSuccess(String channel, int uid, int elapsed) {
+            Log.d(TAG, "onJoinChannelSuccess channel=" + channel + " uid=" + uid);
+        }
+
         @Override
         public void onUserJoined(int uid, int elapsed) {
+            Log.d(TAG, "onUserJoined uid=" + uid);
             runOnUiThread(() -> setupRemoteVideo(uid));
         }
 
         @Override
         public void onUserOffline(int uid, int reason) {
+            Log.d(TAG, "onUserOffline uid=" + uid + " reason=" + reason);
             runOnUiThread(() -> finish());
         }
+
+        @Override
+        public void onError(int err) {
+            Log.e(TAG, "Agora onError = " + err);
+        }
     };
 
-    // 👤 Remote video
     private void setupRemoteVideo(int uid) {
-        SurfaceView remoteView = new SurfaceView(getBaseContext());
+        Log.d(TAG, "setupRemoteVideo uid=" + uid);
+        remoteContainer.removeAllViews();
+
+        SurfaceView remoteView = RtcEngine.CreateRendererView(getBaseContext());
         remoteContainer.addView(remoteView);
 
         agoraEngine.setupRemoteVideo(
@@ -170,13 +205,20 @@ private void setupRemoteVideo(int uid) {
         );
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        Log.d(TAG, "onStop CALLED");
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        Log.d(TAG, "onDestroy CALLED");
 
         if (agoraEngine != null) {
             agoraEngine.leaveChannel();
         }
         RtcEngine.destroy();
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/phasmatic/ui/Profile_Menu/ProfileMenuHelper.java b/app/src/main/java/com/example/phasmatic/ui/Profile_Menu/ProfileMenuHelper.java
index 291a64a..fce6913 100644
--- a/app/src/main/java/com/example/phasmatic/ui/Profile_Menu/ProfileMenuHelper.java
+++ b/app/src/main/java/com/example/phasmatic/ui/Profile_Menu/ProfileMenuHelper.java
@@ -7,6 +7,7 @@
 import androidx.appcompat.widget.PopupMenu;
 
 import com.example.phasmatic.R;
+import com.example.phasmatic.ui.Chat.CallsActivity;
 import com.example.phasmatic.ui.Chat.UsersActivity;
 import com.example.phasmatic.ui.LoginActivity;
 import com.google.firebase.database.DatabaseReference;
@@ -58,6 +59,10 @@ else if (id == R.id.menu_chat) {
                 go_to_chats();
                 return true;
             }
+            else if (id == R.id.menu_calls) {
+                go_to_calls();
+                return true;
+            }
             return false;
         });
 
@@ -73,6 +78,16 @@ private void openAccountActivity() {
         activity.startActivity(i);
     }
 
+    private void go_to_calls() {
+        Intent i = new Intent(activity, CallsActivity.class);
+        i.putExtra("userId", userId);
+        i.putExtra("userFullName", userFullName);
+        i.putExtra("userEmail", userEmail);
+        i.putExtra("userPhone", userPhone);
+        activity.startActivity(i);
+        activity.finish();
+    }
+
     private void logout() {
         Intent i = new Intent(activity, LoginActivity.class);
         i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/res/layout/activity_calls.xml b/app/src/main/res/layout/activity_calls.xml
new file mode 100644
index 0000000..27fd010
--- /dev/null
+++ b/app/src/main/res/layout/activity_calls.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="24dp"
+    android:background="#071B36">
+
+    <TextView
+        android:id="@+id/txtTitleCalls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Video Calls"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        android:textColor="@android:color/white"
+        android:layout_marginBottom="16dp" />
+
+    <TextView
+        android:id="@+id/txtSelectUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Select user"
+        android:textColor="@android:color/white" />
+
+    <Spinner
+        android:id="@+id/spnUsers"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:background="@android:drawable/edit_text" />
+
+    <TextView
+        android:id="@+id/txtMeetingCodeLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Meeting code"
+        android:textColor="@android:color/white"
+        android:layout_marginTop="16dp" />
+
+    <EditText
+        android:id="@+id/edtMeetingCode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter or share code"
+        android:inputType="text"
+        android:padding="10dp"
+        android:background="@android:drawable/edit_text"
+        android:textColor="@android:color/white"
+        android:textColorHint="#88FFFFFF" />
+
+    <Button
+        android:id="@+id/btnJoinCall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Join / Start Call"
+        android:layout_marginTop="20dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_start_call.xml b/app/src/main/res/layout/activity_start_call.xml
new file mode 100644
index 0000000..dade597
--- /dev/null
+++ b/app/src/main/res/layout/activity_start_call.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="24dp"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:background="#071B36">
+
+    <TextView
+        android:id="@+id/txtTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start Video Call"
+        android:textSize="22sp"
+        android:textColor="@android:color/white"
+        android:textStyle="bold"
+        android:layout_marginBottom="24dp" />
+
+    <EditText
+        android:id="@+id/edtChannelName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter room/channel name"
+        android:inputType="text"
+        android:padding="12dp"
+        android:background="@android:drawable/edit_text"
+        android:textColor="@android:color/white"
+        android:textColorHint="#88FFFFFF" />
+
+    <Button
+        android:id="@+id/btnStartCall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Start Call"
+        android:layout_marginTop="16dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/profile_menu.xml b/app/src/main/res/menu/profile_menu.xml
index 309a01a..350a860 100644
--- a/app/src/main/res/menu/profile_menu.xml
+++ b/app/src/main/res/menu/profile_menu.xml
@@ -14,4 +14,8 @@
         android:id="@+id/menu_chat"
         android:title="Messages"
         android:icon="@drawable/ic_logout" />
+
+    <item
+        android:id="@+id/menu_calls"
+        android:title="Calls" />
 </menu>
diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
index b72cdf9..6e625fe 100644
--- a/build/reports/problems/problems-report.html
+++ b/build/reports/problems/problems-report.html
@@ -646,7 +646,7 @@
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"locations":[{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Declaring dependencies using multi-string notation has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10."}],"contextualLabel":"Declaring dependencies using multi-string notation has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_9.html#dependency_multi_string_notation","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"declaring-dependencies-using-multi-string-notation","displayName":"Declaring dependencies using multi-string notation has been deprecated."}],"solutions":[[{"text":"Please use single-string notation instead: \"com.android.tools.lint:lint-gradle:31.13.0\"."}]]},{"locations":[{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Declaring dependencies using multi-string notation has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10."}],"contextualLabel":"Declaring dependencies using multi-string notation has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_9.html#dependency_multi_string_notation","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"declaring-dependencies-using-multi-string-notation","displayName":"Declaring dependencies using multi-string notation has been deprecated."}],"solutions":[[{"text":"Please use single-string notation instead: \"com.android.tools.build:aapt2:8.13.0-13719691:windows\"."}]]},{"locations":[{"path":"C:\\Users\\cosma\\Desktop\\HCI_Project\\app\\build.gradle","line":7}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\cosma\\Desktop\\HCI_Project\\app\\build.gradle","line":33}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('viewBinding = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\cosma\\Desktop\\HCI_Project\\app\\build.gradle","line":34}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('mlModelBinding = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":5,"buildName":"Phasmatic","requestedTasks":":app:assembleDebug","documentationLink":"https://docs.gradle.org/9.2.1/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"locations":[{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Declaring dependencies using multi-string notation has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10."}],"contextualLabel":"Declaring dependencies using multi-string notation has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_9.html#dependency_multi_string_notation","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"declaring-dependencies-using-multi-string-notation","displayName":"Declaring dependencies using multi-string notation has been deprecated."}],"solutions":[[{"text":"Please use single-string notation instead: \"com.android.tools.lint:lint-gradle:31.13.0\"."}]]},{"locations":[{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Declaring dependencies using multi-string notation has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10."}],"contextualLabel":"Declaring dependencies using multi-string notation has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_9.html#dependency_multi_string_notation","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"declaring-dependencies-using-multi-string-notation","displayName":"Declaring dependencies using multi-string notation has been deprecated."}],"solutions":[[{"text":"Please use single-string notation instead: \"com.android.tools.build:aapt2:8.13.0-13719691:windows\"."}]]},{"locations":[{"path":"C:\\Users\\Nikol\\OneDrive\\Desktop\\HCI_Project\\app\\build.gradle","line":7}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\Nikol\\OneDrive\\Desktop\\HCI_Project\\app\\build.gradle","line":36}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('viewBinding = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\Nikol\\OneDrive\\Desktop\\HCI_Project\\app\\build.gradle","line":37}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.2.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('mlModelBinding = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\Nikol\\OneDrive\\Desktop\\HCI_Project\\app\\src\\main\\java\\com\\example\\phasmatic\\ui\\BackButtonHelper.java"},{"taskPath":":app:compileDebugJavaWithJavac"}],"problem":[{"text":"Some input files use or override a deprecated API."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Some input files use or override a deprecated API."}],"contextualLabel":"Some input files use or override a deprecated API.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.plural","displayName":"Some input files use or override a deprecated API."}]},{"locations":[{"path":"C:\\Users\\Nikol\\OneDrive\\Desktop\\HCI_Project\\app\\src\\main\\java\\com\\example\\phasmatic\\ui\\BackButtonHelper.java"},{"taskPath":":app:compileDebugJavaWithJavac"}],"problem":[{"text":"Recompile with -Xlint:deprecation for details."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Recompile with -Xlint:deprecation for details."}],"contextualLabel":"Recompile with -Xlint:deprecation for details.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.recompile","displayName":"Recompile with -Xlint:deprecation for details."}]}],"problemsReport":{"totalProblemCount":7,"buildName":"Phasmatic","requestedTasks":":app:assembleDebug","documentationLink":"https://docs.gradle.org/9.2.1/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>
diff --git a/local.properties b/local.properties
index 9de393a..11c4dd4 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Mar 30 19:39:00 EEST 2026
-sdk.dir=C\:\\Users\\cosma\\AppData\\Local\\Android\\Sdk
+#Mon Mar 30 20:34:59 EEST 2026
+sdk.dir=C\:\\Users\\Nikol\\AppData\\Local\\Android\\Sdk