diff options
author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-11 00:51:19 +0100 |
---|---|---|
committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-11 00:51:19 +0100 |
commit | d6466e214329154ef820ad85342aa683e43d2ebc (patch) | |
tree | ca98680f9204ef39b0890764230dc69d58a74a21 | |
parent | e9afe36b8a632cd85010d9aa8107b1fa806e517c (diff) |
Promenjena dugmad na stranici za prikaz objava. Promenjena boja pozadine stranica.
6 files changed, 49 insertions, 31 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml index 00b22aa..1e37cbb 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF093A4C" + android:fillColor="#737374" android:pathData="M11 18c-0.28 0-0.52-0.1-0.71-0.29C10.09 17.52 10 17.28 10 17c0-0.28 0.1-0.52 0.29-0.71C10.48 16.09 10.72 16 11 16h2c0.28 0 0.52 0.1 0.71 0.29C13.91 16.48 14 16.72 14 17c0 0.28-0.1 0.52-0.29 0.71C13.52 17.91 13.28 18 13 18h-2ZM4 8C3.72 8 3.48 7.9 3.29 7.71 3.09 7.52 3 7.28 3 7c0-0.28 0.1-0.52 0.29-0.71C3.48 6.09 3.72 6 4 6h16c0.28 0 0.52 0.1 0.71 0.29C20.91 6.48 21 6.72 21 7c0 0.28-0.1 0.52-0.29 0.71C20.52 7.91 20.28 8 20 8H4Zm3 5c-0.28 0-0.52-0.1-0.71-0.29C6.09 12.52 6 12.28 6 12c0-0.28 0.1-0.52 0.29-0.71C6.48 11.09 6.72 11 7 11h10c0.28 0 0.52 0.1 0.71 0.29C17.91 11.48 18 11.72 18 12c0 0.28-0.1 0.52-0.29 0.71C17.52 12.91 17.28 13 17 13H7Z"/> </vector>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml index fe93f22..d5a2cb0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml @@ -5,7 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:strokeColor="#FF093A4C" + android:strokeColor="#737374" android:strokeWidth="1.5" android:strokeLineCap="round" android:strokeLineJoin="round" diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_grid_view_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_grid_view_24.xml new file mode 100644 index 0000000..63fadd8 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_grid_view_24.xml @@ -0,0 +1,8 @@ +<vector android:height="24dp" android:tint="#747474" + 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="M5,11h4c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2H5C3.9,3 3,3.9 3,5v4C3,10.1 3.9,11 5,11z"/> + <path android:fillColor="@android:color/white" android:pathData="M5,21h4c1.1,0 2,-0.9 2,-2v-4c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v4C3,20.1 3.9,21 5,21z"/> + <path android:fillColor="@android:color/white" android:pathData="M13,5v4c0,1.1 0.9,2 2,2h4c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-4C13.9,3 13,3.9 13,5z"/> + <path android:fillColor="@android:color/white" android:pathData="M15,21h4c1.1,0 2,-0.9 2,-2v-4c0,-1.1 -0.9,-2 -2,-2h-4c-1.1,0 -2,0.9 -2,2v4C13,20.1 13.9,21 15,21z"/> +</vector> diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_view_list_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_view_list_24.xml new file mode 100644 index 0000000..b4ff51e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_view_list_24.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#747474" 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="M4,14h2c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v2C3,13.55 3.45,14 4,14zM4,19h2c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v2C3,18.55 3.45,19 4,19zM4,9h2c0.55,0 1,-0.45 1,-1V6c0,-0.55 -0.45,-1 -1,-1H4C3.45,5 3,5.45 3,6v2C3,8.55 3.45,9 4,9zM9,14h11c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H9c-0.55,0 -1,0.45 -1,1v2C8,13.55 8.45,14 9,14zM9,19h11c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1H9c-0.55,0 -1,0.45 -1,1v2C8,18.55 8.45,19 9,19zM8,6v2c0,0.55 0.45,1 1,1h11c0.55,0 1,-0.45 1,-1V6c0,-0.55 -0.45,-1 -1,-1H9C8.45,5 8,5.45 8,6z"/> +</vector> 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 a7bd9fb..8085a16 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 @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#f6f6f6" + android:background="#FFFCFCFC" tools:context=".Fragments.FragmentHomePage"> <TextView @@ -112,7 +112,7 @@ android:layout_height="40dp" android:layout_marginTop="8dp" android:clickable="true" - android:src="@drawable/ic_baseline_arrow_back_24" + android:src="@drawable/ic_baseline_arrow_back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageSearch" /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml index 9447ea7..7e16f78 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml @@ -1,20 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" + + android:background="#FFFCFCFC" + android:orientation="vertical" tools:context=".Fragments.FragmentShowPosts"> <androidx.cardview.widget.CardView android:id="@+id/cvSearch" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginTop="10dp" android:layout_marginStart="16dp" + android:layout_marginTop="10dp" android:layout_marginEnd="16dp" - android:elevation="0dp" + android:elevation="10dp" app:cardCornerRadius="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -25,10 +27,11 @@ android:id="@+id/etFragmentShowPostsSearch" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" - android:hint=" Pretraga" - android:paddingLeft="15dp" - android:inputType="textPersonName" /> + + android:backgroundTint="@color/white" + android:hint="Pretraga" + android:inputType="textPersonName" + android:paddingHorizontal="20dp" /> <com.google.android.material.button.MaterialButton android:id="@+id/mbFragmentHomePageSearch" @@ -54,7 +57,7 @@ android:layout_height="50dp" android:layout_alignParentRight="true" android:layout_marginStart="16dp" - android:background="@color/white" + android:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" android:src="@drawable/button_filter" @@ -66,7 +69,8 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@color/white" + + android:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" android:src="@drawable/button_sort" @@ -74,17 +78,15 @@ app:layout_constraintTop_toTopOf="parent" /> - <ImageButton android:id="@+id/btnLinearLayout" android:layout_width="50dp" android:layout_height="50dp" - android:layout_marginEnd="16dp" android:layout_weight="1" - android:background="@color/white" + android:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" - android:src="@drawable/list_empty" + android:src="@drawable/ic_round_view_list_24" app:layout_constraintEnd_toStartOf="@+id/btnGridLayout" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/btnSortDirection" @@ -95,29 +97,32 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_marginStart="220dp" + android:layout_marginEnd="16dp" android:layout_weight="1" - android:background="@color/white" + android:background="#FFFCFCFC" android:clickable="true" android:padding="@dimen/component_padding" android:scaleType="centerCrop" - android:src="@drawable/grid_full" + android:src="@drawable/ic_round_grid_view_24" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/btnSortDirection" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> -<androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:layout_height="match_parent" - android:layout_width="match_parent" - android:id="@+id/swipeContainer"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvMain" + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipeContainer" android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" > + android:layout_height="match_parent"> + + <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"> - </androidx.recyclerview.widget.RecyclerView> -</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + </androidx.recyclerview.widget.RecyclerView> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </LinearLayout>
\ No newline at end of file |