From 5255bade8ef871af3fecc90abc1bed5f70ca7838 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 01:07:44 +0100
Subject: [PATCH 01/16] [Lab 01] 02 - Introduced Spot Activity Design and
 refactored corresponding activity

---
 app/build.gradle                              |  7 ++
 app/src/main/AndroidManifest.xml              |  2 +-
 .../{MainActivity.kt => SpotActivity.kt}      |  7 +-
 app/src/main/res/layout/activity_main.xml     | 18 -----
 app/src/main/res/layout/activity_spot.xml     | 72 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  6 +-
 app/src/main/res/values/strings.xml           |  8 ++-
 app/src/main/res/values/styles.xml            |  2 +-
 8 files changed, 96 insertions(+), 26 deletions(-)
 rename app/src/main/java/com/archaeologicalfieldwork/{MainActivity.kt => SpotActivity.kt} (50%)
 delete mode 100644 app/src/main/res/layout/activity_main.xml
 create mode 100644 app/src/main/res/layout/activity_spot.xml

diff --git a/app/build.gradle b/app/build.gradle
index a667c87..86473d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,4 +34,11 @@ dependencies {
   androidTestImplementation 'androidx.test.ext:junit:1.1.2'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
+  //*************Own Implementations*************
+  //Anko Logger
+  implementation 'org.jetbrains.anko:anko-commons:0.10.8'
+  
+  //Material Design
+  implementation 'com.google.android.material:material:1.2.0'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 19975a6..0767bdc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity android:name=".SpotActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/MainActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
similarity index 50%
rename from app/src/main/java/com/archaeologicalfieldwork/MainActivity.kt
rename to app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
index fc45c30..288c20a 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/MainActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
@@ -2,10 +2,13 @@ package com.archaeologicalfieldwork
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import org.jetbrains.anko.AnkoLogger
+import org.jetbrains.anko.info
 
-class MainActivity : AppCompatActivity() {
+class SpotActivity : AppCompatActivity(), AnkoLogger {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_main)
+    info("Spot Activity started..")
+    setContentView(R.layout.activity_spot)
   }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index f22a759..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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=".MainActivity">
-
-  <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="Hello World!"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 0000000..25d1ce4
--- /dev/null
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -0,0 +1,72 @@
+<?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="com.archaeologicalfieldwork.SpotActivity">
+
+  <RelativeLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorAccent"
+        android:fitsSystemWindows="true"
+        app:elevation="0dip"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+      <androidx.appcompat.widget.Toolbar
+          android:id="@+id/toolbarAdd"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:titleTextColor="@color/colorPrimary" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/appBarLayout"
+        android:fillViewport="true">
+
+      <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/placemarkTitle"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_margin="8dp"
+            android:autofillHints=""
+            android:hint="@string/hint_SpotTitle"
+            android:inputType="text"
+            android:maxLength="25"
+            android:maxLines="1"
+            android:padding="8dp"
+            android:textColor="@color/colorPrimaryDark"
+            android:textSize="14sp" />
+
+        <Button
+            android:id="@+id/btnAdd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:background="@color/colorAccent"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:stateListAnimator="@null"
+            android:text="@string/button_addSpot"
+            android:textColor="@color/colorPrimary"
+            android:textSize="16sp" />
+      </LinearLayout>
+    </ScrollView>
+
+  </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9b4f6b5..6424db0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="colorPrimary">#6200EE</color>
-  <color name="colorPrimaryDark">#3700B3</color>
-  <color name="colorAccent">#03DAC5</color>
+  <color name="colorPrimary">#c7c7c7</color>
+  <color name="colorPrimaryDark">#363636</color>
+  <color name="colorAccent">#6e6e6e</color>
 </resources>
\ 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 6cc7982..e9e4e53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,9 @@
 <resources>
-  <string name="app_name">Archaeological Fieldwork</string>
+    <!--General-->
+    <string name="app_name">Archaeological Fieldwork</string>
+
+    <!--Spot Activity-->
+    <string name="button_addSpot">Add Spot</string>
+    <string name="hint_SpotTitle">Spot Title</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b61e024..7fb9aaf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
   <!-- Base application theme. -->
-  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     <!-- Customize your theme here. -->
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From a4e01c333987b8b8ce8f745902b7257700d3cc1f Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 01:19:00 +0100
Subject: [PATCH 02/16] [Lab 01] 04 - added handling for add spot button +
 small refactoring of package

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../archaeologicalfieldwork/SpotActivity.kt   | 14 ----------
 .../activities/SpotActivity.kt                | 26 +++++++++++++++++++
 app/src/main/res/layout/activity_spot.xml     |  6 ++---
 4 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0767bdc..26b2166 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".SpotActivity">
+    <activity android:name=".activities.SpotActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
deleted file mode 100644
index 288c20a..0000000
--- a/app/src/main/java/com/archaeologicalfieldwork/SpotActivity.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.archaeologicalfieldwork
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.info
-
-class SpotActivity : AppCompatActivity(), AnkoLogger {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    info("Spot Activity started..")
-    setContentView(R.layout.activity_spot)
-  }
-}
\ 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
new file mode 100644
index 0000000..380a086
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -0,0 +1,26 @@
+package com.archaeologicalfieldwork.activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_spot.*
+import org.jetbrains.anko.info
+import org.jetbrains.anko.toast
+import org.jetbrains.anko.AnkoLogger
+import com.archaeologicalfieldwork.R
+
+class SpotActivity : AppCompatActivity(), AnkoLogger {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    info("Spot Activity started..")
+    setContentView(R.layout.activity_spot)
+
+    btnAddSpot.setOnClickListener() {
+      val spotTitel = spotTitle.text.toString()
+      if (spotTitel.isNotEmpty()) {
+        info("add Button pressed: ${spotTitle}")
+      } else {
+        toast("Please Enter a title")
+      }
+    }
+  }
+}
\ 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 25d1ce4..cc47cce 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.archaeologicalfieldwork.SpotActivity">
+    tools:context="com.archaeologicalfieldwork.activities.SpotActivity">
 
   <RelativeLayout
       android:layout_width="match_parent"
@@ -40,7 +40,7 @@
           android:orientation="vertical">
 
         <EditText
-            android:id="@+id/placemarkTitle"
+            android:id="@+id/spotTitle"
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:layout_margin="8dp"
@@ -54,7 +54,7 @@
             android:textSize="14sp" />
 
         <Button
-            android:id="@+id/btnAdd"
+            android:id="@+id/btnAddSpot"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"

From b51208b19f79740116783e73f2e455699fd49068 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 02:07:33 +0100
Subject: [PATCH 03/16] [Lab 01] Ex - added description and placemarks are
 stored in local array

---
 .../activities/SpotActivity.kt                | 35 ++++++++++++-------
 .../models/SpotModel.kt                       |  6 ++++
 app/src/main/res/layout/activity_spot.xml     | 13 +++++++
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 380a086..237c528 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -7,20 +7,31 @@ import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.AnkoLogger
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.models.SpotModel
 
 class SpotActivity : AppCompatActivity(), AnkoLogger {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    info("Spot Activity started..")
-    setContentView(R.layout.activity_spot)
 
-    btnAddSpot.setOnClickListener() {
-      val spotTitel = spotTitle.text.toString()
-      if (spotTitel.isNotEmpty()) {
-        info("add Button pressed: ${spotTitle}")
-      } else {
-        toast("Please Enter a title")
-      }
+    var spot = SpotModel()
+    val spots = ArrayList<SpotModel>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        info("Spot Activity started..")
+        setContentView(R.layout.activity_spot)
+
+        btnAddSpot.setOnClickListener() {
+            spot.title = spotTitle.text.toString()
+            spot.desription = spotDescription.text.toString()
+
+            if (spot.title.isNotEmpty()) {
+                spots.add(spot.copy())
+                info("add Button pressed: ${spot}")
+                for (i in spots.indices) {
+                    info("Spot [$i]: ${this.spots[i]}")
+                }
+            } else {
+                toast("Please Enter a title")
+            }
+        }
     }
-  }
 }
\ 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
new file mode 100644
index 0000000..da32bdd
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -0,0 +1,6 @@
+package com.archaeologicalfieldwork.models
+
+data class SpotModel(
+    var title: String = "",
+    var desription: String = ""
+)
\ 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 cc47cce..22f1f36 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -53,6 +53,19 @@
             android:textColor="@color/colorPrimaryDark"
             android:textSize="14sp" />
 
+        <EditText
+            android:id="@+id/spotDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:hint="@string/hint_SpotDescription"
+            android:inputType="text"
+            android:maxLength="25"
+            android:maxLines="1"
+            android:padding="8dp"
+            android:textColor="@color/colorPrimaryDark"
+            android:textSize="14sp" />
+
         <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 e9e4e53..7a4acf8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,5 +5,5 @@
     <!--Spot Activity-->
     <string name="button_addSpot">Add Spot</string>
     <string name="hint_SpotTitle">Spot Title</string>
-
+    <string name="hint_SpotDescription">Spot Description</string>
 </resources>
\ No newline at end of file

From dc230953df08757f4591d8922943578a93496dae Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 13:58:42 +0100
Subject: [PATCH 04/16] [Lab 02] 02 - Introduced MainApp.kt to store Spot Array
 / refacotred SpotActivity.kt to use MainApp

---
 app/src/main/AndroidManifest.xml                 |  1 +
 .../activities/SpotActivity.kt                   | 11 ++++++-----
 .../com/archaeologicalfieldwork/main/MainApp.kt  | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26b2166..f348afe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.archaeologicalfieldwork">
 
   <application
+      android:name="com.archaeologicalfieldwork.main.MainApp"
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 237c528..01ccada 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -7,27 +7,28 @@ import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.AnkoLogger
 import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
 
 class SpotActivity : AppCompatActivity(), AnkoLogger {
 
     var spot = SpotModel()
-    val spots = ArrayList<SpotModel>()
+    lateinit var app: MainApp
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        info("Spot Activity started..")
         setContentView(R.layout.activity_spot)
+        app = application as MainApp
 
         btnAddSpot.setOnClickListener() {
             spot.title = spotTitle.text.toString()
             spot.desription = spotDescription.text.toString()
 
             if (spot.title.isNotEmpty()) {
-                spots.add(spot.copy())
+                app.spots.add(spot.copy())
                 info("add Button pressed: ${spot}")
-                for (i in spots.indices) {
-                    info("Spot [$i]: ${this.spots[i]}")
+                for (i in app.spots.indices) {
+                    info("Spot [$i]: ${app.spots[i]}")
                 }
             } else {
                 toast("Please Enter a title")
diff --git a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
new file mode 100644
index 0000000..2654dcf
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
@@ -0,0 +1,16 @@
+package com.archaeologicalfieldwork.main
+
+import android.app.Application
+import com.archaeologicalfieldwork.models.SpotModel
+import org.jetbrains.anko.AnkoLogger
+import org.jetbrains.anko.info
+
+class MainApp : Application(), AnkoLogger {
+
+    val spots = ArrayList<SpotModel>()
+
+    override fun onCreate() {
+        super.onCreate()
+        info("Archaelogical Fieldwork started")
+    }
+}
\ No newline at end of file

From bda5457c67f06359fd9c28628fc417daaf212929 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 16:36:16 +0100
Subject: [PATCH 05/16] [Lab 02] 03 - Introduced Spot List Activity as Main
 View plus basic Class for the view

Signed-off-by: Lup31519 <philipp.luxi@st.oth-regensburg.de>
---
 app/src/main/AndroidManifest.xml              |  6 ++++-
 .../activities/SpotListActivity.kt            | 19 +++++++++++++++
 .../main/res/layout/activity_spot_list.xml    | 24 +++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
 create mode 100644 app/src/main/res/layout/activity_spot_list.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f348afe..1acc635 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,13 +10,17 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".activities.SpotActivity">
+
+    <activity android:name=".activities.SpotActivity"></activity>
+
+    <activity android:name=".activities.SpotListActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
         <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/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
new file mode 100644
index 0000000..be3ed7f
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -0,0 +1,19 @@
+package com.archaeologicalfieldwork.activities
+
+import android.os.Bundle
+import android.os.PersistableBundle
+import androidx.appcompat.app.AppCompatActivity
+import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.main.MainApp
+
+
+class SpotListActivity : AppCompatActivity() {
+
+    lateinit var app: MainApp
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_spot_list)
+        app = application as MainApp
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_spot_list.xml b/app/src/main/res/layout/activity_spot_list.xml
new file mode 100644
index 0000000..3523114
--- /dev/null
+++ b/app/src/main/res/layout/activity_spot_list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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="com.archaeologicalfieldwork.activities.SpotListActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorAccent"
+        android:fitsSystemWindows="true"
+        app:elevation="0dip"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:titleTextColor="@color/colorPrimary" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From dbe4916f0be3461f4fe4039589e26c50cc40828d Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 17:20:19 +0100
Subject: [PATCH 06/16] [Lab 02] 04 - Implemented Card + RecyclerView

Signed-off-by: Lup31519 <philipp.luxi@st.oth-regensburg.de>
---
 .../activities/SpotListActivity.kt            | 41 +++++++++++++++++++
 .../archaeologicalfieldwork/main/MainApp.kt   |  3 ++
 .../main/res/layout/activity_spot_list.xml    |  7 ++++
 app/src/main/res/layout/card_spot.xml         | 27 ++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 app/src/main/res/layout/card_spot.xml

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index be3ed7f..d74854c 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -2,9 +2,17 @@ package com.archaeologicalfieldwork.activities
 
 import android.os.Bundle
 import android.os.PersistableBundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.archaeologicalfieldwork.R
 import com.archaeologicalfieldwork.main.MainApp
+import com.archaeologicalfieldwork.models.SpotModel
+import kotlinx.android.synthetic.main.activity_spot_list.*
+import kotlinx.android.synthetic.main.card_spot.view.*
 
 
 class SpotListActivity : AppCompatActivity() {
@@ -15,5 +23,38 @@ class SpotListActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_spot_list)
         app = application as MainApp
+
+        val layoutManager = LinearLayoutManager(this)
+        recyclerView.layoutManager = layoutManager
+        recyclerView.adapter = SpotAdapter(app.spots)
+    }
+}
+
+class SpotAdapter constructor(private var spots: List<SpotModel>) :
+    RecyclerView.Adapter<SpotAdapter.MainHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainHolder {
+        return MainHolder(
+            LayoutInflater.from(parent?.context).inflate(
+                R.layout.card_spot,
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun onBindViewHolder(holder: MainHolder, position: Int) {
+        val spot = spots[holder.adapterPosition]
+        holder.bind(spot)
+    }
+
+    override fun getItemCount(): Int = spots.size
+
+    class MainHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        fun bind(spot: SpotModel) {
+            itemView.spotTitle.text = spot.title
+            itemView.spotDescription.text = spot.desription
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
index 2654dcf..54ca9dd 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
@@ -12,5 +12,8 @@ class MainApp : Application(), AnkoLogger {
     override fun onCreate() {
         super.onCreate()
         info("Archaelogical Fieldwork started")
+        spots.add(SpotModel("One", "About one..."))
+        spots.add(SpotModel("Two", "About two..."))
+        spots.add(SpotModel("Three", "About three..."))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_spot_list.xml b/app/src/main/res/layout/activity_spot_list.xml
index 3523114..246cb16 100644
--- a/app/src/main/res/layout/activity_spot_list.xml
+++ b/app/src/main/res/layout/activity_spot_list.xml
@@ -21,4 +21,11 @@
             app:titleTextColor="@color/colorPrimary" />
     </com.google.android.material.appbar.AppBarLayout>
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_spot.xml b/app/src/main/res/layout/card_spot.xml
new file mode 100644
index 0000000..e16a536
--- /dev/null
+++ b/app/src/main/res/layout/card_spot.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp"
+    android:elevation="24dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <TextView
+            android:id="@+id/spotTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:textSize="30sp" />
+
+        <TextView
+            android:id="@+id/spotDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/spotTitle" />
+
+    </RelativeLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file

From 90a9a53318093f0a42cd7500d5d974c1060f8144 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 17:38:17 +0100
Subject: [PATCH 07/16] [Lab 02] 05 - Added Toolbar + Add sign

Signed-off-by: Lup31519 <philipp.luxi@st.oth-regensburg.de>
---
 .../activities/SpotListActivity.kt                     |  9 +++++++++
 app/src/main/res/menu/menu_main.xml                    | 10 ++++++++++
 app/src/main/res/values/strings.xml                    |  3 +++
 3 files changed, 22 insertions(+)
 create mode 100644 app/src/main/res/menu/menu_main.xml

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index d74854c..171aaef 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -3,6 +3,7 @@ package com.archaeologicalfieldwork.activities
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.LayoutInflater
+import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
@@ -24,10 +25,18 @@ class SpotListActivity : AppCompatActivity() {
         setContentView(R.layout.activity_spot_list)
         app = application as MainApp
 
+        toolbar.title = title
+        setSupportActionBar(toolbar)
+
         val layoutManager = LinearLayoutManager(this)
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = SpotAdapter(app.spots)
     }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
 }
 
 class SpotAdapter constructor(private var spots: List<SpotModel>) :
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..9203c68
--- /dev/null
+++ b/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/item_add"
+        android:icon="@android:drawable/ic_menu_add"
+        android:title="@string/menu_addSpot"
+        app:showAsAction="always" />
+</menu>
\ 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 7a4acf8..82c50f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,9 @@
     <!--General-->
     <string name="app_name">Archaeological Fieldwork</string>
 
+    <!-- Toolbar-->
+    <string name="menu_addSpot">Add</string>
+
     <!--Spot Activity-->
     <string name="button_addSpot">Add Spot</string>
     <string name="hint_SpotTitle">Spot Title</string>

From dafbc199120738cba21cf248884aee08e5d7aa02 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 17:54:02 +0100
Subject: [PATCH 08/16] [Lab 02] Ex - Added Cancel button in toolbar when
 adding new spot

---
 app/build.gradle                              |  2 +-
 .../activities/SpotActivity.kt                | 22 +++++++++++++++++++
 .../activities/SpotListActivity.kt            | 13 +++++++----
 app/src/main/res/menu/menu_new_spot.xml       |  9 ++++++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/menu/menu_new_spot.xml

diff --git a/app/build.gradle b/app/build.gradle
index 86473d6..12b18c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
   defaultConfig {
     applicationId "com.archaeologicalfieldwork"
     minSdkVersion 23
-    targetSdkVersion 30
+    targetSdkVersion 29
     versionCode 1
     versionName "1.0"
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 01ccada..ca24a4d 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -2,6 +2,8 @@ package com.archaeologicalfieldwork.activities
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import kotlinx.android.synthetic.main.activity_spot.*
 import org.jetbrains.anko.info
 import org.jetbrains.anko.toast
@@ -18,6 +20,10 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_spot)
+        toolbarAdd.title = title
+        setSupportActionBar(toolbarAdd)
+        info("Add Spot Activity started...")
+
         app = application as MainApp
 
         btnAddSpot.setOnClickListener() {
@@ -30,9 +36,25 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
                 for (i in app.spots.indices) {
                     info("Spot [$i]: ${app.spots[i]}")
                 }
+                setResult(AppCompatActivity.RESULT_OK)
+                finish()
             } else {
                 toast("Please Enter a title")
             }
         }
     }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_new_spot, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.item_cancel -> {
+                finish()
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index 171aaef..975c8ea 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -2,10 +2,7 @@ package com.archaeologicalfieldwork.activities
 
 import android.os.Bundle
 import android.os.PersistableBundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -14,6 +11,7 @@ import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
 import kotlinx.android.synthetic.main.activity_spot_list.*
 import kotlinx.android.synthetic.main.card_spot.view.*
+import org.jetbrains.anko.startActivityForResult
 
 
 class SpotListActivity : AppCompatActivity() {
@@ -37,6 +35,13 @@ class SpotListActivity : AppCompatActivity() {
         menuInflater.inflate(R.menu.menu_main, menu)
         return super.onCreateOptionsMenu(menu)
     }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item?.itemId) {
+            R.id.item_add -> startActivityForResult<SpotActivity>(0)
+        }
+        return super.onOptionsItemSelected(item)
+    }
 }
 
 class SpotAdapter constructor(private var spots: List<SpotModel>) :
diff --git a/app/src/main/res/menu/menu_new_spot.xml b/app/src/main/res/menu/menu_new_spot.xml
new file mode 100644
index 0000000..0f956e2
--- /dev/null
+++ b/app/src/main/res/menu/menu_new_spot.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/item_cancel"
+        android:title="@string/menu_cancelNewSpot"
+        app:showAsAction="always" />
+</menu>
\ 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 82c50f5..01bf5bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
 
     <!-- Toolbar-->
     <string name="menu_addSpot">Add</string>
+    <string name="menu_cancelNewSpot">Cancel</string>
 
     <!--Spot Activity-->
     <string name="button_addSpot">Add Spot</string>

From 7f1ac26a5835e1ebb3aeacf0abf655edd5329b54 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 18:00:00 +0100
Subject: [PATCH 09/16] [Lab 02] Ex - Outsourced SpotAdapter in own file

---
 .../activities/SpotActivity.kt                |  4 +-
 .../activities/SpotAdapter.kt                 | 39 +++++++++++++++++++
 .../activities/SpotListActivity.kt            | 29 --------------
 app/src/main/res/layout/activity_spot.xml     |  4 +-
 app/src/main/res/layout/card_spot.xml         |  6 +--
 5 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index ca24a4d..314f9e4 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -27,8 +27,8 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
         app = application as MainApp
 
         btnAddSpot.setOnClickListener() {
-            spot.title = spotTitle.text.toString()
-            spot.desription = spotDescription.text.toString()
+            spot.title = spotTitle_Card.text.toString()
+            spot.desription = spotDescription_Card.text.toString()
 
             if (spot.title.isNotEmpty()) {
                 app.spots.add(spot.copy())
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
new file mode 100644
index 0000000..304bea6
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
@@ -0,0 +1,39 @@
+package com.archaeologicalfieldwork.activities
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.models.SpotModel
+import kotlinx.android.synthetic.main.card_spot.view.*
+
+
+class SpotAdapter constructor(private var spots: List<SpotModel>) :
+    RecyclerView.Adapter<SpotAdapter.MainHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainHolder {
+        return MainHolder(
+            LayoutInflater.from(parent?.context).inflate(
+                R.layout.card_spot,
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun onBindViewHolder(holder: MainHolder, position: Int) {
+        val spot = spots[holder.adapterPosition]
+        holder.bind(spot)
+    }
+
+    override fun getItemCount(): Int = spots.size
+
+    class MainHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        fun bind(spot: SpotModel) {
+            itemView.spotTitle_Card.text = spot.title
+            itemView.spotDescription_Card.text = spot.desription
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index 975c8ea..4bb27aa 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -42,33 +42,4 @@ class SpotListActivity : AppCompatActivity() {
         }
         return super.onOptionsItemSelected(item)
     }
-}
-
-class SpotAdapter constructor(private var spots: List<SpotModel>) :
-    RecyclerView.Adapter<SpotAdapter.MainHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainHolder {
-        return MainHolder(
-            LayoutInflater.from(parent?.context).inflate(
-                R.layout.card_spot,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: MainHolder, position: Int) {
-        val spot = spots[holder.adapterPosition]
-        holder.bind(spot)
-    }
-
-    override fun getItemCount(): Int = spots.size
-
-    class MainHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        fun bind(spot: SpotModel) {
-            itemView.spotTitle.text = spot.title
-            itemView.spotDescription.text = spot.desription
-        }
-    }
 }
\ 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..83c7a33 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -40,7 +40,7 @@
           android:orientation="vertical">
 
         <EditText
-            android:id="@+id/spotTitle"
+            android:id="@+id/spotTitle_Card"
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:layout_margin="8dp"
@@ -54,7 +54,7 @@
             android:textSize="14sp" />
 
         <EditText
-            android:id="@+id/spotDescription"
+            android:id="@+id/spotDescription_Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
diff --git a/app/src/main/res/layout/card_spot.xml b/app/src/main/res/layout/card_spot.xml
index e16a536..0ab4f75 100644
--- a/app/src/main/res/layout/card_spot.xml
+++ b/app/src/main/res/layout/card_spot.xml
@@ -11,17 +11,17 @@
         android:padding="16dp">
 
         <TextView
-            android:id="@+id/spotTitle"
+            android:id="@+id/spotTitle_Card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:textSize="30sp" />
 
         <TextView
-            android:id="@+id/spotDescription"
+            android:id="@+id/spotDescription_Card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/spotTitle" />
+            android:layout_below="@id/spotTitle_Card" />
 
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From 23374c0dce3e581acda88c481f2e79afecefae8f Mon Sep 17 00:00:00 2001
From: Philipp Luxi <53474650+philippluxi@users.noreply.github.com>
Date: Wed, 30 Dec 2020 22:19:47 +0100
Subject: [PATCH 10/16] Created Readme.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..332b55c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# Archaeological_Fieldwork
+Repository for submission for the Android programming course at the OTH Regensburg in the winter semester 2020/2021.
+
+### Purpose of the application
+In the final version, places are to be stored, displayed and managed together with title, description and pictures.
+In an extended version, the data storage takes place in Firebase and notes and ratings can be given for the places.

From 84a5fd0f678f1ab692c9f9158bf074c86f4eba7a Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Wed, 30 Dec 2020 23:24:11 +0100
Subject: [PATCH 11/16] [Lab 03] 03 - Introduced MemStore.kt and adapted
 Activities to use the class via mainapp and store interface

---
 .../activities/SpotActivity.kt                | 10 ++++----
 .../activities/SpotListActivity.kt            |  2 +-
 .../archaeologicalfieldwork/main/MainApp.kt   |  6 ++---
 .../models/SpotMemStore.kt                    | 23 +++++++++++++++++++
 .../models/SpotStore.kt                       |  6 +++++
 app/src/main/res/layout/activity_spot.xml     |  4 ++--
 6 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
 create mode 100644 app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 314f9e4..d368651 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -27,15 +27,13 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
         app = application as MainApp
 
         btnAddSpot.setOnClickListener() {
-            spot.title = spotTitle_Card.text.toString()
-            spot.desription = spotDescription_Card.text.toString()
+            spot.title = spotTitle.text.toString()
+            spot.desription = spotDescription.text.toString()
 
             if (spot.title.isNotEmpty()) {
-                app.spots.add(spot.copy())
+                app.spots.create(spot.copy())
                 info("add Button pressed: ${spot}")
-                for (i in app.spots.indices) {
-                    info("Spot [$i]: ${app.spots[i]}")
-                }
+                app.spots.logAll()
                 setResult(AppCompatActivity.RESULT_OK)
                 finish()
             } else {
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index 4bb27aa..5237c13 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -28,7 +28,7 @@ class SpotListActivity : AppCompatActivity() {
 
         val layoutManager = LinearLayoutManager(this)
         recyclerView.layoutManager = layoutManager
-        recyclerView.adapter = SpotAdapter(app.spots)
+        recyclerView.adapter = SpotAdapter(app.spots.findAll())
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
index 54ca9dd..b2d3c39 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
@@ -1,19 +1,17 @@
 package com.archaeologicalfieldwork.main
 
 import android.app.Application
+import com.archaeologicalfieldwork.models.SpotMemStore
 import com.archaeologicalfieldwork.models.SpotModel
 import org.jetbrains.anko.AnkoLogger
 import org.jetbrains.anko.info
 
 class MainApp : Application(), AnkoLogger {
 
-    val spots = ArrayList<SpotModel>()
+    val spots = SpotMemStore()
 
     override fun onCreate() {
         super.onCreate()
         info("Archaelogical Fieldwork started")
-        spots.add(SpotModel("One", "About one..."))
-        spots.add(SpotModel("Two", "About two..."))
-        spots.add(SpotModel("Three", "About three..."))
     }
 }
\ 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
new file mode 100644
index 0000000..613f161
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
@@ -0,0 +1,23 @@
+package com.archaeologicalfieldwork.models
+
+import org.jetbrains.anko.AnkoLogger
+import org.jetbrains.anko.info
+import java.util.ArrayList
+
+
+class SpotMemStore : SpotStore, AnkoLogger {
+
+    val spots = ArrayList<SpotModel>()
+
+    override fun findAll(): List<SpotModel> {
+        return spots
+    }
+
+    override fun create(spot: SpotModel) {
+        spots.add(spot)
+    }
+
+    fun logAll() {
+        spots.forEach { info("${it}") }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt
new file mode 100644
index 0000000..e05de61
--- /dev/null
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt
@@ -0,0 +1,6 @@
+package com.archaeologicalfieldwork.models
+
+interface SpotStore {
+    fun findAll(): List<SpotModel>
+    fun create(spot: SpotModel)
+}
\ 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 83c7a33..22f1f36 100644
--- a/app/src/main/res/layout/activity_spot.xml
+++ b/app/src/main/res/layout/activity_spot.xml
@@ -40,7 +40,7 @@
           android:orientation="vertical">
 
         <EditText
-            android:id="@+id/spotTitle_Card"
+            android:id="@+id/spotTitle"
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:layout_margin="8dp"
@@ -54,7 +54,7 @@
             android:textSize="14sp" />
 
         <EditText
-            android:id="@+id/spotDescription_Card"
+            android:id="@+id/spotDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"

From a70afe940fdfb1b38f6377d5bacc8cfe44e2b898 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 00:47:34 +0100
Subject: [PATCH 12/16] [Lab 03] 04 - Implemented listener to start spot
 activity

---
 .../activities/SpotAdapter.kt                      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
index 304bea6..30eecf3 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
@@ -8,9 +8,14 @@ import com.archaeologicalfieldwork.R
 import com.archaeologicalfieldwork.models.SpotModel
 import kotlinx.android.synthetic.main.card_spot.view.*
 
+interface SpotListener {
+    fun onSpotClick(spot: SpotModel)
+}
 
-class SpotAdapter constructor(private var spots: List<SpotModel>) :
-    RecyclerView.Adapter<SpotAdapter.MainHolder>() {
+class SpotAdapter constructor(
+    private var spots: List<SpotModel>,
+    private val listener: SpotListener
+) : RecyclerView.Adapter<SpotAdapter.MainHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainHolder {
         return MainHolder(
@@ -24,16 +29,17 @@ class SpotAdapter constructor(private var spots: List<SpotModel>) :
 
     override fun onBindViewHolder(holder: MainHolder, position: Int) {
         val spot = spots[holder.adapterPosition]
-        holder.bind(spot)
+        holder.bind(spot, listener)
     }
 
     override fun getItemCount(): Int = spots.size
 
     class MainHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        fun bind(spot: SpotModel) {
+        fun bind(spot: SpotModel, listener: SpotListener) {
             itemView.spotTitle_Card.text = spot.title
             itemView.spotDescription_Card.text = spot.desription
+            itemView.setOnClickListener { listener.onSpotClick(spot) }
         }
     }
 }
\ No newline at end of file

From 39449a71a59f510ba8b857f04b5f76a58a9dbdbc Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 00:48:10 +0100
Subject: [PATCH 13/16] [Lab 03] 04 - Missed file at last commit

---
 .../activities/SpotListActivity.kt                       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index 5237c13..abd2e2f 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -11,10 +11,11 @@ import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
 import kotlinx.android.synthetic.main.activity_spot_list.*
 import kotlinx.android.synthetic.main.card_spot.view.*
+import org.jetbrains.anko.intentFor
 import org.jetbrains.anko.startActivityForResult
 
 
-class SpotListActivity : AppCompatActivity() {
+class SpotListActivity : AppCompatActivity(), SpotListener {
 
     lateinit var app: MainApp
 
@@ -28,7 +29,7 @@ class SpotListActivity : AppCompatActivity() {
 
         val layoutManager = LinearLayoutManager(this)
         recyclerView.layoutManager = layoutManager
-        recyclerView.adapter = SpotAdapter(app.spots.findAll())
+        recyclerView.adapter = SpotAdapter(app.spots.findAll(), this)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -42,4 +43,8 @@ class SpotListActivity : AppCompatActivity() {
         }
         return super.onOptionsItemSelected(item)
     }
+
+    override fun onSpotClick(spot: SpotModel) {
+        startActivityForResult(intentFor<SpotActivity>(), 0)
+    }
 }
\ No newline at end of file

From e35e1d66fcf8c7c740c5eeb54fa83d7292f1b555 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 01:34:11 +0100
Subject: [PATCH 14/16] [Lab 03] 06 - Parcelize SpotModel to pass it from List
 and retrieve in Spot_activity

---
 .../archaeologicalfieldwork/activities/SpotActivity.kt   | 9 +++++++++
 .../activities/SpotListActivity.kt                       | 6 ++++--
 .../java/com/archaeologicalfieldwork/models/SpotModel.kt | 6 +++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index d368651..76c3d4e 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -26,6 +26,15 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
 
         app = application as MainApp
 
+        // Retrieve passed Spot info via Parcelize
+        if (intent.hasExtra("spot_edit")) {
+            info("Detected Intent Extra")
+            spot = intent.extras?.getParcelable<SpotModel>("spot_edit")!!
+            spotTitle.setText(spot.title)
+            spotDescription.setText(spot.desription)
+        }
+
+        // Handle Add Button Press
         btnAddSpot.setOnClickListener() {
             spot.title = spotTitle.text.toString()
             spot.desription = spotDescription.text.toString()
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index abd2e2f..b076856 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -11,11 +11,13 @@ import com.archaeologicalfieldwork.main.MainApp
 import com.archaeologicalfieldwork.models.SpotModel
 import kotlinx.android.synthetic.main.activity_spot_list.*
 import kotlinx.android.synthetic.main.card_spot.view.*
+import org.jetbrains.anko.AnkoLogger
+import org.jetbrains.anko.info
 import org.jetbrains.anko.intentFor
 import org.jetbrains.anko.startActivityForResult
 
 
-class SpotListActivity : AppCompatActivity(), SpotListener {
+class SpotListActivity : AppCompatActivity(), SpotListener, AnkoLogger {
 
     lateinit var app: MainApp
 
@@ -45,6 +47,6 @@ class SpotListActivity : AppCompatActivity(), SpotListener {
     }
 
     override fun onSpotClick(spot: SpotModel) {
-        startActivityForResult(intentFor<SpotActivity>(), 0)
+        startActivityForResult(intentFor<SpotActivity>().putExtra("spot_edit", spot), 0)
     }
 }
\ 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 da32bdd..3a7ac3b 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -1,6 +1,10 @@
 package com.archaeologicalfieldwork.models
 
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
 data class SpotModel(
     var title: String = "",
     var desription: String = ""
-)
\ No newline at end of file
+) : Parcelable
\ No newline at end of file

From 4a30ccb49d30d568e7ecfa88bc521152f3a85d2c Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 02:40:28 +0100
Subject: [PATCH 15/16] [Lab 04] 02 - List view gets update on data change

---
 .../activities/SpotActivity.kt                 | 18 +++++++++++++-----
 .../activities/SpotListActivity.kt             |  6 ++++++
 .../models/SpotMemStore.kt                     | 16 ++++++++++++++++
 .../models/SpotModel.kt                        |  1 +
 .../models/SpotStore.kt                        |  1 +
 app/src/main/res/values/strings.xml            |  2 ++
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 76c3d4e..45f7d99 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -16,6 +16,7 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
 
     var spot = SpotModel()
     lateinit var app: MainApp
+    var edit = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,10 +29,13 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
 
         // Retrieve passed Spot info via Parcelize
         if (intent.hasExtra("spot_edit")) {
-            info("Detected Intent Extra")
+            edit = true
+
             spot = intent.extras?.getParcelable<SpotModel>("spot_edit")!!
             spotTitle.setText(spot.title)
             spotDescription.setText(spot.desription)
+
+            btnAddSpot.setText(R.string.save_spot)
         }
 
         // Handle Add Button Press
@@ -39,14 +43,18 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
             spot.title = spotTitle.text.toString()
             spot.desription = spotDescription.text.toString()
 
-            if (spot.title.isNotEmpty()) {
-                app.spots.create(spot.copy())
+            if (spot.title.isEmpty()) {
+                toast(R.string.enter_spot_title)
+            } else {
+                if (edit) {
+                    app.spots.update(spot.copy())
+                } else {
+                    app.spots.create(spot.copy())
+                }
                 info("add Button pressed: ${spot}")
                 app.spots.logAll()
                 setResult(AppCompatActivity.RESULT_OK)
                 finish()
-            } else {
-                toast("Please Enter a title")
             }
         }
     }
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index b076856..67162c3 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -1,5 +1,6 @@
 package com.archaeologicalfieldwork.activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.*
@@ -49,4 +50,9 @@ class SpotListActivity : AppCompatActivity(), SpotListener, AnkoLogger {
     override fun onSpotClick(spot: SpotModel) {
         startActivityForResult(intentFor<SpotActivity>().putExtra("spot_edit", spot), 0)
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        recyclerView.adapter?.notifyDataSetChanged()
+        super.onActivityResult(requestCode, resultCode, data)
+    }
 }
\ 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 613f161..f53d6e2 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
@@ -4,6 +4,11 @@ import org.jetbrains.anko.AnkoLogger
 import org.jetbrains.anko.info
 import java.util.ArrayList
 
+var lastId = 0L
+
+internal fun getId(): Long {
+    return lastId++
+}
 
 class SpotMemStore : SpotStore, AnkoLogger {
 
@@ -14,7 +19,18 @@ class SpotMemStore : SpotStore, AnkoLogger {
     }
 
     override fun create(spot: SpotModel) {
+        spot.id = getId()
         spots.add(spot)
+        logAll()
+    }
+
+    override fun update(spot: SpotModel) {
+        var foundSpot: SpotModel? = spots.find { spot_iterator -> spot_iterator.id == spot.id }
+        if (foundSpot != null) {
+            foundSpot.title = spot.title
+            foundSpot.desription = spot.desription
+        }
+
     }
 
     fun logAll() {
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
index 3a7ac3b..58acb35 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotModel.kt
@@ -5,6 +5,7 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class SpotModel(
+    var id: Long = 0,
     var title: String = "",
     var desription: String = ""
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt
index e05de61..355d38f 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotStore.kt
@@ -3,4 +3,5 @@ package com.archaeologicalfieldwork.models
 interface SpotStore {
     fun findAll(): List<SpotModel>
     fun create(spot: SpotModel)
+    fun update(spot: SpotModel)
 }
\ 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 01bf5bd..ac45050 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,6 @@
     <string name="button_addSpot">Add 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>
+    <string name="save_spot">Save Spot</string>
 </resources>
\ No newline at end of file

From c1397d883da0080d8395c68438e4eec09276eb02 Mon Sep 17 00:00:00 2001
From: Lup31519 <philipp.luxi@st.oth-regensburg.de>
Date: Thu, 31 Dec 2020 03:12:42 +0100
Subject: [PATCH 16/16] [Release] - Removed unused and sorted imports -
 renamings, and delete blank lines

---
 .../activities/SpotActivity.kt                       |  2 +-
 .../activities/SpotAdapter.kt                        |  4 ++--
 .../activities/SpotListActivity.kt                   | 12 ++++--------
 .../java/com/archaeologicalfieldwork/main/MainApp.kt |  5 ++---
 .../archaeologicalfieldwork/models/SpotMemStore.kt   |  5 ++---
 app/src/main/res/values/strings.xml                  |  3 ++-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
index 45f7d99..7d3ead4 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotActivity.kt
@@ -35,7 +35,7 @@ class SpotActivity : AppCompatActivity(), AnkoLogger {
             spotTitle.setText(spot.title)
             spotDescription.setText(spot.desription)
 
-            btnAddSpot.setText(R.string.save_spot)
+            btnAddSpot.setText(R.string.button_save_spot)
         }
 
         // Handle Add Button Press
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
index 30eecf3..531a878 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotAdapter.kt
@@ -1,12 +1,12 @@
 package com.archaeologicalfieldwork.activities
 
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.LayoutInflater
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.card_spot.view.*
 import com.archaeologicalfieldwork.R
 import com.archaeologicalfieldwork.models.SpotModel
-import kotlinx.android.synthetic.main.card_spot.view.*
 
 interface SpotListener {
     fun onSpotClick(spot: SpotModel)
diff --git a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
index 67162c3..85d9d5e 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/activities/SpotListActivity.kt
@@ -2,20 +2,16 @@ package com.archaeologicalfieldwork.activities
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.PersistableBundle
 import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.archaeologicalfieldwork.R
-import com.archaeologicalfieldwork.main.MainApp
-import com.archaeologicalfieldwork.models.SpotModel
 import kotlinx.android.synthetic.main.activity_spot_list.*
-import kotlinx.android.synthetic.main.card_spot.view.*
 import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.info
 import org.jetbrains.anko.intentFor
 import org.jetbrains.anko.startActivityForResult
+import com.archaeologicalfieldwork.R
+import com.archaeologicalfieldwork.main.MainApp
+import com.archaeologicalfieldwork.models.SpotModel
 
 
 class SpotListActivity : AppCompatActivity(), SpotListener, AnkoLogger {
@@ -41,7 +37,7 @@ class SpotListActivity : AppCompatActivity(), SpotListener, AnkoLogger {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item?.itemId) {
+        when (item.itemId) {
             R.id.item_add -> startActivityForResult<SpotActivity>(0)
         }
         return super.onOptionsItemSelected(item)
diff --git a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
index b2d3c39..5cc66f7 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/main/MainApp.kt
@@ -1,10 +1,9 @@
 package com.archaeologicalfieldwork.main
 
 import android.app.Application
-import com.archaeologicalfieldwork.models.SpotMemStore
-import com.archaeologicalfieldwork.models.SpotModel
-import org.jetbrains.anko.AnkoLogger
 import org.jetbrains.anko.info
+import org.jetbrains.anko.AnkoLogger
+import com.archaeologicalfieldwork.models.SpotMemStore
 
 class MainApp : Application(), AnkoLogger {
 
diff --git a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
index f53d6e2..b9402fd 100644
--- a/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
+++ b/app/src/main/java/com/archaeologicalfieldwork/models/SpotMemStore.kt
@@ -1,8 +1,8 @@
 package com.archaeologicalfieldwork.models
 
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.info
 import java.util.ArrayList
+import org.jetbrains.anko.info
+import org.jetbrains.anko.AnkoLogger
 
 var lastId = 0L
 
@@ -30,7 +30,6 @@ class SpotMemStore : SpotStore, AnkoLogger {
             foundSpot.title = spot.title
             foundSpot.desription = spot.desription
         }
-
     }
 
     fun logAll() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac45050..d17836c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,8 +8,9 @@
 
     <!--Spot Activity-->
     <string name="button_addSpot">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>
-    <string name="save_spot">Save Spot</string>
+
 </resources>
\ No newline at end of file