diff options
author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 15:02:03 +0000 |
---|---|---|
committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 15:02:03 +0000 |
commit | 9659c8868d19b31cf9ecae40bd28a30f13127f26 (patch) | |
tree | 428f090f1d20cc0b4a2865fdc2fdbf5f8af38fbc /Client/BrzoDoLokacije/app/src/main/res/layout | |
parent | f695db67989fd9c2c7b045bc55d8aa780b388d5d (diff) | |
parent | 6181721dc548421ec2926c17a73f0d48a2c99482 (diff) |
Merge branch 'develop' into 'master'
Merge develop -> master
See merge request BrzoDoLokacije2022/odyssey/brzodolokacije!3
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
14 files changed, 760 insertions, 27 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml new file mode 100644 index 0000000..5af0c1f --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Activities.ActivityAddPost"> + + <ImageSwitcher + android:id="@+id/isActivityAddPostSwitcher" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/nextImage" + android:layout_width="78dp" + android:layout_height="499dp" + android:background="@drawable/rounded_transparent_button" + android:gravity="right" + android:padding="30dp" + app:icon="@drawable/ic_baseline_arrow_forward" + app:iconTint="#072242" + app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck" /> + + <Button + android:id="@+id/previousImage" + android:layout_width="70dp" + android:layout_height="497dp" + + android:background="@drawable/rounded_transparent_button" + android:gravity="left" + android:padding="30dp" + app:icon="@drawable/ic_baseline_arrow_back" + app:iconTint="#0E283C" + app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck" /> + + <Button + android:id="@+id/btnActivityAddPostUploadFromGallery" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Otvori galeriju" + app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <TextView + android:id="@+id/tvActivityAddPostLocationtext" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Lokacija" + app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostLocation" + app:layout_constraintEnd_toEndOf="parent" /> + + <EditText + android:id="@+id/etActivityAddPostLocation" + android:layout_width="match_parent" + android:layout_height="50dp" + android:ems="10" + android:hint="Reykjavik, Iceland" + android:inputType="textEmailAddress" + app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" + app:layout_constraintEnd_toEndOf="parent" /> + + <TextView + android:id="@+id/tvActivityAddPostDescriptiontext" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Opis" + app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription" + app:layout_constraintEnd_toEndOf="parent" /> + + <EditText + android:id="@+id/etActivityAddPostDescription" + android:layout_width="match_parent" + android:layout_height="50dp" + android:ems="10" + android:hint="Reykjavik, Iceland" + android:inputType="textEmailAddress" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" + app:layout_constraintEnd_toEndOf="parent" /> + + <Button + android:id="@+id/btnActivityAddPostPost" + android:layout_width="200dp" + android:layout_height="40dp" + android:background="@drawable/rounded_cyan_button" + android:backgroundTint="#1C789A" + android:text="Objavi" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml new file mode 100644 index 0000000..91517a7 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Activities.ActivityCapturePost"> + + <ImageView + android:id="@+id/ivActivityCapturePostImage" + android:layout_width="408dp" + android:layout_height="319dp" + android:layout_marginTop="4dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:srcCompat="@tools:sample/avatars" /> + + <Button + android:id="@+id/btnActivityCapturePostCapture" + android:layout_width="60dp" + android:layout_height="wrap_content" + android:layout_marginTop="68dp" + app:cornerRadius="30dp" + app:icon="@android:drawable/ic_menu_camera" + app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostLocationtext" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.498" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ivActivityCapturePostImage" /> + + <TextView + android:id="@+id/tvActivityCapturePostLocationtext" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="464dp" + android:text="Lokacija" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <EditText + android:id="@+id/etActivityCapturePostLocation" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:ems="10" + android:hint="Reykjavik, Iceland" + android:inputType="textEmailAddress" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext" /> + + <TextView + android:id="@+id/tvActivityCapturePostDescriptiontext" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="Opis" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/etActivityCapturePostLocation" /> + + <EditText + android:id="@+id/etActivityCapturePostDescription" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:ems="10" + android:hint="Reykjavik, Iceland" + android:inputType="textEmailAddress" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext" /> + + + <Button + android:id="@+id/btnActivityCapturePostPost" + android:layout_width="200dp" + android:layout_height="40dp" + android:background="@drawable/rounded_cyan_button" + android:backgroundTint="#1C789A" + android:text="Objavi" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="w,1:1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.431" + app:layout_constraintStart_toStartOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml index 0f82285..115fff5 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml @@ -16,40 +16,37 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="1.0" + app:layout_constraintVertical_bias="0.0" app:srcCompat="@drawable/gradient" /> <androidx.constraintlayout.widget.ConstraintLayout - android:background="@drawable/login_register_background_top_radius" - android:id="@+id/linearLayout" android:layout_width="0dp" - android:layout_height="65dp" + android:layout_height="wrap_content" android:layout_marginStart="50dp" + android:layout_marginTop="150dp" android:layout_marginEnd="50dp" - android:gravity="center|center_horizontal" + android:background="@drawable/login_register_background_top_radius" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@+id/flFragmentActivityLRFragmentsView" + android:padding="20dp" app:layout_constraintEnd_toEndOf="@+id/imageView2" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="1.0"> + app:layout_constraintTop_toTopOf="@+id/imageView2"> <ImageView android:id="@+id/imageView5" - android:layout_width="280dp" + android:layout_width="250dp" android:layout_height="40dp" android:background="@drawable/rounded_white_button_login" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.37" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="1.0"></ImageView> + app:layout_constraintTop_toTopOf="parent"></ImageView> <android.widget.Button android:id="@+id/btnFragmentActivityLRLogin" - android:layout_width="139dp" + android:layout_width="120dp" android:layout_height="40dp" android:background="@drawable/rounded_cyan_button" android:elevation="25dp" @@ -59,19 +56,20 @@ android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="@+id/imageView5" app:layout_constraintEnd_toStartOf="@+id/btnFragmentActivityLRRegister" - app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@+id/imageView5" - app:layout_constraintTop_toTopOf="@+id/imageView5" /> + app:layout_constraintTop_toTopOf="@+id/imageView5" + app:layout_constraintVertical_bias="0.0" /> <android.widget.Button android:id="@+id/btnFragmentActivityLRRegister" - android:layout_width="140dp" + android:layout_width="120dp" android:layout_height="40dp" - android:textColor="#FF1C789A" android:background="@drawable/rounded_transparent_button" android:elevation="25dp" android:padding="0dp" android:text="Registruj se" + android:textColor="#FF1C789A" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageView5" app:layout_constraintTop_toTopOf="@+id/imageView5" @@ -87,12 +85,10 @@ android:layout_marginEnd="50dp" android:background="@drawable/login_register_background_bottom_radius" android:elevation="20dp" - android:foregroundGravity="center_vertical|center" - 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="@+id/imageView2" - app:layout_constraintVertical_bias="0.411"> + app:layout_constraintTop_toBottomOf="@+id/linearLayout"> </FrameLayout> 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 new file mode 100644 index 0000000..00d3460 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout 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" + 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" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + </androidx.recyclerview.widget.RecyclerView> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/tvTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Naslov" /> + + <TextView + android:id="@+id/tvLocationType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="11dp" + android:text="tip lokacije" /> + + <TextView + android:id="@+id/tvLocationParent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Drzava, grad" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="213dp" + android:layout_height="27dp" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/star1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@android:drawable/btn_star_big_on" /> + + <ImageView + android:id="@+id/star2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@android:drawable/btn_star_big_on" /> + + <ImageView + android:id="@+id/star3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@android:drawable/btn_star_big_on" /> + + <ImageView + android:id="@+id/star4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@android:drawable/btn_star_big_on" /> + + <ImageView + android:id="@+id/star5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@android:drawable/btn_star_big_on" /> + </LinearLayout> + + <TextView + android:id="@+id/tvRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:text="4.2" + app:layout_constraintEnd_toStartOf="@+id/textView10" + tools:layout_editor_absoluteY="0dp" /> + + <TextView + android:id="@+id/tvNumberOfRatings" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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"> + + <TextView + android:id="@+id/tvDescription" + android:layout_width="wrap_content" + 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" /> + </androidx.constraintlayout.widget.ConstraintLayout> + </LinearLayout> + + +</LinearLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_splash_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_splash_page.xml new file mode 100644 index 0000000..7035b22 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_splash_page.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#FFFFFF" + android:backgroundTint="#388DAC" + tools:context=".Activities.SplashPage"> + + <ImageView + android:id="@+id/imageView6" + android:layout_width="match_parent" + android:layout_height="match_parent" + 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="0.0" + app:srcCompat="@drawable/gradient" /> + + <ImageView + android:id="@+id/imageView7" + android:layout_width="0dp" + android:layout_height="326dp" + android:layout_marginTop="70dp" + app:layout_constraintBottom_toTopOf="@+id/textView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" + app:srcCompat="@mipmap/ic_launcher_foreground" /> + + <TextView + android:id="@+id/textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="BRZO DO LOKACIJE" + android:textColor="#FFE4E2C9" + android:textSize="25dp" + app:layout_constraintBottom_toTopOf="@+id/textView3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.613" /> + + <TextView + android:id="@+id/textView3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:text="by ODYSSEY" + android:textColor="#FFE4E2C9" + android:textSize="20dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView6" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml new file mode 100644 index 0000000..8f9700e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/bottomSheetAddNewForNav" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/textView6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Dodaj novu objavu" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/btnBottomSheetAddNewOpenAddPost" + android:layout_width="165dp" + android:layout_height="88dp" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:text="Izaberi fotografije iz galerije" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView6" + app:layout_constraintVertical_bias="1.0" /> + + <Button + android:id="@+id/btnBottomSheetAddNewOpenCapturePost" + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Nova fotografija" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.862" + app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewOpenAddPost" + app:layout_constraintTop_toBottomOf="@+id/textView6" + app:layout_constraintVertical_bias="0.666" /> + + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_location.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_location.xml new file mode 100644 index 0000000..bfc1edb --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_location.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentAddLocation"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/hello_blank_fragment" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml new file mode 100644 index 0000000..579afdb --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentAddNew"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <Button + android:id="@+id/btnFragmentAddNewNewLocation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Nova lokacija" + android:textColor="@color/cardview_dark_background" + app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnFragmentAddNewNewPost" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.997" /> + + <Button + android:id="@+id/btnFragmentAddNewNewPost" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + + android:text="Nova objava" + android:textColor="@color/cardview_dark_background" + app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer" + app:layout_constraintEnd_toStartOf="@+id/btnFragmentAddNewNewLocation" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.997" /> + + <View + android:id="@+id/divider3" + android:layout_width="409dp" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnFragmentAddNewNewPost" + app:layout_constraintVertical_bias="1.0" /> + + <FrameLayout + android:id="@+id/flFragmentAddNewFragmentContainer" + android:layout_width="411dp" + android:layout_height="309dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent"> + + </FrameLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> + + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml index 2cf3c8c..c106fcd 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml @@ -6,10 +6,14 @@ tools:context=".Fragments.FragmentAddPost"> <!-- TODO: Update blank fragment layout --> + <TextView android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="Post Add" /> + android:layout_height="20dp"/> + + + + <!-- <Button android:id="@+id/btnFragmentAddLogOut" @@ -18,6 +22,6 @@ android:layout_marginTop="40dp" android:background="@drawable/rounded_cyan_button" android:backgroundTint="#1C789A" - android:text="Log Out" /> + android:text="Log Out" />--> </FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml new file mode 100644 index 0000000..433ae0e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentAddRecension"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml index d20c569..4a91f49 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml @@ -1,14 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Fragments.FragmentMyProfileInfo"> <!-- TODO: Update blank fragment layout --> + <TextView + android:id="@+id/textView5" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="Moji podaci" /> + android:text="Moji podaci" + tools:layout_editor_absoluteX="0dp" + tools:layout_editor_absoluteY="0dp" /> + + <Button + android:id="@+id/buttonLogOut" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Log out" + app:layout_constraintBottom_toBottomOf="@+id/textView5" + app:layout_constraintEnd_toEndOf="@+id/textView5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/textView5" /> + -</FrameLayout>
\ 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/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml new file mode 100644 index 0000000..02512d4 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout 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" + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context=".Fragments.FragmentShowPosts"> + + <EditText + android:id="@+id/editTextTextPersonName2" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:layout_gravity="center_horizontal" + android:ems="10" + android:inputType="textPersonName" + android:text="Name" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="50dp"> + + + <ImageButton + android:id="@+id/button3" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_alignParentRight="true" + android:src="@drawable/filter" + android:scaleType="centerCrop" + android:background="@color/white"/> + + <ImageButton + android:id="@+id/imageButton1" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_marginStart="8dp" + android:layout_weight="1" + android:scaleType="centerCrop" + android:src="@drawable/sort" + app:layout_constraintStart_toEndOf="@+id/button3" + tools:layout_editor_absoluteY="0dp" + android:background="@color/white"/> + + <ImageButton + android:id="@+id/imageButton2" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_marginEnd="16dp" + android:layout_weight="1" + android:background="@color/white" + android:scaleType="centerCrop" + android:src="@drawable/list" + app:layout_constraintEnd_toStartOf="@+id/imageButton3" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@+id/imageButton1" + tools:layout_editor_absoluteY="0dp" /> + + <ImageButton + android:id="@+id/imageButton3" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_marginStart="248dp" + android:layout_weight="1" + android:background="@color/white" + android:scaleType="centerCrop" + android:src="@drawable/grid" + app:layout_constraintStart_toEndOf="@+id/imageButton1" + tools:layout_editor_absoluteY="0dp" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + <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> + +</LinearLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_image.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_image.xml new file mode 100644 index 0000000..c2a999d --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_image.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="380dp" + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_margin="10dp" + android:background="@drawable/rounded_picture_background" + android:clipToOutline="true" + android:clickable="true"> + + <ImageView + android:id="@+id/locationImage" + android:layout_width="match_parent" + android:layout_height="420dp" + android:outlineProvider="background" + android:scaleType="centerCrop" + android:src="@drawable/b1" + 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="0.0" /> + + + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml new file mode 100644 index 0000000..dafd3b9 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="0dp" + android:background="@drawable/rounded_picture_background" + android:clipToOutline="true" +> + + + <ImageView + android:id="@+id/locationImage" + android:layout_width="match_parent" + android:layout_height="250dp" + android:outlineProvider="background" + android:scaleType="centerCrop" + 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="0.0" /> + + <View + android:id="@+id/vBanner" + android:layout_width="match_parent" + android:layout_height="80dp" + android:background="@color/dark_blue_transparent" + android:outlineProvider="background" + app:layout_constraintBottom_toBottomOf="@+id/locationImage" + tools:layout_editor_absoluteX="10dp"> + + + </View> + + <TextView + android:id="@+id/tvTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="top|left" + android:text="Naslov" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.076" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/vBanner" + app:layout_constraintVertical_bias="0.18" /> + + <TextView + android:id="@+id/tvLocationType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Tip lokacije" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="@+id/vBanner" + app:layout_constraintEnd_toStartOf="@+id/tvLocationParent" + app:layout_constraintHorizontal_bias="0.112" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/vBanner" + app:layout_constraintVertical_bias="0.721" /> + + <TextView + android:id="@+id/tvLocationParent" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="grad, drzava" + android:textAlignment="viewEnd" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.952" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/vBanner" + app:layout_constraintVertical_bias="0.737" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |