diff options
Diffstat (limited to 'Client')
3 files changed, 136 insertions, 57 deletions
diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index a3aab99..0000000 --- a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="deploymentTargetDropDown"> - <runningDeviceTargetSelectedWithDropDown> - <Target> - <type value="RUNNING_DEVICE_TARGET" /> - <deviceKey> - <Key> - <type value="SERIAL_NUMBER" /> - <value value="prvcgybaa6f6zhpv" /> - </Key> - </deviceKey> - </Target> - </runningDeviceTargetSelectedWithDropDown> - <timeTargetWasSelectedWithDropDown value="2022-11-09T23:36:53.200298Z" /> - </component> -</project>
\ No newline at end of file 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 00d3460..436784e 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 @@ -1,53 +1,75 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="@dimen/component_padding" xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Activities.ActivitySinglePost"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvMain" android:layout_width="match_parent" - android:layout_height="443dp" + android:paddingBottom="@dimen/component_padding" + android:layout_height="400dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - </androidx.recyclerview.widget.RecyclerView> - <LinearLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="wrap_content" + android:gravity="bottom" + app:layout_constraintTop_toBottomOf="@id/rvMain" + tools:layout_editor_absoluteX="0dp"> <TextView - android:id="@+id/tvTitle" + android:id="@+id/tvLocationParent" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Naslov" /> + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="Drzava, grad" + app:layout_constraintTop_toBottomOf="@+id/tvLocationType" + tools:layout_editor_absoluteX="0dp" /> <TextView - android:id="@+id/tvLocationType" + android:id="@+id/tvTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="11dp" - android:text="tip lokacije" /> + android:text="Naslov" + android:textSize="@dimen/header1_size" + android:textStyle="bold" + android:gravity="top|start" + android:padding="@dimen/text_padding"/> <TextView - android:id="@+id/tvLocationParent" + android:id="@+id/tvLocationType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Drzava, grad" /> + android:gravity="top|start" + android:text="Tip lokacije" + android:padding="@dimen/text_padding" + app:layout_constraintTop_toBottomOf="@+id/tvTitle" + tools:layout_editor_absoluteX="0dp" /> <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/constraintLayout" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvLocationParent"> <LinearLayout - android:layout_width="213dp" - android:layout_height="27dp" - android:orientation="horizontal"> + android:id="@+id/linearLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> <ImageView android:id="@+id/star1" @@ -89,39 +111,110 @@ android:id="@+id/tvRating" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" + android:padding="@dimen/text_padding" android:text="4.2" - app:layout_constraintEnd_toStartOf="@+id/textView10" - tools:layout_editor_absoluteY="0dp" /> + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings" + tools:layout_editor_absoluteY="4dp" /> <TextView android:id="@+id/tvNumberOfRatings" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="@dimen/text_padding" android:text="(10,500)" app:layout_constraintEnd_toEndOf="parent" - tools:layout_editor_absoluteY="0dp" /> - </androidx.constraintlayout.widget.ConstraintLayout> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="10dp" - android:padding="10dp" - android:background="@drawable/rounded_picture_background" - android:elevation="5dp"> + tools:layout_editor_absoluteY="4dp" /> - <TextView - android:id="@+id/tvDescription" - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/constraintLayout3" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.048" - app:layout_constraintStart_toStartOf="parent" - tools:layout_editor_absoluteY="4dp" /> + android:background="@drawable/rounded_picture_background" + android:elevation="5dp" + android:padding="@dimen/component_padding" + app:layout_constraintTop_toBottomOf="@+id/linearLayout" + tools:layout_editor_absoluteX="0dp"> + + <TextView + android:id="@+id/tvDescriptionLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="Opis" + android:textStyle="bold" /> + + <TextView + android:id="@+id/tvDescription" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" + app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingVertical="@dimen/component_padding" + android:layout_weight="1" + android:orientation="horizontal" + app:layout_constraintTop_toBottomOf="@id/constraintLayout3"> + + <ImageButton + android:id="@+id/rateStar1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:src="@android:drawable/btn_star_big_off" /> + + <ImageButton + android:id="@+id/rateStar2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:src="@android:drawable/btn_star_big_off" /> + + <ImageButton + android:id="@+id/rateStar3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:src="@android:drawable/btn_star_big_off" /> + + <ImageButton + android:id="@+id/rateStar4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:src="@android:drawable/btn_star_big_off" /> + + <ImageButton + android:id="@+id/rateStar5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:src="@android:drawable/btn_star_big_off" /> + + <Button + android:id="@+id/submitRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:text="oceni" + android:textColor="@color/black" /> + </LinearLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> - </LinearLayout> + </androidx.constraintlayout.widget.ConstraintLayout> -</LinearLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/dimens.xml b/Client/BrzoDoLokacije/app/src/main/res/values/dimens.xml index b789d50..10ed08f 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/values/dimens.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/values/dimens.xml @@ -1,3 +1,6 @@ <resources> <dimen name="fab_margin">16dp</dimen> + <dimen name="text_padding">5dp</dimen> + <dimen name="header1_size">20dp</dimen> + <dimen name="component_padding">10dp</dimen> </resources>
\ No newline at end of file |