aboutsummaryrefslogtreecommitdiff
path: root/Client
diff options
context:
space:
mode:
authorTAMARA JERINIC <tamara.jerinic@gmail.com>2022-11-14 23:12:15 +0100
committerTAMARA JERINIC <tamara.jerinic@gmail.com>2022-11-14 23:12:15 +0100
commitd98ff2f7d8a15793b5cc92bd430160c53eb3f8ca (patch)
treead002ce351569371589241b8f627352db9f212d4 /Client
parent4e37b6235815f29b8a4a3cd3309207a5b580431b (diff)
Omogućeno dodavanje objava sa fragmenta za prikaz svih objava ulogovanog korisnika. Izmenjen izgled fragmenata za dodavanje objava.
Diffstat (limited to 'Client')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt6
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt14
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt1
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt80
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_a_photo_24.xml5
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml5
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml9
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml50
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml63
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml30
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/values/strings.xml2
11 files changed, 193 insertions, 72 deletions
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 ca773ac..b9e4fd7 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
@@ -12,6 +12,7 @@ import android.widget.*
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
import com.example.brzodolokacije.Models.Location
import com.example.brzodolokacije.Models.LocationType
import com.example.brzodolokacije.Models.PostPreview
@@ -53,7 +54,7 @@ class ActivityAddPost : AppCompatActivity() {
//paths= ArrayList()
- uploadFromGallery=findViewById<View>(R.id.btnActivityAddPostUploadFromGallery) as Button
+ 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
@@ -140,6 +141,7 @@ class ActivityAddPost : AppCompatActivity() {
//veci broj slika
if (data!!.getClipData() != null) {
+
var count = data!!.clipData!!.itemCount
for (i in 0..count - 1) {
@@ -149,6 +151,7 @@ class ActivityAddPost : AppCompatActivity() {
// prikaz ucitanih
switcher.setImageURI(uploadedImages!![0])
+ uploadFromGallery.isVisible=false
place=0
//jedna slika
} else if (data?.getData() != null) {
@@ -156,6 +159,7 @@ class ActivityAddPost : AppCompatActivity() {
//prikaz jedne ucitane
switcher.setImageURI(data.data!!)
+ uploadFromGallery.isVisible=false
}
}
}
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 1eb9916..312dc77 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
@@ -22,6 +22,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
+import androidx.core.view.isVisible
import com.example.brzodolokacije.R
import java.io.File
import java.text.SimpleDateFormat
@@ -47,7 +48,7 @@ class ActivityCapturePost : AppCompatActivity() {
description = findViewById<View>(R.id.etActivityCapturePostDescription) as EditText
post = findViewById<View>(R.id.btnActivityCapturePostPost) as Button
showImage = findViewById<View>(R.id.ivActivityCapturePostImage) as ImageView
- takePhoto = findViewById<View>(R.id.btnActivityCapturePostCapture) as Button
+ takePhoto = findViewById<View>(R.id.btnActivityCapturePostCaptureVisible) as Button
//dodavanje sa kamere
@@ -97,8 +98,8 @@ class ActivityCapturePost : AppCompatActivity() {
takePhoto.setOnClickListener {
val APP_TAG = "BrzoDoLokacije"
- val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)/*
- val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss").format(Date())
+ val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+ /* val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss").format(Date())
//val storageDir: File? = getExternalFilesDir(Environment.DIRECTORY_PICTURES)
//val photo= File(storageDir,"JPEG_${timeStamp}.jpg")
@@ -113,8 +114,8 @@ class ActivityCapturePost : AppCompatActivity() {
FileProvider.getUriForFile(this, "com.codepath.fileprovider", photoFile!!)
intent.putExtra(MediaStore.EXTRA_OUTPUT, fileProvider)
}
- */
+*/
cameraActivityResultLauncher.launch(takePictureIntent)
}
@@ -130,6 +131,9 @@ class ActivityCapturePost : AppCompatActivity() {
description.hint = "Unesite lokaciju"
description.setHintTextColor(Color.RED)
}
+
+
+
}
}
private val cameraActivityResultLauncher =
@@ -138,6 +142,8 @@ class ActivityCapturePost : AppCompatActivity() {
val bundle = result.data!!.extras
val bitmap = bundle!!["data"] as Bitmap?
showImage.setImageBitmap(bitmap)
+ takePhoto.isVisible=false
+
}
}
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
index 243cab0..bad3598 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
@@ -7,6 +7,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.TextView
+import android.widget.Toast
import androidx.fragment.app.FragmentTransaction
import com.example.brzodolokacije.R
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
index 561de10..fb90be7 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
@@ -1,60 +1,58 @@
package com.example.brzodolokacije.Fragments
+import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.TextView
+import android.widget.Toast
+import com.example.brzodolokacije.Activities.ActivityAddPost
+import com.example.brzodolokacije.Activities.ActivityCapturePost
+import com.example.brzodolokacije.Activities.ActivityForgottenPassword
import com.example.brzodolokacije.R
+import com.google.android.material.bottomsheet.BottomSheetDialog
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [FragmentUserPosts.newInstance] factory method to
- * create an instance of this fragment.
- */
class FragmentUserPosts : Fragment() {
- // TODO: Rename and change types of parameters
- private var param1: String? = null
- private var param2: String? = null
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- arguments?.let {
- param1 = it.getString(ARG_PARAM1)
- param2 = it.getString(ARG_PARAM2)
- }
- }
-
+ private lateinit var addNewPost: TextView
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_user_posts, container, false)
- }
+ val view =inflater.inflate(R.layout.fragment_user_posts, container, false)
+// Toast.makeText(
+// activity, "****************USER*****************", Toast.LENGTH_LONG
+// ).show();
+ addNewPost=view.findViewById<View>(R.id.tvFragmentUserPostsAddPost) as TextView
+ addNewPost.setOnClickListener {
+ var bottomSheetDialog2: BottomSheetDialog
+ bottomSheetDialog2= BottomSheetDialog(requireContext())
+ bottomSheetDialog2.setContentView(R.layout.bottom_sheet_add_new_post)
+ bottomSheetDialog2.show()
+
+ var close=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostClose) as ImageButton
+ var openAddPost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenAddPost) as ImageButton
+ var capturePost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenCapturePost) as ImageButton
- companion object {
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment FragmentUserPosts.
- */
- // TODO: Rename and change types and number of parameters
- @JvmStatic
- fun newInstance(param1: String, param2: String) =
- FragmentUserPosts().apply {
- arguments = Bundle().apply {
- putString(ARG_PARAM1, param1)
- putString(ARG_PARAM2, param2)
- }
+ openAddPost.setOnClickListener{
+ val intent = Intent (getActivity(), ActivityAddPost::class.java)
+ getActivity()?.startActivity(intent)
}
+
+ capturePost.setOnClickListener{
+ val intent = Intent (getActivity(), ActivityCapturePost::class.java)
+ getActivity()?.startActivity(intent)
+ }
+ close.setOnClickListener {
+ bottomSheetDialog2.dismiss()
+ }
+ }
+
+ return view
}
+
} \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_a_photo_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_a_photo_24.xml
new file mode 100644
index 0000000..b7e751b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_a_photo_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#274352"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml
new file mode 100644
index 0000000..5f6b662
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#274352"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml
new file mode 100644
index 0000000..32f0448
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:tint="#274352"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M17,19.22H5V7h7V5H5C3.9,5 3,5.9 3,7v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-7h-2V19.22z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M19,2h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0V7h3V5h-3V2z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M7,9h8v2h-8z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M7,12l0,2l8,0l0,-2l-3,0z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M7,15h8v2h-8z"/>
+</vector>
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 5af0c1f..a7a6e06 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
@@ -10,6 +10,7 @@
android:id="@+id/isActivityAddPostSwitcher"
android:layout_width="0dp"
android:layout_height="0dp"
+ android:elevation="10dp"
app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -45,60 +46,95 @@
tools:ignore="SpeakableTextPresentCheck" />
<Button
+ android:clickable="false"
android:id="@+id/btnActivityAddPostUploadFromGallery"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="177dp"
+ android:layout_height="19dp"
android:text="Otvori galeriju"
+ android:visibility="invisible"
+ app:cornerRadius="20dp"
app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tvActivityAddPostLocationtext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginBottom="16dp"
android:text="Lokacija"
app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostLocation"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/etActivityAddPostLocation"
android:layout_width="match_parent"
android:layout_height="50dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:ems="10"
android:hint="Reykjavik, Iceland"
android:inputType="textEmailAddress"
app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tvActivityAddPostDescriptiontext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:text="Opis"
app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/etActivityAddPostDescription"
android:layout_width="match_parent"
android:layout_height="50dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:ems="10"
android:hint="Reykjavik, Iceland"
android:inputType="textEmailAddress"
app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/btnActivityAddPostPost"
- android:layout_width="200dp"
+ android:layout_width="250dp"
android:layout_height="40dp"
+ android:layout_marginBottom="12dp"
android:background="@drawable/rounded_cyan_button"
android:backgroundTint="#1C789A"
android:text="Objavi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent" />
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnActivityAddPostUploadFromGalleryVisible"
+ android:layout_width="50dp"
+ android:layout_height="wrap_content"
+ android:stateListAnimator="@null"
+ app:backgroundTint="#00FFFFFF"
+ app:icon="@drawable/ic_baseline_add_photo_alternate_24"
+ app:iconGravity="textEnd"
+ app:iconSize="40dp"
+ app:iconTint="#1C7696"
+ app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/isActivityAddPostSwitcher" />
+
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
index 91517a7..23d34ee 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -8,33 +8,39 @@
<ImageView
android:id="@+id/ivActivityCapturePostImage"
- android:layout_width="408dp"
- android:layout_height="319dp"
+ android:layout_width="413dp"
+ android:layout_height="0dp"
android:layout_marginTop="4dp"
+ android:scaleType="fitCenter"
+ app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="ImageContrastCheck"
tools:srcCompat="@tools:sample/avatars" />
<Button
android:id="@+id/btnActivityCapturePostCapture"
- android:layout_width="60dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="68dp"
+ android:layout_width="68dp"
+ android:layout_height="15dp"
+ android:visibility="invisible"
app:cornerRadius="30dp"
app:icon="@android:drawable/ic_menu_camera"
+ app:iconTint="#FFFFFF"
+ android:clickable="false"
app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostLocationtext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/ivActivityCapturePostImage" />
+ tools:ignore="SpeakableTextPresentCheck" />
<TextView
android:id="@+id/tvActivityCapturePostLocationtext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="464dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="516dp"
+ android:layout_marginEnd="16dp"
android:text="Lokacija"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@@ -45,20 +51,26 @@
android:id="@+id/etActivityCapturePostLocation"
android:layout_width="match_parent"
android:layout_height="50dp"
+ android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
+ android:layout_marginEnd="16dp"
android:ems="10"
android:hint="Reykjavik, Iceland"
android:inputType="textEmailAddress"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext" />
+ app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext"
+ tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck"
+ android:importantForAutofill="no" />
<TextView
android:id="@+id/tvActivityCapturePostDescriptiontext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="16dp"
android:text="Opis"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
@@ -69,26 +81,49 @@
android:id="@+id/etActivityCapturePostDescription"
android:layout_width="match_parent"
android:layout_height="50dp"
+ android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
+ android:layout_marginEnd="16dp"
android:ems="10"
android:hint="Reykjavik, Iceland"
android:inputType="textEmailAddress"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext" />
+ app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext"
+ tools:ignore="TextContrastCheck"
+ android:importantForAutofill="no" />
<Button
android:id="@+id/btnActivityCapturePostPost"
- android:layout_width="200dp"
- android:layout_height="40dp"
+ android:layout_width="244dp"
+ android:layout_height="35dp"
+ android:layout_marginStart="32dp"
+ android:layout_marginEnd="32dp"
+ android:layout_marginBottom="16dp"
android:background="@drawable/rounded_cyan_button"
android:backgroundTint="#1C789A"
android:text="Objavi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="w,1:1"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.431"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintHorizontal_bias="0.495"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:ignore="TouchTargetSizeCheck" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnActivityCapturePostCaptureVisible"
+ android:layout_width="50dp"
+ android:layout_height="wrap_content"
+ android:stateListAnimator="@null"
+ app:backgroundTint="#00FFFFFF"
+ app:icon="@drawable/ic_baseline_add_a_photo_24"
+ app:iconGravity="textEnd"
+ app:iconSize="40dp"
+ app:iconTint="#1C7696"
+ app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
index 185719b..beada31 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
@@ -1,14 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Fragments.FragmentUserPosts">
<!-- TODO: Update blank fragment layout -->
- <TextView
+ <androidx.cardview.widget.CardView
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/hello_blank_fragment" />
+ android:layout_height="wrap_content">
-</FrameLayout> \ No newline at end of file
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginEnd="110dp"
+ android:src="@drawable/ic_baseline_post_add_24"
+ />
+
+ <TextView
+ android:id="@+id/tvFragmentUserPostsAddPost"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginEnd="20dp"
+ android:clickable="true"
+ android:text="@string/dodaj_objavu"
+ android:textSize="15sp"
+ android:focusable="true" />
+ </androidx.cardview.widget.CardView>
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
index 6770d14..a969148 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="dim">16dp</string>
<string name="title_activity_maps">MapsActivity</string>
+ <string name="dodaj_objavu">Dodaj objavu</string>
+ <string name="todo">TODO</string>
</resources> \ No newline at end of file