Dodate funkcije za izmenu korisničkog imena i imena na back-u. Dodata aktivnost za izmenu korisničkog naloga. Izmenjen fragment myProfileInfo. Izmenjen FragmentProfile.

4 files changed, 231 insertions, 127 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
index 43bad3c..39362b7 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
@@ -90,14 +90,13 @@
         app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName2"
+        android:id="@+id/tvActivityChangeUserDataName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPersonName"
         android:text="Name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintEnd_toStartOf="@+id/btnActivityChangeUserDataName"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/changeDataName" />
 
@@ -105,22 +104,22 @@
         android:id="@+id/changeDataUsername"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="40dp"
         android:layout_marginEnd="333dp"
         android:text="Korisničko ime"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName2" />
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataName" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName3"
+        android:id="@+id/tvActivityChangeUserDataUsername"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPersonName"
         android:text="Name"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnActivityChangeUserDataUsername"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/changeDataUsername" />
 
@@ -134,7 +133,7 @@
 
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName3" />
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername" />
 
     <Button
         android:id="@+id/button2"
@@ -148,4 +147,60 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button" />
 
+    <ImageView
+        android:clickable="true"
+        android:id="@+id/btnActivityChangeUserDataName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataName"
+        app:srcCompat="@drawable/ic_outline_edit_24" />
+    <ImageView
+        android:id="@+id/btnActivityChangeUserDataNameConfirm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataName"
+        app:srcCompat="@drawable/ic_round_check_24" />
+
+    <ImageView
+        android:clickable="true"
+        android:id="@+id/btnActivityChangeUserDataUsername"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataUsername"
+        app:srcCompat="@drawable/ic_outline_edit_24" />
+    <ImageView
+        android:id="@+id/btnActivityChangeUserDataUsernameConfirm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataUsername"
+        app:srcCompat="@drawable/ic_round_check_24" />
+
+    <TextView
+        android:id="@+id/btnActivityChangeUserDataNameError"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataName" />
+
+    <TextView
+        android:id="@+id/btnActivityChangeUserDataUsernameError"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
index 9f5dd96..5c0ceb8 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
@@ -12,9 +12,9 @@
         android:layout_height="match_parent">
 
         <ImageView
-
+            android:scaleType="centerCrop"
             android:id="@+id/imageView3"
-            android:layout_width="447dp"
+            android:layout_width="match_parent"
             android:layout_height="180dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
@@ -74,51 +74,51 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnActivityUserProfileShowPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/buttons" />
+
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:weightSum="3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer">
 
         <Button
+            android:layout_weight="1"
             android:id="@+id/btnActivityUserProfileShowPosts"
-            android:layout_width="wrap_content"
+            android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="4dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
             android:text="Objave"
-
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+             />
 
         <Button
+            android:layout_weight="1"
             android:id="@+id/btnFragmentUserProfileShowData"
-            android:layout_width="wrap_content"
+            android:layout_width="110dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="20dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
-            android:text="Podaci"
+            android:text="Nalog"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+            />
 
         <Button
             android:id="@+id/btnFragmentUserProfileShowRecensions"
-            android:layout_width="wrap_content"
+            android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="4dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileShowPosts"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
-
+           />
+        </LinearLayout>
         <FrameLayout
+            android:layout_weight="1"
             android:id="@+id/flActivityProfileFragmentContainer"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -181,6 +181,7 @@
                     android:textSize="14sp"
                     android:stateListAnimator="@null"
                     android:text="OBJAVE"
+
                     android:textColor="#757471" />
 
                 <Button
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
index 4a91f49..eaf014d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
@@ -4,27 +4,64 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".Fragments.FragmentMyProfileInfo">
 
-    <!-- TODO: Update blank fragment layout -->
-
-    <TextView
-        android:id="@+id/textView5"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Moji podaci"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/buttonLogOut"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Button
+            android:id="@+id/changeAccountData"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_account_circle_24"
+            android:text="Izmena Naloga" />
+
+        <Button
+            android:id="@+id/ChangePassword"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_change_circle_24"
+            android:text="Promena Lozinke" />
+
+        <Button
+            android:id="@+id/getAccoutStatistics"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_stats_24"
+            android:text="Pregled statistike" />
+
+        <Button
+            android:id="@+id/getMyFavorite"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_round_favorite_border_24"
+            android:text="Objave koje vam se sviđaju" />
+
+        <Button
+            android:id="@+id/inviteFriends"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_share_24"
+            android:text="Pozovite prijatelje" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/buttonLogOut"
-        android:layout_width="wrap_content"
+        style="@style/Circular"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Log out"
-        app:layout_constraintBottom_toBottomOf="@+id/textView5"
-        app:layout_constraintEnd_toEndOf="@+id/textView5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView5" />
+        android:layout_gravity="bottom"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:drawableLeft="@drawable/ic_baseline_logout_24"
+        android:text="Izlogujte se"
+        android:drawableTint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index 54686a4..8fe6ee6 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -14,7 +14,7 @@
         <ImageView
 
             android:id="@+id/imageView3"
-            android:layout_width="416dp"
+            android:layout_width="match_parent"
             android:layout_height="190dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
@@ -26,8 +26,8 @@
         <ImageView
 
             android:id="@+id/imageView4"
-            android:layout_width="413dp"
-            android:layout_height="175dp"
+            android:layout_width="match_parent"
+            android:layout_height="190dp"
             app:layout_constraintBottom_toBottomOf="@+id/imageView3"
             app:layout_constraintEnd_toEndOf="@id/imageView3"
             app:layout_constraintHorizontal_bias="0.0"
@@ -108,7 +108,7 @@
             app:layout_constraintHorizontal_bias="0.488"
             app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer"
             app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintVertical_bias="0.97">
+            app:layout_constraintVertical_bias="0.87">
 
             <TableRow
                 android:layout_width="fill_parent"
@@ -117,10 +117,12 @@
 
                 <TextView
                     android:id="@+id/tvFragmentProfileName"
-                    style="@style/title"
-                    android:gravity="center"
+                    android:textSize="23sp"
+                    android:textStyle="bold"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:layout_marginBottom="10dp"
                     android:text="Petar Petrović" />
             </TableRow>
 
@@ -135,8 +137,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center"
-                    android:textSize="17sp"
-                    android:text="PetarP" />
+                    android:text="PetarP"
+                    android:textSize="17sp" />
             </TableRow>
 
             <TableRow
@@ -144,7 +146,7 @@
                 android:layout_height="100dp">
 
                 <Button
-                    android:layout_height="15dp"
+                    android:layout_height="8dp"
                     android:background="@drawable/rounded_transparent_button"
                     android:clickable="false"
                     android:visibility="invisible" />
@@ -156,78 +158,86 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:weightSum="1">
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:weightSum="3"
-                >
-                <TextView
-                    android:layout_width="110dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:id="@+id/tvFragmentProfilePosts"
-                    android:width="100dp"
-                    android:gravity="center"
-                    android:text="OBJAVE" />
-
-                <TextView
-                    android:layout_height="wrap_content"
-                    android:layout_width="110dp"
-                    android:layout_weight="1"
-                    android:id="@+id/tvFragmentProfileFollowers"
-                    android:width="100dp"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:text="PRATIOCI" />
 
-                <TextView
+                <LinearLayout
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_width="110dp"
-                    android:layout_weight="1"
-                    android:id="@+id/tvFragmentProfileFollow"
-                    android:width="100dp"
-                    android:gravity="center"
-                    android:text="PRAĆENJA" />
-</LinearLayout>
+                    android:orientation="horizontal"
+                    android:weightSum="3">
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfilePosts"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:textSize="15dp"
+                        android:textColor="#757471"
+                        android:gravity="center"
+                        android:text="OBJAVE" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowers"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:textSize="15sp"
+                        android:clickable="true"
+                        android:textColor="#757471"
+                        android:gravity="center"
+                        android:text="PRATIOCI" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollow"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:gravity="center"
+                        android:textSize="15sp"
+                        android:textColor="#757471"
+                        android:text="PRAĆENJA" />
+                </LinearLayout>
             </TableRow>
 
             <TableRow
-                android:weightSum="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
+                android:gravity="center"
+                android:weightSum="1">
 
                 <LinearLayout>
-                <TextView
-                    android:id="@+id/tvFragmentProfilePostsNo"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:layout_width="110dp"
-                    android:layout_height="wrap_content"
-                    android:text="156"
-                    android:textSize="20dp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_weight="1"
-                    android:id="@+id/tvFragmentProfileFollowersNo"
-                    android:gravity="center"
-                    android:layout_width="110dp"
-                    android:layout_height="wrap_content"
-                    android:text="50"
-                    android:textSize="20dp"
-                    android:textStyle="bold" />
 
-                <TextView
-                    android:layout_weight="1"
-                    android:id="@+id/tvFragmentProfileFollowNo"
-                    android:layout_width="110dp"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="40"
-                    android:textSize="20dp"
-                    android:textStyle="bold" />
+                    <TextView
+                        android:id="@+id/tvFragmentProfilePostsNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="156"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowersNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="50"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="40"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
                 </LinearLayout>
             </TableRow>
         </TableLayout>
@@ -255,32 +265,33 @@
                 app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
             <Button
-                android:id="@+id/btnFragmentProfileShowMyData"
+                android:id="@+id/btnFragmentProfileShowMyRecensions"
                 android:layout_width="110dp"
                 android:layout_height="wrap_content"
+                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:backgroundTint="#FFFFFF"
                 android:stateListAnimator="@null"
-
-                android:text="Nalog"
+                android:text="Istorija"
                 android:textColor="@color/cardview_dark_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
+                app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
                 app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
             <Button
-                android:id="@+id/btnFragmentProfileShowMyRecensions"
-                android:layout_width="120dp"
+                android:id="@+id/btnFragmentProfileShowMyData"
+                android:layout_width="110dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:backgroundTint="#FFFFFF"
                 android:stateListAnimator="@null"
-                android:text="Istorija"
+
+                android:text="Nalog"
                 android:textColor="@color/cardview_dark_background"
-                app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
                 app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
         </LinearLayout>
 
         <FrameLayout