From b73b6524ff44433c74f899421fcf8284131367cb Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Mon, 12 Dec 2022 01:11:03 +0100
Subject: Izmenjem izgled bottom sheet menija. Izmenjen meni.

---
 .../Activities/NavigationActivity.kt               |  5 +-
 .../res/drawable/ic_baseline_insert_photo_24.xml   |  5 ++
 .../res/drawable/ic_outline_add_a_photo_24.xml     |  5 ++
 .../drawable/ic_outline_add_photo_alternate_24.xml |  5 ++
 .../src/main/res/drawable/ic_outline_camera_24.xml |  5 ++
 .../src/main/res/layout/activity_navigation.xml    |  6 +-
 .../main/res/layout/bottom_sheet_add_new_post.xml  | 65 +++++++++++-----------
 .../app/src/main/res/menu/bottom_nav_menu.xml      | 11 ++--
 .../app/src/main/res/values/styles.xml             |  1 +
 .../app/src/main/res/values/themes.xml             |  2 +-
 10 files changed, 67 insertions(+), 43 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_insert_photo_24.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_a_photo_24.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_camera_24.xml

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
index 60768ff..61c69a0 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
@@ -3,6 +3,7 @@ package com.example.brzodolokacije.Activities
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -63,8 +64,8 @@ class NavigationActivity : AppCompatActivity() {
         bottomSheetDialog2.show()
 
         var close=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostClose) as ImageButton
-        var openAddPost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenAddPost) as ImageButton
-        var capturePost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenCapturePost) as ImageButton
+        var openAddPost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenAddPost) as Button
+        var capturePost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenCapturePost) as Button
 
         openAddPost.setOnClickListener{
             val intent = Intent (this, ActivityAddPost::class.java)
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_insert_photo_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_insert_photo_24.xml
new file mode 100644
index 0000000..238eb8c
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_insert_photo_24.xml
@@ -0,0 +1,5 @@
+<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="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_a_photo_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_a_photo_24.xml
new file mode 100644
index 0000000..db18015
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_a_photo_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="35dp" android:tint="#747474"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,6h-3.17L16,4h-6v2h5.12l1.83,2L21,8v12L5,20v-9L3,11v9c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM8,14c0,2.76 2.24,5 5,5s5,-2.24 5,-5 -2.24,-5 -5,-5 -5,2.24 -5,5zM13,11c1.65,0 3,1.35 3,3s-1.35,3 -3,3 -3,-1.35 -3,-3 1.35,-3 3,-3zM5,6h3L8,4L5,4L5,1L3,1v3L0,4v2h3v3h2z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml
new file mode 100644
index 0000000..6ab0441
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="35dp" android:tint="#747474"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,20L4,20L4,6h9L13,4L4,4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2v9zM10.21,16.83l-1.96,-2.36L5.5,18h11l-3.54,-4.71zM20,4L20,1h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0L20,6h3L23,4h-3z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_camera_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_camera_24.xml
new file mode 100644
index 0000000..155c4e3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_camera_24.xml
@@ -0,0 +1,5 @@
+<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="M14.25,2.26l-0.08,-0.04 -0.01,0.02C13.46,2.09 12.74,2 12,2 6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10c0,-4.75 -3.31,-8.72 -7.75,-9.74zM19.41,9h-7.99l2.71,-4.7c2.4,0.66 4.35,2.42 5.28,4.7zM13.1,4.08L10.27,9l-1.15,2L6.4,6.3C7.84,4.88 9.82,4 12,4c0.37,0 0.74,0.03 1.1,0.08zM5.7,7.09L8.54,12l1.15,2L4.26,14C4.1,13.36 4,12.69 4,12c0,-1.85 0.64,-3.55 1.7,-4.91zM4.59,15h7.98l-2.71,4.7c-2.4,-0.67 -4.34,-2.42 -5.27,-4.7zM10.9,19.91L14.89,13l2.72,4.7C16.16,19.12 14.18,20 12,20c-0.38,0 -0.74,-0.04 -1.1,-0.09zM18.3,16.91l-4,-6.91h5.43c0.17,0.64 0.27,1.31 0.27,2 0,1.85 -0.64,3.55 -1.7,4.91z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml
index 4ba2b6d..f86ba9e 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml
@@ -19,11 +19,11 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNavigationView"
         android:layout_width="match_parent"
-        android:layout_height="75dp"
+        android:layout_height="60dp"
         app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/bottom_nav_menu"/>
+        app:menu="@menu/bottom_nav_menu" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 10aa669..2ab8067 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
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.circularreveal.CircularRevealLinearLayout 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"
->
+    android:orientation="vertical">
+
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewPostClose"
+        android:layout_width="100dp"
+        android:layout_height="20dp"
+        android:layout_gravity="center"
+        app:cornerRadius="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/textView6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="5dp"
         android:fontFamily="sans-serif-black"
         android:text="Dodaj novu objavu"
         android:textSize="20sp"
@@ -18,46 +30,33 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <Button
         android:id="@+id/btnBottomSheetAddNewPostOpenAddPost"
-        android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginStart="30dp"
-
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginBottom="24dp"
-        android:background="@drawable/button_choose_from_gallery"
+        style="@style/clean_button_margin"
+        android:layout_width="match_parent"
+        android:layout_marginTop="20dp"
+        android:gravity="left|center_vertical"
+        android:drawableLeft="@drawable/ic_outline_add_photo_alternate_24"
+        android:text="Izaberi fotografije iz galerije"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btnBottomSheetAddNewPostOpenCapturePost"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView6"
         app:layout_constraintVertical_bias="0.0" />
 
-    <ImageButton
+    <Button
         android:id="@+id/btnBottomSheetAddNewPostOpenCapturePost"
-
-        android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="24dp"
-        android:background="@drawable/button_capture"
+        style="@style/clean_button_margin"
+        android:layout_width="match_parent"
+        android:drawableLeft="@drawable/ic_outline_add_a_photo_24"
+android:layout_marginBottom="16dp"
+        android:text="Fotografiši"
+        android:gravity="left|center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewPostOpenAddPost"
-        app:layout_constraintTop_toBottomOf="@+id/textView6"
-        app:layout_constraintVertical_bias="1.0" />
-
-    <ImageButton
-        android:id="@+id/btnBottomSheetAddNewPostClose"
-        android:layout_width="65dp"
-        android:layout_height="17dp"
-        app:cornerRadius="50dp"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/btnBottomSheetAddNewPostOpenAddPost"
+        app:shapeAppearance="@style/imageViewRoundedEdge" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</com.google.android.material.circularreveal.CircularRevealLinearLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml b/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml
index 405bc3c..533bf34 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+
+    >
     <item
         android:id="@+id/navHomePage"
-        android:title="Početna strana"
+        android:title="Početna"
         android:icon="@drawable/ic_nav_home"/>
     <item
         android:id="@+id/navAllPosts"
         android:icon="@drawable/ic_baseline_list_24"
-        android:title="Sve objave" />
+        android:title="Objave" />
     <item
         android:id="@+id/navAddPost"
         android:title="Dodaj"
-        android:icon="@drawable/add_post_red_image"/>
+        android:icon="@drawable/add_post_red_image"
+        android:iconTint="@color/button_main"/>
     <item
         android:id="@+id/navBrowse"
         android:title="Pretraga"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
index 0e53f9e..66591b7 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
@@ -45,4 +45,5 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_marginTop">7dp</item>
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/themes.xml b/Client/BrzoDoLokacije/app/src/main/res/values/themes.xml
index 0b453e2..593f224 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/themes.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/themes.xml
@@ -12,4 +12,4 @@
        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
 
    </style>
-</resources>
\ No newline at end of file
+ </resources>
\ No newline at end of file
-- 
cgit v1.2.3