Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop

4 files changed, 160 insertions, 303 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
index 8d37c29..0051893 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -33,6 +33,7 @@
         app:rippleColor="#FFFFFF"
         app:srcCompat="@android:drawable/ic_menu_mylocation" />
 
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/ActivityMapsConfirmLocation"
         android:layout_width="wrap_content"
@@ -64,7 +65,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
 
-        <com.google.android.material.textfield.TextInputEditText
+        <AutoCompleteTextView
             android:id="@+id/ActivityMapsSearchBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -86,4 +87,21 @@
 
     </androidx.cardview.widget.CardView>
 
+<!--    <Spinner-->
+<!--        android:id="@+id/MapsActivitySpinner"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="40dp"-->
+<!--        android:background="@null"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />-->
+
+<!--    <AutoCompleteTextView-->
+<!--        android:id="@+id/ActivityMapsAutoCompleteTextView"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="40dp"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />-->
+
   </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml
new file mode 100644
index 0000000..18c519b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml
@@ -0,0 +1,68 @@
+<?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=".Activities.ActivityShowFollowersAndFollowing">
+
+     <Button
+        android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/ic_baseline_arrow_back"
+        android:text="Korisnik"
+
+        android:textAllCaps="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="409dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="4dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingShowFollowers" />
+
+    <Button
+        android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:backgroundTint="#FFFFFF"
+        android:stateListAnimator="@null"
+        android:text="Objave"
+        android:drawableBottom="@drawable/ic_baseline_circle_7"
+        android:textColor="@color/cardview_dark_background"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" />
+
+    <Button
+        android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowing"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:backgroundTint="#FFFFFF"
+        android:stateListAnimator="@null"
+        android:text="Podaci"
+        android:drawableBottom="@drawable/ic_baseline_circle_7"
+        android:drawableTint="@color/white"
+        android:textColor="@color/cardview_dark_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" />
+
+    <FrameLayout
+        android:id="@+id/flActivityShowFollowerAndFollowing"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/divider"/>
+</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 16f4b1e..a446f9a 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
@@ -15,7 +15,7 @@
 
             android:id="@+id/imageView3"
             android:layout_width="match_parent"
-            android:layout_height="300dp"
+            android:layout_height="250dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
             android:src="@drawable/b3"
@@ -28,9 +28,9 @@
 
             android:id="@+id/tvFragmentProfileInfoContainer"
             android:layout_width="0dp"
-            android:layout_height="199dp"
+            android:layout_height="240dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="150dp"
+            android:layout_marginTop="120dp"
             android:layout_marginEnd="20dp"
             android:adjustViewBounds="true"
             android:background="@drawable/profile_view_background"
@@ -46,10 +46,10 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cvFragmentHomePageProfile"
-            android:layout_width="140dp"
-            android:layout_height="140dp"
+            android:layout_width="130dp"
+            android:layout_height="130dp"
             android:layout_gravity="center"
-            android:layout_marginTop="80dp"
+            android:layout_marginTop="60dp"
             android:elevation="10dp"
             app:cardCornerRadius="250dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -125,17 +125,18 @@
             android:layout_height="319dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/divider">
-        </FrameLayout>
+            app:layout_constraintTop_toTopOf="@+id/divider"
+            app:layout_constraintVertical_bias="1.0"></FrameLayout>
 
         <TableLayout
 
             android:layout_width="363dp"
 
-            android:layout_height="122dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="30dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="5dp"
             android:layout_marginEnd="30dp"
             android:layout_marginBottom="8dp"
             android:elevation="1dp"
@@ -145,7 +146,8 @@
             app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile">
+            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile"
+            app:layout_constraintVertical_bias="0.35000002">
 
             <TableRow
                 android:layout_width="match_parent"
@@ -158,47 +160,13 @@
                     android:layout_height="match_parent"
                     android:layout_column="1"
                     android:layout_gravity="center"
-                    android:layout_marginBottom="5dp"
                     android:text="Petar Petrović"
-                    android:textSize="20sp" />
-            </TableRow>
-
-            <TableRow>
-
-                <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3">
-
-                    <ImageButton
-
-                        android:id="@+id/ibActivityUserProfileFollow"
-                        android:layout_width="115dp"
-                        android:layout_height="40dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/rounded_transparent_button"
-                        android:foreground="@drawable/button_follow"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.0"
-                        tools:ignore="TouchTargetSizeCheck" />
-
-                    <ImageButton
-                        android:layout_width="115dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="16dp"
-                        android:height="40dp"
-                        android:background="@drawable/rounded_transparent_button"
-                        android:foreground="@drawable/button_chat"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.0"
-                        tools:ignore="SpeakableTextPresentCheck" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                    android:textStyle="bold"
+                    android:textSize="23sp" />
             </TableRow>
 
 
-            <TableRow android:layout_marginTop="5dp">
+            <TableRow android:layout_marginTop="30dp">
 
                 <TextView
                     android:id="@+id/tvFragmentUserProfilePosts"
@@ -220,30 +188,81 @@
                     android:text="PRAĆENJA" />
             </TableRow>
 
-            <TableRow>
-
+            <TableRow
+                android:layout_height="wrap_content"
+                >
                 <TextView
                     android:id="@+id/tvActivityUserProfilePostsNo"
                     android:layout_width="110dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="156"
-                    android:textFontWeight="700" />
+                    android:textSize="20dp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/tvActivityUserProfileFollowersNo"
                     android:layout_width="110dp"
                     android:gravity="center"
-                    android:text="50" />
+                    android:text="50"
+                    android:textSize="20dp"
+                    android:textStyle="bold"/>
 
                 <TextView
                     android:id="@+id/tvActivityUserProfileFollowNo"
                     android:layout_width="110dp"
                     android:gravity="center"
-                    android:text="40" />
+                    android:text="40"
+                    android:textSize="20dp"
+                    android:textStyle="bold"/>
 
             </TableRow>
 
+            <TableRow
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                >
+
+                <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3">
+
+                    <Button
+
+                        android:id="@+id/btnActivityUserProfileFollow"
+                        android:layout_width="0dp"
+                        android:layout_height="30dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="8dp"
+                        android:drawableLeft="@drawable/ic_outline_person_add_alt_24"
+                        android:text="PRATI"
+                        android:insetTop="0dp"
+                        android:insetBottom="0dp"
+                        app:shapeAppearanceOverlay="@style/Circular"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/activityUserProfileOpenChat"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.13"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <ImageButton
+                        android:id="@+id/activityUserProfileOpenChat"
+                        android:layout_width="35dp"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="16dp"
+                        android:height="40dp"
+                        android:background="@drawable/rounded_button"
+                        android:backgroundTint="#4DB6AC"
+                        android:src="@drawable/ic_round_message_24"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileFollow"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        app:shapeAppearanceOverlay="@style/Circular"
+                        tools:ignore="SpeakableTextPresentCheck" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </TableRow>
         </TableLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
deleted file mode 100644
index 15031e3..0000000
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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=".Fragments.FragmentUserProfile">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-
-            android:id="@+id/imageView3"
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:foreground="@drawable/b3"
-            android:foregroundGravity="center_vertical|center|center_horizontal|fill"
-            android:src="@drawable/b3"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <com.google.android.material.imageview.ShapeableImageView
-
-            android:id="@+id/tvFragmentProfileInfoContainer"
-            android:layout_width="0dp"
-            android:layout_height="199dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="150dp"
-            android:layout_marginEnd="20dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/profile_view_background"
-
-            android:elevation="1dp"
-            android:scaleType="fitEnd"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/imageView3"
-            app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
-
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/cvFragmentHomePageProfile"
-            android:layout_width="140dp"
-            android:layout_height="140dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="80dp"
-            android:elevation="10dp"
-            app:cardCornerRadius="250dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-
-                android:id="@+id/tvFragmentProfileProfilePicture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:elevation="10dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_baseline_person_24"
-                tools:ignore="ContentDescription" />
-        </androidx.cardview.widget.CardView>
-
-        <View
-            android:id="@+id/divider"
-            android:layout_width="409dp"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
-
-        <Button
-            android:id="@+id/btnFragmentUserProfileShowPosts"
-            android:layout_width="wrap_content"
-            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:id="@+id/btnFragmentUserProfileShowData"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="20dp"
-            android:backgroundTint="#FFFFFF"
-            android:stateListAnimator="@null"
-            android:text="Podaci"
-
-            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_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/btnFragmentUserProfileShowPosts"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
-
-        <FrameLayout
-            android:id="@+id/flFragmentProfileFragmentContainer"
-            android:layout_width="409dp"
-            android:layout_height="319dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/divider">
-        </FrameLayout>
-
-        <TableLayout
-            android:elevation="1dp"
-
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="30dp"
-            android:layout_marginBottom="8dp"
-            android:numColumns="3"
-
-            android:stretchColumns="1"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile">
-
-            <TableRow android:layout_column="1">
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_column="1"
-                    android:layout_gravity="center"
-                    android:text="Petar Petrović"
-                    android:textSize="20sp"
-                    android:layout_marginBottom="5dp"/>
-            </TableRow>
-
-            <TableRow>
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_span="3">
-
-                    <ImageButton
-
-                        android:id="@+id/materialButton"
-                        android:layout_width="115dp"
-                        android:layout_height="40dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/rounded_transparent_button"
-                        android:foreground="@drawable/button_follow"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.0"
-                        tools:ignore="TouchTargetSizeCheck" />
-
-                    <ImageButton
-                        android:layout_width="115dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="16dp"
-                        android:height="40dp"
-                        android:background="@drawable/rounded_transparent_button"
-                        android:foreground="@drawable/button_chat"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.0"
-                        tools:ignore="SpeakableTextPresentCheck" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </TableRow>
-
-
-            <TableRow
-                android:layout_marginTop="5dp">
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfilePosts"
-                    android:layout_width="110dp"
-                    android:gravity="center"
-                    android:text="OBJAVE" />
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollowers"
-                    android:layout_width="10dp"
-                    android:gravity="center"
-                    android:text="PRATIOCI" />
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollow"
-
-                    android:layout_width="110dp"
-                    android:gravity="center"
-                    android:text="PRAĆENJA" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfilePostsNo"
-                    android:layout_width="110dp"
-                    android:gravity="center"
-                    android:textFontWeight="700"
-                    android:text="156" />
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollowersNo"
-                    android:layout_width="110dp"
-                    android:gravity="center"
-                    android:text="50" />
-
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollowNo"
-                    android:layout_width="110dp"
-                    android:gravity="center"
-                    android:text="40" />
-
-            </TableRow>
-
-        </TableLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</FrameLayout>
\ No newline at end of file