diff options
14 files changed, 233 insertions, 65 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6609d29 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +demoProjekat/MyApplication/.gitignore +demoProjekat/ diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..748026e --- /dev/null +++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="deploymentTargetDropDown"> + <targetSelectedWithDropDown> + <Target> + <type value="QUICK_BOOT_TARGET" /> + <deviceKey> + <Key> + <type value="VIRTUAL_DEVICE_PATH" /> + <value value="C:\Users\TAMARA\.android\avd\Pixel_3a_XL_API_33.avd" /> + </Key> + </deviceKey> + </Target> + </targetSelectedWithDropDown> + <timeTargetWasSelectedWithDropDown value="2022-11-14T22:24:25.011085400Z" /> + </component> +</project>
\ No newline at end of file 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/FragmentUserPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt index 66e7846..f1f2257 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,44 +1,83 @@ 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.Toast -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.example.brzodolokacije.Adapters.ShowPostsAdapter -import com.example.brzodolokacije.Adapters.ShowPostsHomePageAdapter -import com.example.brzodolokacije.Interfaces.IBackendApi import com.example.brzodolokacije.Models.PostPreview -import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper +import com.google.android.material.button.MaterialButton import retrofit2.Call import retrofit2.Callback import retrofit2.Response + + +import android.widget.Toast +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import com.example.brzodolokacije.Adapters.ShowPostsHomePageAdapter +import com.example.brzodolokacije.Interfaces.IBackendApi +import com.example.brzodolokacije.R + import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import android.widget.Button +import android.widget.ImageButton +import android.widget.TextView +import com.example.brzodolokacije.Activities.ActivityAddPost +import com.example.brzodolokacije.Activities.ActivityCapturePost +import com.example.brzodolokacije.Activities.ActivityForgottenPassword + +import com.google.android.material.bottomsheet.BottomSheetDialog class FragmentUserPosts : Fragment() { private lateinit var posts : MutableList<PostPreview> private lateinit var rvPosts: RecyclerView + private lateinit var addNewPost:TextView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - var view=inflater.inflate(R.layout.fragment_user_posts, container, false) - // Inflate the layout for this fragment + + val view =inflater.inflate(R.layout.fragment_user_posts, container, false) + + 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 + + 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() + } + } + rvPosts=view.findViewById(R.id.rvFragmentUserPostsPosts) as RecyclerView getPosts() return view @@ -73,5 +112,4 @@ class FragmentUserPosts : Fragment() { } } - }
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt index 43c2109..88685e4 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt @@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory object RetrofitHelper { - val baseUrl="http://10.0.2.2:5279" - //val baseUrl="http://147.91.204.115:10082" + //val baseUrl="http://10.0.2.2:5279" + val baseUrl="http://147.91.204.115:10082" private var retrofit_noauth: IBackendApi? = null private var retrofit_auth: IBackendApi? = null 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_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml index 96f60f6..19e6212 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml @@ -76,23 +76,6 @@ app:shapeAppearanceOverlay="@style/imageViewCircle" /> - <com.google.android.material.imageview.ShapeableImageView - android:id="@+id/tvFragmentProfileProfilePicturePlus" - android:layout_width="30dp" - android:layout_height="100dp" - android:layout_margin="5dp" - android:adjustViewBounds="true" - android:elevation="25dp" - android:src="@drawable/add_profile_picture_plus_color" - android:visibility="visible" - app:layout_constraintBottom_toTopOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileProfilePicture" - app:layout_constraintHorizontal_bias="0.8" - app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileProfilePicture" - app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileProfilePicture" - app:layout_constraintVertical_bias="1.0" - app:shapeAppearanceOverlay="@style/imageViewCircle" /> - <TableLayout android:id="@+id/tableLayout" android:layout_width="323dp" 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 f48d0a2..390d5bf 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,26 +1,52 @@ <?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" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + +android:orientation="vertical" 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 --> + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <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> + + + + + <androidx.legacy.widget.Space android:id="@+id/space" android:layout_width="match_parent" android:layout_height="50dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvFragmentUserPostsPosts" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/space" /> + /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file + </LinearLayout> 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 |