From 9a2552e02c2be3e6af204c9ad05af7c7e71848a0 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 13 Mar 2022 23:28:52 +0100
Subject: [PATCH 01/10] Implemented edit username

---
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              | 103 +++++++++---------
 .../java/ch/sdp/vibester/profile/EditUser.kt  |  18 +++
 .../vibester/profile/ProfileDataProvider.kt   |   4 +-
 .../ch/sdp/vibester/profile/ProfileSetup.kt   |  35 +++++-
 .../main/res/layout/activity_edit_user.xml    | 103 ++++++++++++++++++
 app/src/main/res/layout/activity_profile.xml  |  16 +++
 app/src/main/res/values/strings.xml           |   1 +
 8 files changed, 229 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
 create mode 100644 app/src/main/res/layout/activity_edit_user.xml

diff --git a/app/build.gradle b/app/build.gradle
index df5a53915..5a4abf82e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,6 +52,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.google.firebase:firebase-auth-ktx:21.0.1'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20180813'
     testImplementation 'org.robolectric:robolectric:4.6'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e19b26012..c1e74ff27 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.sdp.vibester">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.MyApplication">
-        <activity
-            android:name="ch.sdp.vibester.GamescreenActivity"
-            android:exported="false" />
-        <activity
-            android:name=".profile.ProfileSetup"
-            android:exported="false" />
-        <activity
-            android:name=".MusicTemporary"
-            android:exported="false" />
-       <activity
-            android:name=".GameSetupScreen"
-            android:exported="false" />
-        <activity android:name=".scoreboard.ScoreBoardActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".WelcomeScreen"
-            android:exported="false" />
-        <activity
-            android:name=".Register"
-            android:exported="true" />
-        <activity
-            android:name=".GreetingActivity"
-            android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ch.sdp.vibester">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name=".profile.editUser"
+            android:exported="false" />
+        <activity
+            android:name=".GamescreenActivity"
+            android:exported="false" />
+        <activity
+            android:name=".profile.ProfileSetup"
+            android:exported="false" />
+        <activity
+            android:name=".MusicTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".GameSetupScreen"
+            android:exported="false" />
+        <activity
+            android:name=".scoreboard.ScoreBoardActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".WelcomeScreen"
+            android:exported="false" />
+        <activity
+            android:name=".Register"
+            android:exported="true" />
+        <activity
+            android:name=".GreetingActivity"
+            android:exported="false" />
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt b/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
new file mode 100644
index 000000000..d6c1d1198
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
@@ -0,0 +1,18 @@
+package ch.sdp.vibester.profile
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import ch.sdp.vibester.R
+
+class EditUser : AppCompatActivity() {
+
+    private var popupTitle = ""
+    private var popupText = ""
+    private var popupButton = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        overridePendingTransition(0, 0)
+        setContentView(R.layout.activity_edit_user)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileDataProvider.kt b/app/src/main/java/ch/sdp/vibester/profile/ProfileDataProvider.kt
index 13bc31158..54a0edaa7 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileDataProvider.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/ProfileDataProvider.kt
@@ -2,7 +2,7 @@ package ch.sdp.vibester.profile
 
 class ProfileDataProvider(userID: String, users: List<UserProfile> = emptyList(), scoreboard: List<Int> = emptyList()) {
     private lateinit var user: UserProfile
-    private val userID:Int = userID.toInt()
+    private val userID: Int = userID.toInt()
     private lateinit var users: List<UserProfile>
     private lateinit var scoreboard: List<Int>
 
@@ -53,7 +53,7 @@ class ProfileDataProvider(userID: String, users: List<UserProfile> = emptyList()
     /**
      * Retrieve profile data of user.
      */
-    private fun getUserData():UserProfile {
+    private fun getUserData(): UserProfile {
         return users[userID]
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
index 020c89ddf..3b9b3b8c4 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
@@ -1,9 +1,15 @@
 package ch.sdp.vibester.profile
 
+import android.content.DialogInterface
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.text.InputType
+import android.view.LayoutInflater
+import android.widget.Button
+import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import ch.sdp.vibester.R
 const val EXTRA_ID = "userProfile"
 
@@ -14,9 +20,36 @@ class ProfileSetup: AppCompatActivity() {
         val bundle = intent.extras;
         val user: UserProfile = bundle?.getSerializable(EXTRA_ID) as UserProfile
         setupProfile(user)
+
+        val editUsername = findViewById<Button>(R.id.editProfile)
+
+        editUsername.setOnClickListener {
+            showdialog()
+        }
+    }
+
+    private fun showdialog(){
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder.setTitle("Title")
+
+// Set up the input
+        val input = EditText(this)
+// Specify the type of input expected; this, for example, sets the input as a password, and will mask the text
+        input.setHint("Enter Text")
+        input.inputType = InputType.TYPE_CLASS_TEXT
+        builder.setView(input)
+
+// Set up the buttons
+        builder.setPositiveButton("OK", DialogInterface.OnClickListener { dialog, which ->
+            // Here you get get input text from the Edittext
+            findViewById<TextView>(R.id.username).text = input.text.toString()
+        })
+        builder.setNegativeButton("Cancel", DialogInterface.OnClickListener { dialog, which -> dialog.cancel() })
+
+        builder.show()
     }
 
-     fun setupProfile(user: UserProfile){
+    private fun setupProfile(user: UserProfile){
         findViewById<TextView>(R.id.handle).text =  user.handle
         findViewById<TextView>(R.id.username).text = user.username
         findViewById<TextView>(R.id.totalGames).text = user.totalGames.toString()
diff --git a/app/src/main/res/layout/activity_edit_user.xml b/app/src/main/res/layout/activity_edit_user.xml
new file mode 100644
index 000000000..ae6b60764
--- /dev/null
+++ b/app/src/main/res/layout/activity_edit_user.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    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/popup_window_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".profile.EditUser">
+
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/popup_window_view_with_border"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        app:cardBackgroundColor="#FFFFFF"
+        app:cardCornerRadius="3dp"
+        app:cardElevation="0dp"
+        app:cardMaxElevation="0dp"
+        app:cardPreventCornerOverlap="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/popup_window_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="2dp"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="3dp"
+            app:cardElevation="0dp"
+            app:cardMaxElevation="0dp"
+            app:cardPreventCornerOverlap="false">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/popup_window_background_container"
+                android:layout_width="250dp"
+                android:minHeight="170dp"
+                android:background="#bc214b"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true">
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/popup_window_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Text"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textStyle="bold"
+                    android:textColor="#FFFFFF"
+                    android:textSize="12sp"
+                    app:layout_constraintBottom_toTopOf="@+id/popup_window_button"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/popup_window_title" />
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/popup_window_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    app:autoSizeTextType="uniform"
+                    app:autoSizeMaxTextSize="24dp"
+                    android:background="#9E1C40"
+                    android:text="Title"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+                <Button
+                    android:id="@+id/popup_window_button"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="#851635"
+                    android:text="ok"
+                    android:textAllCaps="false"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.cardview.widget.CardView>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 5bb9889af..f6d918c24 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -33,6 +33,7 @@
         android:textColor="#000"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/username"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
@@ -42,11 +43,13 @@
         android:id="@+id/username"
         android:layout_width="200dp"
         android:layout_height="30dp"
+        android:layout_marginBottom="109dp"
         android:fontFamily="monospace"
         android:textAlignment="center"
         android:textColor="#000"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
@@ -161,4 +164,17 @@
 
     </TableLayout>
 
+    <Button
+        android:id="@+id/editProfile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14dp"
+        android:layout_marginBottom="27dp"
+        android:text="@string/editProfile"
+        app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/username" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55f17ee72..704650920 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="createAcc">Create Account</string>
     <string name="logIn">Log in</string>
     <string name="logInGoogle">Log in with Google</string>
+    <string name="editProfile">Edit Profile</string>
 
     <string-array name="nb_players">
         <item>One</item>

From c3ea79db2f82e1da692a49f556d3d33fb911ea4f Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 14 Mar 2022 11:28:24 +0100
Subject: [PATCH 02/10] Implemented edit handle

---
 .../sdp/vibester/profile/ProfileSetupTest.kt  |  65 +++++++++--
 .../java/ch/sdp/vibester/profile/EditUser.kt  |  18 ---
 .../ch/sdp/vibester/profile/ProfileSetup.kt   |  32 +++---
 .../main/res/layout/activity_edit_user.xml    | 103 ------------------
 app/src/main/res/layout/activity_profile.xml  |  19 +++-
 app/src/main/res/values/strings.xml           |   3 +-
 6 files changed, 89 insertions(+), 151 deletions(-)
 delete mode 100644 app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
 delete mode 100644 app/src/main/res/layout/activity_edit_user.xml

diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt
index 5aa640d89..e238f146d 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt
@@ -3,23 +3,14 @@ package ch.sdp.vibester.profile
 import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
-import ch.sdp.vibester.GreetingActivity
 import ch.sdp.vibester.R
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.Serializable
 
 
 @RunWith(AndroidJUnit4::class)
@@ -49,5 +40,59 @@ class ProfileSetupTest {
         onView(withId(R.id.username)).check(matches(isDisplayed()))
 //        onView(withId(R.id.avatar)).check(matches(isDisplayed()))
     }
+
+    @Test
+    fun checkEditProfile() {
+        val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        intent.putExtra("userProfile", inputProfile)
+        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+
+        val newUsername = "newUser"
+        onView(withId(R.id.editUser)).perform(ViewActions.click())
+        onView(withId(0)).perform(ViewActions.typeText(newUsername), ViewActions.closeSoftKeyboard())
+        onView(withText("OK")).perform(ViewActions.click())
+        onView(withId(R.id.username)).check(matches(withText(newUsername)))
+
+    }
+
+    @Test
+    fun checkEditProfileClickCancel() {
+        val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        intent.putExtra("userProfile", inputProfile)
+        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.editUser)).perform(ViewActions.click())
+        onView(withText("Cancel")).perform(ViewActions.click())
+        onView(withId(R.id.username)).check(matches(withText("username0")))
+    }
+
+    @Test
+    fun checkEditHandle() {
+        val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        intent.putExtra("userProfile", inputProfile)
+        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+
+        val newUserHandle = "newHandle"
+        onView(withId(R.id.editHandle)).perform(ViewActions.click())
+        onView(withId(0)).perform(ViewActions.typeText(newUserHandle), ViewActions.closeSoftKeyboard())
+        onView(withText("OK")).perform(ViewActions.click())
+        onView(withId(R.id.handle)).check(matches(withText("newHandle")))
+
+    }
+
+    @Test
+    fun checkEditHandleClickCancel() {
+        val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        intent.putExtra("userProfile", inputProfile)
+        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.editHandle)).perform(ViewActions.click())
+        onView(withText("Cancel")).perform(ViewActions.click())
+        onView(withId(R.id.handle)).check(matches(withText("user0")))
+    }
     
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt b/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
deleted file mode 100644
index d6c1d1198..000000000
--- a/app/src/main/java/ch/sdp/vibester/profile/EditUser.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package ch.sdp.vibester.profile
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import ch.sdp.vibester.R
-
-class EditUser : AppCompatActivity() {
-
-    private var popupTitle = ""
-    private var popupText = ""
-    private var popupButton = ""
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        overridePendingTransition(0, 0)
-        setContentView(R.layout.activity_edit_user)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
index 3b9b3b8c4..11a71fea1 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
@@ -4,10 +4,8 @@ import android.content.DialogInterface
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.text.InputType
-import android.view.LayoutInflater
 import android.widget.Button
 import android.widget.EditText
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import ch.sdp.vibester.R
@@ -21,34 +19,36 @@ class ProfileSetup: AppCompatActivity() {
         val user: UserProfile = bundle?.getSerializable(EXTRA_ID) as UserProfile
         setupProfile(user)
 
-        val editUsername = findViewById<Button>(R.id.editProfile)
+        val editUsername = findViewById<Button>(R.id.editUser)
+        val editHandle = findViewById<Button>(R.id.editHandle)
 
         editUsername.setOnClickListener {
-            showdialog()
+            showdialog("Change username", "Enter new username", 0, R.id.username)
+        }
+
+        editHandle.setOnClickListener {
+            showdialog("Change handle", "Enter new handle", 0, R.id.handle)
         }
     }
 
-    private fun showdialog(){
+    private fun showdialog(title: String, hint: String, id: Int, textId: Int) {
         val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-        builder.setTitle("Title")
+        builder.setTitle(title)
 
-// Set up the input
         val input = EditText(this)
-// Specify the type of input expected; this, for example, sets the input as a password, and will mask the text
-        input.setHint("Enter Text")
+        input.hint = hint
         input.inputType = InputType.TYPE_CLASS_TEXT
-        builder.setView(input)
+        input.id = id
 
-// Set up the buttons
-        builder.setPositiveButton("OK", DialogInterface.OnClickListener { dialog, which ->
-            // Here you get get input text from the Edittext
-            findViewById<TextView>(R.id.username).text = input.text.toString()
+        builder.setView(input)
+        builder.setPositiveButton("OK", DialogInterface.OnClickListener { _, _ ->
+            findViewById<TextView>(textId).text = input.text.toString()
         })
-        builder.setNegativeButton("Cancel", DialogInterface.OnClickListener { dialog, which -> dialog.cancel() })
-
+        builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
         builder.show()
     }
 
+
     private fun setupProfile(user: UserProfile){
         findViewById<TextView>(R.id.handle).text =  user.handle
         findViewById<TextView>(R.id.username).text = user.username
diff --git a/app/src/main/res/layout/activity_edit_user.xml b/app/src/main/res/layout/activity_edit_user.xml
deleted file mode 100644
index ae6b60764..000000000
--- a/app/src/main/res/layout/activity_edit_user.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    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/popup_window_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".profile.EditUser">
-
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/popup_window_view_with_border"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardCornerRadius="3dp"
-        app:cardElevation="0dp"
-        app:cardMaxElevation="0dp"
-        app:cardPreventCornerOverlap="false"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/popup_window_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_margin="2dp"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="3dp"
-            app:cardElevation="0dp"
-            app:cardMaxElevation="0dp"
-            app:cardPreventCornerOverlap="false">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/popup_window_background_container"
-                android:layout_width="250dp"
-                android:minHeight="170dp"
-                android:background="#bc214b"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/popup_window_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:text="Text"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textStyle="bold"
-                    android:textColor="#FFFFFF"
-                    android:textSize="12sp"
-                    app:layout_constraintBottom_toTopOf="@+id/popup_window_button"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/popup_window_title" />
-
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/popup_window_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    app:autoSizeTextType="uniform"
-                    app:autoSizeMaxTextSize="24dp"
-                    android:background="#9E1C40"
-                    android:text="Title"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="#FFFFFF"
-                    android:textSize="20sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <Button
-                    android:id="@+id/popup_window_button"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:background="#851635"
-                    android:text="ok"
-                    android:textAllCaps="false"
-                    android:textColor="#FFFFFF"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.cardview.widget.CardView>
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index f6d918c24..1614623b7 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -165,15 +165,28 @@
     </TableLayout>
 
     <Button
-        android:id="@+id/editProfile"
+        android:id="@+id/editUser"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="14dp"
         android:layout_marginBottom="27dp"
-        android:text="@string/editProfile"
+        android:text="@string/editUsername"
         app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintHorizontal_bias="0.937"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/username"
+        app:layout_constraintVertical_bias="0.3" />
+
+    <Button
+        android:id="@+id/editHandle"
+        android:layout_width="148dp"
+        android:layout_height="43dp"
+        android:layout_marginStart="67dp"
+        android:layout_marginTop="22dp"
+        android:layout_marginBottom="35dp"
+        android:text="@string/editHandle"
+        app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/username" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 704650920..221f3dde3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,8 @@
     <string name="createAcc">Create Account</string>
     <string name="logIn">Log in</string>
     <string name="logInGoogle">Log in with Google</string>
-    <string name="editProfile">Edit Profile</string>
+    <string name="editUsername">Edit Username</string>
+    <string name="editHandle">Edit Handle</string>
 
     <string-array name="nb_players">
         <item>One</item>

From f833e83f07b1e3ecffa7ecf7a8eb77f48f961566 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 14 Mar 2022 11:46:16 +0100
Subject: [PATCH 03/10] Updated manifest

---
 app/src/main/AndroidManifest.xml                          | 3 ---
 app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1e74ff27..8a1ad2cd0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,9 +13,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication">
-        <activity
-            android:name=".profile.editUser"
-            android:exported="false" />
         <activity
             android:name=".GamescreenActivity"
             android:exported="false" />
diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
index 11a71fea1..9d9fd1476 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
@@ -23,15 +23,15 @@ class ProfileSetup: AppCompatActivity() {
         val editHandle = findViewById<Button>(R.id.editHandle)
 
         editUsername.setOnClickListener {
-            showdialog("Change username", "Enter new username", 0, R.id.username)
+            showDialog("Change username", "Enter new username", 0, R.id.username)
         }
 
         editHandle.setOnClickListener {
-            showdialog("Change handle", "Enter new handle", 0, R.id.handle)
+            showDialog("Change handle", "Enter new handle", 0, R.id.handle)
         }
     }
 
-    private fun showdialog(title: String, hint: String, id: Int, textId: Int) {
+    private fun showDialog(title: String, hint: String, id: Int, textId: Int) {
         val builder: AlertDialog.Builder = AlertDialog.Builder(this)
         builder.setTitle(title)
 

From e86eed941870673a67a0ea3678190414968a8a53 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Mon, 14 Mar 2022 12:07:02 +0100
Subject: [PATCH 04/10] Refactored code

---
 .../java/ch/sdp/vibester/profile/ProfileSetup.kt    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
index 9d9fd1476..5aa3b9602 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
@@ -23,14 +23,16 @@ class ProfileSetup: AppCompatActivity() {
         val editHandle = findViewById<Button>(R.id.editHandle)
 
         editUsername.setOnClickListener {
-            showDialog("Change username", "Enter new username", 0, R.id.username)
+            showGeneralDialog(R.id.username, "username")
         }
 
         editHandle.setOnClickListener {
-            showDialog("Change handle", "Enter new handle", 0, R.id.handle)
+            showGeneralDialog(R.id.handle, "handle")
         }
     }
 
+
+
     private fun showDialog(title: String, hint: String, id: Int, textId: Int) {
         val builder: AlertDialog.Builder = AlertDialog.Builder(this)
         builder.setTitle(title)
@@ -48,6 +50,13 @@ class ProfileSetup: AppCompatActivity() {
         builder.show()
     }
 
+    private fun showGeneralDialog(id: Int, name: String) {
+        val title = "Create $name"
+        val hint = "Enter new $name"
+
+        showDialog(title, hint, 0, id)
+    }
+
 
     private fun setupProfile(user: UserProfile){
         findViewById<TextView>(R.id.handle).text =  user.handle

From 2bee84ecccdb7ebce70efe439d4b206006b5f2c2 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Tue, 15 Mar 2022 18:50:38 +0100
Subject: [PATCH 05/10] added username and password validation

---
 .../ch/sdp/vibester/SignInActivityTest.kt     | 32 +++++++++
 app/src/main/java/ch/sdp/vibester/Register.kt | 67 ++++++++++++-------
 .../vibester/auth/FireBaseAuthenticator.kt    | 27 ++++----
 .../res/layout/activity_google_log_in.xml     |  5 +-
 4 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
index fab09bd17..7e6b33474 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
@@ -84,6 +84,38 @@ class SignInActivityTest {
         onView(withId(R.id.email)).check(matches(withText(randomInt.toString().plus("@gg.com"))))
     }
 
+    @Test
+    fun stringValidationEmptyUsername() {
+        onView(withId(R.id.createAcc)).perform(click())
+        onView(withId(R.id.email)).check(matches(withText("Empty email or password")))
+    }
+
+    @Test
+    fun stringValidationEmptyUPassword() {
+        onView(withId(R.id.createAcc)).perform(click())
+        onView(withId(R.id.email)).check(matches(withText("Empty email or password")))
+    }
+
+    @Test
+    fun stringValidationWrongEmail() {
+        val username = "john"
+        val password = "password"
+        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
+        onView(withId(R.id.createAcc)).perform(click())
+        onView(withId(R.id.email)).check(matches(withText("Not an email")))
+    }
+
+    @Test
+    fun stringValidationShorPassword() {
+        val username = "john@test.com"
+        val password = "12345"
+        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
+        onView(withId(R.id.createAcc)).perform(click())
+        onView(withId(R.id.email)).check(matches(withText("Password has to be at least 6 symbols")))
+    }
+
 
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/Register.kt b/app/src/main/java/ch/sdp/vibester/Register.kt
index 18cfc07e5..9ff48d25c 100644
--- a/app/src/main/java/ch/sdp/vibester/Register.kt
+++ b/app/src/main/java/ch/sdp/vibester/Register.kt
@@ -16,7 +16,7 @@ import com.google.firebase.auth.AuthResult
 
 class Register : AppCompatActivity() {
 
-//    private lateinit var googleSignInClient: GoogleSignInClient
+    private lateinit var googleSignInClient: GoogleSignInClient
 
     private lateinit var authenticator: FireBaseAuthenticator
 
@@ -30,18 +30,18 @@ class Register : AppCompatActivity() {
 //    @FixMe
 //      Commenting this for now until we find a proper way to test it, then will merge it to main
 
-//        val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-//            .requestEmail()
-//            .build()
+        val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestEmail()
+            .build()
 
-//        googleSignInClient = GoogleSignIn.getClient(this, gso)
+        googleSignInClient = GoogleSignIn.getClient(this, gso)
 
-        // Initialize Firebase Auth
+//         Initialize Firebase Auth
         authenticator = FireBaseAuthenticator()
 
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
-//        val googleSignIn = findViewById<Button>(R.id.googleBtn)
+        val googleSignIn = findViewById<Button>(R.id.googleBtn)
 
 
         val username = findViewById<EditText>(R.id.username)
@@ -49,17 +49,20 @@ class Register : AppCompatActivity() {
         email = findViewById<TextView>(R.id.email)
 
         btCreateAcc.setOnClickListener {
-            createAccount(username.text.toString(), password.text.toString())
+            if(stringValidation(username.text.toString(), password.text.toString())) {
+                createAccount(username.text.toString(), password.text.toString())
+            }
         }
 
         btLogIn.setOnClickListener {
-            signIn(username.text.toString(), password.text.toString())
+            if(stringValidation(username.text.toString(), password.text.toString())) {
+                signIn(username.text.toString(), password.text.toString())
+            }
         }
 
-//        googleSignIn.setOnClickListener {
-//            signInGoogle()
-//        }
-
+        googleSignIn.setOnClickListener {
+            signInGoogle()
+        }
 
     }
 
@@ -71,17 +74,35 @@ class Register : AppCompatActivity() {
         }
     }
 
-//    @FixMe
+    //    @FixMe
 //      Commenting this for now until we find a proper way to test it, then will merge it to main
-//    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-//        super.onActivityResult(requestCode, resultCode, data)
-//        updateUI(authenticator.googleActivityResult(requestCode, resultCode, data));
-//    }
-
-//    private fun signInGoogle() {
-//        val intent = googleSignInClient.signInIntent
-//        startActivityForResult(intent, 1000)
-//    }
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        updateUI(authenticator.googleActivityResult(requestCode, resultCode, data));
+    }
+
+    private fun stringValidation(username: String, password: String): Boolean{
+        if(username.isEmpty() || password.isEmpty()) {
+            email.text = "Empty email or password"
+            return false
+        }
+
+        if(!username.contains('@')) {
+            email.text = "Not an email"
+            return false
+        }
+
+        if(password.length < 6) {
+            email.text = "Password has to be at least 6 symbols"
+            return false
+        }
+        return true
+    }
+
+    private fun signInGoogle() {
+        val intent = googleSignInClient.signInIntent
+        startActivityForResult(intent, 1000)
+    }
 
     private fun createAccount(email: String, password: String) {
         authenticator.createAccount(email, password)
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 5be9893d6..824c22719 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -31,18 +31,17 @@ class FireBaseAuthenticator() {
 
 //    @FixMe
 //      Commenting this for now until we find a proper way to test it, then will merge it to main
-//    fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): String? {
-//        return if(requestCode == 1000) {
-//            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
-//            try {
-//                val account = task.getResult(ApiException::class.java)!!
-//                account.email
-//            } catch (e: ApiException) {
-//                "Authentication error"
-//            }
-//        } else {
-//            "Authentication error"
-//        }
-//    }
-
+    fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): String? {
+        return if(requestCode == 1000) {
+            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+            try {
+                val account = task.getResult(ApiException::class.java)!!
+                account.email
+            } catch (e: ApiException) {
+                "Authentication error"
+            }
+        } else {
+            "Authentication error"
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_google_log_in.xml b/app/src/main/res/layout/activity_google_log_in.xml
index 80fdab74f..6ea809751 100644
--- a/app/src/main/res/layout/activity_google_log_in.xml
+++ b/app/src/main/res/layout/activity_google_log_in.xml
@@ -38,12 +38,14 @@
         android:layout_marginTop="31dp"
         android:layout_marginBottom="19dp"
         android:ems="10"
+        android:hint="email"
         android:inputType="textPersonName"
         app:layout_constraintBottom_toTopOf="@+id/password"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/email" />
+        app:layout_constraintTop_toBottomOf="@+id/email"
+        tools:ignore="TouchTargetSizeCheck" />
 
     <EditText
         android:id="@+id/password"
@@ -52,6 +54,7 @@
         android:layout_marginTop="19dp"
         android:layout_marginBottom="175dp"
         android:ems="10"
+        android:hint="password"
         android:inputType="textPassword"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

From cb23122e6536d7db2fbda3e31a518c085ac096e3 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 16 Mar 2022 12:33:10 +0100
Subject: [PATCH 06/10] added some google sign in tests

---
 .../androidTest/java/ch/sdp/vibester/SignInActivityTest.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
index 7e6b33474..0eba59709 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
@@ -116,6 +116,13 @@ class SignInActivityTest {
         onView(withId(R.id.email)).check(matches(withText("Password has to be at least 6 symbols")))
     }
 
+    @Test
+    fun derinTest() {
+        val a = FireBaseAuthenticator()
+        a.googleActivityResult(-1,-1,null)
+        onView(withId(R.id.email)).check(matches(withText("TextView")))
+    }
+
 
 
 }
\ No newline at end of file

From 7038fa071ecd37496a5a54a3a57c4f141862fe39 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 16 Mar 2022 12:44:33 +0100
Subject: [PATCH 07/10] added some google sign in tests

---
 .../androidTest/java/ch/sdp/vibester/SignInActivityTest.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
index 0eba59709..85e77b788 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
@@ -123,6 +123,13 @@ class SignInActivityTest {
         onView(withId(R.id.email)).check(matches(withText("TextView")))
     }
 
+    @Test
+    fun ardaTest() {
+        val a = FireBaseAuthenticator()
+        a.googleActivityResult(1000,-1,null)
+        onView(withId(R.id.email)).check(matches(withText("TextView")))
+    }
+
 
 
 }
\ No newline at end of file

From 9c06b1d027a93ae035d5b177d7a187630e38e0c7 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 16 Mar 2022 17:52:16 +0100
Subject: [PATCH 08/10] fixed codeclimate issues

---
 app/src/main/java/ch/sdp/vibester/Register.kt | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/Register.kt b/app/src/main/java/ch/sdp/vibester/Register.kt
index 9ff48d25c..951457174 100644
--- a/app/src/main/java/ch/sdp/vibester/Register.kt
+++ b/app/src/main/java/ch/sdp/vibester/Register.kt
@@ -27,55 +27,38 @@ class Register : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_google_log_in)
 
-//    @FixMe
-//      Commenting this for now until we find a proper way to test it, then will merge it to main
-
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestEmail()
             .build()
 
         googleSignInClient = GoogleSignIn.getClient(this, gso)
-
-//         Initialize Firebase Auth
         authenticator = FireBaseAuthenticator()
 
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
         val googleSignIn = findViewById<Button>(R.id.googleBtn)
 
-
         val username = findViewById<EditText>(R.id.username)
         val password = findViewById<EditText>(R.id.password)
-        email = findViewById<TextView>(R.id.email)
+        email = findViewById(R.id.email)
 
         btCreateAcc.setOnClickListener {
-            if(stringValidation(username.text.toString(), password.text.toString())) {
-                createAccount(username.text.toString(), password.text.toString())
-            }
+            authenticate(username.text.toString(), password.text.toString(), true)
         }
 
         btLogIn.setOnClickListener {
-            if(stringValidation(username.text.toString(), password.text.toString())) {
-                signIn(username.text.toString(), password.text.toString())
-            }
+            authenticate(username.text.toString(), password.text.toString(), false)
         }
 
         googleSignIn.setOnClickListener {
             signInGoogle()
         }
-
     }
 
     public override fun onStart() {
         super.onStart()
-        val currentUser = authenticator.auth.currentUser
-        if (currentUser != null) {
-            reload();
-        }
     }
 
-    //    @FixMe
-//      Commenting this for now until we find a proper way to test it, then will merge it to main
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         updateUI(authenticator.googleActivityResult(requestCode, resultCode, data));
@@ -99,6 +82,17 @@ class Register : AppCompatActivity() {
         return true
     }
 
+    private fun authenticate(email: String, password: String, creatAcc: Boolean) {
+        if(stringValidation(email, password)) {
+            if(creatAcc) {
+                createAccount(email, password)
+            }
+            else {
+                signIn(email, password)
+            }
+        }
+    }
+
     private fun signInGoogle() {
         val intent = googleSignInClient.signInIntent
         startActivityForResult(intent, 1000)
@@ -135,10 +129,6 @@ class Register : AppCompatActivity() {
         }
     }
 
-    private fun reload() {
-
-    }
-
     private fun updateUI(emailText: String?) {
         email.text = emailText
     }

From 0fa1bde53f55041adf3d1b0f97199fa93e72932a Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 16 Mar 2022 22:51:09 +0100
Subject: [PATCH 09/10] fixed conflicts

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dcdcfd221..fac2fd3f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic="true"
         android:theme="@style/Theme.MyApplication">
+        <activity
             android:name="ch.sdp.vibester.GamescreenActivity"
             android:exported="false" />
         <activity

From d03ad4137d8df1569d4b5a9c139f4fd860fa708b Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 16 Mar 2022 23:29:52 +0100
Subject: [PATCH 10/10] fixing tests

---
 .../ch/sdp/vibester/SignInActivityTest.kt     | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
index 85e77b788..9d7bd379e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
@@ -38,18 +38,6 @@ class SignInActivityTest {
         Register::class.java
     )
 
-
-    @Test
-    fun logInCorrect() {
-        val username = "john@test.com"
-        val password = "password"
-        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
-        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
-        onView(withId(R.id.logIn)).perform(click())
-        Thread.sleep(3_000)
-        onView(withId(R.id.email)).check(matches(withText("john@test.com")))
-    }
-
     @Test
     fun logInIncorrect() {
         val username = "johnyyy@test.com"
@@ -72,18 +60,6 @@ class SignInActivityTest {
         onView(withId(R.id.email)).check(matches(withText("Authentication error")))
     }
 
-    @Test
-    fun createAccountCorrect() {
-        val randomInt = Random.nextInt(0, 10000)
-        val password = "password"
-        val username = randomInt.toString().plus("@gg.com")
-        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
-        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
-        onView(withId(R.id.createAcc)).perform(click())
-        Thread.sleep(3_000)
-        onView(withId(R.id.email)).check(matches(withText(randomInt.toString().plus("@gg.com"))))
-    }
-
     @Test
     fun stringValidationEmptyUsername() {
         onView(withId(R.id.createAcc)).perform(click())
@@ -130,6 +106,28 @@ class SignInActivityTest {
         onView(withId(R.id.email)).check(matches(withText("TextView")))
     }
 
+    @Test
+    fun logInCorrect() {
+        val username = "john@test.com"
+        val password = "password"
+        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
+        onView(withId(R.id.logIn)).perform(click())
+        Thread.sleep(3_000)
+        onView(withId(R.id.email)).check(matches(withText("john@test.com")))
+    }
+
+    @Test
+    fun createAccountCorrect() {
+        val randomInt = Random.nextInt(0, 10000)
+        val password = "password"
+        val username = randomInt.toString().plus("@gg.com")
+        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
+        onView(withId(R.id.createAcc)).perform(click())
+        Thread.sleep(3_000)
+        onView(withId(R.id.email)).check(matches(withText(randomInt.toString().plus("@gg.com"))))
+    }
 
 
 }
\ No newline at end of file