diff options
5 files changed, 59 insertions, 27 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt index 1be978d..cb48d3e 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt @@ -1,5 +1,6 @@ package com.example.brzodolokacije.Fragments +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -14,6 +15,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.example.brzodolokacije.Activities.ChatActivity import com.example.brzodolokacije.Adapters.ShowPostsHomePageAdapter import com.example.brzodolokacije.Interfaces.IBackendApi import com.example.brzodolokacije.Models.LocationType @@ -30,6 +32,7 @@ import retrofit2.converter.gson.GsonConverterFactory class FragmentHomePage : Fragment() { + private lateinit var btnChat:ImageView private lateinit var btnBack:ImageView /* override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -43,6 +46,7 @@ class FragmentHomePage : Fragment() { // Inflate the layout for this fragment var view:View= inflater.inflate(R.layout.fragment_home_page, container, false) btnBack=view.findViewById(R.id.btnFragmentHomePageBack) + btnChat=view.findViewById(R.id.ivFragmentHomePageChat) setBtnBackInvisible() var fm: FragmentTransaction =childFragmentManager.beginTransaction() @@ -54,6 +58,10 @@ class FragmentHomePage : Fragment() { setBtnBackInvisible() } + btnChat.setOnClickListener { + val intent: Intent = Intent(activity, ChatActivity::class.java) + requireActivity().startActivity(intent) + } return view } diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_message_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_message_24.xml new file mode 100644 index 0000000..cacf08d --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_message_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#FFFFFF" + 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="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM17,11h-4v4h-2v-4H7V9h4V5h2v4h4v2z"/> +</vector> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml index 9e28d6d..680bada 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml @@ -5,47 +5,65 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Activities.ChatActivity"> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/topBanner" - android:layout_width="match_parent" - android:clickable="true" - android:layout_height="50dp" - android:background="@color/dark_blue_transparent" - app:layout_constraintStart_toStartOf="parent"> - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textSize="40dp" - android:id="@+id/tvFragmentTitle" - android:text="Chat" - android:textColor="@color/white"/> - - </androidx.constraintlayout.widget.ConstraintLayout> + <ImageButton - android:layout_width="match_parent" - android:layout_height="wrap_content" android:id="@+id/addNewMessage" + android:layout_width="60dp" + android:layout_height="60dp" android:clickable="true" + android:elevation="50dp" android:focusable="true" - app:layout_constraintTop_toBottomOf="@id/topBanner" - android:src="@drawable/button_chat"> + android:backgroundTint="@color/unfollow" + android:src="@drawable/ic_baseline_add_message_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> - </ImageButton> - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + <ImageView + android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:clickable="true" + android:src="@drawable/ic_baseline_arrow_back" + android:textAllCaps="false" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" /> + + <TextView + android:id="@+id/tvActivityShowFollowersOrFollowingShow" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_width="match_parent" + android:layout_marginTop="16dp" + android:layout_marginEnd="268dp" + android:text="Poruke" + android:textSize="25dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeContainer" - app:layout_constraintTop_toBottomOf="@id/addNewMessage"> + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityShowFollowersOrFollowingShow" + app:layout_constraintVertical_bias="1.0" + tools:layout_editor_absoluteX="-27dp"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvMain" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" > + app:layout_constraintTop_toTopOf="parent"> </androidx.recyclerview.widget.RecyclerView> + + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml index 0752536..f39acf2 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml @@ -127,11 +127,12 @@ </FrameLayout> <ImageView - android:id="@+id/imageView12" + android:id="@+id/ivFragmentHomePageChat" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" android:layout_marginEnd="20dp" + android:clickable="true" android:src="@drawable/ic_round_chat_24" app:layout_constraintEnd_toStartOf="@+id/cvFragmentHomePageProfile" app:layout_constraintTop_toTopOf="parent" /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml index f940efd..2d32b2d 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml @@ -28,7 +28,7 @@ android:layout_marginStart="1dp" android:layout_marginEnd="1dp" android:elevation="3dp" - android:scaleType="fitXY" + android:scaleType="centerCrop" app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintEnd_toEndOf="@id/imageView9" app:layout_constraintStart_toStartOf="@id/imageView9" |