From 87db41c4f14b95f4298bca1dd2c50cf7f8b42d92 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 14:16:19 +0100
Subject: [PATCH 01/10] [Lab 04] 04 - Introduced Image Picker

---
 .../activities/SpotActivity.kt                |  8 ++++++++
 .../helpers/ImageHelpers.kt                   | 16 +++++++++++++++
 app/src/main/res/layout/activity_spot.xml     | 20 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  5 ++++-
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 7d3ead4..6f1e214 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -9,6 +9,7 @@ import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.AnkoLogger
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.helpers.showImagePicker
 import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
 
@@ -18,6 +19,8 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
     lateinit var app: MainApp
     var edit = false
 
+    val IMAGE_REQUEST = 1
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_spot)
@@ -57,6 +60,11 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
                 finish()
             }
         }
+
+        //Handle Add Image Button Press
+        btnChooseImage.setOnClickListener {
+            showImagePicker(this, IMAGE_REQUEST)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
new file mode 100644
index 0000000..0866320
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
@@ -0,0 +1,16 @@
+package com.archaeologicalfieldwork.helpers
+
+import android.app.Activity
+import android.content.Intent
+import com.archaeologicalfieldwork.R
+
+
+fun showImagePicker(parent: Activity, id: Int) {
+    val intent = Intent()
+    intent.type = "image/*"
+    intent.action = Intent.ACTION_OPEN_DOCUMENT
+    intent.addCategory(Intent.CATEGORY_OPENABLE)
+
+    val chooser = Intent.createChooser(intent, R.string.select_spot_image.toString())
+    parent.startActivityForResult(chooser, id)
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_spot.xml b/app/src/main/res/layout/activity_spot.xml
index 22f1f36..936e4a2 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -66,6 +66,24 @@
             android:textColor="@color/colorPrimaryDark"
             android:textSize="14sp" />
 
+        <Button
+            android:id="@+id/btnChooseImage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:background="@color/colorAccent"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/button_add_image"
+            android:textColor="@color/colorPrimary"
+            android:textSize="16sp" />
+
+        <ImageView
+            android:id="@+id/placemarkImage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srcCompat="@mipmap/ic_launcher" />
+
         <Button
             android:id="@+id/btnAddSpot"
             android:layout_width="match_parent"
@@ -75,7 +93,7 @@
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:stateListAnimator="@null"
-            android:text="@string/button_addSpot"
+            android:text="@string/button_add_spot"
             android:textColor="@color/colorPrimary"
             android:textSize="16sp" />
       </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d17836c..290f81f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,10 +7,13 @@
     <string name="menu_cancelNewSpot">Cancel</string>
 
     <!--Spot Activity-->
-    <string name="button_addSpot">Add Spot</string>
+    <string name="button_add_spot">Add Spot</string>
     <string name="button_save_spot">Save Spot</string>
     <string name="hint_SpotTitle">Spot Title</string>
     <string name="hint_SpotDescription">Spot Description</string>
     <string name="enter_spot_title">Please enter a Spot Title</string>
+    <!--Image Handling-->
+    <string name="button_add_image">Add Image</string>
+    <string name="select_spot_image">Select Spot image</string>
 
 </resources>
\ No newline at end of file

From afdbefb06ffd34be2547d28bf030a455affd8d7b Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 15:04:50 +0100
Subject: [PATCH 02/10] [Lab 04] 06 - Image is stored in Model, showed in
 SpotActivity and retrieved from Model Parcel on Edit

---
 .../activities/SpotActivity.kt                | 16 +++++++++
 .../helpers/ImageHelpers.kt                   | 33 +++++++++++++++++++
 .../models/SpotModel.kt                       |  3 +-
 app/src/main/res/layout/activity_spot.xml     |  2 +-
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 6f1e214..7eb6636 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -1,5 +1,6 @@
 package com.archaeologicalfieldwork.activities
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Menu
@@ -9,6 +10,8 @@ import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.AnkoLogger
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.helpers.readImage
+import com.archaeologicalfieldwork.helpers.readImageFromPath
 import com.archaeologicalfieldwork.helpers.showImagePicker
 import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
@@ -37,6 +40,7 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
             spot = intent.extras?.getParcelable<SpotModel>("spot_edit")!!
             spotTitle.setText(spot.title)
             spotDescription.setText(spot.desription)
+            spotImage.setImageBitmap(readImageFromPath(this, spot.image))
 
             btnAddSpot.setText(R.string.button_save_spot)
         }
@@ -80,4 +84,16 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
         }
         return super.onOptionsItemSelected(item)
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            IMAGE_REQUEST -> {
+                if (data != null) {
+                    spot.image = data.getData().toString()
+                    spotImage.setImageBitmap((readImage(this, resultCode, data)))
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
index 0866320..36bd3cb 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
@@ -1,8 +1,14 @@
 package com.archaeologicalfieldwork.helpers
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.provider.MediaStore
 import com.archaeologicalfieldwork.R
+import java.io.IOException
 
 
 fun showImagePicker(parent: Activity, id: Int) {
@@ -13,4 +19,31 @@ fun showImagePicker(parent: Activity, id: Int) {
 
     val chooser = Intent.createChooser(intent, R.string.select_spot_image.toString())
     parent.startActivityForResult(chooser, id)
+}
+
+fun readImage(activity: Activity, resultCode: Int, data: Intent?): Bitmap? {
+    var bitmap: Bitmap? = null
+    if (resultCode == Activity.RESULT_OK && data != null && data.data != null) {
+        try {
+            bitmap = MediaStore.Images.Media.getBitmap(activity.contentResolver, data.data)
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+    return bitmap
+}
+
+fun readImageFromPath(context: Context, path: String): Bitmap? {
+    var bitmap: Bitmap? = null
+    val uri = Uri.parse(path)
+    if (uri != null) {
+        try {
+            val parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r")
+            val fileDescriptor = parcelFileDescriptor?.getFileDescriptor()
+            bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor)
+            parcelFileDescriptor?.close()
+        } catch (e: Exception) {
+        }
+    }
+    return bitmap
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
index 58acb35..31a3066 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -7,5 +7,6 @@ import kotlinx.android.parcel.Parcelize
 data class SpotModel(
     var id: Long = 0,
     var title: String = "",
-    var desription: String = ""
+    var desription: String = "",
+    var image: String = ""
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_spot.xml b/app/src/main/res/layout/activity_spot.xml
index 936e4a2..4b1e22a 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -79,7 +79,7 @@
             android:textSize="16sp" />
 
         <ImageView
-            android:id="@+id/placemarkImage"
+            android:id="@+id/spotImage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:srcCompat="@mipmap/ic_launcher" />

From 1507175265f4b455da5cb5e227103235c608b932 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 01:13:51 +0100
Subject: [PATCH 03/10] [Lab 04] Ex - Change Image Button on Edit and when
 image is set

---
 .../com/archaeologicalfieldwork/activities/SpotActivity.kt    | 4 ++++
 .../java/com/archaeologicalfieldwork/models/SpotMemStore.kt   | 2 ++
 app/src/main/res/values/strings.xml                           | 1 +
 3 files changed, 7 insertions(+)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 7eb6636..5f82b55 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -41,6 +41,9 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
             spotTitle.setText(spot.title)
             spotDescription.setText(spot.desription)
             spotImage.setImageBitmap(readImageFromPath(this, spot.image))
+            if (spot.image != null) {
+                btnChooseImage.setText(R.string.change_spot_image)
+            }
 
             btnAddSpot.setText(R.string.button_save_spot)
         }
@@ -92,6 +95,7 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
                 if (data != null) {
                     spot.image = data.getData().toString()
                     spotImage.setImageBitmap((readImage(this, resultCode, data)))
+                    btnChooseImage.setText(R.string.change_spot_image)
                 }
             }
         }
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
index b9402fd..69b703a 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
@@ -29,6 +29,8 @@ class SpotMemStore : SpotStore, AnkoLogger {
         if (foundSpot != null) {
             foundSpot.title = spot.title
             foundSpot.desription = spot.desription
+            foundSpot.image = spot.image
+            logAll()
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 290f81f..9304465 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,5 +15,6 @@
     <!--Image Handling-->
     <string name="button_add_image">Add Image</string>
     <string name="select_spot_image">Select Spot image</string>
+    <string name="change_spot_image">Change Image</string>
 
 </resources>
\ No newline at end of file

From b2a1f4722b92d3f7f1ff6ef4ae40e9be18dc0954 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 01:22:09 +0100
Subject: [PATCH 04/10] [Lab 04] Ex - Image is now shown in ListView

---
 .../activities/SpotAdapter.kt                     |  2 ++
 app/src/main/res/layout/card_spot.xml             | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
index 531a878..7df23c2 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.card_spot.view.*
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.helpers.readImageFromPath
 import com.archaeologicalfieldwork.models.SpotModel
 
 interface SpotListener {
@@ -39,6 +40,7 @@ class SpotAdapter constructor(
         fun bind(spot: SpotModel, listener: SpotListener) {
             itemView.spotTitle_Card.text = spot.title
             itemView.spotDescription_Card.text = spot.desription
+            itemView.imageIcon.setImageBitmap(readImageFromPath(itemView.context, spot.image))
             itemView.setOnClickListener { listener.onSpotClick(spot) }
         }
     }
diff --git a/app/src/main/res/layout/card_spot.xml b/app/src/main/res/layout/card_spot.xml
index 0ab4f75..9ff378d 100644
--- a/app/src/main/res/layout/card_spot.xml
+++ b/app/src/main/res/layout/card_spot.xml
@@ -10,18 +10,29 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
+        <ImageView
+            android:id="@+id/imageIcon"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginEnd="16dp"
+            android:contentDescription="@string/change_spot_image" />
+
         <TextView
             android:id="@+id/spotTitle_Card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:textSize="30sp" />
+            android:textSize="30sp"
+            android:layout_toEndOf="@+id/imageIcon" />
 
         <TextView
             android:id="@+id/spotDescription_Card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/spotTitle_Card" />
+            android:layout_below="@id/spotTitle_Card"
+            android:layout_toEndOf="@+id/imageIcon" />
 
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From 73cc056564591d147787d4f852c5963aa97fa786 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 04:09:00 +0100
Subject: [PATCH 05/10] [Lab 05] 02 - Added SetLocation Button in SpotActivity
 View and On Click Listener

---
 .../activities/SpotActivity.kt                      |  4 ++++
 app/src/main/res/layout/activity_spot.xml           | 13 +++++++++++++
 app/src/main/res/values/strings.xml                 |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 5f82b55..c5cff82 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -72,6 +72,10 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
         btnChooseImage.setOnClickListener {
             showImagePicker(this, IMAGE_REQUEST)
         }
+
+        btnSetLocation.setOnClickListener {
+            info("Set Location pressed")
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/res/layout/activity_spot.xml b/app/src/main/res/layout/activity_spot.xml
index 4b1e22a..d89ae99 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -84,6 +84,19 @@
             android:layout_height="wrap_content"
             app:srcCompat="@mipmap/ic_launcher" />
 
+        <Button
+            android:id="@+id/btnSetLocation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:background="@color/colorAccent"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp"
+            android:stateListAnimator="@null"
+            android:text="@string/button_set_location"
+            android:textColor="@color/colorPrimary"
+            android:textSize="16sp" />
+
         <Button
             android:id="@+id/btnAddSpot"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9304465..f33ff3c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,5 +16,7 @@
     <string name="button_add_image">Add Image</string>
     <string name="select_spot_image">Select Spot image</string>
     <string name="change_spot_image">Change Image</string>
+    <!--Set Location-->
+    <string name="button_set_location">Set Location</string>
 
 </resources>
\ No newline at end of file

From f57b7cd8d0ebee0d6b4f039ce94a37c6f6b4d23a Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 04:31:11 +0100
Subject: [PATCH 06/10] [Lab 05] 03 - Introduced Map Activity and start it on
 Button "Set Location" Click

---
 .gitignore                                    |  2 +
 app/build.gradle                              |  3 +-
 app/src/main/AndroidManifest.xml              | 52 +++++++++++++------
 .../activities/MapActivity.kt                 | 44 ++++++++++++++++
 .../activities/SpotActivity.kt                |  6 ++-
 app/src/main/res/layout/activity_map.xml      |  9 ++++
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
 create mode 100644 app/src/main/res/layout/activity_map.xml

diff --git a/.gitignore b/.gitignore
index 0f1d137..be624f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /captures
 .externalNativeBuild
 .cxx
+/app/src/release/res/values/google_maps_api.xml
+/app/src/debug/res/values/google_maps_api.xml
diff --git a/app/build.gradle b/app/build.gradle
index 12b18c8..7709e54 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,8 @@ dependencies {
   implementation 'androidx.core:core-ktx:1.3.2'
   implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-  testImplementation 'junit:junit:4.12'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    testImplementation 'junit:junit:4.12'
   androidTestImplementation 'androidx.test.ext:junit:1.1.2'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1acc635..da9b6fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,25 +2,45 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.archaeologicalfieldwork">
 
-  <application
-      android:name="com.archaeologicalfieldwork.main.MainApp"
-      android:allowBackup="true"
-      android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:supportsRtl="true"
-      android:theme="@style/AppTheme">
+    <!--
+         The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
+         Google Maps Android API v2, but you must specify either coarse or fine
+         location permissions for the "MyLocation" functionality.
+    -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <activity android:name=".activities.SpotActivity"></activity>
+    <application
+        android:name=".main.MainApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
 
-    <activity android:name=".activities.SpotListActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <!--
+             The API key for Google Maps-based APIs is defined as a string resource.
+             (See the file "res/values/google_maps_api.xml").
+             Note that the API key is linked to the encryption key used to sign the APK.
+             You need a different API key for each encryption key, including the release key that is used to
+             sign the APK for publishing.
+             You can define the keys for the debug and release targets in src/debug/ and src/release/.
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
 
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
+        <activity
+            android:name=".activities.MapActivity"
+            android:label="@string/title_activity_map"></activity>
+        <activity android:name=".activities.SpotActivity" />
+        <activity android:name=".activities.SpotListActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-  </application>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
new file mode 100644
index 0000000..53d0151
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
@@ -0,0 +1,44 @@
+package com.archaeologicalfieldwork.activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.archaeologicalfieldwork.R
+
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.SupportMapFragment
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.MarkerOptions
+
+class MapActivity : AppCompatActivity(), OnMapReadyCallback {
+
+    private lateinit var mMap: GoogleMap
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_map)
+        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+        val mapFragment = supportFragmentManager
+            .findFragmentById(R.id.map) as SupportMapFragment
+        mapFragment.getMapAsync(this)
+    }
+
+    /**
+     * Manipulates the map once available.
+     * This callback is triggered when the map is ready to be used.
+     * This is where we can add markers or lines, add listeners or move the camera. In this case,
+     * we just add a marker near Sydney, Australia.
+     * If Google Play services is not installed on the device, the user will be prompted to install
+     * it inside the SupportMapFragment. This method will only be triggered once the user has
+     * installed Google Play services and returned to the app.
+     */
+    override fun onMapReady(googleMap: GoogleMap) {
+        mMap = googleMap
+
+        // Add a marker in Sydney and move the camera
+        val sydney = LatLng(-34.0, 151.0)
+        mMap.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
+        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index c5cff82..6b3305e 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -15,6 +15,7 @@ import com.archaeologicalfieldwork.helpers.readImageFromPath
 import com.archaeologicalfieldwork.helpers.showImagePicker
 import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
+import org.jetbrains.anko.intentFor
 
 class SpotActivity : AppCompatActivity(), AnkoLogger {
 
@@ -68,13 +69,14 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
             }
         }
 
-        //Handle Add Image Button Press
+        // Handle Add Image Button Press
         btnChooseImage.setOnClickListener {
             showImagePicker(this, IMAGE_REQUEST)
         }
 
+        // Handle Set Location Button Press
         btnSetLocation.setOnClickListener {
-            info("Set Location pressed")
+            startActivity(intentFor<MapActivity>())
         }
     }
 
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
new file mode 100644
index 0000000..5b9dd8e
--- /dev/null
+++ b/app/src/main/res/layout/activity_map.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/map"
+    android:name="com.google.android.gms.maps.SupportMapFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.MapActivity" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f33ff3c..b868228 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,5 +18,6 @@
     <string name="change_spot_image">Change Image</string>
     <!--Set Location-->
     <string name="button_set_location">Set Location</string>
+    <string name="title_activity_map">Map</string>
 
 </resources>
\ No newline at end of file

From 41e6627ab4b8b50ab0e24ff31b4aff5457e026a9 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 04:38:30 +0100
Subject: [PATCH 07/10] [Lab 05] 04 - Removed Google Comments and set default
 location

---
 app/src/main/AndroidManifest.xml              | 30 +++++++------------
 .../activities/MapActivity.kt                 | 16 ++--------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da9b6fb..34611a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,11 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.archaeologicalfieldwork">
 
-    <!--
-         The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
-         Google Maps Android API v2, but you must specify either coarse or fine
-         location permissions for the "MyLocation" functionality.
-    -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
@@ -18,21 +13,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <!--
-             The API key for Google Maps-based APIs is defined as a string resource.
-             (See the file "res/values/google_maps_api.xml").
-             Note that the API key is linked to the encryption key used to sign the APK.
-             You need a different API key for each encryption key, including the release key that is used to
-             sign the APK for publishing.
-             You can define the keys for the debug and release targets in src/debug/ and src/release/.
-        -->
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="@string/google_maps_key" />
-
-        <activity
-            android:name=".activities.MapActivity"
-            android:label="@string/title_activity_map"></activity>
         <activity android:name=".activities.SpotActivity" />
         <activity android:name=".activities.SpotListActivity">
             <intent-filter>
@@ -41,6 +21,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
+
+        <activity
+            android:name=".activities.MapActivity"
+            android:label="@string/title_activity_map"></activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
index 53d0151..cbedeff 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
@@ -24,21 +24,11 @@ class MapActivity : AppCompatActivity(), OnMapReadyCallback {
         mapFragment.getMapAsync(this)
     }
 
-    /**
-     * Manipulates the map once available.
-     * This callback is triggered when the map is ready to be used.
-     * This is where we can add markers or lines, add listeners or move the camera. In this case,
-     * we just add a marker near Sydney, Australia.
-     * If Google Play services is not installed on the device, the user will be prompted to install
-     * it inside the SupportMapFragment. This method will only be triggered once the user has
-     * installed Google Play services and returned to the app.
-     */
     override fun onMapReady(googleMap: GoogleMap) {
         mMap = googleMap
 
-        // Add a marker in Sydney and move the camera
-        val sydney = LatLng(-34.0, 151.0)
-        mMap.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney))
+        val obig = LatLng(48.983307948993094, 12.105706251194382)
+        mMap.addMarker(MarkerOptions().position(obig).title("Marker in Oberisling"))
+        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(obig, 16f))
     }
 }
\ No newline at end of file

From a28bfd86234e5c4b7f6c2a0f508c155222a2ae9f Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 04:45:43 +0100
Subject: [PATCH 08/10] [Lab 05] 05 - Added Location to Model, add Marker on
 Map

---
 .../activities/MapActivity.kt                 | 22 ++++++++++++++-----
 .../activities/SpotActivity.kt                |  4 +++-
 .../models/SpotModel.kt                       |  7 ++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
index cbedeff..2acaff6 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
@@ -3,32 +3,42 @@ package com.archaeologicalfieldwork.activities
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.models.Location
 
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.OnMapReadyCallback
 import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 
 class MapActivity : AppCompatActivity(), OnMapReadyCallback {
 
-    private lateinit var mMap: GoogleMap
+    private lateinit var Map: GoogleMap
+    var location = Location()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_map)
-        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+        location = intent.extras?.getParcelable<Location>("location")!!
+
         val mapFragment = supportFragmentManager
             .findFragmentById(R.id.map) as SupportMapFragment
         mapFragment.getMapAsync(this)
     }
 
     override fun onMapReady(googleMap: GoogleMap) {
-        mMap = googleMap
+        Map = googleMap
+
+        val loc = LatLng(location.lat, location.lng)
+        val options = MarkerOptions()
+            .title("Spot")
+            .snippet("GPS: " + loc.toString())
+            .draggable(true)
+            .position(loc)
 
-        val obig = LatLng(48.983307948993094, 12.105706251194382)
-        mMap.addMarker(MarkerOptions().position(obig).title("Marker in Oberisling"))
-        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(obig, 16f))
+        Map.addMarker(options)
+        Map.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, location.zoom))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 6b3305e..468d882 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -14,6 +14,7 @@ import com.archaeologicalfieldwork.helpers.readImage
 import com.archaeologicalfieldwork.helpers.readImageFromPath
 import com.archaeologicalfieldwork.helpers.showImagePicker
 import com.archaeologicalfieldwork.main.MainApp
+import com.archaeologicalfieldwork.models.Location
 import com.archaeologicalfieldwork.models.SpotModel
 import org.jetbrains.anko.intentFor
 
@@ -76,7 +77,8 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
 
         // Handle Set Location Button Press
         btnSetLocation.setOnClickListener {
-            startActivity(intentFor<MapActivity>())
+            val location = Location(48.983307948993094, 12.105706251194382, 16f)
+            startActivity(intentFor<MapActivity>().putExtra("location", location))
         }
     }
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
index 31a3066..9e1224c 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -9,4 +9,11 @@ data class SpotModel(
     var title: String = "",
     var desription: String = "",
     var image: String = ""
+) : Parcelable
+
+@Parcelize
+data class Location(
+    var lat: Double = 0.0,
+    var lng: Double = 0.0,
+    var zoom: Float = 0f
 ) : Parcelable
\ No newline at end of file

From df63ab5d79fd88f998ade89a1fdf0fc0ac5e3770 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 05:11:17 +0100
Subject: [PATCH 09/10] [Lab 05] Ex - Save Location in Model, display curr Loc
 on Marker Click

---
 .../activities/MapActivity.kt                 | 34 ++++++++++++++++++-
 .../activities/SpotActivity.kt                | 19 ++++++++++-
 .../models/SpotMemStore.kt                    |  3 ++
 .../models/SpotModel.kt                       |  5 ++-
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
index 2acaff6..8d4005f 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
@@ -1,5 +1,8 @@
 package com.archaeologicalfieldwork.activities
 
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.archaeologicalfieldwork.R
@@ -13,7 +16,8 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 
-class MapActivity : AppCompatActivity(), OnMapReadyCallback {
+class MapActivity : AppCompatActivity(), OnMapReadyCallback, GoogleMap.OnMarkerDragListener,
+    GoogleMap.OnMarkerClickListener {
 
     private lateinit var Map: GoogleMap
     var location = Location()
@@ -39,6 +43,34 @@ class MapActivity : AppCompatActivity(), OnMapReadyCallback {
             .position(loc)
 
         Map.addMarker(options)
+        Map.setOnMarkerDragListener(this)
+        Map.setOnMarkerClickListener(this)
         Map.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, location.zoom))
     }
+
+    override fun onMarkerDragStart(marker: Marker) {
+    }
+
+    override fun onMarkerDrag(marker: Marker) {
+    }
+
+    override fun onMarkerDragEnd(marker: Marker) {
+        location.lat = marker.position.latitude
+        location.lng = marker.position.longitude
+        location.zoom = Map.cameraPosition.zoom
+    }
+
+    override fun onMarkerClick(marker: Marker): Boolean {
+        val loc = LatLng(location.lat, location.lng)
+        marker.setSnippet("GPS: " + loc.toString())
+        return false
+    }
+
+    override fun onBackPressed() {
+        val resultIntent = Intent()
+        resultIntent.putExtra("location", location)
+        setResult(Activity.RESULT_OK, resultIntent)
+        finish()
+        super.onBackPressed()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 468d882..e593945 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -25,6 +25,7 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
     var edit = false
 
     val IMAGE_REQUEST = 1
+    val LOCATION_REQUEST = 2
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -78,7 +79,15 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
         // Handle Set Location Button Press
         btnSetLocation.setOnClickListener {
             val location = Location(48.983307948993094, 12.105706251194382, 16f)
-            startActivity(intentFor<MapActivity>().putExtra("location", location))
+            if (spot.zoom != 0F) {
+                location.lat = spot.lat
+                location.lng = spot.lng
+                location.zoom = spot.zoom
+            }
+            startActivityForResult(
+                intentFor<MapActivity>().putExtra("location", location),
+                LOCATION_REQUEST
+            )
         }
     }
 
@@ -106,6 +115,14 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
                     btnChooseImage.setText(R.string.change_spot_image)
                 }
             }
+            LOCATION_REQUEST -> {
+                if (data != null) {
+                    val location = data.extras?.getParcelable<Location>("location")!!
+                    spot.lat = location.lat
+                    spot.lng = location.lng
+                    spot.zoom = location.zoom
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
index 69b703a..459be36 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
@@ -30,6 +30,9 @@ class SpotMemStore : SpotStore, AnkoLogger {
             foundSpot.title = spot.title
             foundSpot.desription = spot.desription
             foundSpot.image = spot.image
+            foundSpot.lat = spot.lat
+            foundSpot.lng = spot.lng
+            foundSpot.zoom = spot.zoom
             logAll()
         }
     }
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
index 9e1224c..37d5a1a 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -8,7 +8,10 @@ data class SpotModel(
     var id: Long = 0,
     var title: String = "",
     var desription: String = "",
-    var image: String = ""
+    var image: String = "",
+    var lat: Double = 0.0,
+    var lng: Double = 0.0,
+    var zoom: Float = 0f
 ) : Parcelable
 
 @Parcelize

From dfeba619968d6c6278652add7e6021d6cb823be2 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Fri, 1 Jan 2021 05:21:45 +0100
Subject: [PATCH 10/10] [Release] - Removed unused imports, sorted imports,
 Auto Reformat all Files

---
 .../com/archaeologicalfieldwork/activities/MapActivity.kt | 6 +++---
 .../archaeologicalfieldwork/activities/SpotActivity.kt    | 2 +-
 .../com/archaeologicalfieldwork/helpers/ImageHelpers.kt   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
index 8d4005f..9d0a2cb 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/MapActivity.kt
@@ -1,12 +1,9 @@
 package com.archaeologicalfieldwork.activities
 
 import android.app.Activity
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import com.archaeologicalfieldwork.R
-import com.archaeologicalfieldwork.models.Location
 
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
@@ -16,6 +13,9 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 
+import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.models.Location
+
 class MapActivity : AppCompatActivity(), OnMapReadyCallback, GoogleMap.OnMarkerDragListener,
     GoogleMap.OnMarkerClickListener {
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index e593945..2e7ba5a 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -8,6 +8,7 @@ import android.view.MenuItem
 import kotlinx.android.synthetic.main.activity_spot.*
 import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
+import org.jetbrains.anko.intentFor
 import org.jetbrains.anko.AnkoLogger
 import com.archaeologicalfieldwork.R
 import com.archaeologicalfieldwork.helpers.readImage
@@ -16,7 +17,6 @@ import com.archaeologicalfieldwork.helpers.showImagePicker
 import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.Location
 import com.archaeologicalfieldwork.models.SpotModel
-import org.jetbrains.anko.intentFor
 
 class SpotActivity : AppCompatActivity(), AnkoLogger {
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
index 36bd3cb..c35ebc4 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/helpers/ImageHelpers.kt
@@ -1,14 +1,14 @@
 package com.archaeologicalfieldwork.helpers
 
+import android.net.Uri
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
+import android.content.Context
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.net.Uri
 import android.provider.MediaStore
-import com.archaeologicalfieldwork.R
+import android.graphics.BitmapFactory
 import java.io.IOException
+import com.archaeologicalfieldwork.R
 
 
 fun showImagePicker(parent: Activity, id: Int) {