diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ac6b0ae..23a89bb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..d5d35ec 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99a1ca7..7883d41 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,33 +10,48 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <meta-data android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id"/>
+        <activity android:name=".logged.profile.ProfileSettingsActivity"></activity>
 
-        <activity android:name="com.facebook.FacebookActivity"
-            android:configChanges=
-                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
+
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name" />
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="@string/fb_login_protocol_scheme" />
             </intent-filter>
         </activity>
-        <activity android:name=".guest.initial_activity.InitialActivity" android:noHistory="true">
+        <activity
+            android:name=".guest.initial_activity.InitialActivity"
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".guest.login_activity.LoginActivity" android:theme="@style/LoginTheme" android:noHistory="true"/>
-        <activity android:name=".guest.register_activity.RegisterActivity" android:theme="@style/LoginTheme" android:noHistory="true"/>
-        <activity android:name=".logged.main.MainLoggedActivity" android:theme="@style/LoggedTheme"/>
+        <activity
+            android:name=".guest.login_activity.LoginActivity"
+            android:noHistory="true"
+            android:theme="@style/LoginTheme" />
+        <activity
+            android:name=".guest.register_activity.RegisterActivity"
+            android:noHistory="true"
+            android:theme="@style/LoginTheme" />
+        <activity
+            android:name=".logged.main.MainLoggedActivity"
+            android:theme="@style/LoggedTheme" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/apusart/api/repositories/UserRepository.kt b/app/src/main/java/com/apusart/api/repositories/UserRepository.kt
index c8ebe5b..21f284c 100644
--- a/app/src/main/java/com/apusart/api/repositories/UserRepository.kt
+++ b/app/src/main/java/com/apusart/api/repositories/UserRepository.kt
@@ -69,4 +69,14 @@ class UserRepository(private val context: Context) {
         val file = userService.getReference(path)
         return Resource.success(file.downloadUrl.await())
     }
+
+//    fun updateEmail(email: String) : Boolean {
+//        val currUser = Firebase.auth.currentUser
+//        var retValue = false
+//        currUser!!.updateEmail(email).addOnCompleteListener { task ->
+//            retValue = task.isSuccessful
+//            Log.d("ChangeEmailTest", "Email change: $retValue")
+//        }
+//        return retValue
+//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileFragment.kt b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileFragment.kt
index 17997a6..07179c4 100644
--- a/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileFragment.kt
+++ b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileFragment.kt
@@ -59,6 +59,9 @@ class ProfileFragment: Fragment(R.layout.profile_fragment) {
                 dialog.cancel()
             }
 
+        profile_page_settings_button.setOnClickListener {
+            startActivity(Intent(context, ProfileSettingsActivity::class.java))
+        }
 
         profile_page_logout_button.setOnClickListener {
             alertDialog.show()
diff --git a/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsActivity.kt b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsActivity.kt
new file mode 100644
index 0000000..2e5b2a4
--- /dev/null
+++ b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsActivity.kt
@@ -0,0 +1,12 @@
+package com.apusart.evently_android.logged.profile
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.apusart.evently_android.R
+
+class ProfileSettingsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_profile_settings)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsFragment.kt b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsFragment.kt
new file mode 100644
index 0000000..7d23ec9
--- /dev/null
+++ b/app/src/main/java/com/apusart/evently_android/logged/profile/ProfileSettingsFragment.kt
@@ -0,0 +1,45 @@
+package com.apusart.evently_android.logged.profile
+
+import android.os.Bundle
+import android.text.InputType
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.apusart.api.repositories.UserRepository
+import com.apusart.evently_android.R
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.ktx.Firebase
+
+class ProfileSettingsFragment : PreferenceFragmentCompat() {
+
+    //private val userRepository = context?.let { UserRepository(it) }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.profile_settings, rootKey)
+
+
+        val userEmailPreference: EditTextPreference? = findPreference("profile_user_email")
+
+        val firebaseEmail = Firebase.auth.currentUser?.email
+        userEmailPreference?.text = firebaseEmail
+
+        userEmailPreference?.summaryProvider = Preference.SummaryProvider<EditTextPreference> { preference ->
+            val email = preference.text
+            var retValue = false
+            if (email != firebaseEmail) {
+//                retValue = userRepository?.updateEmail(email) ?: false
+                val currUser = Firebase.auth.currentUser
+                currUser!!.updateEmail(email).addOnCompleteListener { task ->
+                    retValue = task.isSuccessful
+                }
+            }
+            if(retValue) email
+            else firebaseEmail
+        }
+        userEmailPreference?.setOnBindEditTextListener { editText ->
+            editText.inputType = InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+        }
+
+        //Dodac to samo co wyzej dla innych parametrow usera
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile_settings.xml b/app/src/main/res/layout/activity_profile_settings.xml
new file mode 100644
index 0000000..2679bae
--- /dev/null
+++ b/app/src/main/res/layout/activity_profile_settings.xml
@@ -0,0 +1,30 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".logged.profile.ProfileSettingsActivity">
+
+    <TextView
+        android:id="@+id/profile_settings_page_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:gravity="center"
+        android:text="Settings"
+        android:textAppearance="@style/HeadlineRoboto24Pt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <fragment
+        android:id="@+id/profile_settings_page_fragment"
+        android:name="com.apusart.evently_android.logged.profile.ProfileSettingsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/profile_settings_page_title" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/profile_settings.xml b/app/src/main/res/xml/profile_settings.xml
new file mode 100644
index 0000000..f68a81f
--- /dev/null
+++ b/app/src/main/res/xml/profile_settings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="user_settings"
+        android:title="User Settings">
+
+        <EditTextPreference
+            android:key="profile_user_name"
+            android:title="Change user name"
+            android:summary="Michał Raszczuk" />
+
+        <EditTextPreference
+            android:key="profile_user_email"
+            android:title="Change email"
+            android:summary="mraszczuk@wp.pl" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="app_info"
+        android:title="App Settings" >
+
+        <Preference
+            android:key="app_version"
+            android:title="Application Version"
+            android:summary="1.0.0" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4ebf09..4b78cfa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 26 22:02:27 CET 2020
+#Sun Dec 13 17:23:30 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip