From 78caf6a59402f930b0d828bc6ce5faac1c5b4ed4 Mon Sep 17 00:00:00 2001 From: "branislav.radivojevic" Date: Mon, 28 Nov 2022 14:06:40 +0100 Subject: Sortiranje istorije + bugfixes --- .../example/brzodolokacije/Activities/ActivityAddPost.kt | 14 ++++++++------ .../brzodolokacije/Activities/ActivityCapturePost.kt | 14 ++++++++------ .../brzodolokacije/Activities/ActivitySinglePost.kt | 4 +++- .../main/java/com/example/brzodolokacije/Models/Post.kt | 6 ++++++ 4 files changed, 25 insertions(+), 13 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 995ef4d..6db305e 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 @@ -120,7 +120,7 @@ class ActivityAddPost : AppCompatActivity() { tagText.isGone=false tagText.isVisible=true - if(tagList.count()<5) { + if(tagList.count()<4 && tagText.text.toString().length>=3) { var tagstr = tagText.text.toString() var newbtn = Button(this) newbtn.setId(tagidcounter) @@ -149,7 +149,7 @@ class ActivityAddPost : AppCompatActivity() { tagText.text.clear() } else{ - Toast.makeText(this,"Maksimalno 5 tagova",Toast.LENGTH_LONG) + Toast.makeText(this,"Maksimalno 4 tagova ( duzine + karaktera)",Toast.LENGTH_LONG) } } @@ -326,10 +326,12 @@ class ActivityAddPost : AppCompatActivity() { var descReq=RequestBody.create("text/plain".toMediaTypeOrNull(),desc) var idReq=RequestBody.create("text/plain".toMediaTypeOrNull(),"dsa") - var tagliststring="" - for(tag in tagList){ - tagliststring=tagliststring+tag+"|" - } + var tagliststring="none" + if(tagList.count()>0){ + tagliststring="" + for(tag in tagList){ + tagliststring=tagliststring+tag+"|" + }} var tagReq=RequestBody.create("text/plain".toMediaTypeOrNull(),tagliststring) val imagesParts = arrayOfNulls( diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt index 2321f18..40adea2 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt @@ -102,7 +102,7 @@ class ActivityCapturePost : AppCompatActivity() { tagText.isGone=false tagText.isVisible=true - if(tagList.count()<5) { + if(tagList.count()<4 && tagText.text.toString().length>=3) { var tagstr = tagText.text.toString() var newbtn = Button(this) newbtn.setId(tagidcounter) @@ -131,7 +131,7 @@ class ActivityCapturePost : AppCompatActivity() { tagText.text.clear() } else{ - Toast.makeText(this,"Maksimalno 5 tagova",Toast.LENGTH_LONG) + Toast.makeText(this,"Maksimalno 4 tagova (duzine 3+ karaktera)",Toast.LENGTH_LONG) } } @@ -328,10 +328,12 @@ class ActivityCapturePost : AppCompatActivity() { var descReq= RequestBody.create("text/plain".toMediaTypeOrNull(),desc) var idReq= RequestBody.create("text/plain".toMediaTypeOrNull(),"dsa") - var tagliststring="" - for(tag in tagList){ - tagliststring=tagliststring+tag+"|" - } + var tagliststring="none" + if(tagList.count()>0){ + tagliststring="" + for(tag in tagList){ + tagliststring=tagliststring+tag+"|" + }} var tagReq=RequestBody.create("text/plain".toMediaTypeOrNull(),tagliststring) val imagesParts = arrayOfNulls( diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt index 0e9c9da..569ab89 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt @@ -7,8 +7,10 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.preference.PreferenceManager +import android.provider.ContactsContract.CommonDataKinds.Im import android.util.Log import android.view.Gravity +import android.widget.ImageButton import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity @@ -122,7 +124,7 @@ class ActivitySinglePost : AppCompatActivity() { fun setRatingListeners(){ val emptyStar=R.drawable.empty_star val fullStar=R.drawable.full_star - + //var starlist:List = mutableListOf() binding.rateStar1.setOnClickListener { Toast.makeText(this,"kliknuta prva zvezdica",Toast.LENGTH_SHORT).show() diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index e2e9209..47e581d 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import kotlinx.android.parcel.Parcelize import okhttp3.MultipartBody import java.time.LocalDateTime +import java.util.* data class Post ( var _id:String, @@ -35,7 +36,12 @@ data class PostPreview ( var ratings:Float, var comments:List?, var images:List, + var ratingscount:Int, + var createdAt:LocalDateTime, + var lastViewed: LocalDateTime?, //samo za istoriju pregleda var tags:List? + + //nedostaju datum i vreme kreiranja ):Parcelable -- cgit v1.2.3 From 63793c3567e2f1a712b4fbc47522859aacb31619 Mon Sep 17 00:00:00 2001 From: "branislav.radivojevic" Date: Mon, 28 Nov 2022 14:51:56 +0100 Subject: tag list layout overlap fix --- Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Client') 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 96ac3ff..8e3fbb4 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 @@ -99,7 +99,7 @@ android:hint="Reykjavik, Iceland" android:inputType="textEmailAddress" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" + app:layout_constraintBottom_toTopOf="@+id/llTags" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -133,12 +133,12 @@ -- cgit v1.2.3 From e4b8c1498f3320b4f7aa0283241c7a06b77b349c Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 28 Nov 2022 16:34:10 +0100 Subject: Ispravljen tip podataka. --- .../main/java/com/example/brzodolokacije/Activities/MapsActivity.kt | 2 +- .../app/src/main/java/com/example/brzodolokacije/Models/Post.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Client') diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt index faaa3b4..fa3f06b 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt @@ -233,7 +233,7 @@ class MapsActivity : AppCompatActivity() { responseLocations=response.body()!! var tempList=mutableListOf() if(existingLocation!=null && existingLocation.size>0) - for(loc in existingLocation!!){ + for(loc in existingLocation!!){ spinnerAdapter!!.remove(loc.name) } for(loc in responseLocations!!){ diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index 47e581d..f0f67a7 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -37,8 +37,8 @@ data class PostPreview ( var comments:List?, var images:List, var ratingscount:Int, - var createdAt:LocalDateTime, - var lastViewed: LocalDateTime?, //samo za istoriju pregleda + var createdAt:Date, + var lastViewed: Date?, //samo za istoriju pregleda var tags:List? -- cgit v1.2.3