From 694bf9d5a1c0176c8dbd6efb2ecb55bbbbaeead4 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 8 Nov 2022 03:25:55 +0100
Subject: Dodate permisije za kameru. Omogucecno zvati image capture intent.

---
 Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml     | 14 +++++++++++---
 .../brzodolokacije/Activities/ActivityCapturePost.kt       | 12 ++++++------
 .../brzodolokacije/Activities/NavigationActivity.kt        |  5 ++---
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 0e76583..dc4b3bb 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -6,13 +6,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
+    <uses-permission android:name="android.permission.CAMERA"
+        android:required="true"
+        android:requiredFeature="true"/>
     <!--SVOJSTVA-->
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"></uses-feature>
+    <uses-feature android:name="android.hardware.camera" android:required="true"></uses-feature>
     
     <!--AKTIVNOSTI-->
     <application
@@ -75,6 +76,13 @@
             android:name="android.support.FILE_PROVIDER_PATHS"
             android:resource="@xml/file_paths" />
         </provider>
+
     </application>
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
 
 </manifest>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index f0b9c76..bb6b473 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -65,7 +65,7 @@ class ActivityCapturePost : AppCompatActivity() {
         takePhoto.setOnClickListener {
             val cameraIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
             Toast.makeText(
-               applicationContext, "take photo is working", Toast.LENGTH_LONG
+                applicationContext, "take photo is working", Toast.LENGTH_LONG
             ).show();
             if(cameraIntent.resolveActivity(packageManager)!=null){
                 var photoFile: File?=null
@@ -84,11 +84,11 @@ class ActivityCapturePost : AppCompatActivity() {
                 }catch (e:IOException){Toast.makeText(
                     applicationContext, "greska", Toast.LENGTH_LONG
                 ).show();}
-
+                startActivityForResult(cameraIntent,1)
                 if(photoFile!=null){
                     val _uri=FileProvider.getUriForFile(this,"com.example.android.fileprovider",photoFile)
                     cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT,_uri)
-                    startActivityForResult(cameraIntent,1)
+
                 }
 
             }
@@ -105,8 +105,8 @@ class ActivityCapturePost : AppCompatActivity() {
             showImage.setImageURI(Uri.parse(photoPath))
 
 
-        /*var photo:Bitmap=data.extras!!.get("data") as Bitmap
-            showImage.setImageBitmap(photo)*/
+            /*var photo:Bitmap=data.extras!!.get("data") as Bitmap
+                showImage.setImageBitmap(photo)*/
         }
     }
-}
\ No newline at end of file
+}
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 1701e85..481591d 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
@@ -26,11 +26,10 @@ class NavigationActivity : AppCompatActivity() {
         val addPostFragment= FragmentAddNew()
         val profileFragment=FragmentProfile()
         val bottomNav=findViewById<View>(R.id.bottomNavigationView) as BottomNavigationView
-        //setCurrentFragment(fragmentShowPosts)
-        setCurrentFragment(browseFragment)
+        setCurrentFragment(fragmentShowPosts)
         bottomNav.setOnNavigationItemSelectedListener {
             when(it.itemId){
-               // R.id.navHome->setCurrentFragment(fragmentShowPosts)
+                R.id.navHome->setCurrentFragment(fragmentShowPosts)
                 //R.id.navAddPost->setCurrentFragment(addPostFragment)
                 R.id.navAddPost->showBottomSheetAddNew()
                 R.id.navBrowse->setCurrentFragment(browseFragment)
-- 
cgit v1.2.3