From f63a76bfb807de3fb153fbc107a1b1d6bbdd7c37 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 12:09:40 +0100
Subject: Popravljena navigacija na ActivityAddPost-u.

---
 .../example/brzodolokacije/Activities/ActivityAddPost.kt  |  9 ++-------
 .../app/src/main/res/layout/activity_add_post.xml         | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index 23fc5c2..aaa2733 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -37,7 +37,7 @@ class ActivityAddPost : AppCompatActivity() {
     private lateinit var takePhoto: Button
     private lateinit var showNextImage:Button
     private lateinit var showPreviousImage:Button
-    private lateinit var switcher: ImageSwitcher
+    private lateinit var switcher: ImageView
     private var uploadedImages:ArrayList<Uri?>?=null
 
     private lateinit var location:EditText
@@ -73,7 +73,7 @@ class ActivityAddPost : AppCompatActivity() {
         uploadFromGallery=findViewById<View>(R.id.btnActivityAddPostUploadFromGalleryVisible) as Button
         showNextImage=findViewById<View>(R.id.nextImage) as Button
         showPreviousImage=findViewById<View>(R.id.previousImage) as Button
-        switcher=findViewById<View>(R.id.isActivityAddPostSwitcher) as ImageSwitcher
+        switcher=findViewById<View>(R.id.isActivityAddPostSwitcher) as ImageView
         description=findViewById<View>(R.id.etActivityAddPostDescription) as EditText
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
@@ -95,11 +95,6 @@ class ActivityAddPost : AppCompatActivity() {
         progressDialog!!.setCanceledOnTouchOutside(false)
 
 
-        switcher?.setFactory{
-            val imgView = ImageView(applicationContext)
-            imgView.scaleType = ImageView.ScaleType.CENTER_CROP
-            imgView.setPadding(8, 8, 8, 8)
-            imgView}
         addLocation.setOnClickListener {
             val myIntent = Intent(this, MapsActivity::class.java)
             startActivityForResult(myIntent,LOCATIONREQCODE)
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index 0d3eba5..dabb494 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -6,20 +6,25 @@
     android:layout_height="match_parent"
     tools:context=".Activities.ActivityAddPost">
 
-    <ImageSwitcher
+    <ImageView
         android:id="@+id/isActivityAddPostSwitcher"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:elevation="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        tools:ignore="ImageContrastCheck"
+        tools:srcCompat="@tools:sample/avatars"/>
 
     <Button
         android:id="@+id/nextImage"
         android:layout_width="78dp"
         android:layout_height="0dp"
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="right"
         android:padding="30dp"
@@ -34,7 +39,7 @@
         android:id="@+id/previousImage"
         android:layout_width="70dp"
         android:layout_height="0dp"
-
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="left"
         android:padding="30dp"
-- 
cgit v1.2.3