diff options
7 files changed, 137 insertions, 53 deletions
diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml index af6c93b..59f1e26 100644 --- a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml +++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ <deviceKey> <Key> <type value="VIRTUAL_DEVICE_PATH" /> - <value value="C:\Users\PC\.android\avd\Pixel_6_API_33.avd" /> + <value value="C:\Users\PC\.android\avd\Pixel_4a_API_33.avd" /> </Key> </deviceKey> </Target> </targetSelectedWithDropDown> - <timeTargetWasSelectedWithDropDown value="2022-12-07T14:05:59.558531400Z" /> + <timeTargetWasSelectedWithDropDown value="2022-12-07T19:39:34.164319600Z" /> </component> </project>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt index 8f737a3..6964209 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt @@ -80,7 +80,7 @@ class CommentsAdapter (val items : MutableList<CommentSend>,val activity: Activi else{ showKeyboard(etReply) btnPostReply.setOnClickListener{ - if(etReply.text.isNotEmpty()){ + if(etReply.text!!.isNotEmpty()){ val postId=(activity as ActivitySinglePost).post._id Log.d("main",binding.toString()) val comment= CommentReceive(etReply.text.toString(),item._id) @@ -121,7 +121,7 @@ class CommentsAdapter (val items : MutableList<CommentSend>,val activity: Activi if(response.isSuccessful){ var newComment=response.body()!! requestGetComments(newComment) - itemView.etReply.text.clear() + itemView.etReply.text!!.clear() hideKeyboard(itemView.etReply) itemView.etReply.clearFocus() }else{ diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml new file mode 100644 index 0000000..4cf0a52 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + 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="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> +</vector> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml index 4dcab31..ca8a043 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml @@ -92,16 +92,19 @@ </androidx.recyclerview.widget.RecyclerView> </androidx.constraintlayout.widget.ConstraintLayout> +<androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="match_parent" + android:layout_height="wrap_content"> <androidx.cardview.widget.CardView android:id="@+id/cvParentMessageEdit" - android:layout_width="match_parent" - android:layout_height="40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="40dp" android:layout_marginBottom="5dp" - android:layout_marginStart="16dp" - android:layout_marginTop="10dp" - android:layout_marginEnd="16dp" - android:elevation="0dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" app:cardCornerRadius="20dp"> @@ -109,24 +112,37 @@ android:id="@+id/etNewMessage" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" - android:hint=" poruka" - android:inputType="textPersonName" - android:paddingLeft="15dp" + android:backgroundTint="@color/white" + android:hint="Ukucajte poruku..." + android:paddingLeft="10dp" tools:ignore="TouchTargetSizeCheck" - android:autofillHints="emailAddress"/> + android:inputType="textCapSentences|textMultiLine"/> + + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + <ImageButton android:id="@+id/btnSendMessage" android:layout_width="25dp" android:layout_height="25dp" - android:layout_gravity="right|center_vertical" - android:scaleType="centerCrop" - android:layout_marginEnd="10dp" + android:layout_gravity="center" + android:layout_margin="10dp" android:background="@null" - android:src="@drawable/post_comment" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" app:cornerRadius="16dp" tools:ignore="SpeakableTextPresentCheck" /> - </androidx.cardview.widget.CardView> +</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml index 68a796d..a396f07 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:layout_marginLeft="10dp" - android:backgroundTint="#eef1f6" + android:backgroundTint="@color/purple_500" android:background="@drawable/view_corner_radius" app:cardCornerRadius="15dp" app:layout_constraintStart_toStartOf="parent" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:maxLines="50" android:maxWidth="300dp" - android:backgroundTint="#eef1f6" + android:textColor="@color/white" android:padding="5dp" android:paddingHorizontal="15dp" app:layout_constraintStart_toStartOf="parent" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml index 250f640..005c802 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml @@ -50,29 +50,60 @@ app:layout_constraintTop_toBottomOf="@+id/postCommentLayout"> </androidx.recyclerview.widget.RecyclerView> - - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/postCommentLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> - <EditText - android:id="@+id/NewComment" - android:layout_width="match_parent" + <androidx.cardview.widget.CardView + android:id="@+id/cvParentCommentEdit" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:hint="Unesite komentar ovde" /> + android:minHeight="40dp" + android:layout_marginBottom="5dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/NewComment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint="Unesite komentar..." + android:paddingLeft="10dp" + tools:ignore="TouchTargetSizeCheck" + android:inputType="textCapSentences|textMultiLine"/> + + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> - <ImageView - android:id="@+id/btnPostComment" - android:layout_width="30dp" - android:layout_height="30dp" - android:backgroundTint="@color/white" - android:scaleType="fitCenter" - android:src="@drawable/ic_baseline_send_24" /> - </LinearLayout> + <ImageButton + android:id="@+id/btnPostComment" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_gravity="center" + android:layout_margin="10dp" + android:background="@null" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" + app:cornerRadius="16dp" + tools:ignore="SpeakableTextPresentCheck" /> + </androidx.cardview.widget.CardView> + </androidx.appcompat.widget.LinearLayoutCompat> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml index 5e0dc03..45ecde0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml @@ -58,26 +58,58 @@ </androidx.appcompat.widget.LinearLayoutCompat> <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/llReply" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:id="@+id/llReply"> + android:layout_height="wrap_content"> - <EditText - android:layout_width="match_parent" + <androidx.cardview.widget.CardView + android:id="@+id/cvParentCommentEdit" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:id="@+id/etReply" - android:hint="odgovor na komentar"/> - <ImageButton - android:id="@+id/btnPostReply" - android:layout_width="50dp" - android:layout_height="50dp" - android:layout_gravity="end" - android:layout_weight="0" - android:backgroundTint="@color/white" - android:scaleType="centerCrop" - android:src="@drawable/post_comment" /> + android:minHeight="40dp" + android:layout_marginBottom="5dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/etReply" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint="Unesite komentar..." + android:paddingLeft="10dp" + tools:ignore="TouchTargetSizeCheck" + android:inputType="textCapSentences|textMultiLine"/> + + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendReplyButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <ImageButton + android:id="@+id/btnPostReply" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_gravity="center" + android:layout_margin="10dp" + android:background="@null" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" + app:cornerRadius="16dp" + tools:ignore="SpeakableTextPresentCheck" /> + </androidx.cardview.widget.CardView> </androidx.appcompat.widget.LinearLayoutCompat> <androidx.recyclerview.widget.RecyclerView android:layout_width="match_parent" |