diff options
author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-12 19:12:58 +0100 |
---|---|---|
committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-12 19:12:58 +0100 |
commit | e724e67c83fd5f4ef16560194db76eb09658c178 (patch) | |
tree | 96a200c568fae4962063fb03e9999785eba6adea /Client/BrzoDoLokacije/app/src/main/res/layout | |
parent | 146a65780784e1339dc20ccda0f8da20ef228e53 (diff) |
Izmena stranica home page, single post, home page item,
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
8 files changed, 94 insertions, 68 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml index 3a1fbbc..53bed93 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml @@ -14,21 +14,24 @@ app:layout_constraintStart_toStartOf="parent" android:background="@color/unfollow_transparent" android:id="@+id/clImageHeader"> + <ImageButton + android:id="@+id/btnBackToPost" android:layout_width="50dp" android:layout_height="50dp" - app:layout_constraintStart_toStartOf="parent" android:background="@null" android:src="@drawable/ic_baseline_arrow_back" - android:id="@+id/btnBackToPost"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> <ImageButton + android:id="@+id/btnDownload" android:layout_width="50dp" android:layout_height="50dp" - app:layout_constraintEnd_toEndOf="parent" android:background="@null" - android:src="@drawable/ic_baseline_arrow_back" - android:id="@+id/btnDownload"/> + android:src="@drawable/ic_baseline_download_24" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml index c804032..d2229e8 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml @@ -5,6 +5,7 @@ tools:context=".Activities.ActivitySinglePost" android:layout_width="match_parent" android:layout_height="match_parent" + android:elevation="10dp" android:id="@+id/PostSwipeRefresh"> <androidx.constraintlayout.widget.ConstraintLayout @@ -28,13 +29,13 @@ <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/linearLayout2" android:layout_width="match_parent" - android:textSize="15dp" - android:layout_height="330dp" + android:layout_height="match_parent" android:background="@drawable/view_top_corner_radius" android:elevation="30dp" android:paddingHorizontal="16dp" android:paddingTop="16dp" android:paddingBottom="0dp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -68,8 +69,8 @@ android:layout_height="wrap_content" android:gravity="top|start" android:padding="@dimen/text_padding" - android:textSize="15dp" android:text="Drzava, grad" + android:textSize="15dp" app:layout_constraintStart_toEndOf="@+id/imageView12" app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> @@ -93,9 +94,9 @@ android:gravity="top|start" android:padding="@dimen/text_padding" android:text="User" + android:textColor="#FF03DAC5" android:textSize="20dp" android:textStyle="bold" - android:textColor="#FF03DAC5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvLocationType" /> @@ -123,8 +124,8 @@ android:id="@+id/ivFavourite" android:layout_width="30dp" android:layout_height="30dp" - android:clickable="true" android:layout_marginRight="5dp" + android:clickable="true" android:src="@drawable/ic_baseline_favorite_border_24" app:layout_constraintBottom_toBottomOf="@+id/tvRating" app:layout_constraintEnd_toStartOf="@+id/tvRating" @@ -132,13 +133,13 @@ <TextView android:id="@+id/tvRating" - android:textSize="15dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginEnd="4dp" android:padding="@dimen/text_padding" android:text="4.2" + android:textSize="15dp" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings" app:layout_constraintTop_toTopOf="parent" /> @@ -149,8 +150,8 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:padding="@dimen/text_padding" - android:textSize="15dp" android:text="(10,500)" + android:textSize="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -178,8 +179,11 @@ <androidx.cardview.widget.CardView android:id="@+id/MapDialogueMapView" + android:elevation="15dp" android:layout_width="match_parent" android:layout_height="150dp" + + android:layout_marginHorizontal="3dp" android:layout_marginTop="8dp" app:cardCornerRadius="10dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml index f54d0b2..2fcf6dd 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml @@ -5,7 +5,8 @@ android:id="@+id/bottomSheetAddNewForNav" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:background="@drawable/view_top_corner_radius"> <TextView 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 8085a16..889b5b2 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 @@ -74,7 +74,7 @@ android:layout_width="0dp" android:layout_height="40dp" android:layout_marginStart="16dp" - android:layout_marginTop="45dp" + android:layout_marginTop="35dp" android:layout_marginEnd="16dp" android:elevation="0dp" app:cardCornerRadius="20dp" @@ -120,7 +120,6 @@ android:id="@+id/flFragmentHomePageMainContent" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml index 9baa8c6..3666635 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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" tools:context=".Fragments.FragmentHomePageMainScroll" android:layout_width="match_parent" @@ -9,9 +10,7 @@ <ScrollView android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - > + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" @@ -20,28 +19,29 @@ <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" - android:layout_marginStart="10dp" - android:layout_marginEnd="16dp" - app:cardElevation="0dp" android:id="@+id/cvFragmentHomePageText2" android:layout_width="match_parent" android:layout_height="wrap_content" - android:stateListAnimator="@null" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="5dp" + android:backgroundTint="#FFFCFCFC" android:elevation="0dp" - android:layout_marginTop="16dp"> + android:stateListAnimator="@null" + app:cardElevation="0dp"> <TextView android:id="@+id/tvFragmentHomePageNewest" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="left" - android:text="Najnovije" android:clickable="true" + android:text="Najnovije" + android:textSize="16dp" android:textStyle="bold" /> - </androidx.cardview.widget.CardView> <androidx.recyclerview.widget.RecyclerView @@ -154,17 +154,19 @@ android:id="@+id/ll1" android:layout_width="match_parent" android:layout_height="wrap_content"> + <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" - android:layout_marginTop="16dp" android:id="@+id/cvFragmentHomePageText1" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" + android:layout_marginTop="16dp" android:layout_marginEnd="16dp" + android:backgroundTint="#FFFCFCFC" android:elevation="0dp" - app:cardElevation="0dp" - > + android:layout_marginBottom="5dp" + + app:cardElevation="0dp"> <TextView android:id="@+id/tvFragmentHomePagePopular" @@ -172,6 +174,7 @@ android:layout_height="match_parent" android:layout_gravity="left" android:text="Popularno" + android:textSize="16dp" android:textStyle="bold" /> @@ -183,7 +186,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" /> + android:layout_marginBottom="8dp" /> </LinearLayout> <LinearLayout @@ -192,15 +195,18 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> + <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" - app:cardElevation="0dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" + android:layout_marginBottom="5dp" + android:id="@+id/cvFragmentHomePageText3" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp"> + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:backgroundTint="#FFFCFCFC" + app:cardElevation="0dp"> <TextView android:id="@+id/tvFragmentHomePageBestRated" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml index d376715..bf90b04 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml @@ -13,16 +13,28 @@ android:padding="@dimen/component_padding" tools:layout_editor_absoluteX="0dp"> - - <TextView - android:id="@+id/tvDescription" + <androidx.cardview.widget.CardView + android:id="@+id/cvDescription" + app:cardCornerRadius="10dp" + android:elevation="15dp" + android:layout_margin="3dp" + android:padding="5dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"> + <TextView + android:layout_margin="5dp" + android:id="@+id/tvDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.cardview.widget.CardView> <LinearLayout @@ -32,17 +44,16 @@ android:layout_marginTop="30dp" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvDescription"> + app:layout_constraintTop_toBottomOf="@+id/cvDescription"> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="Oceni" + + style="@style/title" android:gravity="center_vertical" android:layout_weight="1" - android:textColor="@color/cardview_dark_background" - android:textSize="@dimen/header1_size" - android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.005" app:layout_constraintStart_toStartOf="parent" @@ -54,7 +65,7 @@ android:layout_height="50dp" android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView android:id="@+id/rateStar2" @@ -62,7 +73,7 @@ android:layout_height="50dp" android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView android:id="@+id/rateStar3" @@ -70,7 +81,7 @@ android:layout_height="50dp" android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView android:id="@+id/rateStar4" @@ -78,7 +89,7 @@ android:layout_height="50dp" android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView android:id="@+id/rateStar5" @@ -86,7 +97,7 @@ android:layout_height="50dp" android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> </LinearLayout> 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 3aa56f9..9622c34 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 @@ -7,8 +7,8 @@ <com.google.android.material.imageview.ShapeableImageView android:id="@+id/imageView9" - android:layout_width="170dp" - android:layout_height="210dp" + android:layout_width="165dp" + android:layout_height="223dp" android:layout_marginStart="8dp" android:layout_marginTop="4dp" android:layout_marginEnd="8dp" @@ -17,8 +17,10 @@ android:src="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" app:shapeAppearanceOverlay="@style/Circular" /> <ImageView @@ -35,8 +37,8 @@ <com.google.android.material.imageview.ShapeableImageView android:id="@+id/ivPIHPBackground" - android:layout_width="170dp" - android:layout_height="170dp" + android:layout_width="165dp" + android:layout_height="185dp" android:layout_marginStart="1dp" android:layout_marginEnd="1dp" android:elevation="3dp" @@ -54,37 +56,37 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="2dp" + android:layout_marginBottom="2dp" android:elevation="3dp" android:text="TextView" android:textSize="13sp" android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + app:layout_constraintBottom_toTopOf="@+id/tvPIHPLocationDetail" + app:layout_constraintStart_toStartOf="parent" /> <TextView android:id="@+id/tvPIHPRecension" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="3dp" android:layout_marginEnd="4dp" + android:layout_marginBottom="18dp" android:elevation="3dp" android:text="TextView" android:textSize="11dp" android:textStyle="bold" - app:layout_constraintEnd_toEndOf="@+id/imageView9" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + app:layout_constraintBottom_toBottomOf="@+id/imageView9" + app:layout_constraintEnd_toEndOf="@+id/imageView9" /> <ImageView android:id="@+id/imageView10" android:layout_width="15dp" android:layout_height="15dp" - android:layout_marginTop="3dp" + android:layout_marginBottom="18dp" android:elevation="3dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintEnd_toStartOf="@+id/tvPIHPRecension" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" app:srcCompat="@drawable/ic_baseline_star_rate_24" /> <ImageView @@ -93,10 +95,10 @@ android:layout_width="18dp" android:layout_height="18dp" android:layout_marginStart="8dp" - android:layout_marginTop="2dp" + android:layout_marginBottom="3dp" android:elevation="3dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" app:srcCompat="@drawable/ic_baseline_location_on_24" /> <TextView @@ -104,14 +106,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="2dp" + android:layout_marginBottom="3dp" android:elevation="3dp" android:text="TextView" android:textSize="11dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintEnd_toEndOf="@+id/imageView9" app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/imageView11" - app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" /> + app:layout_constraintStart_toEndOf="@+id/imageView11" /> " /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml index 3821869..0ce4776 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml @@ -115,7 +115,7 @@ android:layout_marginTop="2dp" android:layout_marginEnd="24dp" android:elevation="10dp" - android:text="TextView" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvPostPreviewRating" /> |